diff options
| author | John Reck <jreck@google.com> | 2011-02-02 16:27:40 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-02-02 16:27:40 -0800 |
| commit | 4daecf299171596ff8d1c2f1b845be810fd87fb1 (patch) | |
| tree | a7d4178d9050d706a562ae9b35af00d21da4354c | |
| parent | cd7c92482b63717c931198d3b1d787a734146e3c (diff) | |
| parent | 98dcbbc1d930daad5642a329f2ddc59c8d956c02 (diff) | |
| download | packages_apps_Browser-4daecf299171596ff8d1c2f1b845be810fd87fb1.zip packages_apps_Browser-4daecf299171596ff8d1c2f1b845be810fd87fb1.tar.gz packages_apps_Browser-4daecf299171596ff8d1c2f1b845be810fd87fb1.tar.bz2 | |
am 98dcbbc1: am df3c5056: Merge "Add missing null check" into honeycomb
* commit '98dcbbc1d930daad5642a329f2ddc59c8d956c02':
Add missing null check
| -rw-r--r-- | src/com/android/browser/widget/BookmarkThumbnailWidgetService.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/com/android/browser/widget/BookmarkThumbnailWidgetService.java b/src/com/android/browser/widget/BookmarkThumbnailWidgetService.java index cc06349..e525159 100644 --- a/src/com/android/browser/widget/BookmarkThumbnailWidgetService.java +++ b/src/com/android/browser/widget/BookmarkThumbnailWidgetService.java @@ -110,9 +110,11 @@ public class BookmarkThumbnailWidgetService extends RemoteViewsService { if (ids != null) { for (int id : ids) { BookmarkFactory bf = mFactories.remove(id); - // Workaround a known framework bug - // onDestroy is currently never called - bf.onDestroy(); + if (bf != null) { + // Workaround a known framework bug + // onDestroy is currently never called + bf.onDestroy(); + } } } } else if (ACTION_CHANGE_FOLDER.equals(action)) { |