Merge "Add strings for incoming call UX for self-managed calls."
diff --git a/src/com/android/server/telecom/CallAudioManager.java b/src/com/android/server/telecom/CallAudioManager.java
index e50fd21..1075be2 100644
--- a/src/com/android/server/telecom/CallAudioManager.java
+++ b/src/com/android/server/telecom/CallAudioManager.java
@@ -477,6 +477,16 @@
pw.println("Foreground call:");
pw.println(mForegroundCall);
+
+ pw.println("CallAudioModeStateMachine pending messages:");
+ pw.increaseIndent();
+ mCallAudioModeStateMachine.dumpPendingMessages(pw);
+ pw.decreaseIndent();
+
+ pw.println("CallAudioRouteStateMachine pending messages:");
+ pw.increaseIndent();
+ mCallAudioRouteStateMachine.dumpPendingMessages(pw);
+ pw.decreaseIndent();
}
@VisibleForTesting
diff --git a/src/com/android/server/telecom/CallAudioModeStateMachine.java b/src/com/android/server/telecom/CallAudioModeStateMachine.java
index 7121a53..3d778f2 100644
--- a/src/com/android/server/telecom/CallAudioModeStateMachine.java
+++ b/src/com/android/server/telecom/CallAudioModeStateMachine.java
@@ -24,6 +24,7 @@
import android.util.SparseArray;
import com.android.internal.util.IState;
+import com.android.internal.util.IndentingPrintWriter;
import com.android.internal.util.State;
import com.android.internal.util.StateMachine;
@@ -515,6 +516,10 @@
}
}
+ public void dumpPendingMessages(IndentingPrintWriter pw) {
+ getHandler().getLooper().dump(pw::println, "");
+ }
+
@Override
protected void onPostHandleMessage(Message msg) {
Log.endSession();
diff --git a/src/com/android/server/telecom/CallAudioRouteStateMachine.java b/src/com/android/server/telecom/CallAudioRouteStateMachine.java
index dd69534..7dfd78c 100644
--- a/src/com/android/server/telecom/CallAudioRouteStateMachine.java
+++ b/src/com/android/server/telecom/CallAudioRouteStateMachine.java
@@ -37,6 +37,7 @@
import android.util.SparseArray;
import com.android.internal.util.IState;
+import com.android.internal.util.IndentingPrintWriter;
import com.android.internal.util.State;
import com.android.internal.util.StateMachine;
import com.android.server.telecom.bluetooth.BluetoothRouteManager;
@@ -1318,6 +1319,10 @@
quitNow();
}
+ public void dumpPendingMessages(IndentingPrintWriter pw) {
+ getHandler().getLooper().dump(pw::println, "");
+ }
+
/**
* Sets whether notifications should be suppressed or not. Used when in a call to ensure the
* device will not vibrate due to notifications.
diff --git a/src/com/android/server/telecom/TelephonyUtil.java b/src/com/android/server/telecom/TelephonyUtil.java
index 50b8901..a76821a 100644
--- a/src/com/android/server/telecom/TelephonyUtil.java
+++ b/src/com/android/server/telecom/TelephonyUtil.java
@@ -94,8 +94,8 @@
int subId2 = telephonyManager.getSubIdForPhoneAccount(account2);
if (subId1 != SubscriptionManager.INVALID_SUBSCRIPTION_ID &&
subId2 != SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
- retval = (SubscriptionManager.getSlotId(subId1) <
- SubscriptionManager.getSlotId(subId2)) ? -1 : 1;
+ retval = (SubscriptionManager.getSlotIndex(subId1) <
+ SubscriptionManager.getSlotIndex(subId2)) ? -1 : 1;
}
// Then order by package
diff --git a/src/com/android/server/telecom/VideoProviderProxy.java b/src/com/android/server/telecom/VideoProviderProxy.java
index 26018de..62613b0 100644
--- a/src/com/android/server/telecom/VideoProviderProxy.java
+++ b/src/com/android/server/telecom/VideoProviderProxy.java
@@ -318,7 +318,7 @@
if (!canUseCamera(mCall.getContext(), callingPackage, callingUid, callingPid)) {
// Calling app is not permitted to use the camera. Ignore the request and send
// back a call session event indicating the error.
- Log.i(this, "onSetCamera: camera permission denied; package=%d, uid=%d, "
+ Log.i(this, "onSetCamera: camera permission denied; package=%s, uid=%d, "
+ "pid=%d, targetSdkVersion=%d",
callingPackage, callingUid, callingPid, targetSdkVersion);