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

Commit a6ddeaab authored by Matt Pietal's avatar Matt Pietal Committed by Automerger Merge Worker
Browse files

Merge "Capture all remote exceptions" into udc-dev am: 16161f64 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23059648



Change-Id: I15d3151e745c3794a70d92284b1cc30a582e0936
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 36c712e0 16161f64

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java

+5 −2
Original line number Original line Diff line number Diff line
@@ -2941,9 +2941,12 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable, 
        if (mSurfaceBehindRemoteAnimationFinishedCallback != null) {

        if (mSurfaceBehindRemoteAnimationFinishedCallback != null) {

            try {

            try {

                mSurfaceBehindRemoteAnimationFinishedCallback.onAnimationFinished();

                mSurfaceBehindRemoteAnimationFinishedCallback.onAnimationFinished();

            } catch (Throwable t) {

                // The surface may no longer be available. Just capture the exception

                Log.w(TAG, "Surface behind remote animation callback failed, and it's probably ok: "

                        + t.getMessage());

            } finally {

                mSurfaceBehindRemoteAnimationFinishedCallback = null;

                mSurfaceBehindRemoteAnimationFinishedCallback = null;

            } catch (RemoteException e) {

                e.printStackTrace();

            }

            }

        }

        }

    }

    }