commit 132933dc2e0e67012e6022b04a744a52344b1285
author Christopher Tate <ctate@google.com> Thu Mar 27 13:10:50 2014 -0700
committer Christopher Tate <ctate@google.com> Thu Mar 27 13:22:26 2014 -0700
tree 59de02abb93f23086ef78df7b4255c8ad291be48
parent 5454ac6b3754685210ac4dd790d24dad70bc2801

Unlinked providers STILL shouldn't cause crashes

Bug 13651057

Change-Id: Id7e5ba521ac3f201b1a44f122358ca5af2929e06

services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java

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 @@
                 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);
                     }
                 }