Merge changes from topics "cts-from-user", "zen-origins" into main
* changes: Expose AZR-related methods with fromUser as @TestApi Properly distinguish origin of Zen Changes
No related branches found
No related tags found
Showing
- core/api/test-current.txt 3 additions, 0 deletionscore/api/test-current.txt
- core/java/android/app/INotificationManager.aidl 8 additions, 8 deletionscore/java/android/app/INotificationManager.aidl
- core/java/android/app/NotificationManager.java 67 additions, 8 deletionscore/java/android/app/NotificationManager.java
- packages/SettingsLib/src/com/android/settingslib/notification/EnableZenModeDialog.java 11 additions, 3 deletions...android/settingslib/notification/EnableZenModeDialog.java
- packages/SystemUI/src/com/android/systemui/statusbar/policy/ZenModeControllerImpl.java 6 additions, 1 deletion...roid/systemui/statusbar/policy/ZenModeControllerImpl.java
- services/core/java/com/android/server/notification/ConditionProviders.java 1 addition, 1 deletion...a/com/android/server/notification/ConditionProviders.java
- services/core/java/com/android/server/notification/DefaultDeviceEffectsApplier.java 0 additions, 1 deletion...roid/server/notification/DefaultDeviceEffectsApplier.java
- services/core/java/com/android/server/notification/NotificationManagerService.java 60 additions, 43 deletions...droid/server/notification/NotificationManagerService.java
- services/core/java/com/android/server/notification/NotificationShellCmd.java 7 additions, 2 deletions...com/android/server/notification/NotificationShellCmd.java
- services/core/java/com/android/server/notification/ZenModeHelper.java 2 additions, 2 deletions...e/java/com/android/server/notification/ZenModeHelper.java
- services/tests/uiservicestests/src/com/android/server/notification/DefaultDeviceEffectsApplierTest.java 3 additions, 3 deletions.../server/notification/DefaultDeviceEffectsApplierTest.java
- services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java 167 additions, 21 deletions...d/server/notification/NotificationManagerServiceTest.java
- services/tests/uiservicestests/src/com/android/server/notification/ZenModeHelperTest.java 35 additions, 8 deletions...rc/com/android/server/notification/ZenModeHelperTest.java
Loading
Please register or sign in to comment