am 2cca29a3: Merge change 26711 into eclair

Merge commit '2cca29a333eb2d29d4f7cceb5e73313d7857ca82' into eclair-plus-aosp

* commit '2cca29a333eb2d29d4f7cceb5e73313d7857ca82':
  Fix widget stopListening NPE.
This commit is contained in:
Ken Shirriff
2009-09-23 17:04:37 -07:00
committed by Android Git Automerger

View File

@@ -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);
}
}
}