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

Commit bdfb3074 authored by Josh Tsuji's avatar Josh Tsuji Committed by Issei Suzuki
Browse files

Set occluded state on remote animation cancel. 

The launch animator cancel method can be
called by other methods within the activity
launch animator, which is very dangerous
since it can set the occluded state incorrectly.

Bug: 235463625
Test: occlude and unocclude repeatedly to trigger cancel/restart
Change-Id: I1a8cc95876c2966009c9cfa8dbe2471a360930a7
parent c77d9bda

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

+5 −3
Original line number Diff line number Diff line
@@ -842,7 +842,6 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable, 


                @Override

                public void onLaunchAnimationCancelled() {

                    setOccluded(true /* occluded */, false /* animate */);

                    Log.d(TAG, "Occlude launch animation cancelled. Occluded state is now: "

                            + mOccluded);

                }
@@ -915,7 +914,7 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable, 
                        mUnoccludeAnimator.cancel();

                    }



                    setOccluded(isKeyguardOccluded, false /* animate */);

                    setOccluded(isKeyguardOccluded /* isOccluded */, false /* animate */);

                    Log.d(TAG, "Unocclude animation cancelled. Occluded state is now: "

                            + mOccluded);

                }
@@ -3195,7 +3194,10 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable, 
        @Override

        public void onAnimationCancelled(boolean isKeyguardOccluded) throws RemoteException {

            super.onAnimationCancelled(isKeyguardOccluded);

            Log.d(TAG, "Occlude launch animation cancelled. Occluded state is now: " + mOccluded);

            setOccluded(isKeyguardOccluded /* occluded */, false /* animate */);



            Log.d(TAG, "Occlude animation cancelled by WM. "

                    + "Setting occluded state to: " + mOccluded);

        }

    }

}