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

Commit feebb44e authored by Louis Chang's avatar Louis Chang Committed by Android Build Coastguard Worker
Browse files

[RESTRICT AUTOMERGE] Do not send new Intent to non-exported activity when navigateUpTo 

The new Intent was delivered to a non-exported activity while
#navigateUpTo was called from an Activity of a different uid.

Bug: 238605611
Test: atest StartActivityTests
Change-Id: I854dd825bfd9a2c08851980d480d1f3a177af6cf
Merged-In: I854dd825bfd9a2c08851980d480d1f3a177af6cf
(cherry picked from commit 7bd9c8bf)
(cherry picked from commit ebf6889f753d40d51301a7cd11d6286d4b1a16aa)
Merged-In: I854dd825bfd9a2c08851980d480d1f3a177af6cf
parent 9a7bd3cd

services/core/java/com/android/server/wm/Task.java

+1 −1
Original line number Diff line number Diff line
@@ -5507,7 +5507,7 @@ class Task extends TaskFragment { 
                    abort = true;

                }

                if (abort) {

                    android.util.EventLog.writeEvent(0x534e4554, "238605611", callingUid, "");

                    Slog.e(TAG, "Cannot navigateUpTo, intent =" + destIntent);

                    foundParentInTask = false;

                } else {

                    parent.deliverNewIntentLocked(callingUid, destIntent, destGrants,