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

Merge "Lock relevant fields on channel update" into oc-dev

Browse Source
This commit is contained in:
Julia Reynolds
2017-05-11 20:55:23 +00:00
committed by Android (Google) Code Review
parent a7af385208 e0b2574626
commit 6307ac52e5
3 changed files with 212 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
core/java/android/app/NotificationChannel.java
View File

@@ -98,21 +98,11 @@ public final class NotificationChannel implements Parcelable {
*/
public static final int USER_LOCKED_SOUND = 0x00000020;
/**
* @hide
*/
public static final int USER_LOCKED_ALLOWED = 0x00000040;
/**
* @hide
*/
public static final int USER_LOCKED_SHOW_BADGE = 0x00000080;
/**
* @hide
*/
public static final int USER_LOCKED_AUDIO_ATTRIBUTES = 0x00000100;
/**
* @hide
*/
@@ -123,9 +113,7 @@ public final class NotificationChannel implements Parcelable {
USER_LOCKED_LIGHTS,
USER_LOCKED_VIBRATION,
USER_LOCKED_SOUND,
USER_LOCKED_ALLOWED,
USER_LOCKED_SHOW_BADGE,
USER_LOCKED_AUDIO_ATTRIBUTES
};
private static final int DEFAULT_LIGHT_COLOR = 0;
@@ -270,6 +258,13 @@ public final class NotificationChannel implements Parcelable {
mUserLockedFields |= field;
}
/**
* @hide
*/
public void unlockFields(int field) {
mUserLockedFields &= ~field;
}
/**
* @hide
*/