Merge "Add null-safety checks" into tm-qpr-dev (4c318891) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/app/ChooserActivity.java

+14 −7

Original line number	Diff line number	Diff line
		@@ -2940,12 +2940,14 @@ public class ChooserActivity extends ResolverActivity implements

		private void startFinishAnimation() {
		View rootView = findRootView();
		if (rootView != null) {
		rootView.startAnimation(new FinishAnimation(this, rootView));
		}
		}

		private boolean maybeCancelFinishAnimation() {
		View rootView = findRootView();
		Animation animation = rootView.getAnimation();
		Animation animation = rootView == null ? null : rootView.getAnimation();
		if (animation instanceof FinishAnimation) {
		boolean hasEnded = animation.hasEnded();
		animation.cancel();
		@@ -4073,11 +4075,13 @@ public class ChooserActivity extends ResolverActivity implements
		*/
		private static class FinishAnimation extends AlphaAnimation implements
		Animation.AnimationListener {
		@Nullable
		private Activity mActivity;
		@Nullable
		private View mRootView;
		private final float mFromAlpha;

		FinishAnimation(Activity activity, View rootView) {
		FinishAnimation(@NonNull Activity activity, @NonNull View rootView) {
		super(rootView.getAlpha(), 0.0f);
		mActivity = activity;
		mRootView = rootView;
		@@ -4101,7 +4105,9 @@ public class ChooserActivity extends ResolverActivity implements

		@Override
		public void cancel() {
		if (mRootView != null) {
		mRootView.setAlpha(mFromAlpha);
		}
		cleanup();
		super.cancel();
		}
		@@ -4112,9 +4118,10 @@ public class ChooserActivity extends ResolverActivity implements

		@Override
		public void onAnimationEnd(Animation animation) {
		if (mActivity != null) {
		mActivity.finish();
		Activity activity = mActivity;
		cleanup();
		if (activity != null) {
		activity.finish();
		}
		}