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

Merge "[ActivityManager] Fix NPE when start activity" into lmp-mr1-dev

Browse Source
This commit is contained in:
Craig Mautner
2014-12-04 21:44:33 +00:00
committed by Android (Google) Code Review
parent 9c28ba76f6 cd5d198d7e
commit 1289a3b2d3
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

@@ -1314,7 +1314,6 @@ public final class ActivityStackSupervisor implements DisplayListener {
}
}
}
ActivityStack resultStack = resultRecord == null ? null : resultRecord.task.stack;
final int launchFlags = intent.getFlags();
@@ -1391,6 +1390,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,