diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2016-12-08 21:43:53 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-12-08 21:43:53 +0000 |
| commit | 57df7d5daacc5c1f40fd9985d8bdb1b9754998bf (patch) | |
| tree | bba6189372848dab69f21234fa1bb9b1e759f10e | |
| parent | 7470dbb38c133e011f5e4e2af19ce85b433c3494 (diff) | |
| parent | f1fb59a1d2aeb6002d1eb0f14fb791566ce33184 (diff) | |
| download | android_packages_apps_PackageInstaller-57df7d5daacc5c1f40fd9985d8bdb1b9754998bf.tar.gz android_packages_apps_PackageInstaller-57df7d5daacc5c1f40fd9985d8bdb1b9754998bf.tar.bz2 android_packages_apps_PackageInstaller-57df7d5daacc5c1f40fd9985d8bdb1b9754998bf.zip | |
Merge "Prioritze package installer intent filter" into lmp-dev
| -rw-r--r-- | Android.mk | 2 | ||||
| -rw-r--r-- | AndroidManifest.xml | 10 |
2 files changed, 7 insertions, 5 deletions
@@ -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> |