Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 571dc539: am 17400627: Merge "Avoid NPE in forceStopPackageLocked()." into lmp-mr1-dev

Browse Source 
* commit '571dc539a120f234ecfc847edf57edc7762ab862':
  Avoid NPE in forceStopPackageLocked().
This commit is contained in:
Jeff Sharkey
2014-11-21 23:24:08 +00:00
committed by Android Git Automerger
parent c8d97850a8 571dc539a1
commit 4524e06de7
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/am/ActivityManagerService.java
View File

@@ -5661,7 +5661,7 @@ public final class ActivityManagerService extends ActivityManagerNative
didSomething = true; didSomething = true;
it.remove(); it.remove();
pir.canceled = true; pir.canceled = true;
if (pir.key.activity != null) { if (pir.key.activity != null && pir.key.activity.pendingResults != null) {
pir.key.activity.pendingResults.remove(pir.ref); pir.key.activity.pendingResults.remove(pir.ref);
} }
} }