summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Ken Shirriff <kens@google.com> 2009-09-23 16:42:53 -0700
committer Ken Shirriff <kens@google.com> 2009-09-23 16:43:34 -0700
commite21167a9e5978f167fa6e8d26bbb2986b6609372 (patch)
tree55c886cb0a734db8ce3d78dc0b93aa9b59247a0d
parentd4c00a173aacf815bb8c5bcffaab21da61ac7d66 (diff)
Fix widget stopListening NPE.
lookupHostLocked caller needs to check for null return value.
-rw-r--r--services/java/com/android/server/AppWidgetService.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/services/java/com/android/server/AppWidgetService.java b/services/java/com/android/server/AppWidgetService.java
index 5439f8be72f1..3c469546081d 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);
+ }
}
}