Merge "Fix NPE in CallAudioRouteController" into main
diff --git a/src/com/android/server/telecom/CallsManager.java b/src/com/android/server/telecom/CallsManager.java
index ab350bc..540c152 100644
--- a/src/com/android/server/telecom/CallsManager.java
+++ b/src/com/android/server/telecom/CallsManager.java
@@ -4426,12 +4426,14 @@
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 @@
return true;
}
}
+ Log.i(this, "onMediaButton: type=%d; no active calls", type);
return false;
}
diff --git a/src/com/android/server/telecom/HeadsetMediaButton.java b/src/com/android/server/telecom/HeadsetMediaButton.java
index 7458f54..afc82ae 100644
--- a/src/com/android/server/telecom/HeadsetMediaButton.java
+++ b/src/com/android/server/telecom/HeadsetMediaButton.java
@@ -103,7 +103,7 @@
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;