Merge "Don't allow Settings to change its own standby bucket."

This commit is contained in:
TreeHugger Robot
2019-08-26 23:57:35 +00:00
committed by Android (Google) Code Review

View File

@@ -31,6 +31,7 @@ import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo; import android.content.pm.ResolveInfo;
import android.content.res.Resources; import android.content.res.Resources;
import android.os.Bundle; import android.os.Bundle;
import android.text.TextUtils;
import androidx.preference.ListPreference; import androidx.preference.ListPreference;
import androidx.preference.Preference; import androidx.preference.Preference;
@@ -82,6 +83,7 @@ public class InactiveApps extends SettingsPreferenceFragment
final Context context = getActivity(); final Context context = getActivity();
final PackageManager pm = context.getPackageManager(); final PackageManager pm = context.getPackageManager();
final UsageStatsManager usm = context.getSystemService(UsageStatsManager.class); final UsageStatsManager usm = context.getSystemService(UsageStatsManager.class);
final String settingsPackage = context.getPackageName();
Intent launcherIntent = new Intent(Intent.ACTION_MAIN); Intent launcherIntent = new Intent(Intent.ACTION_MAIN);
launcherIntent.addCategory(Intent.CATEGORY_LAUNCHER); launcherIntent.addCategory(Intent.CATEGORY_LAUNCHER);
@@ -95,6 +97,10 @@ public class InactiveApps extends SettingsPreferenceFragment
p.setEntries(SETTABLE_BUCKETS_NAMES); p.setEntries(SETTABLE_BUCKETS_NAMES);
p.setEntryValues(SETTABLE_BUCKETS_VALUES); p.setEntryValues(SETTABLE_BUCKETS_VALUES);
updateSummary(p); updateSummary(p);
// Don't allow Settings to change its own standby bucket.
if (TextUtils.equals(packageName, settingsPackage)) {
p.setEnabled(false);
}
p.setOnPreferenceChangeListener(this); p.setOnPreferenceChangeListener(this);
screen.addPreference(p); screen.addPreference(p);