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

Commit b19c1e01 authored by Josh Tsuji's avatar Josh Tsuji
Browse files

Play sounds only once, on keyguard exit. 

Fixes: 192083598
Test: unlock in every which way and hear 1 unlock sound instead of 2
Change-Id: I9219a85de1c934a903acb038840b6182ef0a3c55
parent 82f0979e

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