Merge "Check the config before moving to restricted bucket on bg restriction" into tm-dev (d4937bbc) · Commits · e / os / android_frameworks_base

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

+6 −0

Original line number	Diff line number	Diff line
		@@ -1841,6 +1841,9 @@ public final class AppRestrictionController {
		}

		void handleUidInactive(int uid, boolean disabled) {
		if (!mConstantsObserver.mBgAutoRestrictedBucket) {
		return;
		}
		final ArrayList<Runnable> pendingTasks = mTmpRunnables;
		synchronized (mSettingsLock) {
		final int index = mActiveUids.indexOfKey(uid);
		@@ -1863,6 +1866,9 @@ public final class AppRestrictionController {
		}

		void handleUidActive(int uid) {
		if (!mConstantsObserver.mBgAutoRestrictedBucket) {
		return;
		}
		synchronized (mSettingsLock) {
		final AppStandbyInternal appStandbyInternal = mInjector.getAppStandbyInternal();
		final int userId = UserHandle.getUserId(uid);