Merge "Allow DND screens on low ram devices" into rvc-qpr-dev am: 74c6c21b96
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12294001 Change-Id: I1e318a02298759aa95d71459508273d7985a2696
This commit is contained in:
@@ -40,20 +40,13 @@ public class ZenAccessController extends BasePreferenceController {
|
||||
|
||||
private static final String TAG = "ZenAccessController";
|
||||
|
||||
private final ActivityManager mActivityManager;
|
||||
|
||||
public ZenAccessController(Context context, String preferenceKey) {
|
||||
super(context, preferenceKey);
|
||||
mActivityManager = (ActivityManager) mContext.getSystemService(Context.ACTIVITY_SERVICE);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getAvailabilityStatus() {
|
||||
return isSupported(mActivityManager) ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
|
||||
}
|
||||
|
||||
public static boolean isSupported(ActivityManager activityManager) {
|
||||
return !activityManager.isLowRamDevice();
|
||||
return AVAILABLE;
|
||||
}
|
||||
|
||||
public static Set<String> getPackagesRequestingNotificationPolicyAccess() {
|
||||
|
@@ -50,9 +50,6 @@ public class ZenAccessDetails extends AppInfoWithHeader implements
|
||||
@Override
|
||||
protected boolean refreshUi() {
|
||||
final Context context = getContext();
|
||||
if (!ZenAccessController.isSupported(context.getSystemService(ActivityManager.class))) {
|
||||
return false;
|
||||
}
|
||||
// If this app didn't declare this permission in their manifest, don't bother showing UI.
|
||||
final Set<String> needAccessApps =
|
||||
ZenAccessController.getPackagesRequestingNotificationPolicyAccess();
|
||||
|
@@ -53,9 +53,6 @@ public class ZenAccessSettingObserverMixin extends ContentObserver implements Li
|
||||
|
||||
@Override
|
||||
public void onStart() {
|
||||
if (!ZenAccessController.isSupported(mContext.getSystemService(ActivityManager.class))) {
|
||||
return;
|
||||
}
|
||||
mContext.getContentResolver().registerContentObserver(
|
||||
Settings.Secure.getUriFor(
|
||||
Settings.Secure.ENABLED_NOTIFICATION_POLICY_ACCESS_PACKAGES),
|
||||
@@ -69,9 +66,6 @@ public class ZenAccessSettingObserverMixin extends ContentObserver implements Li
|
||||
|
||||
@Override
|
||||
public void onStop() {
|
||||
if (!ZenAccessController.isSupported(mContext.getSystemService(ActivityManager.class))) {
|
||||
return;
|
||||
}
|
||||
mContext.getContentResolver().unregisterContentObserver(this /* observer */);
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user