summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Kweku Adams <kwekua@google.com> 2020-06-04 11:22:04 -0700
committer Kweku Adams <kwekua@google.com> 2020-06-05 20:04:11 +0000
commit71eac9ebe7297a31d76ac1c67f200070b62a17bf (patch)
treec6fa61c0eaa9113094782de81f8749883f605773
parentc4ac9d2321dfced8ffd398da827ad7e56e242991 (diff)
Disable restricted bucket.
Bug: 158099599 Test: atest CtsUsageStatsTestCases:UsageStatsTest Test: atest FrameworksServicesTests:AppIdleHistoryTests Test: atest FrameworksServicesTests:AppStandbyControllerTests Change-Id: I40e769037148177530edc43ae0c01d4d29aec857
-rw-r--r--core/java/android/app/usage/UsageStatsManager.java1
-rwxr-xr-xcore/java/android/provider/Settings.java2
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 1b19e1290121..9e20a862b16e 100755
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -11974,7 +11974,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