Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4bde4b92 authored by Adam Powell's avatar Adam Powell Committed by Android (Google) Code Review
Browse files

Merge "Check for valid records associated with activity tokens in... 

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

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

+5 −1
Original line number Diff line number Diff line
@@ -13404,7 +13404,8 @@ public final class ActivityManagerService extends ActivityManagerNative 
    @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 final class ActivityManagerService extends ActivityManagerNative















        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) {