summaryrefslogtreecommitdiffstats
path: root/src/com/android
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2011-02-02 16:20:05 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-02-02 16:20:05 -0800
commitdf3c5056623ceed1f5b234cf57fce81be4570f3b (patch)
tree0c87b52e035db14c90b5011bf1d4e1a988479cac /src/com/android
parent4b21788c4f0b0197989c16b7393870a12ca76a5c (diff)
parenta93982d1ac21696d04775b2758e150ed43c8f651 (diff)
downloadpackages_apps_Browser-df3c5056623ceed1f5b234cf57fce81be4570f3b.zip
packages_apps_Browser-df3c5056623ceed1f5b234cf57fce81be4570f3b.tar.gz
packages_apps_Browser-df3c5056623ceed1f5b234cf57fce81be4570f3b.tar.bz2
Merge "Add missing null check" into honeycomb
Diffstat (limited to 'src/com/android')
-rw-r--r--src/com/android/browser/widget/BookmarkThumbnailWidgetService.java8
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)) {