| commit | 2c23216d49fcae0c153fb6c8cdc10601bc932548 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Tue Jan 26 22:25:33 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jan 26 22:25:33 2021 +0000 |
| tree | 1a35f0e32e63503c8c3defc585eb8abae03bca65 | |
| parent | d1874fe87089a000bdd8edf23d095da9c51e3c7b [diff] | |
| parent | 595e3ee3c0e429e663e1ca9c75f522137d43129b [diff] |
Merge "ActivityManagerService: all users can handle freezer state in debug builds" into rvc-qpr-dev am: 595e3ee3c0 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13408289 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Idb3eb9683278717e14451f286b4d715ca6e6b2c7
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index 04d8cc7..bca3952 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -20401,7 +20401,7 @@ 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 ");