Merge "ActivityManagerService: all users can handle freezer state in debug builds" into rvc-qpr-dev am: 595e3ee3c0 am: 2c23216d49

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id3cb960fd0d8614dbe9dca5549058a895c227d5c
This commit is contained in:
TreeHugger Robot
2021-01-26 23:27:57 +00:00
committed by Automerger Merge Worker

View File

@@ -17565,7 +17565,7 @@ public class ActivityManagerService extends IActivityManager.Stub
int callerUid = Binder.getCallingUid();
// Only system can toggle the freezer state
if (callerUid == SYSTEM_UID) {
if (callerUid == SYSTEM_UID || Build.IS_DEBUGGABLE) {
return mOomAdjuster.mCachedAppOptimizer.enableFreezer(enable);
} else {
throw new SecurityException("Caller uid " + callerUid + " cannot set freezer state ");