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

Merge "Exclude autogrouping from rate limiter" into oc-mr1-dev

Browse Source 
am: 21bc812a25

Change-Id: I2376f1ddba23dfc9cf872082cd7a43164eb0b870
This commit is contained in:
Julia Reynolds
2017-08-18 18:35:24 +00:00
committed by android-build-merger
parent 7544eed3ce 21bc812a25
commit ef2264e849
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3105,7 +3105,7 @@ public class NotificationManagerService extends SystemService {
} }
} }
if (summaryRecord != null && checkDisqualifyingFeatures(userId, MY_UID, if (summaryRecord != null && checkDisqualifyingFeatures(userId, MY_UID,
summaryRecord.sbn.getId(), summaryRecord.sbn.getTag(), summaryRecord)) { summaryRecord.sbn.getId(), summaryRecord.sbn.getTag(), summaryRecord, true)) {
mHandler.post(new EnqueueNotificationRunnable(userId, summaryRecord)); mHandler.post(new EnqueueNotificationRunnable(userId, summaryRecord));
} }
} }
@@ -3450,7 +3450,8 @@ public class NotificationManagerService extends SystemService {
user, null, System.currentTimeMillis()); user, null, System.currentTimeMillis());
final NotificationRecord r = new NotificationRecord(getContext(), n, channel); final NotificationRecord r = new NotificationRecord(getContext(), n, channel);
if (!checkDisqualifyingFeatures(userId, notificationUid, id, tag, r)) { if (!checkDisqualifyingFeatures(userId, notificationUid, id, tag, r,
r.sbn.getOverrideGroupKey() != null)) {
return; return;
} }
@@ -3505,7 +3506,7 @@ public class NotificationManagerService extends SystemService {
* Has side effects. * Has side effects.
*/ */
private boolean checkDisqualifyingFeatures(int userId, int callingUid, int id, String tag, private boolean checkDisqualifyingFeatures(int userId, int callingUid, int id, String tag,
NotificationRecord r) { NotificationRecord r, boolean isAutogroup) {
final String pkg = r.sbn.getPackageName(); final String pkg = r.sbn.getPackageName();
final String dialerPackage = final String dialerPackage =
getContext().getSystemService(TelecomManager.class).getSystemDialerPackage(); getContext().getSystemService(TelecomManager.class).getSystemDialerPackage();
@@ -3529,7 +3530,8 @@ public class NotificationManagerService extends SystemService {
// rate limit updates that aren't completed progress notifications // rate limit updates that aren't completed progress notifications
if (mNotificationsByKey.get(r.sbn.getKey()) != null if (mNotificationsByKey.get(r.sbn.getKey()) != null
&& !r.getNotification().hasCompletedProgress()) { && !r.getNotification().hasCompletedProgress()
&& !isAutogroup) {
final float appEnqueueRate = mUsageStats.getAppEnqueueRate(pkg); final float appEnqueueRate = mUsageStats.getAppEnqueueRate(pkg);
if (appEnqueueRate > mMaxPackageEnqueueRate) { if (appEnqueueRate > mMaxPackageEnqueueRate) {
@@ -3537,7 +3539,7 @@ public class NotificationManagerService extends SystemService {
final long now = SystemClock.elapsedRealtime(); final long now = SystemClock.elapsedRealtime();
if ((now - mLastOverRateLogTime) > MIN_PACKAGE_OVERRATE_LOG_INTERVAL) { if ((now - mLastOverRateLogTime) > MIN_PACKAGE_OVERRATE_LOG_INTERVAL) {
Slog.e(TAG, "Package enqueue rate is " + appEnqueueRate Slog.e(TAG, "Package enqueue rate is " + appEnqueueRate
+ ". Shedding events. package=" + pkg); + ". Shedding " + r.sbn.getKey() + ". package=" + pkg);
mLastOverRateLogTime = now; mLastOverRateLogTime = now;
} }
return false; return false;