Merge "Improve headset media button logging in Telecom." into main (bec2a436) · Commits · e / os / android_packages_services_Telecomm

src/com/android/server/telecom/CallsManager.java

+4 −1

Original line number	Diff line number	Diff line
		@@ -4426,12 +4426,14 @@ public class CallsManager extends Call.ListenerBase
		return true;
		}
		} else {
		Log.addEvent(ringingCall, LogUtils.Events.INFO,
		"media btn short press - answer call.");
		answerCall(ringingCall, VideoProfile.STATE_AUDIO_ONLY);
		return true;
		}
		} else if (HeadsetMediaButton.LONG_PRESS == type) {
		if (ringingCall != null) {
		Log.addEvent(getForegroundCall(),
		Log.addEvent(ringingCall,
		LogUtils.Events.INFO, "media btn long press - reject");
		ringingCall.reject(false, null);
		} else {
		@@ -4452,6 +4454,7 @@ public class CallsManager extends Call.ListenerBase
		return true;
		}
		}
		Log.i(this, "onMediaButton: type=%d; no active calls", type);
		return false;
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -103,7 +103,7 @@ public class HeadsetMediaButton extends CallsManagerListenerBase {
		if ((event != null) && ((event.getKeyCode() == KeyEvent.KEYCODE_HEADSETHOOK) \|\|
		(event.getKeyCode() == KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE))) {
		synchronized (mLock) {
		Log.v(this, "SessionCallback: HEADSETHOOK/MEDIA_PLAY_PAUSE");
		Log.i(this, "onMediaButton: event=%s", event);
		boolean consumed = handleCallMediaButton(event);
		Log.v(this, "==> handleCallMediaButton(): consumed = %b.", consumed);
		return consumed;