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

Commit ee07b869 authored by Josh Tsuji's avatar Josh Tsuji Committed by Automerger Merge Worker
Browse files

Merge "Play sounds only once, on keyguard exit." into sc-dev am: f0221c00 

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

Change-Id: Ie3f98bdd7ee6c499d5feeb017e674f3a9cdb694d
parents 78e0d0fc f0221c00

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

+7 −6
Original line number Diff line number Diff line
@@ -2178,12 +2178,6 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable, 
                mDrawnCallback = null;

            }



            // only play "unlock" noises if not on a call (since the incall UI

            // disables the keyguard)

            if (TelephonyManager.EXTRA_STATE_IDLE.equals(mPhoneState)) {

                playSounds(false);

            }



            LatencyTracker.getInstance(mContext)

                    .onActionEnd(LatencyTracker.ACTION_LOCKSCREEN_UNLOCK);
@@ -2301,6 +2295,13 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable, 
    }



    private void onKeyguardExitFinished() {

        // only play "unlock" noises if not on a call (since the incall UI

        // disables the keyguard)

        if (TelephonyManager.EXTRA_STATE_IDLE.equals(mPhoneState)) {

            Log.i("TEST", "playSounds: false");

            playSounds(false);

        }



        setShowingLocked(false);

        mWakeAndUnlocking = false;

        mDismissCallbackRegistry.notifyDismissSucceeded();