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

Commit 3d91f110 authored by Julia Reynolds's avatar Julia Reynolds
Browse files

Allow channels to be renamed. 

Because string resource ids aren't stable.

Test: runtest systemui-notification
Change-Id: Iaaa07b8c8cc1c8c321c7fedbfe1e252b4c1153dd
parent cce5466f

core/java/android/app/NotificationChannel.java

+7 −0
Original line number Original line Diff line number Diff line
@@ -275,6 +275,13 @@ public final class NotificationChannel implements Parcelable { 
        mDeleted = deleted;

        mDeleted = deleted;

    }

    }





    /**

     * @hide

     */

    public void setNameResId(@StringRes int nameResId) {

        this.mNameResId = nameResId;

    }



    // Modifiable by a notification ranker.

    // Modifiable by a notification ranker.





    /**

    /**

services/core/java/com/android/server/notification/RankingHelper.java

+4 −3
Original line number Original line Diff line number Diff line
@@ -521,14 +521,15 @@ public class RankingHelper implements RankingConfig { 
        }

        }





        NotificationChannel existing = r.channels.get(channel.getId());

        NotificationChannel existing = r.channels.get(channel.getId());

        // Keep existing settings

        // Keep existing settings, except deleted status and name

        if (existing != null) {

        if (existing != null && fromTargetApp) {

            if (existing.isDeleted()) {

            if (existing.isDeleted()) {

                existing.setDeleted(false);

                existing.setDeleted(false);

            }

            }





            MetricsLogger.action(getChannelLog(channel, pkg));

            existing.setNameResId(channel.getNameResId());





            MetricsLogger.action(getChannelLog(channel, pkg));

            updateConfig();

            updateConfig();

            return;

            return;

        }

        }