From e21167a9e5978f167fa6e8d26bbb2986b6609372 Mon Sep 17 00:00:00 2001 From: Ken Shirriff Date: Wed, 23 Sep 2009 16:42:53 -0700 Subject: [PATCH] Fix widget stopListening NPE. lookupHostLocked caller needs to check for null return value. --- services/java/com/android/server/AppWidgetService.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/services/java/com/android/server/AppWidgetService.java b/services/java/com/android/server/AppWidgetService.java index 5439f8be72f10..3c469546081db 100644 --- 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); + } } }