commit f0c38121234d20222bd35544a4fc44d5127a45f2
author Kweku Adams <kwekua@google.com> Mon Mar 20 16:13:49 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Mar 20 16:13:49 2023 +0000
tree 2fa22630a6b1f82dd2a34dcba60024311d3767c7
parent ac67b77af7d6b981ad6830bc0d5d3dcd95286465
parent 13f75dcf2b5607ea6a038889411eeab950539aa9

Merge "Remove RESTRICTED bucket off code." into udc-dev

src/com/android/settings/fuelgauge/InactiveApps.java

diff --git a/src/com/android/settings/fuelgauge/InactiveApps.java b/src/com/android/settings/fuelgauge/InactiveApps.java
index 0d87ae7..284e5be 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.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 @@
     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 @@
             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 @@
         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);