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

am bfb30244: Merge "[ActivityManager] Fix NPE when start activity"

Browse Source 
* commit 'bfb30244fbd3c6ba9eb8308b6bbacc9f78e8b6ef':
  [ActivityManager] Fix NPE when start activity
This commit is contained in:
Olawale Ogunwale
2014-12-12 13:57:06 +00:00
committed by Android Git Automerger
parent b0dd6d3a8a bfb30244fb
commit 0e954dccab
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/am/ActivityStackSupervisor.java
View File

@@ -1315,7 +1315,6 @@ public final class ActivityStackSupervisor implements DisplayListener {
}
}
}
ActivityStack resultStack = resultRecord == null ? null : resultRecord.task.stack;
final int launchFlags = intent.getFlags();
@@ -1392,6 +1391,8 @@ public final class ActivityStackSupervisor implements DisplayListener {
}
}
final ActivityStack resultStack = resultRecord == null ? null : resultRecord.task.stack;
if (err != ActivityManager.START_SUCCESS) {
if (resultRecord != null) {
resultStack.sendActivityResultLocked(-1,