summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/app/INotificationManager.aidl2
-rw-r--r--core/java/android/provider/Settings.java8
2 files changed, 10 insertions, 0 deletions
diff --git a/core/java/android/app/INotificationManager.aidl b/core/java/android/app/INotificationManager.aidl
index dab5aff5c9a8..35a9f9b509cd 100644
--- a/core/java/android/app/INotificationManager.aidl
+++ b/core/java/android/app/INotificationManager.aidl
@@ -188,6 +188,8 @@ interface INotificationManager
List<ComponentName> getEnabledNotificationListeners(int userId);
ComponentName getAllowedNotificationAssistantForUser(int userId);
ComponentName getAllowedNotificationAssistant();
+ ComponentName getDefaultNotificationAssistant();
+ void resetDefaultNotificationAssistant(boolean loadFromConfig);
boolean hasEnabledNotificationListener(String packageName, int userId);
@UnsupportedAppUsage
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index f3c37ff827af..427158ac411d 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -9929,6 +9929,14 @@ public final class Settings {
"clipboard_show_access_notifications";
/**
+ * If nonzero, nas has not been updated to reflect new changes.
+ * @hide
+ */
+ @Readable
+ public static final String NAS_SETTINGS_UPDATED = "nas_settings_updated";
+
+
+ /**
* These entries are considered common between the personal and the managed profile,
* since the managed profile doesn't get to change them.
*/