commit bf73bbffc18f5abb5350fa3a410830c05ad10206
author Dianne Hackborn <hackbod@google.com> Fri Apr 23 12:59:47 2010 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Fri Apr 23 12:59:47 2010 -0700
tree f933174f8484fce8efa6413c78028eecc4a63ec1
parent 251ccef0445d4456809bfc41a6344e2dae24f2c3
parent ba3e31d9eed67291a51b501d12fdc27625af688e

Merge "Some debugging help for issue #2594388" into froyo

core/java/android/service/wallpaper/WallpaperService.java

diff --git a/core/java/android/service/wallpaper/WallpaperService.java b/core/java/android/service/wallpaper/WallpaperService.java
index f47a8d0..7f202a7 100644
--- a/core/java/android/service/wallpaper/WallpaperService.java
+++ b/core/java/android/service/wallpaper/WallpaperService.java
@@ -715,6 +715,8 @@
             
             if (mCreated) {
                 try {
+                    if (DEBUG) Log.v(TAG, "Removing window and destroying surface "
+                            + mSurfaceHolder.getSurface() + " of: " + this);
                     mSession.remove(mWindow);
                 } catch (RemoteException e) {
                 }

core/java/android/view/Surface.java

diff --git a/core/java/android/view/Surface.java b/core/java/android/view/Surface.java
index 255e317..6a9218a 100644
--- a/core/java/android/view/Surface.java
+++ b/core/java/android/view/Surface.java
@@ -386,7 +386,7 @@
 
     @Override
     public String toString() {
-        return "Surface(native-token=" + mSurfaceControl + ")";
+        return "Surface(native-token=" + mSurface + ")";
     }
 
     private Surface(Parcel source) throws OutOfResourcesException {