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

Commit 9a126ddc authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes Ie865aba7,Ic51a9ceb into udc-dev am: 85b959f4 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24134363



Change-Id: I1fa281944e05defe269445ea791742d4db584a31
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 608986bc 85b959f4

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

+7 −2
Original line number Original line Diff line number Diff line
@@ -4300,7 +4300,8 @@ final class InstallPackageHelper { 
        //   - It's an APEX or overlay package since stopped state does not affect them.

        //   - It's an APEX or overlay package since stopped state does not affect them.

        //   - It is enumerated with a <initial-package-state> tag having the stopped attribute

        //   - It is enumerated with a <initial-package-state> tag having the stopped attribute

        //     set to false

        //     set to false

        //   - It doesn't have a launcher entry which means the user doesn't have a way to unstop it

        //   - It doesn't have an enabled and exported launcher activity, which means the user

        //     wouldn't have a way to un-stop it

        final boolean isApexPkg = (scanFlags & SCAN_AS_APEX) != 0;

        final boolean isApexPkg = (scanFlags & SCAN_AS_APEX) != 0;

        if (mPm.mShouldStopSystemPackagesByDefault

        if (mPm.mShouldStopSystemPackagesByDefault

                && scanSystemPartition

                && scanSystemPartition
@@ -4326,7 +4327,11 @@ final class InstallPackageHelper { 
        categories.add(Intent.CATEGORY_LAUNCHER);

        categories.add(Intent.CATEGORY_LAUNCHER);

        final List<ParsedActivity> activities = parsedPackage.getActivities();

        final List<ParsedActivity> activities = parsedPackage.getActivities();

        for (int indexActivity = 0; indexActivity < activities.size(); indexActivity++) {

        for (int indexActivity = 0; indexActivity < activities.size(); indexActivity++) {

            final List<ParsedIntentInfo> intents = activities.get(indexActivity).getIntents();

            final ParsedActivity activity = activities.get(indexActivity);

            if (!activity.isEnabled() || !activity.isExported()) {

                continue;

            }

            final List<ParsedIntentInfo> intents = activity.getIntents();

            for (int indexIntent = 0; indexIntent < intents.size(); indexIntent++) {

            for (int indexIntent = 0; indexIntent < intents.size(); indexIntent++) {

                final IntentFilter intentFilter = intents.get(indexIntent).getIntentFilter();

                final IntentFilter intentFilter = intents.get(indexIntent).getIntentFilter();

                if (intentFilter != null && intentFilter.matchCategories(categories) == null) {

                if (intentFilter != null && intentFilter.matchCategories(categories) == null) {