commit 4e4ed74f1c29ede44450f78354755bfabfb1fc4f
author Yorke Lee <yorkelee@google.com> Tue May 05 16:23:05 2015 -0700
committer Yorke Lee <yorkelee@google.com> Tue May 05 16:23:05 2015 -0700
tree 8abe15c20234bb3bf89f9aac16c502c011d8a044
parent ac30f08f0ef02e67d77a2f01c9d1018fe61a1605

Use current userhandle when querying for default dialer

Also update TestDialerActivity to use placeCall API.

Bug: 20696062
Change-Id: I65f9585f7659009e76456c4613de48f0558dd0b5

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

diff --git a/src/com/android/server/telecom/components/UserCallIntentProcessor.java b/src/com/android/server/telecom/components/UserCallIntentProcessor.java
index d19a260..82dc713 100644
--- a/src/com/android/server/telecom/components/UserCallIntentProcessor.java
+++ b/src/com/android/server/telecom/components/UserCallIntentProcessor.java
@@ -21,11 +21,13 @@
 import com.android.server.telecom.R;
 import com.android.server.telecom.TelephonyUtil;
 
+import android.app.ActivityManager;
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.UserHandle;
 import android.os.UserManager;
+import android.telecom.DefaultDialerManager;
 import android.telecom.PhoneAccount;
 import android.telecom.TelecomManager;
 import android.telecom.VideoProfile;
@@ -140,12 +142,14 @@
             return false;
         }
 
-        final TelecomManager telecomManager =
-                (TelecomManager) mContext.getSystemService(Context.TELECOM_SERVICE);
-        if (TextUtils.equals(telecomManager.getDefaultDialerPackage(), callingPackageName)) {
+        final String defaultDialer = DefaultDialerManager.getDefaultDialerApplication(mContext,
+                mUserHandle.getIdentifier());
+        if (TextUtils.equals(defaultDialer, callingPackageName)) {
             return true;
         }
 
+        final TelecomManager telecomManager =
+                (TelecomManager) mContext.getSystemService(Context.TELECOM_SERVICE);
         return TextUtils.equals(telecomManager.getSystemDialerPackage(), callingPackageName);
     }
 

testapps/src/com/android/server/telecom/testapps/TestDialerActivity.java

diff --git a/testapps/src/com/android/server/telecom/testapps/TestDialerActivity.java b/testapps/src/com/android/server/telecom/testapps/TestDialerActivity.java
index 4153ee1..17f7dc8 100644
--- a/testapps/src/com/android/server/telecom/testapps/TestDialerActivity.java
+++ b/testapps/src/com/android/server/telecom/testapps/TestDialerActivity.java
@@ -88,9 +88,10 @@
     }
 
     private void placeCall() {
-        final Intent intent = new Intent(Intent.ACTION_CALL,
-                Uri.fromParts(PhoneAccount.SCHEME_TEL, mNumberView.getText().toString(), null));
-        startActivityForResult(intent, 0);
+        final TelecomManager telecomManager =
+                (TelecomManager) getSystemService(Context.TELECOM_SERVICE);
+        telecomManager.placeCall(Uri.fromParts(PhoneAccount.SCHEME_TEL,
+                mNumberView.getText().toString(), null), null);
     }
 
     private void testVoicemail() {