Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0c1be50f authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

am dc14dc6d: am bf73bbff: Merge "Some debugging help for issue #2594388" into froyo 

Merge commit 'dc14dc6d' into kraken

* commit 'dc14dc6d':
  Some debugging help for issue #2594388
parents d066e3c2 dc14dc6d

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

+2 −0
Original line number Diff line number Diff line
@@ -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

+1 −1
Original line number Diff line number Diff line
@@ -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 {