commit e21167a9e5978f167fa6e8d26bbb2986b6609372
author Ken Shirriff <kens@google.com> Wed Sep 23 16:42:53 2009 -0700
committer Ken Shirriff <kens@google.com> Wed Sep 23 16:43:34 2009 -0700
tree 55c886cb0a734db8ce3d78dc0b93aa9b59247a0d
parent d4c00a173aacf815bb8c5bcffaab21da61ac7d66

Fix widget stopListening NPE.

lookupHostLocked caller needs to check for null return value.

services/java/com/android/server/AppWidgetService.java

diff --git a/services/java/com/android/server/AppWidgetService.java b/services/java/com/android/server/AppWidgetService.java
index 5439f8b..3c46954 100644
--- a/services/java/com/android/server/AppWidgetService.java
+++ b/services/java/com/android/server/AppWidgetService.java
@@ -473,8 +473,10 @@
     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);
+            }
         }
     }