summaryrefslogtreecommitdiffstats
path: root/core/java
diff options
context:
space:
mode:
authorJohn Spurlock <jspurlock@google.com>2014-04-27 16:42:29 -0400
committerJohn Spurlock <jspurlock@google.com>2014-04-27 17:41:51 -0400
commit1c923a386ee4d8c31cc289f8628b8fc46bf08e86 (patch)
treef0ea65598ddbd665d516aa059d11ee38bd815828 /core/java
parente77bb36d48b6b8b5c3bb6a1195aca469bb237919 (diff)
downloadframeworks_base-1c923a386ee4d8c31cc289f8628b8fc46bf08e86.zip
frameworks_base-1c923a386ee4d8c31cc289f8628b8fc46bf08e86.tar.gz
frameworks_base-1c923a386ee4d8c31cc289f8628b8fc46bf08e86.tar.bz2
Force condition provider unsubscribe when exiting zen mode.
Bug:13743109 Change-Id: I3c205067498a86e2862a0c545bc38e41682693d5
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/service/notification/ConditionProviderService.java9
1 files changed, 7 insertions, 2 deletions
diff --git a/core/java/android/service/notification/ConditionProviderService.java b/core/java/android/service/notification/ConditionProviderService.java
index 70d474e..d6ef8f5 100644
--- a/core/java/android/service/notification/ConditionProviderService.java
+++ b/core/java/android/service/notification/ConditionProviderService.java
@@ -69,8 +69,13 @@ public abstract class ConditionProviderService extends Service {
return mNoMan;
}
- public final void notifyConditions(Condition[] conditions) {
- if (!isBound()) return;
+ public final void notifyCondition(Condition condition) {
+ if (condition == null) return;
+ notifyConditions(new Condition[]{ condition });
+ }
+
+ public final void notifyConditions(Condition... conditions) {
+ if (!isBound() || conditions == null) return;
try {
getNotificationInterface().notifyConditions(getPackageName(), mProvider, conditions);
} catch (android.os.RemoteException ex) {