Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fb16a68c authored by John Spurlock's avatar John Spurlock Committed by Android Git Automerger
Browse files

am c6ab8a61: am d0154550: Merge "Deactivate notification listeners disabled at... 

am c6ab8a61: am d0154550: Merge "Deactivate notification listeners disabled at runtime." into jb-mr2-dev

* commit 'c6ab8a61':
  Deactivate notification listeners disabled at runtime.
parents 98354974 c6ab8a61

services/java/com/android/server/NotificationManagerService.java

+6 −3
Original line number Diff line number Diff line
@@ -1133,6 +1133,7 @@ public class NotificationManagerService extends INotificationManager.Stub 
            boolean queryRestart = false;

            boolean queryRemove = false;

            boolean packageChanged = false;

            boolean cancelNotifications = true;

            

            if (action.equals(Intent.ACTION_PACKAGE_ADDED)

                    || (queryRemove=action.equals(Intent.ACTION_PACKAGE_REMOVED))
@@ -1163,7 +1164,7 @@ public class NotificationManagerService extends INotificationManager.Stub 
                                .getApplicationEnabledSetting(pkgName);

                        if (enabled == PackageManager.COMPONENT_ENABLED_STATE_ENABLED

                                || enabled == PackageManager.COMPONENT_ENABLED_STATE_DEFAULT) {

                            return;

                            cancelNotifications = false;

                        }

                    }

                    pkgList = new String[]{pkgName};
@@ -1172,8 +1173,10 @@ public class NotificationManagerService extends INotificationManager.Stub 
                boolean anyListenersInvolved = false;

                if (pkgList != null && (pkgList.length > 0)) {

                    for (String pkgName : pkgList) {

                        if (cancelNotifications) {

                            cancelAllNotificationsInt(pkgName, 0, 0, !queryRestart,

                                    UserHandle.USER_ALL);

                        }

                        if (mEnabledListenerPackageNames.contains(pkgName)) {

                            anyListenersInvolved = true;

                        }