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

Commit b71a5bc0 authored by Adam Powell's avatar Adam Powell
Browse files

Check for valid records associated with activity tokens in 

ActivityManagerService up-navigation methods.

Silly monkeys.

Fixes bug 6328725

Change-Id: Ifec3f162bdfc2e7e872a689210752c0f6b9b0ab7
parent 69c1a571

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

+5 −1
Original line number Diff line number Diff line
@@ -13398,7 +13398,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,








@@ -13407,6 +13408,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) {