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

Check distraction flags in addition to suspension state

Browse Source 
Test: xts in same topic
Fixes: 136431772
Change-Id: I129fae6e1fc93d26ea027bd67f46ea664728e913
This commit is contained in:
Julia Reynolds
2019-07-02 13:14:36 -04:00
parent 4377d5637f
commit 7912df2966
1 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2256,7 +2256,7 @@ public class NotificationManagerService extends SystemService {
final int callingUid = Binder.getCallingUid();
final boolean isSystemToast = isCallerSystemOrPhone()
|| PackageManagerService.PLATFORM_PACKAGE_NAME.equals(pkg);
final boolean isPackageSuspended = isPackageSuspendedForUser(pkg, callingUid);
final boolean isPackageSuspended = isPackagePaused(pkg);
final boolean notificationsDisabledForPackage = !areNotificationsEnabledForPackage(pkg,
callingUid);
@@ -4104,17 +4104,7 @@ public class NotificationManagerService extends SystemService {
Preconditions.checkNotNull(pkg);
checkCallerIsSameApp(pkg);
boolean isPaused;
final PackageManagerInternal pmi = LocalServices.getService(
PackageManagerInternal.class);
int flags = pmi.getDistractingPackageRestrictions(
pkg, Binder.getCallingUserHandle().getIdentifier());
isPaused = ((flags & PackageManager.RESTRICTION_HIDE_NOTIFICATIONS) != 0);
isPaused |= isPackageSuspendedForUser(pkg, Binder.getCallingUid());
return isPaused;
return isPackagePausedOrSuspended(pkg, Binder.getCallingUid());
}
private void verifyPrivilegedListener(INotificationListener token, UserHandle user,
@@ -5375,11 +5365,18 @@ public class NotificationManagerService extends SystemService {
}
@GuardedBy("mNotificationLock")
private boolean isPackageSuspendedLocked(NotificationRecord r) {
final String pkg = r.sbn.getPackageName();
final int callingUid = r.sbn.getUid();
boolean isPackagePausedOrSuspended(String pkg, int uid) {
boolean isPaused;
return isPackageSuspendedForUser(pkg, callingUid);
final PackageManagerInternal pmi = LocalServices.getService(
PackageManagerInternal.class);
int flags = pmi.getDistractingPackageRestrictions(
pkg, Binder.getCallingUserHandle().getIdentifier());
isPaused = ((flags & PackageManager.RESTRICTION_HIDE_NOTIFICATIONS) != 0);
isPaused |= isPackageSuspendedForUser(pkg, uid);
return isPaused;
}
protected class PostNotificationRunnable implements Runnable {
@@ -5412,7 +5409,8 @@ public class NotificationManagerService extends SystemService {
return;
}
final boolean isPackageSuspended = isPackageSuspendedLocked(r);
final boolean isPackageSuspended =
isPackagePausedOrSuspended(r.sbn.getPackageName(), r.getUid());
r.setHidden(isPackageSuspended);
if (isPackageSuspended) {
mUsageStats.registerSuspendedByAdmin(r);