Merge "Add APIs to getDefaultDialerPackage and getSystemDialerPackage"
diff --git a/src/com/android/server/telecom/TelecomServiceImpl.java b/src/com/android/server/telecom/TelecomServiceImpl.java
index 3e4de8a..93cfa66 100644
--- a/src/com/android/server/telecom/TelecomServiceImpl.java
+++ b/src/com/android/server/telecom/TelecomServiceImpl.java
@@ -30,6 +30,7 @@
 import android.os.IBinder;
 import android.os.UserHandle;
 import android.os.UserManager;
+import android.telecom.DefaultDialerManager;
 import android.telecom.PhoneAccount;
 import android.telecom.PhoneAccountHandle;
 import android.telecom.TelecomManager;
@@ -444,6 +445,8 @@
 
         /**
          * @see android.telecom.TelecomManager#getDefaultPhoneApp
+         * @deprecated - Use {@link android.telecom.TelecomManager#getDefaultDialerPackage()}
+         *         instead.
          */
         @Override
         public ComponentName getDefaultPhoneApp() {
@@ -455,6 +458,27 @@
         }
 
         /**
+         * @see android.telecom.TelecomManager#getDefaultDialerPackage
+         */
+        @Override
+        public String getDefaultDialerPackage() {
+            final ComponentName defaultDialer =
+                    DefaultDialerManager.getDefaultDialerApplication(mContext);
+            if (defaultDialer != null) {
+                return defaultDialer.getPackageName();
+            }
+            return null;
+        }
+
+        /**
+         * @see android.telecom.TelecomManager#getSystemDialerPackage
+         */
+        @Override
+        public String getSystemDialerPackage() {
+            return mContext.getResources().getString(R.string.ui_default_package);
+        }
+
+        /**
          * @see android.telecom.TelecomManager#isInCall
          */
         @Override