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

Merge "Disable blocking helper" into qt-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-04-19 20:38:02 +00:00
committed by Android (Google) Code Review
parent 7abea9fa92 6650004569
commit f090b5896e
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -308,8 +308,7 @@ public class NotificationManagerService extends SystemService {
static final String[] DEFAULT_ALLOWED_ADJUSTMENTS = new String[] {
Adjustment.KEY_IMPORTANCE,
Adjustment.KEY_CONTEXTUAL_ACTIONS,
Adjustment.KEY_TEXT_REPLIES,
Adjustment.KEY_USER_SENTIMENT};
Adjustment.KEY_TEXT_REPLIES};
static final String[] NON_BLOCKABLE_DEFAULT_ROLES = new String[] {
RoleManager.ROLE_DIALER,
@@ -7324,7 +7323,7 @@ public class NotificationManagerService extends SystemService {
private static final String ATT_USER_SET = "user_set";
// TODO: STOPSHIP (b/127994217) switch to final value when onboarding flow is implemented
private static final String TAG_ALLOWED_ADJUSTMENT_TYPES = "allowed_adjustments_tmp";
private static final String TAG_ALLOWED_ADJUSTMENT_TYPES = "allowed_adjustments_tmp2";
private static final String ATT_TYPES = "types";
private final Object mLock = new Object();