Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix parantheses in conditional" into rvc-dev am: 8556105582 am: 4e0dd1ebf0

Browse Source 
Change-Id: I429c06389f84f12a8cfa4296b098c74692583a9e
This commit is contained in:
Automerger Merge Worker
2020-03-03 01:41:18 +00:00
parent bf2c57e744 4e0dd1ebf0
commit ebfa74a61e
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/pm/PackageManagerService.java
View File

@@ -13117,7 +13117,7 @@ public class PackageManagerService extends IPackageManager.Stub
synchronized (mLock) { synchronized (mLock) {
allPackages = mPackages.keySet().toArray(new String[mPackages.size()]); 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) { synchronized (mLock) {
pkgSetting.setEnabled(newState, userId, callingPackage); pkgSetting.setEnabled(newState, userId, callingPackage);
if (newState == COMPONENT_ENABLED_STATE_DISABLED_USER if ((newState == COMPONENT_ENABLED_STATE_DISABLED_USER
|| newState == COMPONENT_ENABLED_STATE_DISABLED || newState == COMPONENT_ENABLED_STATE_DISABLED)
&& pkgSetting.getPermissionsState().hasPermission( && pkgSetting.getPermissionsState().hasPermission(
Manifest.permission.SUSPEND_APPS, userId)) { Manifest.permission.SUSPEND_APPS, userId)) {
// This app should not generally be allowed to get disabled by the UI, but if it // 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 // ever does, we don't want to end up with some of the user's apps permanently
// blocked // suspended.
unsuspendForSuspendingPackage(packageName, userId); unsuspendForSuspendingPackage(packageName, userId);
removeAllDistractingPackageRestrictions(userId); removeAllDistractingPackageRestrictions(userId);
} }

2
services/core/java/com/android/server/pm/Settings.java
View File

@@ -4837,6 +4837,8 @@ public final class Settings {
pw.print(ps.getHidden(user.id)); pw.print(ps.getHidden(user.id));
pw.print(" suspended="); pw.print(" suspended=");
pw.print(ps.getSuspended(user.id)); pw.print(ps.getSuspended(user.id));
pw.print(" distractionFlags=");
pw.print(ps.getDistractionFlags(user.id));
pw.print(" stopped="); pw.print(" stopped=");
pw.print(ps.getStopped(user.id)); pw.print(ps.getStopped(user.id));
pw.print(" notLaunched="); pw.print(" notLaunched=");