diff options
| author | Chris Wren <cwren@android.com> | 2014-10-29 14:54:16 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-10-29 14:54:18 +0000 |
| commit | 402152d6736839d89a9179cd4371201020074797 (patch) | |
| tree | a7bba4ef07623b22613a8c30ea6976387f66a2b9 | |
| parent | 141823ec6313d9545b8354ea1e3e017a1da3cfa8 (diff) | |
| parent | 8326a8a9453be1fa401f187994f7c8fabe68e489 (diff) | |
| download | frameworks_base-402152d6736839d89a9179cd4371201020074797.zip frameworks_base-402152d6736839d89a9179cd4371201020074797.tar.gz frameworks_base-402152d6736839d89a9179cd4371201020074797.tar.bz2 | |
Merge "Reveal notification listener settings APIs." into lmp-mr1-dev
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/provider/Settings.java | 7 |
2 files changed, 4 insertions, 4 deletions
diff --git a/api/current.txt b/api/current.txt index 4cfab54..67a81a0 100644 --- a/api/current.txt +++ b/api/current.txt @@ -25165,6 +25165,7 @@ package android.provider { field public static final java.lang.String ACTION_NFCSHARING_SETTINGS = "android.settings.NFCSHARING_SETTINGS"; field public static final java.lang.String ACTION_NFC_PAYMENT_SETTINGS = "android.settings.NFC_PAYMENT_SETTINGS"; field public static final java.lang.String ACTION_NFC_SETTINGS = "android.settings.NFC_SETTINGS"; + field public static final java.lang.String ACTION_NOTIFICATION_LISTENER_SETTINGS = "android.settings.ACTION_NOTIFICATION_LISTENER_SETTINGS"; field public static final java.lang.String ACTION_PRINT_SETTINGS = "android.settings.ACTION_PRINT_SETTINGS"; field public static final java.lang.String ACTION_PRIVACY_SETTINGS = "android.settings.PRIVACY_SETTINGS"; field public static final java.lang.String ACTION_QUICK_LAUNCH_SETTINGS = "android.settings.QUICK_LAUNCH_SETTINGS"; diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index a165279..c091d25 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -787,11 +787,10 @@ public final class Settings { * <p> * Output: Nothing. * @see android.service.notification.NotificationListenerService - * @hide */ @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION) public static final String ACTION_NOTIFICATION_LISTENER_SETTINGS - = "android.settings.NOTIFICATION_LISTENER_SETTINGS"; + = "android.settings.ACTION_NOTIFICATION_LISTENER_SETTINGS"; /** * @hide @@ -4738,8 +4737,8 @@ public final class Settings { public static final String SMS_DEFAULT_APPLICATION = "sms_default_application"; /** - * Name of a package that the current user has explicitly allowed to see all of that - * user's notifications. + * Names of the packages that the current user has explicitly allowed to + * see all of the user's notifications, separated by ':'. * * @hide */ |