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

Commit a3cd8e09 authored by Bryce Lee's avatar Bryce Lee
Browse files

Make sure correct default values for ActivityStarter. 

Request#reset() used different default values for the calling uid
and pid. Since reset is called before use, these the default values
were incorrect.

This changelist corrects this issue.

Change-Id: I1a04ed443fb5d9d6b248bbb1b2031d87f83f9774
Fixes: 70507511
Test: atest OsHostTests#testNonExportedActivities
parent d93d206c

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

+9 −2
Original line number Diff line number Diff line
@@ -317,6 +317,13 @@ class ActivityStarter { 
         */

        boolean mayWait;



        /**

         * Ensure constructed request matches reset instance.

         */

        Request() {

            reset();

        }



        /**

         * Sets values back to the initial state, clearing any held references.

         */
@@ -332,8 +339,8 @@ class ActivityStarter { 
            resultTo = null;

            resultWho = null;

            requestCode = 0;

            callingPid = 0;

            callingUid = 0;

            callingPid = DEFAULT_CALLING_PID;

            callingUid = DEFAULT_CALLING_UID;

            callingPackage = null;

            realCallingPid = 0;

            realCallingUid = 0;