From 14e9548a418807199699586c446de3d21db9ec63 Mon Sep 17 00:00:00 2001
From: pkotwicz <pkotwicz@chromium.org>
Date: Fri, 11 Nov 2016 21:51:21 -0800
Subject: [PATCH] Use FileProvider for installing WebAPKs on Android N

Android N now bans installing APKs from world readable files and requires
FileProvider. See http://stackoverflow.com/questions/36755301/how-to-run-install-app-in-internal-files-dir

BUG=663800

Review-Url: https://codereview.chromium.org/2487353002
Cr-Commit-Position: refs/heads/master@{#431777}
---
 chrome/android/java/res/xml/file_paths.xml    |  1 +
 .../browser/webapps/WebApkInstaller.java      | 31 +++++++++++++------
 .../android/webapk/webapk_installer.cc        |  3 +-
 3 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/chrome/android/java/res/xml/file_paths.xml b/chrome/android/java/res/xml/file_paths.xml
index 5be9ca6b5bc2ae..5a1fbe4b094991 100644
--- a/chrome/android/java/res/xml/file_paths.xml
+++ b/chrome/android/java/res/xml/file_paths.xml
@@ -9,6 +9,7 @@
 <paths xmlns:android="http://schemas.android.com/apk/res/android">
     <files-path name="images" path="images/"/>
     <cache-path name="cache" path="net-export/"/>
+    <cache-path name="webapk" path="webapks/" />
 
     <!-- Note(twellington): This path is included to facilitate creating
          content:// URIs for downloads. This may no longer work if/when users
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebApkInstaller.java b/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebApkInstaller.java
index c5162bf5837bba..2b3a2c9fb66f47 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebApkInstaller.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebApkInstaller.java
@@ -4,18 +4,21 @@
 
 package org.chromium.chrome.browser.webapps;
 
-import android.content.ActivityNotFoundException;
+import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.net.Uri;
+import android.os.Build;
 import android.os.Looper;
 
 import org.chromium.base.ApplicationState;
 import org.chromium.base.ApplicationStatus;
+import org.chromium.base.ContentUriUtils;
 import org.chromium.base.ContextUtils;
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.chrome.browser.ShortcutHelper;
 import org.chromium.chrome.browser.banners.InstallerDelegate;
+import org.chromium.chrome.browser.util.IntentUtils;
 
 import java.io.File;
 
@@ -87,16 +90,24 @@ private boolean installAsyncAndMonitorInstallationFromNative(
      * @param filePath File to install.
      */
     private boolean installDownloadedWebApk(String filePath) {
-        Intent intent = new Intent(Intent.ACTION_VIEW);
-        Uri fileUri = Uri.fromFile(new File(filePath));
-        intent.setDataAndType(fileUri, "application/vnd.android.package-archive");
-        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        try {
-            ContextUtils.getApplicationContext().startActivity(intent);
-        } catch (ActivityNotFoundException e) {
-            return false;
+        // TODO(pkotwicz|hanxi): For Chrome Stable figure out a different way of installing
+        // WebAPKs which does not involve enabling "installation from Unsigned Sources".
+        Context context = ContextUtils.getApplicationContext();
+        Intent intent;
+        File pathToInstall = new File(filePath);
+
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) {
+            intent = new Intent(Intent.ACTION_VIEW);
+            Uri fileUri = Uri.fromFile(pathToInstall);
+            intent.setDataAndType(fileUri, "application/vnd.android.package-archive");
+            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        } else {
+            Uri source = ContentUriUtils.getContentUriFromFile(context, pathToInstall);
+            intent = new Intent(Intent.ACTION_INSTALL_PACKAGE);
+            intent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
+            intent.setData(source);
         }
-        return true;
+        return IntentUtils.safeStartActivity(context, intent);
     }
 
     private InstallerDelegate.Observer createInstallerDelegateObserver() {
diff --git a/chrome/browser/android/webapk/webapk_installer.cc b/chrome/browser/android/webapk/webapk_installer.cc
index 175969f0a1107d..92b58fbc235ea6 100644
--- a/chrome/browser/android/webapk/webapk_installer.cc
+++ b/chrome/browser/android/webapk/webapk_installer.cc
@@ -397,7 +397,8 @@ void WebApkInstaller::OnCreatedSubDirAndSetPermissions(
     return;
   }
 
-  DownloadWebApk(output_dir.AppendASCII(webapk_package_), download_url, true);
+  DownloadWebApk(output_dir.AppendASCII(webapk_package_ + ".apk"),
+                 download_url, true);
 }
 
 void WebApkInstaller::DownloadWebApk(const base::FilePath& output_path,