DSDA Framework changes

- Add new event for RESUME fail case
- Make certain ConnectionService methods protected

Change-Id: Ib2a7cc13f6256fa3eef7d5dc77a6f66baa19e7ca
CRs-Fixed: 3041636

2 files changed, 21 insertions, 5 deletions

diff --git a/telecomm/java/android/telecom/Connection.java b/telecomm/java/android/telecom/Connection.java
index 4ed6a70dde0a..b719811791ce 100644
--- a/telecomm/java/android/telecom/Connection.java
+++ b/telecomm/java/android/telecom/Connection.java
@@ -888,6 +888,17 @@ public abstract class Connection extends Conferenceable {
     public static final String EVENT_CALL_HOLD_FAILED = "android.telecom.event.CALL_HOLD_FAILED";
 
     /**
+     * Connection event used to inform Telecom when a resume operation on a call has failed.
+     * This event is only sent when concurrent calls (DSDA) are possible
+     * <p>
+     * Sent via {@link #sendConnectionEvent(String, Bundle)}.  The {@link Bundle} parameter is
+     * expected to be null when this connection event is used.
+     * @hide
+     */
+    public static final String EVENT_CALL_RESUME_FAILED =
+            "android.telecom.event.CALL_RESUME_FAILED";
+
+    /**
      * Connection event used to inform Telecom when a switch operation on a call has failed.
      * <p>
      * Sent via {@link #sendConnectionEvent(String, Bundle)}.  The {@link Bundle} parameter is
diff --git a/telecomm/java/android/telecom/ConnectionService.java b/telecomm/java/android/telecom/ConnectionService.java
index 7cff44ea47b8..90f5074a20a6 100755
--- a/telecomm/java/android/telecom/ConnectionService.java
+++ b/telecomm/java/android/telecom/ConnectionService.java
@@ -2285,7 +2285,8 @@ public abstract class ConnectionService extends Service {
         }
     }
 
-    private void hold(String callId) {
+    /** {@hide} */
+    protected void hold(String callId) {
         Log.i(this, "hold %s", callId);
         if (mConnectionById.containsKey(callId)) {
             findConnectionForAction(callId, "hold").onHold();
@@ -2294,7 +2295,8 @@ public abstract class ConnectionService extends Service {
         }
     }
 
-    private void unhold(String callId) {
+    /** {@hide} */
+    protected void unhold(String callId) {
         Log.i(this, "unhold %s", callId);
         if (mConnectionById.containsKey(callId)) {
             findConnectionForAction(callId, "unhold").onUnhold();
@@ -3350,7 +3352,8 @@ public abstract class ConnectionService extends Service {
         }
     }
 
-    private Connection findConnectionForAction(String callId, String action) {
+    /** {@hide} */
+    protected Connection findConnectionForAction(String callId, String action) {
         if (callId != null && mConnectionById.containsKey(callId)) {
             return mConnectionById.get(callId);
         }
@@ -3365,7 +3368,8 @@ public abstract class ConnectionService extends Service {
         return sNullConnection;
     }
 
-    private Conference findConferenceForAction(String conferenceId, String action) {
+    /** {@hide} */
+    protected Conference findConferenceForAction(String conferenceId, String action) {
         if (mConferenceById.containsKey(conferenceId)) {
             return mConferenceById.get(conferenceId);
         }
@@ -3411,7 +3415,8 @@ public abstract class ConnectionService extends Service {
         return ids;
     }
 
-    private Conference getNullConference() {
+    /** {@hide} */
+    protected Conference getNullConference() {
         if (sNullConference == null) {
             sNullConference = new Conference(null) {};
         }