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

When phone is ringing, power button should only mute the ringer, not hang up.

Browse Source 
Fixes my previous fix for bug b/2201585 (Pressing power button when phone ringing should mute ringer)

Change-Id: I9460e21245b9719f715818f7ad878b121857d773
Signed-off-by: Mike Lockwood <lockwood@android.com>
This commit is contained in:
Mike Lockwood
2009-10-23 11:29:52 -04:00
parent 75d3caafc4
commit 2eb4796590
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
policy/com/android/internal/policy/impl/PhoneWindowManager.java
View File

@@ -1682,17 +1682,19 @@ public class PhoneWindowManager implements WindowManagerPolicy {
if (code == KeyEvent.KEYCODE_ENDCALL
|| code == KeyEvent.KEYCODE_POWER) {
if (down) {
boolean hungUp = false;
boolean handled = false;
// key repeats are generated by the window manager, and we don't see them
// here, so unless the driver is doing something it shouldn't be, we know
// this is the real press event.
ITelephony phoneServ = getPhoneInterface();
if (phoneServ != null) {
try {
// power button should hang up only when ringing
// but not after the call has been answered
if (code == KeyEvent.KEYCODE_ENDCALL || phoneServ.isRinging()) {
hungUp = phoneServ.endCall();
if (code == KeyEvent.KEYCODE_ENDCALL) {
handled = phoneServ.endCall();
} else if (code == KeyEvent.KEYCODE_POWER && phoneServ.isRinging()) {
// Pressing power during incoming call should silence the ringer
phoneServ.silenceRinger();
handled = true;
}
} catch (RemoteException ex) {
Log.w(TAG, "ITelephony threw RemoteException" + ex);
@@ -1701,7 +1703,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
Log.w(TAG, "!!! Unable to find ITelephony interface !!!");
}
// power button should turn off screen in addition to hanging up the phone
if ((hungUp && code != KeyEvent.KEYCODE_POWER) || !screenIsOn) {
if ((handled && code != KeyEvent.KEYCODE_POWER) || !screenIsOn) {
mShouldTurnOffOnKeyUp = false;
} else {
// only try to turn off the screen if we didn't already hang up