summaryrefslogtreecommitdiffstats
path: root/services/appwidget
diff options
context:
space:
mode:
authorChristopher Tate <ctate@google.com>2014-03-27 13:10:50 -0700
committerChristopher Tate <ctate@google.com>2014-03-27 13:22:26 -0700
commit132933dc2e0e67012e6022b04a744a52344b1285 (patch)
tree59de02abb93f23086ef78df7b4255c8ad291be48 /services/appwidget
parent5454ac6b3754685210ac4dd790d24dad70bc2801 (diff)
downloadframeworks_base-132933dc2e0e67012e6022b04a744a52344b1285.zip
frameworks_base-132933dc2e0e67012e6022b04a744a52344b1285.tar.gz
frameworks_base-132933dc2e0e67012e6022b04a744a52344b1285.tar.bz2
Unlinked providers STILL shouldn't cause crashes
Bug 13651057 Change-Id: Id7e5ba521ac3f201b1a44f122358ca5af2929e06
Diffstat (limited to 'services/appwidget')
-rw-r--r--services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java b/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java
index b7c1704..2f56e62 100644
--- a/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java
+++ b/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java
@@ -1751,7 +1751,8 @@ class AppWidgetServiceImpl {
for (int i = 0; i < N; i++) {
AppWidgetId id = mAppWidgetIds.get(i);
if (backupTarget.equals(id.host.packageName)
- || backupTarget.equals(id.provider.info.provider.getPackageName())) {
+ || (id.provider != null && backupTarget.equals(
+ id.provider.info.provider.getPackageName()))) {
serializeAppWidgetId(out, id);
}
}