Merge "Check for valid records associated with activity tokens in ActivityManagerService up-navigation methods."

Author: adamp

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

@@ -13404,7 +13404,8 @@ private void saveLocaleLocked(Locale l, boolean isDiff, boolean isPersist) {
     @Override
     public boolean targetTaskAffinityMatchesActivity(IBinder token, String destAffinity) {
         ActivityRecord srec = ActivityRecord.forToken(token);
-        return srec.task.affinity != null && srec.task.affinity.equals(destAffinity);
+        return srec != null && srec.task.affinity != null &&
+                srec.task.affinity.equals(destAffinity);
     }
 
     public boolean navigateUpTo(IBinder token, Intent destIntent, int resultCode,
@@ -13413,6 +13414,9 @@ public boolean navigateUpTo(IBinder token, Intent destIntent, int resultCode,
 
         synchronized (this) {
             ActivityRecord srec = ActivityRecord.forToken(token);
+            if (srec == null) {
+                return false;
+            }
             ArrayList<ActivityRecord> history = srec.stack.mHistory;
             final int start = history.indexOf(srec);
             if (start < 0) {