commit 346c55bdd8f370d6a870197e8b46aba4b3167275
author Makoto Onuki <omakoto@google.com> Wed May 23 15:45:22 2018 -0700
committer android-build-merger <android-build-merger@google.com> Wed May 23 15:45:22 2018 -0700
tree 6cb340c4c1e69e48f950aedad7506ac3bc8f1596
parent 539f693086aa96b1d4c6e5c9c8f8b2c42342059a
parent 29c5266d284fa6321d11685c61c5d5d098349e6b

Merge "Avoid NPE in AM.getMyMemoryState()" into pi-dev
am: 29c5266d28

Change-Id: Ia37099ed51b1b9bbf2af5dc9deab74494c5de2da

services/core/java/com/android/server/am/ActivityManagerService.java

diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index 4b386be..ee6fdf5 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 @@
     }
 
     @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 @@
             synchronized (mPidsSelfLocked) {
                 proc = mPidsSelfLocked.get(Binder.getCallingPid());
             }
-            fillInProcMemInfo(proc, outInfo, clientTargetSdk);
+            if (proc != null) {
+                fillInProcMemInfo(proc, outState, clientTargetSdk);
+            }
         }
     }