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

Merge "Increase test coverage for NotificationChannel" into rvc-dev am: 34621b08e3

Browse Source 
Change-Id: If00a5d5c28359554f2c7fb356c93229def9fcd07
This commit is contained in:
Automerger Merge Worker
2020-03-11 20:13:38 +00:00
parent 5665ab61a3 34621b08e3
commit 4a7a59e4b0
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/test-current.txt
View File

@@ -428,6 +428,7 @@ package android.app {
method public boolean isBlockableSystem(); method public boolean isBlockableSystem();
method public boolean isImportanceLockedByCriticalDeviceFunction(); method public boolean isImportanceLockedByCriticalDeviceFunction();
method public boolean isImportanceLockedByOEM(); method public boolean isImportanceLockedByOEM();
method public void lockFields(int);
method public void setBlockableSystem(boolean); method public void setBlockableSystem(boolean);
method public void setDeleted(boolean); method public void setDeleted(boolean);
method public void setFgServiceShown(boolean); method public void setFgServiceShown(boolean);
@@ -435,6 +436,7 @@ package android.app {
method public void setImportanceLockedByOEM(boolean); method public void setImportanceLockedByOEM(boolean);
method public void setImportantConversation(boolean); method public void setImportantConversation(boolean);
method public void setOriginalImportance(int); method public void setOriginalImportance(int);
field public static final int USER_LOCKED_SOUND = 32; // 0x20
} }
public final class NotificationChannelGroup implements android.os.Parcelable { public final class NotificationChannelGroup implements android.os.Parcelable {

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

@@ -134,6 +134,7 @@ public final class NotificationChannel implements Parcelable {
* @hide * @hide
*/ */
@SystemApi @SystemApi
@TestApi
public static final int USER_LOCKED_SOUND = 0x00000020; public static final int USER_LOCKED_SOUND = 0x00000020;
/** /**
@@ -331,6 +332,7 @@ public final class NotificationChannel implements Parcelable {
/** /**
* @hide * @hide
*/ */
@TestApi
public void lockFields(int field) { public void lockFields(int field) {
mUserLockedFields |= field; mUserLockedFields |= field;
} }