commit 5adc858b0f19003194b061946b00d8a2fd3f666e
author Santos Cordon <santoscordon@google.com> Mon Oct 06 23:42:52 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Oct 06 23:42:52 2014 +0000
tree 36572661e61edd0bdb807c932dd00e37868c89d8
parent 72d271c4fdb6e497cf374ac1bfd1e615393fc4b2
parent 4f50f8e29d7479351ec344ec592686708ff01055

Merge "Dont clear serviceConnections on subsequent bind() calls." into lmp-dev

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

diff --git a/src/com/android/server/telecom/CallActivity.java b/src/com/android/server/telecom/CallActivity.java
index b249788..69da7e4 100644
--- a/src/com/android/server/telecom/CallActivity.java
+++ b/src/com/android/server/telecom/CallActivity.java
@@ -112,11 +112,20 @@
         }
 
         intent.putExtra(CallReceiver.KEY_IS_DEFAULT_DIALER, isDefaultDialer());
-        sendBroadcastToReceiver(intent, false /* isIncoming */);
+
+        if (UserHandle.myUserId() == UserHandle.USER_OWNER) {
+            CallReceiver.processOutgoingCallIntent(getApplicationContext(), intent);
+        } else {
+            sendBroadcastToReceiver(intent, false /* isIncoming */);
+        }
     }
 
     private void processIncomingCallIntent(Intent intent) {
-        sendBroadcastToReceiver(intent, true /* isIncoming */);
+        if (UserHandle.myUserId() == UserHandle.USER_OWNER) {
+            CallReceiver.processIncomingCallIntent(intent);
+        } else {
+            sendBroadcastToReceiver(intent, true /* isIncoming */);
+        }
     }
 
     private boolean isDefaultDialer() {

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

diff --git a/src/com/android/server/telecom/CallReceiver.java b/src/com/android/server/telecom/CallReceiver.java
index fe82b67..c8fdeb4 100644
--- a/src/com/android/server/telecom/CallReceiver.java
+++ b/src/com/android/server/telecom/CallReceiver.java
@@ -19,6 +19,7 @@
  * the primary user.
  */
 public class CallReceiver extends BroadcastReceiver {
+    private static final String TAG = CallReceiver.class.getName();
 
     static final String KEY_IS_INCOMING_CALL = "is_incoming_call";
     static final String KEY_IS_DEFAULT_DIALER =
@@ -27,7 +28,7 @@
     @Override
     public void onReceive(Context context, Intent intent) {
         final boolean isIncomingCall = intent.getBooleanExtra(KEY_IS_INCOMING_CALL, false);
-        Log.d(this, "onReceive - isIncomingCall: %s", isIncomingCall);
+        Log.i(TAG, "onReceive - isIncomingCall: %s", isIncomingCall);
 
         if (isIncomingCall) {
             processIncomingCallIntent(intent);
@@ -41,7 +42,7 @@
      *
      * @param intent Call intent containing data about the handle to call.
      */
-    private void processOutgoingCallIntent(Context context, Intent intent) {
+    static void processOutgoingCallIntent(Context context, Intent intent) {
         Uri handle = intent.getData();
         String scheme = handle.getScheme();
         String uriString = handle.getSchemeSpecificPart();
@@ -84,16 +85,16 @@
         }
     }
 
-    private void processIncomingCallIntent(Intent intent) {
+    static void processIncomingCallIntent(Intent intent) {
         PhoneAccountHandle phoneAccountHandle = intent.getParcelableExtra(
                 TelecomManager.EXTRA_PHONE_ACCOUNT_HANDLE);
 
         if (phoneAccountHandle == null) {
-            Log.w(this, "Rejecting incoming call due to null phone account");
+            Log.w(TAG, "Rejecting incoming call due to null phone account");
             return;
         }
         if (phoneAccountHandle.getComponentName() == null) {
-            Log.w(this, "Rejecting incoming call due to null component name");
+            Log.w(TAG, "Rejecting incoming call due to null component name");
             return;
         }
 
@@ -105,16 +106,17 @@
             clientExtras = Bundle.EMPTY;
         }
 
-        Log.d(this, "Processing incoming call from connection service [%s]",
+        Log.d(TAG, "Processing incoming call from connection service [%s]",
                 phoneAccountHandle.getComponentName());
         getCallsManager().processIncomingCallIntent(phoneAccountHandle, clientExtras);
     }
 
-    CallsManager getCallsManager() {
+    static CallsManager getCallsManager() {
         return CallsManager.getInstance();
     }
 
-    private void disconnectCallAndShowErrorDialog(Context context, Call call, int errorCode) {
+    private static void disconnectCallAndShowErrorDialog(
+            Context context, Call call, int errorCode) {
         call.disconnect();
         final Intent errorIntent = new Intent(context, ErrorDialogActivity.class);
         int errorMessageId = -1;