[go: up one dir, main page]

Remove REQUEST_INSTALL_PACKAGES permission for notouch build

Downloads home isn't supported in notouch builds, so we don't need this
permission.

(cherry picked from commit 0e5c8a211005c4c94ce5bdd349abe9a6febe8f50)

Bug: 972750
Change-Id: I964dbfbc3c8d3a9d0be8b1b03884815a5d7c6bc6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1652055
Reviewed-by: Yaron Friedman <yfriedman@chromium.org>
Commit-Queue: Michael Thiessen <mthiesse@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#667763}
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1656010
Reviewed-by: Michael Thiessen <mthiesse@chromium.org>
Cr-Commit-Position: refs/branch-heads/3809@{#253}
Cr-Branched-From: d82dec1a818f378c464ba307ddd9c92133eac355-refs/heads/master@{#665002}
diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml
index 948cf72..fbc631f0 100644
--- a/chrome/android/java/AndroidManifest.xml
+++ b/chrome/android/java/AndroidManifest.xml
@@ -37,7 +37,11 @@
     <uses-permission-sdk-23 android:name="android.permission.BLUETOOTH_ADMIN"/>
     <uses-permission-sdk-23 android:name="android.permission.READ_CONTACTS"/>
     <uses-permission-sdk-23 android:name="android.permission.REORDER_TASKS"/>
-    <uses-permission-sdk-23 android:name="android.permission.REQUEST_INSTALL_PACKAGES"/>
+    <!-- notouch build doesn't support downloads home and shouldn't need this permission -->
+    {% set notouch_build = notouch_build|default(0) %}
+    {% if notouch_build == "false" %}
+        <uses-permission-sdk-23 android:name="android.permission.REQUEST_INSTALL_PACKAGES"/>
+    {% endif %}
 
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.DOWNLOAD_WITHOUT_NOTIFICATION" />
@@ -490,7 +494,6 @@
         <!-- ChromeTabbedActivity related -->
         <activity android:name="org.chromium.chrome.browser.ChromeTabbedActivity"
             android:theme="@style/Theme.Chromium.TabbedMode"
-            {% set notouch_build = notouch_build|default(0) %}
             {% if notouch_build == "true" %}
             android:exported="false"
             {% else %}