Merge change 26711 into eclair

* changes: Fix widget stopListening NPE.
2009-09-23 19:55:14 -04:00
parent e6bea600fe e21167a9e5
commit 2cca29a333
1 changed files with 4 additions and 2 deletions
--- a/services/java/com/android/server/AppWidgetService.java
+++ b/services/java/com/android/server/AppWidgetService.java
@@ -473,8 +473,10 @@ class AppWidgetService extends IAppWidgetService.Stub
    public void stopListening(int hostId) {
        synchronized (mAppWidgetIds) {
            Host host = lookupHostLocked(getCallingUid(), hostId);
-            host.callbacks = null;
-            pruneHostLocked(host);
+            if (host != null) {
+                host.callbacks = null;
+                pruneHostLocked(host);
+            }
        }
    }