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

Commit 41be51a5 authored by Julia Reynolds's avatar Julia Reynolds Committed by Android (Google) Code Review
Browse files

Merge "Let apps see if their conversations have been demoted"

parents 72879c81 cecd53dc

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -5957,6 +5957,7 @@ package android.app { 
    method public long[] getVibrationPattern();

    method public boolean hasUserSetImportance();

    method public boolean hasUserSetSound();

    method public boolean isDemoted();

    method public boolean isImportantConversation();

    method public void setAllowBubbles(boolean);

    method public void setBypassDnd(boolean);

api/test-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -453,6 +453,7 @@ package android.app { 
    method public void lockFields(int);

    method public void setBlockable(boolean);

    method public void setDeleted(boolean);

    method public void setDemoted(boolean);

    method public void setFgServiceShown(boolean);

    method public void setImportanceLockedByCriticalDeviceFunction(boolean);

    method public void setImportanceLockedByOEM(boolean);
@@ -476,6 +477,7 @@ package android.app { 
    method public boolean isNotificationAssistantAccessGranted(@NonNull android.content.ComponentName);

    method public boolean matchesCallFilter(android.os.Bundle);

    method public void setNotificationAssistantAccessGranted(@Nullable android.content.ComponentName, boolean);

    method public void updateNotificationChannel(@NonNull String, int, @NonNull android.app.NotificationChannel);

  }



  public final class PictureInPictureParams implements android.os.Parcelable {

core/java/android/app/NotificationChannel.java

+4 −1
Original line number Diff line number Diff line
@@ -828,12 +828,15 @@ public final class NotificationChannel implements Parcelable { 
    /**

     * @hide

     */

    @TestApi

    public void setDemoted(boolean demoted) {

        mDemoted = demoted;

    }



    /**

     * @hide

     * Returns whether the user has decided that this channel does not represent a conversation. The

     * value will always be false for channels that never claimed to be conversations - that is,

     * for channels where {@link #getConversationId()} and {@link #getParentChannelId()} are empty.

     */

    public boolean isDemoted() {

        return mDemoted;

core/java/android/app/NotificationManager.java

+14 −0
Original line number Diff line number Diff line
@@ -954,6 +954,20 @@ public class NotificationManager { 
        }

    }



    /**

     * @hide

     */

    @TestApi

    public void updateNotificationChannel(@NonNull String pkg, int uid,

            @NonNull NotificationChannel channel) {

        INotificationManager service = getService();

        try {

            service.updateNotificationChannelForPackage(pkg, uid, channel);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

    }



    /**

     * @hide

     */

non-updatable-api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -5957,6 +5957,7 @@ package android.app { 
    method public long[] getVibrationPattern();

    method public boolean hasUserSetImportance();

    method public boolean hasUserSetSound();

    method public boolean isDemoted();

    method public boolean isImportantConversation();

    method public void setAllowBubbles(boolean);

    method public void setBypassDnd(boolean);