diff options
| author | Daniel Sandler <dsandler@android.com> | 2012-06-01 14:31:05 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-06-01 14:31:05 -0700 |
| commit | 01827ce9f2d5f4441c7f7b0211d2739824320daf (patch) | |
| tree | 3d82f0dc16317c5c7fe0069b27da4477a214f739 /services | |
| parent | 0a19dba545d25760839399e4bc8ece6d9cc888da (diff) | |
| parent | 26ece57dadb5e59e619bcd5d906935837d55d5db (diff) | |
| download | frameworks_base-01827ce9f2d5f4441c7f7b0211d2739824320daf.zip frameworks_base-01827ce9f2d5f4441c7f7b0211d2739824320daf.tar.gz frameworks_base-01827ce9f2d5f4441c7f7b0211d2739824320daf.tar.bz2 | |
Merge "Be more discriminating when canceling notifications on changing packages." into jb-dev
Diffstat (limited to 'services')
| -rwxr-xr-x | services/java/com/android/server/NotificationManagerService.java | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/services/java/com/android/server/NotificationManagerService.java b/services/java/com/android/server/NotificationManagerService.java index 52ba665..f6d3b608 100755 --- a/services/java/com/android/server/NotificationManagerService.java +++ b/services/java/com/android/server/NotificationManagerService.java @@ -494,10 +494,11 @@ public class NotificationManagerService extends INotificationManager.Stub String action = intent.getAction(); boolean queryRestart = false; + boolean packageChanged = false; if (action.equals(Intent.ACTION_PACKAGE_REMOVED) || action.equals(Intent.ACTION_PACKAGE_RESTARTED) - || action.equals(Intent.ACTION_PACKAGE_CHANGED) + || (packageChanged=action.equals(Intent.ACTION_PACKAGE_CHANGED)) || (queryRestart=action.equals(Intent.ACTION_QUERY_PACKAGE_RESTART)) || action.equals(Intent.ACTION_EXTERNAL_APPLICATIONS_UNAVAILABLE)) { String pkgList[] = null; @@ -514,6 +515,15 @@ public class NotificationManagerService extends INotificationManager.Stub if (pkgName == null) { return; } + if (packageChanged) { + // We cancel notifications for packages which have just been disabled + final int enabled = mContext.getPackageManager() + .getApplicationEnabledSetting(pkgName); + if (enabled == PackageManager.COMPONENT_ENABLED_STATE_ENABLED + || enabled == PackageManager.COMPONENT_ENABLED_STATE_DEFAULT) { + return; + } + } pkgList = new String[]{pkgName}; } if (pkgList != null && (pkgList.length > 0)) { |