Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1a2a4055 authored by Makoto Onuki's avatar Makoto Onuki Committed by android-build-merger
Browse files

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

am: 346c55bd

Change-Id: Iadde2839fc6b2cb2dbc573e2252b72cc393c7732
parents 4f281ee6 346c55bd

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

+7 −2
Original line number Diff line number Diff line
@@ -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);













            }















        }















    }