Merge "Capture all remote exceptions" into udc-dev (16161f64) · Commits · e / os / android_frameworks_base

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();
	}		}
	}		}
	}		}