From 13f75dcf2b5607ea6a038889411eeab950539aa9 Mon Sep 17 00:00:00 2001 From: Kweku Adams Date: Tue, 14 Mar 2023 20:01:22 +0000 Subject: [PATCH] Remove RESTRICTED bucket off code. The RESTRICTED bucket has been enabled for a few releases and we have no intention of disabling it by itself at this point. Bug: 273564840 Test: atest CtsJobSchedulerTestCases:ConnectivityConstraintTest Test: atest CtsJobSchedulerTestCases:JobThrottlingTest Test: atest CtsUsageStatsTestCases:UsageStatsTest Change-Id: I51bfd0b00bb582a839a356e8d926a6d0ca81a683 --- .../android/settings/fuelgauge/InactiveApps.java | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/src/com/android/settings/fuelgauge/InactiveApps.java b/src/com/android/settings/fuelgauge/InactiveApps.java index 0d87ae73fe6..284e5be6c1f 100644 --- a/src/com/android/settings/fuelgauge/InactiveApps.java +++ b/src/com/android/settings/fuelgauge/InactiveApps.java @@ -32,7 +32,6 @@ import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.content.res.Resources; import android.os.Bundle; -import android.provider.Settings; import android.text.TextUtils; import androidx.preference.ListPreference; @@ -51,9 +50,6 @@ public class InactiveApps extends SettingsPreferenceFragment private static final CharSequence[] FULL_SETTABLE_BUCKETS_NAMES = {"ACTIVE", "WORKING_SET", "FREQUENT", "RARE", "RESTRICTED"}; - private static final CharSequence[] REDUCED_SETTABLE_BUCKETS_NAMES = - Arrays.copyOfRange(FULL_SETTABLE_BUCKETS_NAMES, 0, 4); - private static final CharSequence[] FULL_SETTABLE_BUCKETS_VALUES = { Integer.toString(STANDBY_BUCKET_ACTIVE), Integer.toString(STANDBY_BUCKET_WORKING_SET), @@ -62,9 +58,6 @@ public class InactiveApps extends SettingsPreferenceFragment Integer.toString(STANDBY_BUCKET_RESTRICTED) }; - private static final CharSequence[] REDUCED_SETTABLE_BUCKETS_VALUES = - Arrays.copyOfRange(FULL_SETTABLE_BUCKETS_VALUES, 0, 4); - private UsageStatsManager mUsageStats; @Override @@ -94,13 +87,8 @@ public class InactiveApps extends SettingsPreferenceFragment final Context context = getActivity(); final PackageManager pm = context.getPackageManager(); final String settingsPackage = context.getPackageName(); - final boolean allowRestrictedBucket = Settings.Global.getInt(getContentResolver(), - Settings.Global.ENABLE_RESTRICTED_BUCKET, - Settings.Global.DEFAULT_ENABLE_RESTRICTED_BUCKET) == 1; - final CharSequence[] bucketNames = allowRestrictedBucket - ? FULL_SETTABLE_BUCKETS_NAMES : REDUCED_SETTABLE_BUCKETS_NAMES; - final CharSequence[] bucketValues = allowRestrictedBucket - ? FULL_SETTABLE_BUCKETS_VALUES : REDUCED_SETTABLE_BUCKETS_VALUES; + final CharSequence[] bucketNames = FULL_SETTABLE_BUCKETS_NAMES; + final CharSequence[] bucketValues = FULL_SETTABLE_BUCKETS_VALUES; Intent launcherIntent = new Intent(Intent.ACTION_MAIN); launcherIntent.addCategory(Intent.CATEGORY_LAUNCHER);