1 files changed, 17 insertions, 1 deletions
diff --git a/telecomm/java/android/telecom/Phone.java b/telecomm/java/android/telecom/Phone.java
index 47154da..0fd124d 100644
--- a/telecomm/java/android/telecom/Phone.java
+++ b/telecomm/java/android/telecom/Phone.java
@@ -123,7 +123,7 @@ public final class Phone {
 
     final void internalAddCall(ParcelableCall parcelableCall) {
         Call call = new Call(this, parcelableCall.getId(), mInCallAdapter,
-                parcelableCall.getState());
+                parcelableCall.getState(), parcelableCall.isActive());
         mCallByTelecomCallId.put(parcelableCall.getId(), call);
         mCalls.add(call);
         checkCallTree(parcelableCall);
@@ -179,6 +179,12 @@ public final class Phone {
         }
     }
 
+    final void onMergeFailed(ParcelableCall parcelableCall) {
+         Call call = mCallByTelecomCallId.get(parcelableCall.getId());
+         if (call != null) {
+             call.onMergeFailed();
+         }
+    }
     /**
      * Called to destroy the phone and cleanup any lingering calls.
      */
@@ -280,6 +286,16 @@ public final class Phone {
     }
 
     /**
+     * Instructs Telecomm to switch to other active subscripion
+     *
+     * @param subId switch to this subscription
+     * {@hide}
+     */
+    public void switchToOtherActiveSub(String subId) {
+        mInCallAdapter.switchToOtherActiveSub(subId);
+    }
+
+    /**
      * Obtains the current phone call audio state of the {@code Phone}.
      *
      * @return An object encapsulating the audio state.