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

Commit 4036e8d4 authored by Julia Reynolds's avatar Julia Reynolds
Browse files

Save deleted channels. 

To discourage the pattern of deleting channels and
recreating them to get around user settings.

Behavior:
- Creating a deleted channel brings back the old channel
(with it's old settings)
- Updating a deleted channel fails
- public getChannel apis should not return deleted channels

Also align data clean up done when clearing data & uninstalling
a package

Test: runtest systemui-notification, cts, cts-verifier

Change-Id: If19c20311c978fd8d3b1cb8b234dc1e68c7356be
parent 1f6df68a

api/current.txt

+0 −1
Original line number Diff line number Diff line
@@ -5397,7 +5397,6 @@ package android.app { 
    method public java.lang.CharSequence getName();

    method public android.net.Uri getSound();

    method public long[] getVibrationPattern();

    method public boolean isAllowed();

    method public void setBypassDnd(boolean);

    method public void setImportance(int);

    method public void setLights(boolean);

api/system-current.txt

+2 −1
Original line number Diff line number Diff line
@@ -5558,10 +5558,11 @@ package android.app { 
    method public android.net.Uri getSound();

    method public int getUserLockedFields();

    method public long[] getVibrationPattern();

    method public boolean isAllowed();

    method public boolean isDeleted();

    method public void lockFields(int);

    method public void populateFromXml(org.xmlpull.v1.XmlPullParser);

    method public void setBypassDnd(boolean);

    method public void setDeleted(boolean);

    method public void setImportance(int);

    method public void setLights(boolean);

    method public void setLockscreenVisibility(int);

api/test-current.txt

+0 −1
Original line number Diff line number Diff line
@@ -5407,7 +5407,6 @@ package android.app { 
    method public java.lang.CharSequence getName();

    method public android.net.Uri getSound();

    method public long[] getVibrationPattern();

    method public boolean isAllowed();

    method public void setBypassDnd(boolean);

    method public void setImportance(int);

    method public void setLights(boolean);

core/java/android/app/INotificationManager.aidl

+3 −2
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ interface INotificationManager 
{

    void cancelAllNotifications(String pkg, int userId);



    void clearData(String pkg, int uid);

    void enqueueToast(String pkg, ITransientNotification callback, int duration);

    void cancelToast(String pkg, ITransientNotification callback);

    void enqueueNotificationWithTag(String pkg, String opPkg, String tag, int id,
@@ -54,10 +55,10 @@ interface INotificationManager 
    void createNotificationChannels(String pkg, in ParceledListSlice channelsList);

    void updateNotificationChannelForPackage(String pkg, int uid, in NotificationChannel channel);

    NotificationChannel getNotificationChannel(String pkg, String channelId);

    NotificationChannel getNotificationChannelForPackage(String pkg, int uid, String channelId);

    NotificationChannel getNotificationChannelForPackage(String pkg, int uid, String channelId, boolean includeDeleted);

    void deleteNotificationChannel(String pkg, String channelId);

    ParceledListSlice getNotificationChannels(String pkg);

    ParceledListSlice getNotificationChannelsForPackage(String pkg, int uid);

    ParceledListSlice getNotificationChannelsForPackage(String pkg, int uid, boolean includeDeleted);



    // TODO: Remove this when callers have been migrated to the equivalent

    // INotificationListener method.

core/java/android/app/NotificationChannel.java

+25 −10
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ public final class NotificationChannel implements Parcelable { 
    private static final String TAG_CHANNEL = "channel";

    private static final String ATT_NAME = "name";

    private static final String ATT_ID = "id";

    private static final String ATT_DELETED = "deleted";

    private static final String ATT_PRIORITY = "priority";

    private static final String ATT_VISIBILITY = "visibility";

    private static final String ATT_IMPORTANCE = "importance";
@@ -120,7 +121,7 @@ public final class NotificationChannel implements Parcelable { 
            NotificationManager.VISIBILITY_NO_OVERRIDE;

    private static final int DEFAULT_IMPORTANCE =

            NotificationManager.IMPORTANCE_UNSPECIFIED;

    private static final boolean DEFAULT_ALLOWED = true;

    private static final boolean DEFAULT_DELETED = false;



    private final String mId;

    private CharSequence mName;
@@ -133,7 +134,7 @@ public final class NotificationChannel implements Parcelable { 
    private int mUserLockedFields;

    private boolean mVibrationEnabled;

    private boolean mShowBadge;

    private boolean mAllowed = DEFAULT_ALLOWED;

    private boolean mDeleted = DEFAULT_DELETED;



    /**

     * Creates a notification channel.
@@ -170,7 +171,7 @@ public final class NotificationChannel implements Parcelable { 
        mUserLockedFields = in.readInt();

        mVibrationEnabled = in.readByte() != 0;

        mShowBadge = in.readByte() != 0;

        mAllowed = in.readByte() != 0;

        mDeleted = in.readByte() != 0;

    }



    @Override
@@ -196,7 +197,7 @@ public final class NotificationChannel implements Parcelable { 
        dest.writeInt(mUserLockedFields);

        dest.writeByte(mVibrationEnabled ? (byte) 1 : (byte) 0);

        dest.writeByte(mShowBadge ? (byte) 1 : (byte) 0);

        dest.writeByte(mAllowed ? (byte) 1 : (byte) 0);

        dest.writeByte(mDeleted ? (byte) 1 : (byte) 0);

    }



    /**
@@ -207,6 +208,14 @@ public final class NotificationChannel implements Parcelable { 
        mUserLockedFields |= field;

    }



    /**

     * @hide

     */

    @SystemApi

    public void setDeleted(boolean deleted) {

        mDeleted = deleted;

    }



    // Modifiable by a notification ranker.



    /**
@@ -365,10 +374,11 @@ public final class NotificationChannel implements Parcelable { 
    }



    /**

     * Returns whether notifications are allowed to post to this channel.

     * @hide

     */

    public boolean isAllowed() {

        return mAllowed;

    @SystemApi

    public boolean isDeleted() {

        return mDeleted;

    }



    /**
@@ -393,6 +403,7 @@ public final class NotificationChannel implements Parcelable { 
        enableVibration(safeBool(parser, ATT_VIBRATION_ENABLED, false));

        setVibrationPattern(safeLongArray(parser, ATT_VIBRATION, null));

        setShowBadge(safeBool(parser, ATT_SHOW_BADGE, false));

        setDeleted(safeBool(parser, ATT_DELETED, false));

        lockFields(safeInt(parser, ATT_USER_LOCKED, 0));

    }
@@ -434,6 +445,9 @@ public final class NotificationChannel implements Parcelable { 
        if (canShowBadge()) {

            out.attribute(null, ATT_SHOW_BADGE, Boolean.toString(canShowBadge()));

        }

        if (isDeleted()) {

            out.attribute(null, ATT_DELETED, Boolean.toString(isDeleted()));

        }



        out.endTag(null, TAG_CHANNEL);

    }
@@ -464,6 +478,7 @@ public final class NotificationChannel implements Parcelable { 
        record.put(ATT_USER_LOCKED, Integer.toString(getUserLockedFields()));

        record.put(ATT_VIBRATION, longArrayToString(getVibrationPattern()));

        record.put(ATT_SHOW_BADGE, Boolean.toString(canShowBadge()));

        record.put(ATT_DELETED, Boolean.toString(isDeleted()));

        return record;

    }
@@ -547,7 +562,7 @@ public final class NotificationChannel implements Parcelable { 
        if (mUserLockedFields != that.mUserLockedFields) return false;

        if (mVibrationEnabled != that.mVibrationEnabled) return false;

        if (mShowBadge != that.mShowBadge) return false;

        if (mAllowed != that.mAllowed) return false;

        if (mDeleted != that.mDeleted) return false;

        if (mId != null ? !mId.equals(that.mId) : that.mId != null) return false;

        if (mName != null ? !mName.equals(that.mName) : that.mName != null) return false;

        if (mSound != null ? !mSound.equals(that.mSound) : that.mSound != null) return false;
@@ -568,7 +583,7 @@ public final class NotificationChannel implements Parcelable { 
        result = 31 * result + mUserLockedFields;

        result = 31 * result + (mVibrationEnabled ? 1 : 0);

        result = 31 * result + (mShowBadge ? 1 : 0);

        result = 31 * result + (mAllowed ? 1 : 0);

        result = 31 * result + (mDeleted ? 1 : 0);

        return result;

    }
@@ -586,7 +601,7 @@ public final class NotificationChannel implements Parcelable { 
                ", mUserLockedFields=" + mUserLockedFields +

                ", mVibrationEnabled=" + mVibrationEnabled +

                ", mShowBadge=" + mShowBadge +

                ", mAllowed=" + mAllowed +

                ", mDeleted=" + mDeleted +

                '}';

    }

}