Merge "Add handleCallIntent method in TelecomManager." am: e35965e881

am: ffbc91f6e8

Change-Id: Ie21e6e65f1145f13c197e8eb4ded0e9449cccf5a

telecomm/java/android/telecom/TelecomManager.java

@@ -1905,6 +1905,22 @@ public class TelecomManager {
         return false;
     }
 
+    /**
+     * Handles {@link Intent#ACTION_CALL} intents trampolined from UserCallActivity.
+     * @param intent The {@link Intent#ACTION_CALL} intent to handle.
+     * @hide
+     */
+    public void handleCallIntent(Intent intent) {
+        try {
+            if (isServiceConnected()) {
+                getTelecomService().handleCallIntent(intent);
+            }
+        } catch (RemoteException e) {
+            Log.e(TAG, "RemoteException handleCallIntent: " + e);
+        }
+
+    }
+
     private ITelecomService getTelecomService() {
         if (mTelecomServiceOverride != null) {
             return mTelecomServiceOverride;

telecomm/java/com/android/internal/telecom/ITelecomService.aidl

@@ -284,4 +284,9 @@ interface ITelecomService {
      * @see TelecomServiceImpl#isInEmergencyCall
      */
     boolean isInEmergencyCall();
+
+    /**
+     * @see TelecomServiceImpl#handleCallIntent
+     */
+    void handleCallIntent(in Intent intent);
 }