diff options
| author | Daniel Sandler <dsandler@android.com> | 2013-03-21 22:01:59 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-03-21 22:01:59 +0000 |
| commit | dc0299fb2373faddd547d433ffa049fb40d64fac (patch) | |
| tree | e48b25eef99c35425d3ab642741ea131acee39ae /core/java/android | |
| parent | c3ab03a9f2c0bc2c4ce8ade6957bcfc30fe2f9ee (diff) | |
| parent | 4b749ef5f2d510b84b99aa269d5c77af22457d04 (diff) | |
Merge "Allow whitelisted non-system packages to listen for notifications." into jb-mr2-dev
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/app/INotificationManager.aidl | 2 | ||||
| -rw-r--r-- | core/java/android/provider/Settings.java | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/core/java/android/app/INotificationManager.aidl b/core/java/android/app/INotificationManager.aidl index 14bcc0d7fba4..3d9b2ae83518 100644 --- a/core/java/android/app/INotificationManager.aidl +++ b/core/java/android/app/INotificationManager.aidl @@ -41,7 +41,7 @@ interface INotificationManager StatusBarNotification[] getActiveNotifications(String callingPkg); StatusBarNotification[] getHistoricalNotifications(String callingPkg, int count); - void registerListener(in INotificationListener listener, int userid); + void registerListener(in INotificationListener listener, String pkg, int userid); void unregisterListener(in INotificationListener listener, int userid); } diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 8346cc169919..19283be3897f 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -4039,6 +4039,14 @@ public final class Settings { public static final String SCREENSAVER_DEFAULT_COMPONENT = "screensaver_default_component"; /** + * Name of a package that the current user has explicitly allowed to see all of that + * user's notifications. + * + * @hide + */ + public static final String ENABLED_NOTIFICATION_LISTENERS = "enabled_notification_listeners"; + + /** * This are the settings to be backed up. * * NOTE: Settings are backed up and restored in the order they appear |