From e1bc2ec7101472a9f2495f65e0b49d7888ed957f Mon Sep 17 00:00:00 2001
From: Hall Liu <hallliu@google.com>
Date: Fri, 9 Oct 2015 15:58:37 -0700
Subject: [PATCH] Add TelecomManager constructor for passing in
 TelecomServiceImpl override

Bug: 24618535
Change-Id: I2dafcc9ab496de94eb6a6894916030ed4e7556f8
---
 telecomm/java/android/telecom/TelecomManager.java | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/telecomm/java/android/telecom/TelecomManager.java b/telecomm/java/android/telecom/TelecomManager.java
index a8f2aca43708..8b347ccdb9a8 100644
--- a/telecomm/java/android/telecom/TelecomManager.java
+++ b/telecomm/java/android/telecom/TelecomManager.java
@@ -447,6 +447,8 @@ public class TelecomManager {
 
     private final Context mContext;
 
+    private final ITelecomService mTelecomServiceOverride;
+
     /**
      * @hide
      */
@@ -458,12 +460,20 @@ public class TelecomManager {
      * @hide
      */
     public TelecomManager(Context context) {
+        this(context, null);
+    }
+
+    /**
+     * @hide
+     */
+    public TelecomManager(Context context, ITelecomService telecomServiceImpl) {
         Context appContext = context.getApplicationContext();
         if (appContext != null) {
             mContext = appContext;
         } else {
             mContext = context;
         }
+        mTelecomServiceOverride = telecomServiceImpl;
     }
 
     /**
@@ -1340,6 +1350,9 @@ public class TelecomManager {
     }
 
     private ITelecomService getTelecomService() {
+        if (mTelecomServiceOverride != null) {
+            return mTelecomServiceOverride;
+        }
         return ITelecomService.Stub.asInterface(ServiceManager.getService(Context.TELECOM_SERVICE));
     }
 
-- 
2.11.0