Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Enable RESTRICTED bucket." into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-03-23 18:58:14 +00:00
committed by Android (Google) Code Review
parent 3bcbf195d0 0793e0de68
commit 77cbe77beb
3 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apex/jobscheduler/service/java/com/android/server/usage/AppStandbyController.java
View File

@@ -190,7 +190,7 @@ public class AppStandbyController
ONE_HOUR,
ONE_HOUR,
2 * ONE_HOUR,
4 * ONE_DAY
4 * ONE_HOUR
};
private static final int[] THRESHOLD_BUCKETS = {

2
core/java/android/provider/Settings.java
View File

@@ -13112,7 +13112,7 @@ public final class Settings {
* @see #ENABLE_RESTRICTED_BUCKET
* @hide
*/
public static final int DEFAULT_ENABLE_RESTRICTED_BUCKET = 0;
public static final int DEFAULT_ENABLE_RESTRICTED_BUCKET = 1;
/**
* Whether or not app auto restriction is enabled. When it is enabled, settings app will

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

@@ -940,7 +940,22 @@ public class AppStandbyControllerTests {
.setLong("elapsed_threshold_restricted", -1);
mInjector.mPropertiesChangedListener
.onPropertiesChanged(mInjector.getDeviceConfigProperties());
testTimeout();
reportEvent(mController, USER_INTERACTION, 0, PACKAGE_1);
mController.checkIdleStates(USER_ID);
assertBucket(STANDBY_BUCKET_ACTIVE);
mInjector.mElapsedRealtime = HOUR_MS;
mController.checkIdleStates(USER_ID);
assertBucket(STANDBY_BUCKET_FREQUENT);
mInjector.mElapsedRealtime = 2 * HOUR_MS;
mController.checkIdleStates(USER_ID);
assertBucket(STANDBY_BUCKET_RARE);
mInjector.mElapsedRealtime = 4 * HOUR_MS;
mController.checkIdleStates(USER_ID);
assertBucket(STANDBY_BUCKET_RESTRICTED);
}
/**