diff options
| author | Christopher Tate <ctate@google.com> | 2014-03-27 20:25:27 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-27 20:25:27 +0000 |
| commit | 46b6401c87fd3eccaf4c417af643a5708ceef71c (patch) | |
| tree | 0248861adf7c2ef20c754966999f2408d91777a7 | |
| parent | edb172bee5c67063b053b166f1d3e3b62d80d802 (diff) | |
| parent | 450e63af4e5e434faef7c0c250ed10a00139eec9 (diff) | |
| download | frameworks_base-46b6401c87fd3eccaf4c417af643a5708ceef71c.zip frameworks_base-46b6401c87fd3eccaf4c417af643a5708ceef71c.tar.gz frameworks_base-46b6401c87fd3eccaf4c417af643a5708ceef71c.tar.bz2 | |
am 450e63af: Merge "Unlinked providers STILL shouldn\'t cause crashes"
* commit '450e63af4e5e434faef7c0c250ed10a00139eec9':
Unlinked providers STILL shouldn't cause crashes
| -rw-r--r-- | services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java | 3 |
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); } } |