Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "NotificationService causes watchdog issues and improves performance" am: 9e55959a8a am: 2f34d0ec1b

Browse Source 
Change-Id: Iec23886357b1262b2f53ab38c1fe397ac0be4fa3
This commit is contained in:
Automerger Merge Worker
2019-12-12 19:34:23 +00:00
parent c32c015715 2f34d0ec1b
commit 4c9a527338
1 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
services/core/java/com/android/server/notification/NotificationComparator.java
View File

@@ -23,7 +23,6 @@ import android.content.BroadcastReceiver;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.IntentFilter; import android.content.IntentFilter;
import android.provider.Settings;
import android.telecom.TelecomManager; import android.telecom.TelecomManager;
import com.android.internal.util.NotificationMessagingUtil; import com.android.internal.util.NotificationMessagingUtil;
@@ -55,14 +54,9 @@ public class NotificationComparator
final boolean isLeftHighImportance = leftImportance >= IMPORTANCE_DEFAULT; final boolean isLeftHighImportance = leftImportance >= IMPORTANCE_DEFAULT;
final boolean isRightHighImportance = rightImportance >= IMPORTANCE_DEFAULT; final boolean isRightHighImportance = rightImportance >= IMPORTANCE_DEFAULT;
// With new interruption model, prefer importance bucket above all other criteria if (isLeftHighImportance != isRightHighImportance) {
// (to ensure buckets are contiguous) // by importance bucket, high importance higher than low importance
if (Settings.Secure.getInt(mContext.getContentResolver(), return -1 * Boolean.compare(isLeftHighImportance, isRightHighImportance);
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 // first all colorized notifications