diff options
Diffstat (limited to 'InCallUI')
| -rw-r--r-- | InCallUI/AndroidManifest.xml | 6 | ||||
| -rw-r--r-- | InCallUI/src/com/android/incallui/Call.java | 1 | ||||
| -rw-r--r-- | InCallUI/src/com/android/incallui/CallCommandClient.java | 246 | ||||
| -rw-r--r-- | InCallUI/src/com/android/incallui/CallHandlerService.java | 312 | ||||
| -rw-r--r-- | InCallUI/src/com/android/incallui/CallList.java | 6 |
5 files changed, 3 insertions, 568 deletions
diff --git a/InCallUI/AndroidManifest.xml b/InCallUI/AndroidManifest.xml index 76483920f..1ab6936c5 100644 --- a/InCallUI/AndroidManifest.xml +++ b/InCallUI/AndroidManifest.xml @@ -44,12 +44,6 @@ android:exported="false"> </activity> - <service android:name="CallHandlerService"> - <intent-filter> - <action android:name="com.android.services.telephony.common.ICallHandlerService" /> - </intent-filter> - </service> - <service android:name="InCallServiceImpl"> <intent-filter> <action android:name="android.telecomm.InCallService" /> diff --git a/InCallUI/src/com/android/incallui/Call.java b/InCallUI/src/com/android/incallui/Call.java index b82e938b5..d844d8eab 100644 --- a/InCallUI/src/com/android/incallui/Call.java +++ b/InCallUI/src/com/android/incallui/Call.java @@ -34,7 +34,6 @@ import java.util.List; import java.util.Locale; /** - * Class object used across CallHandlerService APIs. * Describes a single call and its state. */ public final class Call { diff --git a/InCallUI/src/com/android/incallui/CallCommandClient.java b/InCallUI/src/com/android/incallui/CallCommandClient.java deleted file mode 100644 index 52d2100c8..000000000 --- a/InCallUI/src/com/android/incallui/CallCommandClient.java +++ /dev/null @@ -1,246 +0,0 @@ -/* - * Copyright (C) 2013 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * 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 - */ - -package com.android.incallui; - -import android.os.RemoteException; - - -import com.android.services.telephony.common.AudioMode; -import com.android.services.telephony.common.ICallCommandService; -import com.android.services.telephony.common.Call; - -/** - * Main interface for phone related commands. - */ -public class CallCommandClient { - - private static CallCommandClient sInstance; - - public static synchronized CallCommandClient getInstance() { - if (sInstance == null) { - sInstance = new CallCommandClient(); - } - return sInstance; - } - - private ICallCommandService mCommandService; - - private CallCommandClient() { - } - - public void setService(ICallCommandService service) { - mCommandService = service; - } - - public void answerCall(int callId) { - Log.i(this, "answerCall: " + callId); - if (mCommandService == null) { - Log.e(this, "Cannot answer call; CallCommandService == null"); - return; - } - try { - mCommandService.answerCall(callId); - } catch (RemoteException e) { - Log.e(this, "Error answering call.", e); - } - } - - public void rejectCall(Call call, boolean rejectWithMessage, String message) { - Log.i(this, "rejectCall: " + call.getCallId() + - ", with rejectMessage? " + rejectWithMessage); - if (mCommandService == null) { - Log.e(this, "Cannot reject call; CallCommandService == null"); - return; - } - try { - mCommandService.rejectCall(call, rejectWithMessage, message); - } catch (RemoteException e) { - Log.e(this, "Error rejecting call.", e); - } - } - - public void disconnectCall(int callId) { - Log.i(this, "disconnect Call: " + callId); - if (mCommandService == null) { - Log.e(this, "Cannot disconnect call; CallCommandService == null"); - return; - } - try { - mCommandService.disconnectCall(callId); - } catch (RemoteException e) { - Log.e(this, "Error disconnecting call.", e); - } - } - - public void separateCall(int callId) { - Log.i(this, "separate Call: " + callId); - if (mCommandService == null) { - Log.e(this, "Cannot separate call; CallCommandService == null"); - return; - } - try { - mCommandService.separateCall(callId); - } catch (RemoteException e) { - Log.e(this, "Error separating call.", e); - } - } - - public void mute(boolean onOff) { - Log.i(this, "mute: " + onOff); - if (mCommandService == null) { - Log.e(this, "Cannot mute call; CallCommandService == null"); - return; - } - try { - mCommandService.mute(onOff); - } catch (RemoteException e) { - Log.e(this, "Error muting phone.", e); - } - } - - public void hold(int callId, boolean onOff) { - Log.i(this, "hold call(" + onOff + "): " + callId); - if (mCommandService == null) { - Log.e(this, "Cannot hold call; CallCommandService == null"); - return; - } - try { - mCommandService.hold(callId, onOff); - } catch (RemoteException e) { - Log.e(this, "Error holding call.", e); - } - } - - public void merge() { - Log.i(this, "merge calls"); - if (mCommandService == null) { - Log.e(this, "Cannot merge call; CallCommandService == null"); - return; - } - try { - mCommandService.merge(); - } catch (RemoteException e) { - Log.e(this, "Error merging calls.", e); - } - } - - public void swap() { - Log.i(this, "swap active/hold calls"); - if (mCommandService == null) { - Log.e(this, "Cannot swap call; CallCommandService == null"); - return; - } - try { - mCommandService.swap(); - } catch (RemoteException e) { - Log.e(this, "Error merging calls.", e); - } - } - - public void addCall() { - Log.i(this, "add a new call"); - if (mCommandService == null) { - Log.e(this, "Cannot add call; CallCommandService == null"); - return; - } - try { - mCommandService.addCall(); - } catch (RemoteException e) { - Log.e(this, "Error merging calls.", e); - } - } - - public void setAudioMode(int mode) { - Log.i(this, "Set Audio Mode: " + AudioMode.toString(mode)); - if (mCommandService == null) { - Log.e(this, "Cannot set audio mode; CallCommandService == null"); - return; - } - try { - mCommandService.setAudioMode(mode); - } catch (RemoteException e) { - Log.e(this, "Error setting speaker.", e); - } - } - - public void playDtmfTone(char digit, boolean timedShortTone) { - if (mCommandService == null) { - Log.e(this, "Cannot start dtmf tone; CallCommandService == null"); - return; - } - try { - Log.v(this, "Sending dtmf tone " + digit); - mCommandService.playDtmfTone(digit, timedShortTone); - } catch (RemoteException e) { - Log.e(this, "Error setting speaker.", e); - } - - } - - public void stopDtmfTone() { - if (mCommandService == null) { - Log.e(this, "Cannot stop dtmf tone; CallCommandService == null"); - return; - } - try { - Log.v(this, "Stop dtmf tone "); - mCommandService.stopDtmfTone(); - } catch (RemoteException e) { - Log.e(this, "Error setting speaker.", e); - } - } - - public void postDialWaitContinue(int callId) { - if (mCommandService == null) { - Log.e(this, "Cannot postDialWaitContinue(); CallCommandService == null"); - return; - } - try { - Log.v(this, "postDialWaitContinue()"); - mCommandService.postDialWaitContinue(callId); - } catch (RemoteException e) { - Log.e(this, "Error on postDialWaitContinue().", e); - } - } - - public void postDialCancel(int callId) { - if (mCommandService == null) { - Log.e(this, "Cannot postDialCancel(); CallCommandService == null"); - return; - } - try { - Log.v(this, "postDialCancel()"); - mCommandService.postDialCancel(callId); - } catch (RemoteException e) { - Log.e(this, "Error on postDialCancel().", e); - } - } - - public void setSystemBarNavigationEnabled(boolean enable) { - if (mCommandService == null) { - Log.e(this, "Cannot setSystemBarNavigationEnabled(); CallCommandService == null"); - return; - } - try { - Log.v(this, "setSystemBarNavigationEnabled() enabled = " + enable); - mCommandService.setSystemBarNavigationEnabled(enable); - } catch (RemoteException e) { - Log.d(this, "Error on setSystemBarNavigationEnabled()."); - } - } - -} diff --git a/InCallUI/src/com/android/incallui/CallHandlerService.java b/InCallUI/src/com/android/incallui/CallHandlerService.java deleted file mode 100644 index 14b9f1fec..000000000 --- a/InCallUI/src/com/android/incallui/CallHandlerService.java +++ /dev/null @@ -1,312 +0,0 @@ -/* - * Copyright (C) 2013 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * 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 - */ - -package com.android.incallui; - -import android.app.Service; -import android.content.Intent; -import android.os.Handler; -import android.os.IBinder; -import android.os.Message; - -import com.android.services.telephony.common.AudioMode; -import com.android.services.telephony.common.Call; -import com.android.services.telephony.common.ICallCommandService; -import com.android.services.telephony.common.ICallHandlerService; - -import java.util.AbstractMap; -import java.util.List; -import java.util.Map; - -/** - * Service used to listen for call state changes. - */ -public class CallHandlerService extends Service { - - private final static String TAG = CallHandlerService.class.getSimpleName(); - - private static final int ON_UPDATE_CALL = 1; - private static final int ON_UPDATE_MULTI_CALL = 2; - private static final int ON_UPDATE_CALL_WITH_TEXT_RESPONSES = 3; - private static final int ON_AUDIO_MODE = 4; - private static final int ON_SUPPORTED_AUDIO_MODE = 5; - private static final int ON_DISCONNECT_CALL = 6; - private static final int ON_BRING_TO_FOREGROUND = 7; - private static final int ON_POST_CHAR_WAIT = 8; - private static final int ON_START = 9; - private static final int ON_DESTROY = 10; - - private static final int LARGEST_MSG_ID = ON_DESTROY; - - - private CallList mCallList; - private Handler mMainHandler; - private Object mHandlerInitLock = new Object(); - private InCallPresenter mInCallPresenter; - private AudioModeProvider mAudioModeProvider; - private boolean mServiceStarted = false; - - @Override - public void onCreate() { - Log.i(TAG, "onCreate"); - super.onCreate(); - - synchronized(mHandlerInitLock) { - if (mMainHandler == null) { - mMainHandler = new MainHandler(); - } - } - - } - - @Override - public void onDestroy() { - Log.i(TAG, "onDestroy"); - - // onDestroy will get called when: - // 1) there are no more calls - // 2) the client (TeleService) crashes. - // - // Because onDestroy is not sequenced with calls to CallHandlerService binder, - // we cannot know which is happening. - // Thats okay since in both cases we want to end all calls and let the UI know it can tear - // itself down when it's ready. Start the destruction sequence. - mMainHandler.sendMessage(mMainHandler.obtainMessage(ON_DESTROY)); - } - - - @Override - public IBinder onBind(Intent intent) { - Log.i(TAG, "onBind"); - return mBinder; - } - - @Override - public boolean onUnbind(Intent intent) { - Log.i(TAG, "onUnbind"); - - // Returning true here means we get called on rebind, which is a feature we do not need. - // Return false so that all reconnections happen with a call to onBind(). - return false; - } - - private final ICallHandlerService.Stub mBinder = new ICallHandlerService.Stub() { - - @Override - public void startCallService(ICallCommandService service) { - try { - Log.d(TAG, "startCallService: " + service.toString()); - - mMainHandler.sendMessage(mMainHandler.obtainMessage(ON_START, service)); - } catch (Exception e) { - Log.e(TAG, "Error processing setCallCommandservice() call", e); - } - } - - @Override - public void onDisconnect(Call call) { - try { - Log.i(TAG, "onDisconnected: " + call); - mMainHandler.sendMessage(mMainHandler.obtainMessage(ON_DISCONNECT_CALL, call)); - } catch (Exception e) { - Log.e(TAG, "Error processing onDisconnect() call.", e); - } - } - - @Override - public void onIncoming(Call call, List<String> textResponses) { - try { - Log.i(TAG, "onIncomingCall: " + call); - Map.Entry<Call, List<String>> incomingCall - = new AbstractMap.SimpleEntry<Call, List<String>>(call, textResponses); - mMainHandler.sendMessage(mMainHandler.obtainMessage( - ON_UPDATE_CALL_WITH_TEXT_RESPONSES, incomingCall)); - } catch (Exception e) { - Log.e(TAG, "Error processing onIncoming() call.", e); - } - } - - @Override - public void onUpdate(List<Call> calls) { - try { - Log.i(TAG, "onUpdate: " + calls); - mMainHandler.sendMessage(mMainHandler.obtainMessage(ON_UPDATE_MULTI_CALL, calls)); - } catch (Exception e) { - Log.e(TAG, "Error processing onUpdate() call.", e); - } - } - - @Override - public void onAudioModeChange(int mode, boolean muted) { - try { - Log.i(TAG, "onAudioModeChange : " + - AudioMode.toString(mode)); - mMainHandler.sendMessage(mMainHandler.obtainMessage(ON_AUDIO_MODE, mode, - muted ? 1 : 0, null)); - } catch (Exception e) { - Log.e(TAG, "Error processing onAudioModeChange() call.", e); - } - } - - @Override - public void onSupportedAudioModeChange(int modeMask) { - try { - Log.i(TAG, "onSupportedAudioModeChange : " + - AudioMode.toString(modeMask)); - mMainHandler.sendMessage(mMainHandler.obtainMessage(ON_SUPPORTED_AUDIO_MODE, - modeMask, 0, null)); - } catch (Exception e) { - Log.e(TAG, "Error processing onSupportedAudioModeChange() call.", e); - } - } - - @Override - public void bringToForeground(boolean showDialpad) { - mMainHandler.sendMessage(mMainHandler.obtainMessage(ON_BRING_TO_FOREGROUND, - showDialpad ? 1 : 0, 0)); - } - - @Override - public void onPostDialWait(int callId, String chars) { - mMainHandler.sendMessage(mMainHandler.obtainMessage(ON_POST_CHAR_WAIT, callId, 0, - chars)); - } - }; - - private void doStart(ICallCommandService service) { - Log.i(TAG, "doStart"); - - // always setup the new callcommandservice - CallCommandClient.getInstance().setService(service); - - // If we have a new service when one is already started, we can continue - // using the service that we already have. - if (mServiceStarted) { - Log.i(TAG, "Starting a service before another one is completed"); - doStop(); - } - - mCallList = CallList.getInstance(); - mAudioModeProvider = AudioModeProvider.getInstance(); - mInCallPresenter = InCallPresenter.getInstance(); - - mInCallPresenter.setUp(getApplicationContext(), mCallList, mAudioModeProvider); - - mServiceStarted = true; - } - - public void doStop() { - Log.i(TAG, "doStop"); - - if (!mServiceStarted) { - return; - } - - mServiceStarted = false; - - // We are disconnected, clear the call list so that UI can start - // tearing itself down. - mCallList.clearOnDisconnect(); - mCallList = null; - - mInCallPresenter.tearDown(); - mInCallPresenter = null; - mAudioModeProvider = null; - } - - /** - * Handles messages from the service so that they get executed on the main thread, where they - * can interact with UI. - */ - private class MainHandler extends Handler { - MainHandler() { - // TODO: Evaluate whether we need to send messages asynchronously. The Handler - // implementation in the public API handles message sending synchronously, which may - // cause deadlocks. - super(getApplicationContext().getMainLooper()); - } - - @Override - public void handleMessage(Message msg) { - executeMessage(msg); - } - } - - private void executeMessage(Message msg) { - if (msg.what > LARGEST_MSG_ID) { - // If you got here, you may have added a new message and forgotten to - // update LARGEST_MSG_ID - Log.wtf(TAG, "Cannot handle message larger than LARGEST_MSG_ID."); - } - - // If we are not initialized, ignore all messages except start up - if (!mServiceStarted && msg.what != ON_START) { - Log.i(TAG, "System not initialized. Ignoring message: " + msg.what); - return; - } - - Log.d(TAG, "executeMessage " + msg.what); - - switch (msg.what) { - case ON_UPDATE_CALL: - Log.i(TAG, "ON_UPDATE_CALL: " + msg.obj); - //mCallList.onUpdate((Call) msg.obj); - break; - case ON_UPDATE_MULTI_CALL: - Log.i(TAG, "ON_UPDATE_MULTI_CALL: " + msg.obj); - //mCallList.onUpdate((List<Call>) msg.obj); - break; - case ON_UPDATE_CALL_WITH_TEXT_RESPONSES: - AbstractMap.SimpleEntry<Call, List<String>> entry - = (AbstractMap.SimpleEntry<Call, List<String>>) msg.obj; - Log.i(TAG, "ON_INCOMING_CALL: " + entry.getKey()); - //mCallList.onIncoming(entry.getKey(), entry.getValue()); - break; - case ON_DISCONNECT_CALL: - Log.i(TAG, "ON_DISCONNECT_CALL: " + msg.obj); - //mCallList.onDisconnect((Call) msg.obj); - break; - case ON_POST_CHAR_WAIT: - //mInCallPresenter.onPostDialCharWait(msg.arg1, (String) msg.obj); - break; - case ON_AUDIO_MODE: - Log.i(TAG, "ON_AUDIO_MODE: " + - AudioMode.toString(msg.arg1) + ", muted (" + (msg.arg2 == 1) + ")"); - mAudioModeProvider.onAudioModeChange(msg.arg1, msg.arg2 == 1); - break; - case ON_SUPPORTED_AUDIO_MODE: - Log.i(TAG, "ON_SUPPORTED_AUDIO_MODE: " + AudioMode.toString( - msg.arg1)); - - mAudioModeProvider.onSupportedAudioModeChange(msg.arg1); - break; - case ON_BRING_TO_FOREGROUND: - Log.i(TAG, "ON_BRING_TO_FOREGROUND" + msg.arg1); - if (mInCallPresenter != null) { - mInCallPresenter.bringToForeground(msg.arg1 != 0); - } - break; - case ON_START: - doStart((ICallCommandService) msg.obj); - break; - case ON_DESTROY: - doStop(); - break; - default: - break; - } - } -} diff --git a/InCallUI/src/com/android/incallui/CallList.java b/InCallUI/src/com/android/incallui/CallList.java index 022281224..343a94337 100644 --- a/InCallUI/src/com/android/incallui/CallList.java +++ b/InCallUI/src/com/android/incallui/CallList.java @@ -30,9 +30,9 @@ import java.util.List; import java.util.Set; /** - * Maintains the list of active calls received from CallHandlerService and notifies interested - * classes of changes to the call list as they are received from the telephony stack. - * Primary lister of changes to this class is InCallPresenter. + * Maintains the list of active calls and notifies interested classes of changes to the call list + * as they are received from the telephony stack. Primary listener of changes to this class is + * InCallPresenter. */ public class CallList { |