Merge "Improve logging of connection changes due to redial and handover." into sc-dev
diff --git a/src/com/android/services/telephony/TelephonyConnection.java b/src/com/android/services/telephony/TelephonyConnection.java
index 2383981..cdbe8c7 100755
--- a/src/com/android/services/telephony/TelephonyConnection.java
+++ b/src/com/android/services/telephony/TelephonyConnection.java
@@ -157,10 +157,11 @@
updateState();
break;
case MSG_HANDOVER_STATE_CHANGED:
+ // fall through
case MSG_REDIAL_CONNECTION_CHANGED:
String what = (msg.what == MSG_HANDOVER_STATE_CHANGED)
? "MSG_HANDOVER_STATE_CHANGED" : "MSG_REDIAL_CONNECTION_CHANGED";
- Log.v(TelephonyConnection.this, what);
+ Log.i(TelephonyConnection.this, "Connection changed due to: %s", what);
AsyncResult ar = (AsyncResult) msg.obj;
com.android.internal.telephony.Connection connection =
(com.android.internal.telephony.Connection) ar.result;
@@ -177,7 +178,7 @@
mOriginalConnection.getAddress() != null &&
mOriginalConnection.getAddress().equals(connection.getAddress())) ||
connection.getState() == mOriginalConnection.getStateBeforeHandover())) {
- Log.d(TelephonyConnection.this, "Setting original connection after"
+ Log.i(TelephonyConnection.this, "Setting original connection after"
+ " handover or redial, current original connection="
+ mOriginalConnection.toString()
+ ", new original connection="
@@ -744,6 +745,8 @@
@Override
public void onOriginalConnectionReplaced(
com.android.internal.telephony.Connection newConnection) {
+ Log.i(TelephonyConnection.this, "onOriginalConnectionReplaced; newConn=%s",
+ newConnection);
setOriginalConnection(newConnection);
}
@@ -1511,6 +1514,7 @@
}
public void registerForCallEvents(Phone phone) {
+ Log.i(this, "registerForCallEvents; phone=%s", phone);
phone.registerForPreciseCallStateChanged(mHandler, MSG_PRECISE_CALL_STATE_CHANGED, null);
phone.registerForHandoverStateChanged(mHandler, MSG_HANDOVER_STATE_CHANGED, null);
phone.registerForRedialConnectionChanged(mHandler, MSG_REDIAL_CONNECTION_CHANGED, null);
@@ -1522,7 +1526,8 @@
}
void setOriginalConnection(com.android.internal.telephony.Connection originalConnection) {
- Log.v(this, "new TelephonyConnection, originalConnection: " + originalConnection);
+ Log.i(this, "setOriginalConnection: TelephonyConnection, originalConnection: "
+ + originalConnection);
if (mOriginalConnection != null && originalConnection != null
&& !originalConnection.isIncoming()
&& originalConnection.getOrigDialString() == null
@@ -2076,6 +2081,7 @@
*/
void clearOriginalConnection() {
if (mOriginalConnection != null) {
+ Log.i(this, "clearOriginalConnection; clearing=%s", mOriginalConnection);
if (getPhone() != null) {
unregisterForCallEvents(getPhone());
}