Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Josh Tsuji
2021-06-29 17:45:46 +00:00
committed by Android (Google) Code Review
parent e2dc0091d7 b19c1e01e2
commit f0221c0079
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
View File

@@ -2178,12 +2178,6 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable,
mDrawnCallback = null; 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) LatencyTracker.getInstance(mContext)
.onActionEnd(LatencyTracker.ACTION_LOCKSCREEN_UNLOCK); .onActionEnd(LatencyTracker.ACTION_LOCKSCREEN_UNLOCK);
@@ -2301,6 +2295,13 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable,
} }
private void onKeyguardExitFinished() { 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); setShowingLocked(false);
mWakeAndUnlocking = false; mWakeAndUnlocking = false;
mDismissCallbackRegistry.notifyDismissSucceeded(); mDismissCallbackRegistry.notifyDismissSucceeded();