Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 57df7d5d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Prioritze package installer intent filter" into lmp-dev

parents 7470dbb3 f1fb59a1

Android.mk

+2 −0
Original line number Original line Diff line number Diff line
@@ -12,6 +12,8 @@ LOCAL_STATIC_JAVA_LIBRARIES += android-support-v4 
LOCAL_PACKAGE_NAME := PackageInstaller

LOCAL_PACKAGE_NAME := PackageInstaller

LOCAL_CERTIFICATE := platform

LOCAL_CERTIFICATE := platform





LOCAL_PRIVILEGED_MODULE := true



LOCAL_PROGUARD_FLAG_FILES := proguard.flags

LOCAL_PROGUARD_FLAG_FILES := proguard.flags





include $(BUILD_PACKAGE)
 
include $(BUILD_PACKAGE)

AndroidManifest.xml

+5 −5
Original line number Original line Diff line number Diff line
@@ -23,20 +23,20 @@ 
        <activity android:name=".PackageInstallerActivity"

        <activity android:name=".PackageInstallerActivity"

                android:configChanges="orientation|keyboardHidden|screenSize"

                android:configChanges="orientation|keyboardHidden|screenSize"

                android:excludeFromRecents="true">

                android:excludeFromRecents="true">

            <intent-filter>

            <intent-filter android:priority="1">

                <action android:name="android.intent.action.VIEW" />

                <action android:name="android.intent.action.VIEW" />

                <action android:name="android.intent.action.INSTALL_PACKAGE" />

                <action android:name="android.intent.action.INSTALL_PACKAGE" />

                <category android:name="android.intent.category.DEFAULT" />

                <category android:name="android.intent.category.DEFAULT" />

                <data android:scheme="file" />

                <data android:scheme="file" />

                <data android:mimeType="application/vnd.android.package-archive" />

                <data android:mimeType="application/vnd.android.package-archive" />

            </intent-filter>

            </intent-filter>

            <intent-filter>

            <intent-filter android:priority="1">

                <action android:name="android.intent.action.INSTALL_PACKAGE" />

                <action android:name="android.intent.action.INSTALL_PACKAGE" />

                <category android:name="android.intent.category.DEFAULT" />

                <category android:name="android.intent.category.DEFAULT" />

                <data android:scheme="file" />

                <data android:scheme="file" />

                <data android:scheme="package" />

                <data android:scheme="package" />

            </intent-filter>

            </intent-filter>

            <intent-filter>

            <intent-filter android:priority="1">

                <action android:name="android.content.pm.action.CONFIRM_PERMISSIONS" />

                <action android:name="android.content.pm.action.CONFIRM_PERMISSIONS" />

                <category android:name="android.intent.category.DEFAULT" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

            </intent-filter>
@@ -50,7 +50,7 @@ 
                android:configChanges="orientation|keyboardHidden|screenSize"

                android:configChanges="orientation|keyboardHidden|screenSize"

                android:excludeFromRecents="true"

                android:excludeFromRecents="true"

                android:theme="@style/Theme.AlertDialogActivity">

                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.DELETE" />

                <action android:name="android.intent.action.UNINSTALL_PACKAGE" />

                <action android:name="android.intent.action.UNINSTALL_PACKAGE" />

                <category android:name="android.intent.category.DEFAULT" />

                <category android:name="android.intent.category.DEFAULT" />
@@ -66,7 +66,7 @@ 
                android:configChanges="orientation|keyboardHidden|screenSize"

                android:configChanges="orientation|keyboardHidden|screenSize"

                android:excludeFromRecents="true"

                android:excludeFromRecents="true"

                android:theme="@android:style/Theme.DeviceDefault.Dialog.NoActionBar">

                android:theme="@android:style/Theme.DeviceDefault.Dialog.NoActionBar">

            <intent-filter>

            <intent-filter android:priority="1">

                <action android:name="android.content.pm.action.REQUEST_PERMISSION" />

                <action android:name="android.content.pm.action.REQUEST_PERMISSION" />

                <category android:name="android.intent.category.DEFAULT" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

            </intent-filter>