From 5d4bdd1964ce3bd5a12d1e40c3a3bba55c2232b7 Mon Sep 17 00:00:00 2001
From: "Philip P. Moltmann" <moltmann@google.com>
Date: Fri, 9 Dec 2016 14:11:08 -0800
Subject: Prioritize package installer intent filter

Package Installer intent should always be handled by the package
installer. Only privilegded apps can have a priority > 0.

The K version is I79fd77b12bad9b79d1a53d08629a2b07919aad2c
The L version is I27611baae21c3820f594e8f58aec34fc4d0b1ffb
The M version is I7f1726fc9665e57ec63c966570169216eb2e0764

Bug: 32553261

CVE-2017-0491

Change-Id: I3d9054ddd475c7e77e1696e31285a6b47d59fa2a
(cherry picked from commit 540a404bd489d65feca8dbd85216891300e0fcfc)
(cherry picked from commit 5c49b6bf732c88481466dea341917b8604ce53fa
	with adaptations by <sultanxda@gmail.com>)
---
 AndroidManifest.xml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 3f1bb1d8..7fbc1d4b 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -29,20 +29,20 @@
         <activity android:name=".PackageInstallerActivity"
                 android:configChanges="orientation|keyboardHidden|screenSize"
                 android:excludeFromRecents="true">
-            <intent-filter>
+            <intent-filter android:priority="1">
                 <action android:name="android.intent.action.VIEW" />
                 <action android:name="android.intent.action.INSTALL_PACKAGE" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <data android:scheme="file" />
                 <data android:mimeType="application/vnd.android.package-archive" />
             </intent-filter>
-            <intent-filter>
+            <intent-filter android:priority="1">
                 <action android:name="android.intent.action.INSTALL_PACKAGE" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <data android:scheme="file" />
                 <data android:scheme="package" />
             </intent-filter>
-            <intent-filter>
+            <intent-filter android:priority="1">
                 <action android:name="android.content.pm.action.CONFIRM_PERMISSIONS" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
@@ -72,7 +72,7 @@
                 android:configChanges="orientation|keyboardHidden|screenSize"
                 android:excludeFromRecents="true"
                 android:theme="@style/GrantPermissions">
-            <intent-filter>
+            <intent-filter android:priority="1">
                 <action android:name="android.content.pm.action.REQUEST_PERMISSIONS" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
@@ -84,7 +84,7 @@
                   android:label="@string/app_permissions"
                   android:theme="@style/Settings"
                   android:permission="android.permission.GRANT_RUNTIME_PERMISSIONS">
-            <intent-filter>
+            <intent-filter android:priority="1">
                 <action android:name="android.intent.action.MANAGE_PERMISSIONS" />
                 <action android:name="android.intent.action.MANAGE_APP_PERMISSIONS" />
                 <action android:name="android.intent.action.MANAGE_PERMISSION_APPS" />
@@ -98,7 +98,7 @@
 
         <receiver android:name=".permission.model.PermissionStatusReceiver"
             android:permission="android.permission.GRANT_RUNTIME_PERMISSIONS">
-            <intent-filter>
+            <intent-filter android:priority="1">
                 <action android:name="android.intent.action.GET_PERMISSIONS_COUNT" />
                 <action android:name="android.intent.action.GET_PERMISSIONS_PACKAGES" />
             </intent-filter>
@@ -108,11 +108,11 @@
         <service android:name=".wear.WearPackageInstallerService"
                  android:permission="com.google.android.permission.INSTALL_WEARABLE_PACKAGES"
                  android:exported="true">
-            <intent-filter>
+            <intent-filter android:priority="1">
                 <action android:name="com.android.packageinstaller.wear.INSTALL_PACKAGE"/>
                 <data android:scheme="content" android:mimeType="vnd.android.cursor.item/*"/>
             </intent-filter>
-            <intent-filter>
+            <intent-filter android:priority="1">
                 <action android:name="com.android.packageinstaller.wear.UNINSTALL_PACKAGE"/>
             </intent-filter>
         </service>
-- 
cgit v1.2.3