Merge "Prevent NPE in startActivityUnchecked" into oc-dev

2017-05-03 20:59:04 +00:00
parent 943242804e 625f4936c9
commit 45a5adadbd
1 changed files with 1 additions and 1 deletions
--- a/services/core/java/com/android/server/am/ActivityStarter.java
+++ b/services/core/java/com/android/server/am/ActivityStarter.java
@@ -1059,7 +1059,7 @@ class ActivityStarter {
                // We didn't do anything...  but it was needed (a.k.a., client don't use that
                // intent!)  And for paranoia, make sure we have correctly resumed the top activity.
                resumeTargetStackIfNeeded();
-                if (outActivity.length > 0) {
+                if (outActivity != null && outActivity.length > 0) {
                    outActivity[0] = reusedActivity;
                }
                return START_TASK_TO_FRONT;