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

Commit f0216079 authored by Yu-Ting Tseng's avatar Yu-Ting Tseng Committed by Android (Google) Code Review
Browse files

Merge changes I4fdfbe80,Ie2bb56c5,I6ee0e839 into tm-qpr-dev 

* changes:
  Merge "Log BAL and full screen intent to statsd." into tm-qpr-dev
  Merge "Update BAL Check to return Allow Reason" into tm-qpr-dev
  Merge "Add ownership for BackgroundActivityStartController" into tm-qpr-dev
parents dc00a732 fad746a5

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

+7 −0
Original line number Diff line number Diff line
@@ -98,6 +98,8 @@ public class ActivityStartController { 
    /** Whether an {@link ActivityStarter} is currently executing (starting an Activity). */

    private boolean mInExecution = false;



    private final BackgroundActivityStartController mBalController;



    /**

     * TODO(b/64750076): Capture information necessary for dump and

     * {@link #postStartActivityProcessingForLastStarter} rather than keeping the entire object
@@ -120,6 +122,7 @@ public class ActivityStartController { 
        mFactory.setController(this);

        mPendingRemoteAnimationRegistry = new PendingRemoteAnimationRegistry(service.mGlobalLock,

                service.mH);

        mBalController = new BackgroundActivityStartController(mService, mSupervisor);

    }



    /**
@@ -670,4 +673,8 @@ public class ActivityStartController { 
            pw.println("(nothing)");

        }

    }



    BackgroundActivityStartController getBackgroundActivityLaunchController() {

        return mBalController;

    }

}

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

+34 −306

File changed.

Preview size limit exceeded, changes collapsed.

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

+13 −4
Original line number Diff line number Diff line
@@ -2182,10 +2182,19 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { 
        if (appThread != null) {

            callerApp = getProcessController(appThread);

        }

        final ActivityStarter starter = getActivityStartController().obtainStarter(

                null /* intent */, "moveTaskToFront");

        if (starter.shouldAbortBackgroundActivityStart(callingUid, callingPid, callingPackage, -1,

                -1, callerApp, null, false, null, null)) {

        final BackgroundActivityStartController balController =

                getActivityStartController().getBackgroundActivityLaunchController();

        if (balController.shouldAbortBackgroundActivityStart(

                callingUid,

                callingPid,

                callingPackage,

                -1,

                -1,

                callerApp,

                null,

                false,

                null,

                null)) {

            if (!isBackgroundActivityStartsEnabled()) {

                return;

            }

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

+14 −4
Original line number Diff line number Diff line
@@ -119,10 +119,20 @@ class AppTaskImpl extends IAppTask.Stub { 
                if (appThread != null) {

                    callerApp = mService.getProcessController(appThread);

                }

                final ActivityStarter starter = mService.getActivityStartController().obtainStarter(

                        null /* intent */, "moveToFront");

                if (starter.shouldAbortBackgroundActivityStart(callingUid, callingPid,

                        callingPackage, -1, -1, callerApp, null, false, null, null)) {

                final BackgroundActivityStartController balController =

                        mService.getActivityStartController()

                                .getBackgroundActivityLaunchController();

                if (balController.shouldAbortBackgroundActivityStart(

                        callingUid,

                        callingPid,

                        callingPackage,

                        -1,

                        -1,

                        callerApp,

                        null,

                        false,

                        null,

                        null)) {

                    if (!mService.isBackgroundActivityStartsEnabled()) {

                        return;

                    }

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

0 → 100644
+483 −0

File added.

Preview size limit exceeded, changes collapsed.