diff options
| author | Chloris Kuo <chloriskuo@google.com> | 2021-03-19 06:57:10 -0700 |
|---|---|---|
| committer | Chloris Kuo <chloriskuo@google.com> | 2021-04-09 11:21:33 -0700 |
| commit | 3f03f51421eb4d69d44528444f0821dd63bf922e (patch) | |
| tree | d5f2d7b7e1366fd872b7704e5b864b08b0cc3625 /core/java | |
| parent | 748a568a4b33defbfb8ff93c8ade9da16569db94 (diff) | |
NAS Settings Migration
Change default NAS to AiAi for Pixel devices
Bug: 173106358
Test: manually on device, atest
Change-Id: I2fe0b3eed479188509df5ce65d1b2a1281e6c85a
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/app/INotificationManager.aidl | 2 | ||||
| -rw-r--r-- | core/java/android/provider/Settings.java | 8 |
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 c97f097e02c3..764b850feac8 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -9925,6 +9925,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. */ |