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

Merge "Pre-P cannot change alarms/media dnd policy"

Browse Source
This commit is contained in:
TreeHugger Robot
2018-02-20 19:19:52 +00:00
committed by Android (Google) Code Review
parent 4ab3a17295 98ef61b549
commit 56f4dca407
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

@@ -3021,9 +3021,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) {
@@ -3036,10 +3036,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);