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

Commit f43cf00e authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android (Google) Code Review
Browse files

Merge "Remove support for file:// items."

parents 2118cc30 57f6dbc5

packages/PackageInstaller/AndroidManifest.xml

+0 −2
Original line number Original line Diff line number Diff line
@@ -43,14 +43,12 @@ 
                <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="content" />

                <data android:scheme="content" />

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

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

            </intent-filter>

            </intent-filter>

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

            <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="package" />

                <data android:scheme="package" />

                <data android:scheme="content" />

                <data android:scheme="content" />

            </intent-filter>

            </intent-filter>

services/core/java/com/android/server/pm/PackageManagerService.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -3502,7 +3502,7 @@ public class PackageManagerService extends IPackageManager.Stub 
    private @NonNull String getRequiredInstallerLPr() {

    private @NonNull String getRequiredInstallerLPr() {

        final Intent intent = new Intent(Intent.ACTION_INSTALL_PACKAGE);

        final Intent intent = new Intent(Intent.ACTION_INSTALL_PACKAGE);

        intent.addCategory(Intent.CATEGORY_DEFAULT);

        intent.addCategory(Intent.CATEGORY_DEFAULT);

        intent.setDataAndType(Uri.fromFile(new File("foo.apk")), PACKAGE_MIME_TYPE);

        intent.setDataAndType(Uri.parse("content://com.example/foo.apk"), PACKAGE_MIME_TYPE);

















        final List<ResolveInfo> matches = queryIntentActivitiesInternal(intent, PACKAGE_MIME_TYPE,







        final List<ResolveInfo> matches = queryIntentActivitiesInternal(intent, PACKAGE_MIME_TYPE,











                MATCH_SYSTEM_ONLY | MATCH_DIRECT_BOOT_AWARE | MATCH_DIRECT_BOOT_UNAWARE,







                MATCH_SYSTEM_ONLY | MATCH_DIRECT_BOOT_AWARE | MATCH_DIRECT_BOOT_UNAWARE,