Merge "D2D communication improvements." into sc-dev

telephony/java/android/telephony/ims/ImsCallProfile.java

@@ -791,7 +791,9 @@ public final class ImsCallProfile implements Parcelable {
                 + ", emergencyCallTesting=" + mEmergencyCallTesting
                 + ", hasKnownUserIntentEmergency=" + mHasKnownUserIntentEmergency
                 + ", mRestrictCause=" + mRestrictCause
-                + ", mCallerNumberVerstat= " + mCallerNumberVerificationStatus + " }";
+                + ", mCallerNumberVerstat= " + mCallerNumberVerificationStatus
+                + ", mAcceptedRtpHeaderExtensions= " + mAcceptedRtpHeaderExtensionTypes
+                + " }";
     }
 
     @Override

telephony/java/android/telephony/ims/RtpHeaderExtension.java

@@ -134,4 +134,19 @@ public final class RtpHeaderExtension implements Parcelable {
         result = 31 * result + Arrays.hashCode(mExtensionData);
         return result;
     }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("RtpHeaderExtension{mLocalIdentifier=");
+        sb.append(mLocalIdentifier);
+        sb.append(", mData=");
+        for (byte b : mExtensionData) {
+            sb.append(Integer.toBinaryString(b));
+            sb.append("b_");
+        }
+        sb.append("}");
+
+        return sb.toString();
+    }
 }

telephony/java/android/telephony/ims/RtpHeaderExtensionType.java

@@ -133,4 +133,16 @@ public final class RtpHeaderExtensionType implements Parcelable {
     public int hashCode() {
         return Objects.hash(mLocalIdentifier, mUri);
     }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("RtpHeaderExtensionType{mLocalIdentifier=");
+        sb.append(mLocalIdentifier);
+        sb.append(", mUri=");
+        sb.append(mUri);
+        sb.append("}");
+
+        return sb.toString();
+    }
 }

telephony/java/com/android/internal/telephony/ITelephony.aidl

@@ -2339,6 +2339,11 @@ interface ITelephony {
      */
     void sendDeviceToDeviceMessage(int message, int value);
 
+    /**
+     * Sets the specified transport active; only for use through shell.
+     */
+    void setActiveDeviceToDeviceTransport(String transport);
+
     /**
      * Gets the config of RCS VoLTE single registration enabled for the carrier/subscription.
      */