Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Pre-P cannot change alarms/media dnd policy

Browse Source 
Test: runtest --path cts/tests/app/src/android/app/cts/NotifiationManagerTest.java
Bug: 70662324
Change-Id: I063c9b0c6c7282c0ea6969fa2f27f42879d84185
This commit is contained in:
Beverly
2018-02-15 10:36:28 -05:00
parent 97661735aa
commit 98ef61b549
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
services/core/java/com/android/server/notification/NotificationManagerService.java
View File

@@ -3017,9 +3017,9 @@ public class NotificationManagerService extends SystemService {
/**
* Sets the notification policy. Apps that target API levels below
* {@link android.os.Build.VERSION_CODES#P} cannot make DND silence
* {@link Policy#PRIORITY_CATEGORY_ALARMS} or
* {@link Policy#PRIORITY_CATEGORY_MEDIA_SYSTEM_OTHER}
* {@link android.os.Build.VERSION_CODES#P} cannot change user-designated values to
* allow or disallow {@link Policy#PRIORITY_CATEGORY_ALARMS} and
* {@link Policy#PRIORITY_CATEGORY_MEDIA_SYSTEM_OTHER} from bypassing dnd
*/
@Override
public void setNotificationPolicy(String pkg, Policy policy) {
@@ -3032,10 +3032,14 @@ public class NotificationManagerService extends SystemService {
if (applicationInfo.targetSdkVersion <= Build.VERSION_CODES.O_MR1) {
Policy currPolicy = mZenModeHelper.getNotificationPolicy();
int priorityCategories = policy.priorityCategories
| (currPolicy.priorityCategories & Policy.PRIORITY_CATEGORY_ALARMS)
| (currPolicy.priorityCategories &
Policy.PRIORITY_CATEGORY_MEDIA_SYSTEM_OTHER);
int priorityCategories = policy.priorityCategories;
// ignore alarm and media values from new policy
priorityCategories &= ~Policy.PRIORITY_CATEGORY_ALARMS;
priorityCategories &= ~Policy.PRIORITY_CATEGORY_MEDIA_SYSTEM_OTHER;
// use user-designated values
priorityCategories |= currPolicy.PRIORITY_CATEGORY_ALARMS;
priorityCategories |= currPolicy.PRIORITY_CATEGORY_MEDIA_SYSTEM_OTHER;
policy = new Policy(priorityCategories,
policy.priorityCallSenders, policy.priorityMessageSenders,
policy.suppressedVisualEffects);