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

Commit 4bc5649c authored by Michal Karpinski's avatar Michal Karpinski
Browse files

Minor refactoring for instrumenting with background activity 

starts permission

Bug: 110956953
Test: atest WmTests:ActivityStarterTests
Change-Id: I144542ffb6a17364efc5d64e8fc516b4af7465ad
parent c7026dd6

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

+3 −3
Original line number Diff line number Diff line
@@ -1172,9 +1172,9 @@ final class ProcessRecord implements WindowProcessListener { 


    void setActiveInstrumentation(ActiveInstrumentation instr) {

        mInstr = instr;

        mWindowProcessController.setInstrumenting(instr != null);

        mWindowProcessController.setInstrumentingWithBackgroundActivityStartPrivileges(instr != null

                && instr.mHasBackgroundActivityStartsPermission);

        boolean isInstrumenting = instr != null;

        mWindowProcessController.setInstrumenting(isInstrumenting,

                isInstrumenting && instr.mHasBackgroundActivityStartsPermission);

    }



    ActiveInstrumentation getActiveInstrumentation() {

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

+3 −10
Original line number Diff line number Diff line
@@ -364,23 +364,16 @@ public class WindowProcessController extends ConfigurationContainer<Configuratio 
        return mAllowBackgroundActivityStarts;

    }



    public void setInstrumenting(boolean instrumenting) {

    public void setInstrumenting(boolean instrumenting,

            boolean hasBackgroundActivityStartPrivileges) {

        mInstrumenting = instrumenting;

        mInstrumentingWithBackgroundActivityStartPrivileges = hasBackgroundActivityStartPrivileges;

    }



    boolean isInstrumenting() {

        return mInstrumenting;

    }



    /**

     * {@see isInstrumentingWithBackgroundActivityStartPrivileges}

     */

    public void setInstrumentingWithBackgroundActivityStartPrivileges(

            boolean instrumentingWithBackgroundActivityStartPrivileges) {

        mInstrumentingWithBackgroundActivityStartPrivileges =

                instrumentingWithBackgroundActivityStartPrivileges;

    }



    /**

     * @return true if the instrumentation was started by a holder of

     * START_ACTIVITIES_FROM_BACKGROUND permission

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

+1 −1
Original line number Diff line number Diff line
@@ -672,7 +672,7 @@ public class ActivityStarterTests extends ActivityTestsBase { 
        // caller is temp whitelisted

        callerApp.setAllowBackgroundActivityStarts(callerIsTempWhitelisted);

        // caller is instrumenting with background activity starts privileges

        callerApp.setInstrumentingWithBackgroundActivityStartPrivileges(

        callerApp.setInstrumenting(callerIsInstrumentingWithBackgroundActivityStartPrivileges,

                callerIsInstrumentingWithBackgroundActivityStartPrivileges);



        final ActivityOptions options = spy(ActivityOptions.makeBasic());