diff options
| author | Kweku Adams <kwekua@google.com> | 2020-06-23 00:13:41 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-06-23 00:13:41 +0000 |
| commit | 6cca0018637162ca7452d96fbd8b759c154d0f73 (patch) | |
| tree | 8e46d866036a2e55f94bc0a992a73ba176e90a20 /core/java/android | |
| parent | 6f85ed6d6fc08082a24fa2952a7de1ce205bef64 (diff) | |
| parent | 71eac9ebe7297a31d76ac1c67f200070b62a17bf (diff) | |
Merge "Disable restricted bucket." into rvc-dev
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/app/usage/UsageStatsManager.java | 1 | ||||
| -rwxr-xr-x | core/java/android/provider/Settings.java | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/app/usage/UsageStatsManager.java b/core/java/android/app/usage/UsageStatsManager.java index 2ce6a86753a6..8a6cc95319fb 100644 --- a/core/java/android/app/usage/UsageStatsManager.java +++ b/core/java/android/app/usage/UsageStatsManager.java @@ -154,6 +154,7 @@ public final class UsageStatsManager { * been misbehaving in some manner. * Apps in this bucket will have the most restrictions, including network restrictions and * additional restrictions on jobs. + * <p> Note: this bucket is not enabled in {@link Build.VERSION_CODES#R}. * @see #getAppStandbyBucket() */ public static final int STANDBY_BUCKET_RESTRICTED = 45; diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 4abb2c59e1c8..64d9c9dcc6e0 100755 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -12009,7 +12009,7 @@ public final class Settings { * @see #ENABLE_RESTRICTED_BUCKET * @hide */ - public static final int DEFAULT_ENABLE_RESTRICTED_BUCKET = 1; + public static final int DEFAULT_ENABLE_RESTRICTED_BUCKET = 0; /** * Whether or not app auto restriction is enabled. When it is enabled, settings app will |