commit 1a2a40552a261bf3efecf09a9af472c4e9d0157c
author Makoto Onuki <omakoto@google.com> Wed May 23 17:26:40 2018 -0700
committer android-build-merger <android-build-merger@google.com> Wed May 23 17:26:40 2018 -0700
tree 96f35d026c57962aab4456792565498a3c4b92d1
parent 4f281ee62344db2f4e44e279222be95fc78fd12c
parent 346c55bdd8f370d6a870197e8b46aba4b3167275

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

Change-Id: Iadde2839fc6b2cb2dbc573e2252b72cc393c7732

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);
+            }
         }
     }