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

Commit 3080f146 authored by Michal Karpinski's avatar Michal Karpinski Committed by android-build-merger
Browse files

Merge "Remember the process that token was added for also for the services... 

Merge "Remember the process that token was added for also for the services that are already running" into qt-dev am: b112f3f6 am: f29eccc2
am: 89f35269

Change-Id: I146d4c08a646d590b76a28c068dadb904934e2a4
parents d845c127 89f35269

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

+6 −5
Original line number Diff line number Diff line
@@ -551,12 +551,10 @@ final class ServiceRecord extends Binder implements ComponentName.WithComponentN 
                            .removeAllowBackgroundActivityStartsToken(this);

                    ams.mHandler.removeCallbacks(mStartedWhitelistingBgActivityStartsCleanUp);

                }

                mAppForStartedWhitelistingBgActivityStarts = null;

            }

            if (mHasStartedWhitelistingBgActivityStarts) {

            // Make sure the cleanup callback knows about the new process.

                mAppForStartedWhitelistingBgActivityStarts = _proc;

            }

            mAppForStartedWhitelistingBgActivityStarts = mHasStartedWhitelistingBgActivityStarts

                    ? _proc : null;

            if (mHasStartedWhitelistingBgActivityStarts

                    || mHasBindingWhitelistingBgActivityStarts) {

                _proc.addAllowBackgroundActivityStartsToken(this);
@@ -656,6 +654,9 @@ final class ServiceRecord extends Binder implements ComponentName.WithComponentN 
     */

    void whitelistBgActivityStartsOnServiceStart() {

        setHasStartedWhitelistingBgActivityStarts(true);

        if (app != null) {

            mAppForStartedWhitelistingBgActivityStarts = app;

        }



        // This callback is stateless, so we create it once when we first need it.

        if (mStartedWhitelistingBgActivityStartsCleanUp == null) {