diff options
| -rw-r--r-- | services/core/java/com/android/server/am/ActivityManagerService.java | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index 4b386bedb75e..ee6fdf57dd9c 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -15821,7 +15821,10 @@ public class ActivityManagerService extends IActivityManager.Stub } @Override - public void getMyMemoryState(ActivityManager.RunningAppProcessInfo outInfo) { + public void getMyMemoryState(ActivityManager.RunningAppProcessInfo outState) { + if (outState == null) { + throw new IllegalArgumentException("outState is null"); + } enforceNotIsolatedCaller("getMyMemoryState"); final int callingUid = Binder.getCallingUid(); @@ -15832,7 +15835,9 @@ public class ActivityManagerService extends IActivityManager.Stub synchronized (mPidsSelfLocked) { proc = mPidsSelfLocked.get(Binder.getCallingPid()); } - fillInProcMemInfo(proc, outInfo, clientTargetSdk); + if (proc != null) { + fillInProcMemInfo(proc, outState, clientTargetSdk); + } } } |