commit 9682a5a15b69d0a10702a88f2ca03fdfe0fc886d
author Michael Kolb <kolby@google.com> Mon Aug 23 16:28:48 2010 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon Aug 23 16:28:48 2010 -0700
tree 845a7100de9ca13c7436ee88f1d087740a57f56e
parent 4f817cf01d311d9932b2998a368ccd9e3219ca69
parent 5239ee173a2ddcbd621a9e1fa5a6d1623ac04fd4

Merge "fixed bookmarks widget bug   http://b/issue?id=2942821   added check for null intent when service is started"

src/com/android/browser/widget/BookmarkStackWidgetService.java

diff --git a/src/com/android/browser/widget/BookmarkStackWidgetService.java b/src/com/android/browser/widget/BookmarkStackWidgetService.java
index 5334499..f58cec1 100644
--- a/src/com/android/browser/widget/BookmarkStackWidgetService.java
+++ b/src/com/android/browser/widget/BookmarkStackWidgetService.java
@@ -16,6 +16,8 @@
 
 package com.android.browser.widget;
 
+import com.android.browser.R;
+
 import android.app.PendingIntent;
 import android.appwidget.AppWidgetManager;
 import android.content.ComponentName;
@@ -33,8 +35,6 @@
 import android.widget.RemoteViews;
 import android.widget.RemoteViewsService;
 
-import com.android.browser.R;
-
 import java.util.ArrayList;
 import java.util.List;
 
@@ -82,8 +82,7 @@
 
     @Override
     public int onStartCommand(Intent intent, int flags, int startId) {
-        final String action = intent.getAction();
-        if (UPDATE.equals(action)) {
+        if ((intent == null) || (intent.getAction() != null) && UPDATE.equals(intent.getAction())) {
             mHandler.sendEmptyMessage(MSG_UPDATE);
         }
         return START_STICKY;