Merge "Revert "added call notif exemption to PostNotificationRunnable"" into tm-dev am: e536aa4f9e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18130632 Change-Id: I4c26bb10ad9db584110d8691107d3b51bcdc9553 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -7371,7 +7371,6 @@ public class NotificationManagerService extends SystemService {
|
|||||||
@Override
|
@Override
|
||||||
public void run() {
|
public void run() {
|
||||||
boolean appBanned = !areNotificationsEnabledForPackageInt(pkg, uid);
|
boolean appBanned = !areNotificationsEnabledForPackageInt(pkg, uid);
|
||||||
boolean isCallNotification = isCallNotification(pkg, uid);
|
|
||||||
synchronized (mNotificationLock) {
|
synchronized (mNotificationLock) {
|
||||||
try {
|
try {
|
||||||
NotificationRecord r = null;
|
NotificationRecord r = null;
|
||||||
@@ -7390,10 +7389,8 @@ public class NotificationManagerService extends SystemService {
|
|||||||
|
|
||||||
final StatusBarNotification n = r.getSbn();
|
final StatusBarNotification n = r.getSbn();
|
||||||
final Notification notification = n.getNotification();
|
final Notification notification = n.getNotification();
|
||||||
boolean isCallNotificationAndCorrectStyle = isCallNotification
|
|
||||||
&& notification.isStyle(Notification.CallStyle.class);
|
|
||||||
|
|
||||||
if (!(notification.isMediaNotification() || isCallNotificationAndCorrectStyle)
|
if (!notification.isMediaNotification()
|
||||||
&& (appBanned || isRecordBlockedLocked(r))) {
|
&& (appBanned || isRecordBlockedLocked(r))) {
|
||||||
mUsageStats.registerBlocked(r);
|
mUsageStats.registerBlocked(r);
|
||||||
if (DBG) {
|
if (DBG) {
|
||||||
|
|||||||
Reference in New Issue
Block a user