commit 89b1481f240dba5f17b3b916aab7d20e6b3f92af
author Yorke Lee <yorkelee@google.com> Mon Jun 15 21:26:14 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jun 15 21:26:17 2015 +0000
tree 87884aa77ed5ae0974e2eda125f9e624f937eceb
parent c722ad9cf7f27ce544f4b80757c42e51f5e8071f
parent b3984309ff85330e0f99270d0bcd0e3d48055a6c

Merge "Send broadcast when default dialer changes" into mnc-dev

src/com/android/server/telecom/TelecomServiceImpl.java

diff --git a/src/com/android/server/telecom/TelecomServiceImpl.java b/src/com/android/server/telecom/TelecomServiceImpl.java
index e874fc0..5d20956 100644
--- a/src/com/android/server/telecom/TelecomServiceImpl.java
+++ b/src/com/android/server/telecom/TelecomServiceImpl.java
@@ -22,6 +22,7 @@
 import static android.Manifest.permission.REGISTER_SIM_SUBSCRIPTION;
 import static android.Manifest.permission.WRITE_SECURE_SETTINGS;
 
+import android.app.ActivityManager;
 import android.app.AppOpsManager;
 import android.content.ComponentName;
 import android.content.Context;
@@ -857,7 +858,17 @@
             synchronized (mLock) {
                 long token  = Binder.clearCallingIdentity();
                 try {
-                    return DefaultDialerManager.setDefaultDialerApplication(mContext, packageName);
+                    final boolean result =
+                            DefaultDialerManager.setDefaultDialerApplication(mContext, packageName);
+                    if (result) {
+                        final Intent intent =
+                                new Intent(TelecomManager.ACTION_DEFAULT_DIALER_CHANGED);
+                        intent.putExtra(TelecomManager.EXTRA_CHANGE_DEFAULT_DIALER_PACKAGE_NAME,
+                                packageName);
+                        mContext.sendBroadcastAsUser(intent,
+                                new UserHandle(ActivityManager.getCurrentUser()));
+                    }
+                    return result;
                 } finally {
                     Binder.restoreCallingIdentity(token);
                 }

src/com/android/server/telecom/components/ChangeDefaultDialerDialog.java

diff --git a/src/com/android/server/telecom/components/ChangeDefaultDialerDialog.java b/src/com/android/server/telecom/components/ChangeDefaultDialerDialog.java
index 95b81b1..5fd7904 100644
--- a/src/com/android/server/telecom/components/ChangeDefaultDialerDialog.java
+++ b/src/com/android/server/telecom/components/ChangeDefaultDialerDialog.java
@@ -18,7 +18,6 @@
 
 import android.content.Context;
 import android.content.DialogInterface;
-import android.content.Intent;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
@@ -65,8 +64,7 @@
     public void onClick(DialogInterface dialog, int which) {
         switch (which) {
             case BUTTON_POSITIVE:
-                DefaultDialerManager.setDefaultDialerApplication(ChangeDefaultDialerDialog.this,
-                        mNewPackage);
+                TelecomManager.from(this).setDefaultDialer(mNewPackage);
                 setResult(RESULT_OK);
                 break;
             case BUTTON_NEGATIVE: