Disable managed services special access screens...
... on low ram devices.
- Remove them from the 'Special app access' screen
- Display an error message if an app intents directly to
them
Bug: 35219985
Test: visual, and runtest --path ManagedAccessSettingsLowRamTest.java,
when the device is in low ram mode and when it's not.
Change-Id: Ied919cb248ae56683a00e3492c4737dfd00449ac
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index 500c72d..ce0f838 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -98,6 +98,7 @@
public static class DreamSettingsActivity extends SettingsActivity { /* empty */ }
public static class NotificationStationActivity extends SettingsActivity { /* empty */ }
public static class UserSettingsActivity extends SettingsActivity { /* empty */ }
+ public static class SpecialAccessSettingsActivity extends SettingsActivity { /* empty */ }
public static class NotificationAccessSettingsActivity extends SettingsActivity { /* empty */ }
public static class VrListenersSettingsActivity extends SettingsActivity { /* empty */ }
public static class PictureInPictureSettingsActivity extends SettingsActivity { /* empty */ }
diff --git a/src/com/android/settings/applications/SpecialAccessSettings.java b/src/com/android/settings/applications/SpecialAccessSettings.java
index 069db76..cbd102e 100644
--- a/src/com/android/settings/applications/SpecialAccessSettings.java
+++ b/src/com/android/settings/applications/SpecialAccessSettings.java
@@ -14,8 +14,11 @@
package com.android.settings.applications;
+import android.app.ActivityManager;
import android.content.Context;
+import android.os.Bundle;
import android.provider.SearchIndexableResource;
+import android.support.v7.preference.Preference;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
@@ -31,6 +34,9 @@
private static final String TAG = "SpecialAccessSettings";
+ private static final String[] DISABLED_FEATURES_LOW_RAM =
+ new String[] {"notification_access", "zen_access", "enabled_vr_listeners"};
+
@Override
protected String getLogTag() {
return TAG;
@@ -42,6 +48,20 @@
}
@Override
+ public void onCreate(Bundle icicle) {
+ super.onCreate(icicle);
+
+ if (ActivityManager.isLowRamDeviceStatic()) {
+ for (String disabledFeature : DISABLED_FEATURES_LOW_RAM) {
+ Preference pref = findPreference(disabledFeature);
+ if (pref != null) {
+ removePreference(disabledFeature);
+ }
+ }
+ }
+ }
+
+ @Override
protected List<PreferenceController> getPreferenceControllers(Context context) {
return null;
}
diff --git a/src/com/android/settings/core/gateway/SettingsGateway.java b/src/com/android/settings/core/gateway/SettingsGateway.java
index f9aa887..9888656 100644
--- a/src/com/android/settings/core/gateway/SettingsGateway.java
+++ b/src/com/android/settings/core/gateway/SettingsGateway.java
@@ -53,6 +53,7 @@
import com.android.settings.applications.PictureInPictureSettings;
import com.android.settings.applications.ProcessStatsSummary;
import com.android.settings.applications.ProcessStatsUi;
+import com.android.settings.applications.SpecialAccessSettings;
import com.android.settings.applications.UsageAccessDetails;
import com.android.settings.applications.VrListenerSettings;
import com.android.settings.applications.WriteSettingsDetails;
@@ -189,6 +190,7 @@
DataUsageSummary.class.getName(),
DreamSettings.class.getName(),
UserSettings.class.getName(),
+ SpecialAccessSettings.class.getName(),
NotificationAccessSettings.class.getName(),
ZenAccessSettings.class.getName(),
PrintSettingsFragment.class.getName(),
diff --git a/src/com/android/settings/notification/NotificationAccessSettings.java b/src/com/android/settings/notification/NotificationAccessSettings.java
index 37601b3..858482c 100644
--- a/src/com/android/settings/notification/NotificationAccessSettings.java
+++ b/src/com/android/settings/notification/NotificationAccessSettings.java
@@ -16,21 +16,18 @@
package com.android.settings.notification;
+import android.app.ActivityManager;
import android.app.AlertDialog;
import android.app.Dialog;
import android.app.Fragment;
-import android.app.NotificationManager;
import android.content.ComponentName;
-import android.content.Context;
import android.content.DialogInterface;
import android.os.AsyncTask;
import android.os.Bundle;
import android.provider.Settings;
import android.service.notification.NotificationListenerService;
-import android.util.Log;
import com.android.internal.annotations.VisibleForTesting;
-import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
diff --git a/src/com/android/settings/notification/ZenAccessSettings.java b/src/com/android/settings/notification/ZenAccessSettings.java
index 0d37980..238c11e 100644
--- a/src/com/android/settings/notification/ZenAccessSettings.java
+++ b/src/com/android/settings/notification/ZenAccessSettings.java
@@ -92,19 +92,25 @@
@Override
public void onResume() {
super.onResume();
- reloadList();
- getContentResolver().registerContentObserver(
- Secure.getUriFor(Secure.ENABLED_NOTIFICATION_POLICY_ACCESS_PACKAGES), false,
- mObserver);
- getContentResolver().registerContentObserver(
- Secure.getUriFor(Secure.ENABLED_NOTIFICATION_LISTENERS), false,
- mObserver);
+ if (!ActivityManager.isLowRamDeviceStatic()) {
+ reloadList();
+ getContentResolver().registerContentObserver(
+ Secure.getUriFor(Secure.ENABLED_NOTIFICATION_POLICY_ACCESS_PACKAGES), false,
+ mObserver);
+ getContentResolver().registerContentObserver(
+ Secure.getUriFor(Secure.ENABLED_NOTIFICATION_LISTENERS), false,
+ mObserver);
+ } else {
+ setEmptyText(R.string.disabled_low_ram_device);
+ }
}
@Override
public void onPause() {
super.onPause();
- getContentResolver().unregisterContentObserver(mObserver);
+ if (!ActivityManager.isLowRamDeviceStatic()) {
+ getContentResolver().unregisterContentObserver(mObserver);
+ }
}
private void reloadList() {
diff --git a/src/com/android/settings/utils/ManagedServiceSettings.java b/src/com/android/settings/utils/ManagedServiceSettings.java
index d76520f..83190b3 100644
--- a/src/com/android/settings/utils/ManagedServiceSettings.java
+++ b/src/com/android/settings/utils/ManagedServiceSettings.java
@@ -17,6 +17,7 @@
package com.android.settings.utils;
import android.annotation.Nullable;
+import android.app.ActivityManager;
import android.app.AlertDialog;
import android.app.Dialog;
import android.app.Fragment;
@@ -91,8 +92,12 @@
@Override
public void onResume() {
super.onResume();
- mServiceListing.reload();
- mServiceListing.setListening(true);
+ if (!ActivityManager.isLowRamDeviceStatic()) {
+ mServiceListing.reload();
+ mServiceListing.setListening(true);
+ } else {
+ setEmptyText(R.string.disabled_low_ram_device);
+ }
}
@Override
@@ -230,7 +235,6 @@
public static class Config {
public String tag;
public String setting;
- public String secondarySetting;
public String intentAction;
public String permission;
public String noun;