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

Commit c317ac26 authored by Sudheer Shanka's avatar Sudheer Shanka Committed by Automerger Merge Worker
Browse files

Merge "Check app idle states and inform listeners on power-save-wl change."... 

Merge "Check app idle states and inform listeners on power-save-wl change." into rvc-dev am: 91294181

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12166806

Change-Id: I3922fb434808d866650c8417c10d50e64dc4cd16
parents 0fbb33a2 91294181

apex/jobscheduler/service/java/com/android/server/usage/AppStandbyController.java

+11 −6
Original line number Diff line number Diff line
@@ -456,7 +456,7 @@ public class AppStandbyController implements AppStandbyInternal { 
            mSystemServicesReady = true;



            // Offload to handler thread to avoid boot time impact.

            mHandler.post(mInjector::updatePowerWhitelistCache);

            mHandler.post(AppStandbyController.this::updatePowerWhitelistCache);



            boolean userFileExists;

            synchronized (mAppIdleLock) {
@@ -1684,6 +1684,14 @@ public class AppStandbyController implements AppStandbyInternal { 
        }

    }



    private void updatePowerWhitelistCache() {

        if (mInjector.getBootPhase() < PHASE_SYSTEM_SERVICES_READY) {

            return;

        }

        mInjector.updatePowerWhitelistCache();

        postCheckIdleStates(UserHandle.USER_ALL);

    }



    private class PackageReceiver extends BroadcastReceiver {

        @Override

        public void onReceive(Context context, Intent intent) {
@@ -1999,10 +2007,7 @@ public class AppStandbyController implements AppStandbyInternal { 
            }

        }



        private void updatePowerWhitelistCache() {

            if (mBootPhase < PHASE_SYSTEM_SERVICES_READY) {

                return;

            }

        void updatePowerWhitelistCache() {

            try {

                // Don't call out to DeviceIdleController with the lock held.

                final String[] whitelistedPkgs =
@@ -2204,7 +2209,7 @@ public class AppStandbyController implements AppStandbyInternal { 
                    break;

                case PowerManager.ACTION_POWER_SAVE_WHITELIST_CHANGED:

                    if (mSystemServicesReady) {

                        mHandler.post(mInjector::updatePowerWhitelistCache);

                        mHandler.post(AppStandbyController.this::updatePowerWhitelistCache);

                    }

                    break;

            }

services/tests/servicestests/src/com/android/server/usage/AppStandbyControllerTests.java

+4 −0
Original line number Diff line number Diff line
@@ -217,6 +217,10 @@ public class AppStandbyControllerTests { 
            return mNonIdleWhitelistApps.contains(packageName);

        }



        @Override

        void updatePowerWhitelistCache() {

        }



        @Override

        boolean isRestrictedBucketEnabled() {

            return mIsRestrictedBucketEnabled;