summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilip P. Moltmann <moltmann@google.com>2016-12-08 21:54:47 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-12-08 21:54:47 +0000
commitdb7e6fafb265c38319ebe9d30e2bcf584e688a4f (patch)
tree6655743b6f881858c77f2a5f5ab217b8a432a468
parent11b02451853c799ba7c807f2ebee988f98bc4de5 (diff)
parent1c2b3518694218b2a7ec66a7c392f6549a934f1b (diff)
downloadandroid_packages_apps_PackageInstaller-db7e6fafb265c38319ebe9d30e2bcf584e688a4f.tar.gz
android_packages_apps_PackageInstaller-db7e6fafb265c38319ebe9d30e2bcf584e688a4f.tar.bz2
android_packages_apps_PackageInstaller-db7e6fafb265c38319ebe9d30e2bcf584e688a4f.zip
Prioritze package installer intent filter am: f1fb59a1d2
am: 1c2b351869 Change-Id: I4415f6a19221dcf3a8fd381a52b9ad469a1d249f
-rw-r--r--Android.mk2
-rw-r--r--AndroidManifest.xml10
2 files changed, 7 insertions, 5 deletions
diff --git a/Android.mk b/Android.mk
index 092bf9c0..60f31b93 100644
--- a/Android.mk
+++ b/Android.mk
@@ -12,6 +12,8 @@ LOCAL_STATIC_JAVA_LIBRARIES += android-support-v4
LOCAL_PACKAGE_NAME := PackageInstaller
LOCAL_CERTIFICATE := platform
+LOCAL_PRIVILEGED_MODULE := true
+
LOCAL_PROGUARD_FLAG_FILES := proguard.flags
include $(BUILD_PACKAGE)
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index ca8777d0..fb889518 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -23,20 +23,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>
@@ -50,7 +50,7 @@
android:configChanges="orientation|keyboardHidden|screenSize"
android:excludeFromRecents="true"
android:theme="@style/Theme.AlertDialogActivity">
- <intent-filter>
+ <intent-filter android:priority="1">
<action android:name="android.intent.action.DELETE" />
<action android:name="android.intent.action.UNINSTALL_PACKAGE" />
<category android:name="android.intent.category.DEFAULT" />
@@ -66,7 +66,7 @@
android:configChanges="orientation|keyboardHidden|screenSize"
android:excludeFromRecents="true"
android:theme="@android:style/Theme.DeviceDefault.Dialog.NoActionBar">
- <intent-filter>
+ <intent-filter android:priority="1">
<action android:name="android.content.pm.action.REQUEST_PERMISSION" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>