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

Commit d12166e4 authored by Jim Miller's avatar Jim Miller
Browse files

Fix crash in ConfirmDeviceCredentials 

This reverts the workaround for bug 23849216 which has since
been fixed.

Fixes bug 27138063

Change-Id: Ifab4d072d0c95bb121bf3a9d852f2b16e92b7144
parent a8594410

src/com/android/settings/ConfirmDeviceCredentialBaseActivity.java

+0 −14
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ public abstract class ConfirmDeviceCredentialBaseActivity extends SettingsActivi 
    private boolean mDark;

    private boolean mEnterAnimationPending;

    private boolean mFirstTimeVisible = true;

    private final Handler mHandler = new Handler();



    @Override

    protected void onCreate(Bundle savedState) {
@@ -76,7 +75,6 @@ public abstract class ConfirmDeviceCredentialBaseActivity extends SettingsActivi 
            mFirstTimeVisible = false;

            prepareEnterAnimation();

            mEnterAnimationPending = true;

            mHandler.postDelayed(mEnterAnimationCompleteTimeoutRunnable, 1000);

        }

    }
@@ -92,7 +90,6 @@ public abstract class ConfirmDeviceCredentialBaseActivity extends SettingsActivi 
    public void onEnterAnimationComplete() {

        super.onEnterAnimationComplete();

        if (mEnterAnimationPending) {

            mHandler.removeCallbacks(mEnterAnimationCompleteTimeoutRunnable);

            startEnterAnimation();

            mEnterAnimationPending = false;

        }
@@ -105,15 +102,4 @@ public abstract class ConfirmDeviceCredentialBaseActivity extends SettingsActivi 
    public void startEnterAnimation() {

        getFragment().startEnterAnimation();

    }



    /**

     * Workaround for a bug in window manager which results that onEnterAnimationComplete doesn't

     * get called in all cases.

     */

    private final Runnable mEnterAnimationCompleteTimeoutRunnable = new Runnable() {

        @Override

        public void run() {

            onEnterAnimationComplete();

        }

    };

}