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

Commit 0b8d8ab2 authored by Julia Reynolds's avatar Julia Reynolds Committed by Automerger Merge Worker
Browse files

Merge "Track sent conversations better" into rvc-dev am: e59c7e46 am:... 

Merge "Track sent conversations better" into rvc-dev am: e59c7e46 am: a9aad039 am: cc94115e am: f8451682

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11821055

Change-Id: I7cf6b82a8a12847d836df473d63db0c0d86fdc22
parents bc1ff55a f8451682

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

+7 −7
Original line number Diff line number Diff line
@@ -2050,12 +2050,15 @@ public class NotificationManagerService extends SystemService { 
        mStripRemoteViewsSizeBytes = getContext().getResources().getInteger(

                com.android.internal.R.integer.config_notificationStripRemoteViewSizeBytes);



        mMsgPkgsAllowedAsConvos = Set.of(

                getContext().getResources().getStringArray(

        mMsgPkgsAllowedAsConvos = Set.of(getStringArrayResource(

                com.android.internal.R.array.config_notificationMsgPkgsAllowedAsConvos));

        mStatsManager = statsManager;

    }



    protected String[] getStringArrayResource(int key) {

        return getContext().getResources().getStringArray(key);

    }



    @Override

    public void onStart() {

        SnoozeHelper snoozeHelper = new SnoozeHelper(getContext(), (userId, r, muteOnReturn) -> {
@@ -2740,10 +2743,7 @@ public class NotificationManagerService extends SystemService { 
    }



    protected void maybeRegisterMessageSent(NotificationRecord r) {

        Context appContext = r.getSbn().getPackageContext(getContext());

        Notification.Builder nb =

                Notification.Builder.recoverBuilder(appContext, r.getNotification());

        if (nb.getStyle() instanceof Notification.MessagingStyle) {

        if (r.isConversation()) {

            if (r.getShortcutInfo() != null) {

                if (mPreferencesHelper.setValidMessageSent(

                        r.getSbn().getPackageName(), r.getUid())) {

services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java

+138 −84

File changed.

Preview size limit exceeded, changes collapsed.