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

Commit 4e0dd1eb authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Fix parantheses in conditional" into rvc-dev am: 85561055 

Change-Id: Ie9239e42dd8850dc1a879fb6636ac1167af2472e
parents 1aa1d902 85561055

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

+4 −4
Original line number Diff line number Diff line
@@ -13117,7 +13117,7 @@ public class PackageManagerService extends IPackageManager.Stub 
        synchronized (mLock) {

            allPackages = mPackages.keySet().toArray(new String[mPackages.size()]);

        }

        PackageManagerService.this.removeDistractingPackageRestrictions(allPackages, userId);

        removeDistractingPackageRestrictions(allPackages, userId);

    }















    /**










@@ -20161,13 +20161,13 @@ public class PackageManagerService extends IPackageManager.Stub













            }















            synchronized (mLock) {















                pkgSetting.setEnabled(newState, userId, callingPackage);













                if (newState == COMPONENT_ENABLED_STATE_DISABLED_USER













                        || newState == COMPONENT_ENABLED_STATE_DISABLED













                if ((newState == COMPONENT_ENABLED_STATE_DISABLED_USER













                        || newState == COMPONENT_ENABLED_STATE_DISABLED)















                        && pkgSetting.getPermissionsState().hasPermission(















                                Manifest.permission.SUSPEND_APPS, userId)) {















                    // This app should not generally be allowed to get disabled by the UI, but if it















                    // ever does, we don't want to end up with some of the user's apps permanently













                    // blocked













                    // suspended.















                    unsuspendForSuspendingPackage(packageName, userId);















                    removeAllDistractingPackageRestrictions(userId);















                }

























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



+2
−0




























Original line number
Diff line number
Diff line








@@ -4837,6 +4837,8 @@ public final class Settings {













            pw.print(ps.getHidden(user.id));















            pw.print(" suspended=");















            pw.print(ps.getSuspended(user.id));













            pw.print(" distractionFlags=");













            pw.print(ps.getDistractionFlags(user.id));















            pw.print(" stopped=");















            pw.print(ps.getStopped(user.id));















            pw.print(" notLaunched=");