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

Commit a882886f authored by Robert Carr's avatar Robert Carr
Browse files

Rename destroyInTransaction to destroyNotInTransaction.

Destroy is not scoped with a transaction. We are using this appropriately but
the name has been wrong for a long time.

Change-Id: I2bb5d91774a3c0a0b23ef73a26484cc2a2c0386b
parent ca4c5a62
Loading
Loading
Loading
Loading
+3 −3
Original line number Original line Diff line number Diff line
@@ -589,7 +589,7 @@ class WindowStateAnimator {
                        if (SHOW_TRANSACTIONS || SHOW_SURFACE_ALLOC) {
                        if (SHOW_TRANSACTIONS || SHOW_SURFACE_ALLOC) {
                            WindowManagerService.logSurface(mWin, "DESTROY PENDING", true);
                            WindowManagerService.logSurface(mWin, "DESTROY PENDING", true);
                        }
                        }
                        mPendingDestroySurface.destroyInTransaction();
                        mPendingDestroySurface.destroyNotInTransaction();
                    }
                    }
                    mPendingDestroySurface = mSurfaceController;
                    mPendingDestroySurface = mSurfaceController;
                }
                }
@@ -626,7 +626,7 @@ class WindowStateAnimator {
                if (SHOW_TRANSACTIONS || SHOW_SURFACE_ALLOC) {
                if (SHOW_TRANSACTIONS || SHOW_SURFACE_ALLOC) {
                    WindowManagerService.logSurface(mWin, "DESTROY PENDING", true);
                    WindowManagerService.logSurface(mWin, "DESTROY PENDING", true);
                }
                }
                mPendingDestroySurface.destroyInTransaction();
                mPendingDestroySurface.destroyNotInTransaction();
                // Don't hide wallpaper if we're destroying a deferred surface
                // Don't hide wallpaper if we're destroying a deferred surface
                // after a surface mode change.
                // after a surface mode change.
                if (!mDestroyPreservedSurfaceUponRedraw) {
                if (!mDestroyPreservedSurfaceUponRedraw) {
@@ -1421,7 +1421,7 @@ class WindowStateAnimator {
    void destroySurface() {
    void destroySurface() {
        try {
        try {
            if (mSurfaceController != null) {
            if (mSurfaceController != null) {
                mSurfaceController.destroyInTransaction();
                mSurfaceController.destroyNotInTransaction();
            }
            }
        } catch (RuntimeException e) {
        } catch (RuntimeException e) {
            Slog.w(TAG, "Exception thrown when destroying surface " + this
            Slog.w(TAG, "Exception thrown when destroying surface " + this
+1 −1
Original line number Original line Diff line number Diff line
@@ -168,7 +168,7 @@ class WindowSurfaceController {
        }
        }
    }
    }


    void destroyInTransaction() {
    void destroyNotInTransaction() {
        if (SHOW_TRANSACTIONS || SHOW_SURFACE_ALLOC) {
        if (SHOW_TRANSACTIONS || SHOW_SURFACE_ALLOC) {
            Slog.i(TAG, "Destroying surface " + this + " called by " + Debug.getCallers(8));
            Slog.i(TAG, "Destroying surface " + this + " called by " + Debug.getCallers(8));
        }
        }