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"

Browse Source 
am: 9e55959a8a

Change-Id: Ie4d4b3970b20625b61bfd3c47d7b37eac207e3c0
This commit is contained in:
shaozhongqi
2019-12-12 11:16:53 -08:00
committed by android-build-merger
parent 94131bee05 9e55959a8a
commit 2f34d0ec1b
1 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
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,15 +54,10 @@ 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
// (to ensure buckets are contiguous)
if (Settings.Secure.getInt(mContext.getContentResolver(),
Settings.Secure.NOTIFICATION_NEW_INTERRUPTION_MODEL, 1) == 1) {
if (isLeftHighImportance != isRightHighImportance) { if (isLeftHighImportance != isRightHighImportance) {
// by importance bucket, high importance higher than low importance // by importance bucket, high importance higher than low importance
return -1 * Boolean.compare(isLeftHighImportance, isRightHighImportance); return -1 * Boolean.compare(isLeftHighImportance, isRightHighImportance);
} }
}
// first all colorized notifications // first all colorized notifications
boolean leftImportantColorized = isImportantColorized(left); boolean leftImportantColorized = isImportantColorized(left);