Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2a15c08d authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Increase test coverage for NotificationChannel" into rvc-dev am: 34621b08 am: 4a7a59e4 

Change-Id: Iba24ea9514c4c0218ac78a379c5f75d0bf1fc2d8
parents 5193979a 4a7a59e4

api/test-current.txt

+2 −0
Original line number Original line Diff line number Diff line
@@ -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 {

core/java/android/app/NotificationChannel.java

+2 −0
Original line number Original line Diff line number Diff line
@@ -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;

    }

    }