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

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

Merge "Intercept direct launch of instant app installer"

parents 93dea5e1 7d6a729c

core/java/android/content/pm/PackageManagerInternal.java

+1 −0
Original line number Diff line number Diff line
@@ -241,6 +241,7 @@ public abstract class PackageManagerInternal { 
    public abstract void grantEphemeralAccess(int userId, Intent intent,

            int targetAppId, int ephemeralAppId);



    public abstract boolean isInstantAppInstallerComponent(ComponentName component);

    /**

     * Prunes instant apps and state associated with uninstalled

     * instant apps according to the current platform policy.

services/core/java/com/android/server/am/ActivityStarter.java

+12 −0
Original line number Diff line number Diff line
@@ -640,6 +640,18 @@ class ActivityStarter { 
        final Intent ephemeralIntent = new Intent(intent);

        // Don't modify the client's object!

        intent = new Intent(intent);

        if (componentSpecified

                && intent.getData() != null

                && Intent.ACTION_VIEW.equals(intent.getAction())

                && intent.hasCategory(Intent.CATEGORY_BROWSABLE)

                && mService.getPackageManagerInternalLocked()

                        .isInstantAppInstallerComponent(intent.getComponent())) {

            // intercept intents targeted directly to the ephemeral installer the

            // ephemeral installer should never be started with a raw URL; instead

            // adjust the intent so it looks like a "normal" instant app launch

            intent.setComponent(null /*component*/);

            componentSpecified = false;

        }



        ResolveInfo rInfo = mSupervisor.resolveIntent(intent, resolvedType, userId);

        if (rInfo == null) {

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

+12 −2
Original line number Diff line number Diff line
@@ -5788,6 +5788,10 @@ public class PackageManagerService extends IPackageManager.Stub { 
                        return false;

                    }

                    if (ps.getInstantApp(userId)) {

                        if (DEBUG_EPHEMERAL) {

                            Slog.v(TAG, "DENY instant app installed;"

                                    + " pkg: " + packageName);

                        }

                        return false;

                    }

                }
@@ -6267,7 +6271,6 @@ public class PackageManagerService extends IPackageManager.Stub { 
                        intent, resolvedType, flags, userId), userId);

                addEphemeral = !ephemeralDisabled

                        && isEphemeralAllowed(intent, result, userId, false /*skipPackageCheck*/);















                // Check for cross profile results.















                boolean hasNonNegativePriorityResult = hasNonNegativePriority(result);















                xpResolveInfo = queryCrossProfileIntents(










@@ -23072,6 +23075,13 @@ Slog.v(TAG, ":: stepped forward, applying functor at tag " + parser.getName());













            }















        }



























        @Override













        public boolean isInstantAppInstallerComponent(ComponentName component) {













            synchronized (mPackages) {













                return component != null && component.equals(mInstantAppInstallerComponent);













            }













        }



























        @Override















        public void pruneInstantApps() {















            synchronized (mPackages) {