diff options
7 files changed, 2 insertions, 54 deletions
diff --git a/api/current.txt b/api/current.txt index 62f0113a7d1c..0cf1de32270a 100644 --- a/api/current.txt +++ b/api/current.txt @@ -26781,6 +26781,7 @@ package android.provider { field public static final deprecated java.lang.String DEVICE_PROVISIONED = "device_provisioned"; field public static final java.lang.String ENABLED_ACCESSIBILITY_SERVICES = "enabled_accessibility_services"; field public static final java.lang.String ENABLED_INPUT_METHODS = "enabled_input_methods"; + field public static final java.lang.String ENABLED_NOTIFICATION_POLICY_ACCESS_PACKAGES = "enabled_notification_policy_access_packages"; field public static final deprecated java.lang.String HTTP_PROXY = "http_proxy"; field public static final java.lang.String INPUT_METHOD_SELECTOR_VISIBILITY = "input_method_selector_visibility"; field public static final java.lang.String INSTALL_NON_MARKET_APPS = "install_non_market_apps"; diff --git a/api/system-current.txt b/api/system-current.txt index 4118f338ed64..1ce9ec39f40b 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -28873,6 +28873,7 @@ package android.provider { field public static final deprecated java.lang.String DEVICE_PROVISIONED = "device_provisioned"; field public static final java.lang.String ENABLED_ACCESSIBILITY_SERVICES = "enabled_accessibility_services"; field public static final java.lang.String ENABLED_INPUT_METHODS = "enabled_input_methods"; + field public static final java.lang.String ENABLED_NOTIFICATION_POLICY_ACCESS_PACKAGES = "enabled_notification_policy_access_packages"; field public static final deprecated java.lang.String HTTP_PROXY = "http_proxy"; field public static final java.lang.String INPUT_METHOD_SELECTOR_VISIBILITY = "input_method_selector_visibility"; field public static final java.lang.String INSTALL_NON_MARKET_APPS = "install_non_market_apps"; diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index ad46c3dadbd3..37f2c0477887 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -5598,8 +5598,6 @@ public final class Settings { /** * Names of the packages that the current user has explicitly allowed to * manage notification policy configuration, separated by ':'. - * - * @hide */ public static final String ENABLED_NOTIFICATION_POLICY_ACCESS_PACKAGES = "enabled_notification_policy_access_packages"; diff --git a/core/java/android/service/notification/ConditionProviderService.java b/core/java/android/service/notification/ConditionProviderService.java index bbac023b9a38..88bd283d06a1 100644 --- a/core/java/android/service/notification/ConditionProviderService.java +++ b/core/java/android/service/notification/ConditionProviderService.java @@ -168,11 +168,6 @@ public abstract class ConditionProviderService extends Service { } @Override - public void onRequestConditions(int relevance) { - mHandler.obtainMessage(H.ON_REQUEST_CONDITIONS, relevance, 0).sendToTarget(); - } - - @Override public void onSubscribe(Uri conditionId) { mHandler.obtainMessage(H.ON_SUBSCRIBE, conditionId).sendToTarget(); } @@ -185,7 +180,6 @@ public abstract class ConditionProviderService extends Service { private final class H extends Handler { private static final int ON_CONNECTED = 1; - private static final int ON_REQUEST_CONDITIONS = 2; private static final int ON_SUBSCRIBE = 3; private static final int ON_UNSUBSCRIBE = 4; @@ -198,10 +192,6 @@ public abstract class ConditionProviderService extends Service { name = "onConnected"; onConnected(); break; - case ON_REQUEST_CONDITIONS: - name = "onRequestConditions"; - onRequestConditions(msg.arg1); - break; case ON_SUBSCRIBE: name = "onSubscribe"; onSubscribe((Uri)msg.obj); diff --git a/core/java/android/service/notification/IConditionProvider.aidl b/core/java/android/service/notification/IConditionProvider.aidl index ada8939b01f2..3f3c6b80286d 100644 --- a/core/java/android/service/notification/IConditionProvider.aidl +++ b/core/java/android/service/notification/IConditionProvider.aidl @@ -22,7 +22,6 @@ import android.service.notification.Condition; /** @hide */ oneway interface IConditionProvider { void onConnected(); - void onRequestConditions(int relevance); void onSubscribe(in Uri conditionId); void onUnsubscribe(in Uri conditionId); }
\ No newline at end of file diff --git a/services/core/java/com/android/server/notification/ConditionProviders.java b/services/core/java/com/android/server/notification/ConditionProviders.java index 9441d88f2504..19872144bfe3 100644 --- a/services/core/java/com/android/server/notification/ConditionProviders.java +++ b/services/core/java/com/android/server/notification/ConditionProviders.java @@ -168,24 +168,6 @@ public class ConditionProviders extends ManagedServices { } } - public void requestConditions(IConditionListener callback, int relevance) { - synchronized(mMutex) { - if (DEBUG) Slog.d(TAG, "requestConditions callback=" + callback - + " relevance=" + Condition.relevanceToString(relevance)); - if (callback == null) return; - relevance = relevance & (Condition.FLAG_RELEVANT_NOW | Condition.FLAG_RELEVANT_ALWAYS); - if (relevance != 0) { - mListeners.put(callback.asBinder(), callback); - requestConditionsLocked(relevance); - } else { - mListeners.remove(callback.asBinder()); - if (mListeners.isEmpty()) { - requestConditionsLocked(0); - } - } - } - } - private Condition[] validateConditions(String pkg, Condition[] conditions) { if (conditions == null || conditions.length == 0) return null; final int N = conditions.length; @@ -382,25 +364,6 @@ public class ConditionProviders extends ManagedServices { return info == null ? null : (IConditionProvider) info.service; } - private void requestConditionsLocked(int flags) { - for (ManagedServiceInfo info : mServices) { - final IConditionProvider provider = provider(info); - if (provider == null) continue; - // clear all stored conditions from this provider that we no longer care about - for (int i = mRecords.size() - 1; i >= 0; i--) { - final ConditionRecord r = mRecords.get(i); - if (r.info != info) continue; - if (r.subscribed) continue; - mRecords.remove(i); - } - try { - provider.onRequestConditions(flags); - } catch (RemoteException e) { - Slog.w(TAG, "Error requesting conditions from " + info.component, e); - } - } - } - private static class ConditionRecord { public final Uri id; public final ComponentName component; diff --git a/services/core/java/com/android/server/notification/ZenModeConditions.java b/services/core/java/com/android/server/notification/ZenModeConditions.java index c2e434979c01..cee9ec8a026d 100644 --- a/services/core/java/com/android/server/notification/ZenModeConditions.java +++ b/services/core/java/com/android/server/notification/ZenModeConditions.java @@ -59,10 +59,6 @@ public class ZenModeConditions implements ConditionProviders.Callback { pw.print(prefix); pw.print("mSubscriptions="); pw.println(mSubscriptions); } - public void requestConditions(IConditionListener callback, int relevance) { - mConditionProviders.requestConditions(callback, relevance); - } - public void evaluateConfig(ZenModeConfig config, boolean processSubscriptions) { if (config == null) return; if (config.manualRule != null && config.manualRule.condition != null |