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

Commit 5f156c24 authored by Louis Chang's avatar Louis Chang
Browse files

Rechecks if the intent component specified 

This is a regression issue by commit 54fbb053 where the value of
componentSpecified only rely on the caller while building the
ActivityStarter without checking the given intent. This could
resulted in wrong activity type (e.g home) while starting an
Activity.

Bug: 290583872
Test: atest ActivityStarterTests
Change-Id: Id9554466af819811006eb501873340ec94dc696b
parent 8dffd57f

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

+4 −0
Original line number Diff line number Diff line
@@ -698,6 +698,10 @@ class ActivityStarter { 
                        mRequest.intent, caller, callingUid);

            }



            if (mRequest.intent != null) {

                mRequest.componentSpecified |= mRequest.intent.getComponent() != null;

            }



            // If the caller hasn't already resolved the activity, we're willing

            // to do so here. If the caller is already holding the WM lock here,

            // and we need to check dynamic Uri permissions, then we're forced

services/tests/wmtests/src/com/android/server/wm/ActivityStarterTests.java

+4 −0
Original line number Diff line number Diff line
@@ -1332,6 +1332,10 @@ public class ActivityStarterTests extends WindowTestsBase { 
        starter.setReason("testNoActivityInfo").setIntent(intent)

                .setActivityInfo(null).execute();

        verify(starter.mRequest).resolveActivity(any());



        // Also verifies the value of Request#componentSpecified should be true even the

        // ActivityStarter#setComponentSpecified is not explicitly set.

        assertTrue(starter.mRequest.componentSpecified);

    }



    @Test