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

Commit ea4427b6 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

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

Change-Id: Ib1e825f4eb3956dd3673f2edb74cde749a639db7
parents 4ff6a770 e59c7e46
Loading
Loading
Loading
Loading
+7 −7
Original line number Diff line number Diff line
@@ -2048,12 +2048,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) -> {
@@ -2741,10 +2744,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())) {
+138 −84

File changed.

Preview size limit exceeded, changes collapsed.