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

Commit 4c9a5273 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "NotificationService causes watchdog issues and improves performance"... 

Merge "NotificationService causes watchdog issues and improves performance" am: 9e55959a am: 2f34d0ec

Change-Id: Iec23886357b1262b2f53ab38c1fe397ac0be4fa3
parents c32c0157 2f34d0ec

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

+3 −9
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ import android.content.BroadcastReceiver; 
import android.content.Context;

import android.content.Intent;

import android.content.IntentFilter;

import android.provider.Settings;

import android.telecom.TelecomManager;



import com.android.internal.util.NotificationMessagingUtil;
@@ -55,15 +54,10 @@ public class NotificationComparator 
        final boolean isLeftHighImportance = leftImportance >= IMPORTANCE_DEFAULT;

        final boolean isRightHighImportance = rightImportance >= IMPORTANCE_DEFAULT;



        // With new interruption model, prefer importance bucket above all other criteria

        // (to ensure buckets are contiguous)

        if (Settings.Secure.getInt(mContext.getContentResolver(),

                Settings.Secure.NOTIFICATION_NEW_INTERRUPTION_MODEL, 1) == 1) {

        if (isLeftHighImportance != isRightHighImportance) {

            // by importance bucket, high importance higher than low importance

            return -1 * Boolean.compare(isLeftHighImportance, isRightHighImportance);

        }

        }



        // first all colorized notifications

        boolean leftImportantColorized = isImportantColorized(left);