am "Fix emergency callback number not shown for incoming calls."

merged from goog/mirror-m-wireless-internal-release
068085b Fix emergency callback number not shown for incoming calls.

1 files changed, 12 insertions, 0 deletions

diff --git a/telecomm/java/android/telecom/Connection.java b/telecomm/java/android/telecom/Connection.java
index 54130ae..f7a19f8 100644
--- a/telecomm/java/android/telecom/Connection.java
+++ b/telecomm/java/android/telecom/Connection.java
@@ -177,6 +177,15 @@ public abstract class Connection implements IConferenceable {
     // Next CAPABILITY value: 0x00020000
     //**********************************************************************************************
 
+    /**
+     * Indicates that the current device callback number should be shown.
+     *
+     * @hide
+     */
+    public static final int CAPABILITY_SHOW_CALLBACK_NUMBER = 0x00008000;
+
+
+
     // Flag controlling whether PII is emitted into the logs
     private static final boolean PII_DEBUG = Log.isLoggable(android.util.Log.DEBUG);
 
@@ -275,6 +284,9 @@ public abstract class Connection implements IConferenceable {
         if (can(capabilities, CAPABILITY_GENERIC_CONFERENCE)) {
             builder.append(" CAPABILITY_GENERIC_CONFERENCE");
         }
+        if (can(capabilities, CAPABILITY_SHOW_CALLBACK_NUMBER)) {
+            builder.append(" CAPABILITY_SHOW_CALLBACK_NUMBER");
+        }
         builder.append("]");
         return builder.toString();
     }