drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am d606be25: Merge "Don\'t crash when component enable/disable broadcasts race with uninstall" into klp-dev

Browse Source 
* commit 'd606be2562f937584a274eba5b595c5a08e4dbdc':
  Don't crash when component enable/disable broadcasts race with uninstall
This commit is contained in:
Christopher Tate
2013-10-09 15:21:49 -07:00
committed by Android Git Automerger
parent 972de25202 d606be2562
commit 680fac0c66
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
services/java/com/android/server/NotificationManagerService.java
View File

@ -1167,11 +1167,19 @@ public class NotificationManagerService extends INotificationManager.Stub
}
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) {
cancelNotifications = false;
try {
final int enabled = mContext.getPackageManager()
.getApplicationEnabledSetting(pkgName);
if (enabled == PackageManager.COMPONENT_ENABLED_STATE_ENABLED
|| enabled == PackageManager.COMPONENT_ENABLED_STATE_DEFAULT) {
cancelNotifications = false;
}
} catch (IllegalArgumentException e) {
// Package doesn't exist; probably racing with uninstall.
// cancelNotifications is already true, so nothing to do here.
if (DBG) {
Slog.i(TAG, "Exception trying to look up app enabled setting", e);
}
}
}
pkgList = new String[]{pkgName};