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

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

@@ -715,6 +715,8 @@ public abstract class WallpaperService extends Service {
             
             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

@@ -386,7 +386,7 @@ public class Surface implements Parcelable {
 
     @Override
     public String toString() {
-        return "Surface(native-token=" + mSurfaceControl + ")";
+        return "Surface(native-token=" + mSurface + ")";
     }
 
     private Surface(Parcel source) throws OutOfResourcesException {