Merge "Check the config before moving to restricted bucket on bg restriction" into tm-dev

This commit is contained in:
Jing Ji
2022-03-21 16:23:06 +00:00
committed by Android (Google) Code Review

View File

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