summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@android.com>2010-12-28 10:38:38 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2010-12-28 10:38:38 -0800
commit536feda7b133b297d43ea62111979d150f222d88 (patch)
treea38edeb6bf8b86645f7c24269515cc15e0d1bf48 /services
parent878fb9138b4de5767131be6a2e270cbd834daad3 (diff)
parent949fc0efc3203c580372e7713df5331818ae81f1 (diff)
downloadframeworks_base-536feda7b133b297d43ea62111979d150f222d88.zip
frameworks_base-536feda7b133b297d43ea62111979d150f222d88.tar.gz
frameworks_base-536feda7b133b297d43ea62111979d150f222d88.tar.bz2
am 949fc0ef: Merge "frameworks/base: Fix to release references to previous live wallpaper"
* commit '949fc0efc3203c580372e7713df5331818ae81f1': frameworks/base: Fix to release references to previous live wallpaper
Diffstat (limited to 'services')
-rw-r--r--services/java/com/android/server/WallpaperManagerService.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/services/java/com/android/server/WallpaperManagerService.java b/services/java/com/android/server/WallpaperManagerService.java
index 859c85c..997e750 100644
--- a/services/java/com/android/server/WallpaperManagerService.java
+++ b/services/java/com/android/server/WallpaperManagerService.java
@@ -587,6 +587,8 @@ class WallpaperManagerService extends IWallpaperManager.Stub {
mIWindowManager.removeWindowToken(mWallpaperConnection.mToken);
} catch (RemoteException e) {
}
+ mWallpaperConnection.mService = null;
+ mWallpaperConnection.mEngine = null;
mWallpaperConnection = null;
}
}