commit e41661cbc5db3cbb8e60e0137fbac3f3a1f506a5
author Chiao Cheng <chiaocheng@google.com> Tue Jul 23 13:28:26 2013 -0700
committer Chiao Cheng <chiaocheng@google.com> Wed Jul 24 17:10:51 2013 -0700
tree 2e54aa07ac50237b29fd04e375cdda60d32c5f68
parent 345350ee0b6fa5c510e64b4b8cfb5ed1e5d70851

Adding mute and speaker methods to CallCommandService.

Catching all exceptions from command service since they won't be sent over ipc.

Change-Id: Icdd11a9fe7d4041b228bf2543a8bf0b1ef7b1651

src/com/android/phone/CallCommandService.java

diff --git a/src/com/android/phone/CallCommandService.java b/src/com/android/phone/CallCommandService.java
index c0f8c67..6a0ef2f 100644
--- a/src/com/android/phone/CallCommandService.java
+++ b/src/com/android/phone/CallCommandService.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (C) 2013 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -11,24 +11,30 @@
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
- * limitations under the License.
+ * limitations under the License
  */
 
 package com.android.phone;
 
+import android.content.Context;
+import android.util.Log;
+
 import com.android.internal.telephony.CallManager;
 import com.android.services.telephony.common.ICallCommandService;
 
 /**
- * Service interface used by in-call ui to control phone calls using commands
- * exposed as methods.  Instances of this class are handed to in-call UI via
- * CallMonitorService.
+ * Service interface used by in-call ui to control phone calls using commands exposed as methods.
+ * Instances of this class are handed to in-call UI via CallMonitorService.
  */
 class CallCommandService extends ICallCommandService.Stub {
 
+    private static final String TAG = CallCommandService.class.getSimpleName();
+
+    private Context mContext;
     private CallManager mCallManager;
 
-    public CallCommandService(CallManager callManager) {
+    public CallCommandService(Context context, CallManager callManager) {
+        mContext = context;
         mCallManager = callManager;
     }
 
@@ -37,8 +43,12 @@
      */
     @Override
     public void answerCall(int callId) {
-        // TODO(klp): Change to using the callId and logic from InCallScreen::internalAnswerCall
-        PhoneUtils.answerCall(mCallManager.getFirstActiveRingingCall());
+        try {
+            // TODO(klp): Change to using the callId and logic from InCallScreen::internalAnswerCall
+            PhoneUtils.answerCall(mCallManager.getFirstActiveRingingCall());
+        } catch (Exception e) {
+            Log.e(TAG, "Error during answerCall().", e);
+        }
     }
 
     /**
@@ -46,13 +56,40 @@
      */
     @Override
     public void rejectCall(int callId) {
-        // TODO(klp): Change to using the callId
-        PhoneUtils.hangupRingingCall(mCallManager.getFirstActiveRingingCall());
+        try {
+            // TODO(klp): Change to using the callId
+            PhoneUtils.hangupRingingCall(mCallManager.getFirstActiveRingingCall());
+        } catch (Exception e) {
+            Log.e(TAG, "Error during rejectCall().", e);
+        }
     }
 
     @Override
     public void disconnectCall(int callId) {
-        // TODO(klp): Change to using the callId
-        PhoneUtils.hangup(mCallManager);
+        try {
+            // TODO(klp): Change to using the callId
+            PhoneUtils.hangup(mCallManager);
+        } catch (Exception e) {
+            Log.e(TAG, "Error during disconnectCall().", e);
+        }
+    }
+
+    @Override
+    public void mute(boolean onOff) {
+        try {
+            PhoneUtils.setMute(onOff);
+        } catch (Exception e) {
+            Log.e(TAG, "Error during mute().", e);
+        }
+    }
+
+    @Override
+    public void speaker(boolean onOff) {
+        try {
+            // TODO(klp): add bluetooth logic from InCallScreen.toggleSpeaker()
+            PhoneUtils.turnOnSpeaker(mContext, onOff, true);
+        } catch (Exception e) {
+            Log.e(TAG, "Error during speaker().", e);
+        }
     }
 }