Merge "ConnectionService API has only one completed callback (2/3)" into lmp-dev
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index a8d1f99..43a1f5e 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -34,6 +34,7 @@
<uses-permission android:name="android.permission.VIBRATE" />
<uses-permission android:name="android.permission.WRITE_CALL_LOG" />
<uses-permission android:name="android.permission.BIND_CONNECTION_SERVICE" />
+ <uses-permission android:name="android.permission.BIND_INCALL_SERVICE" />
<!-- Protects the ability to register any PhoneAccount with a capability flags of either
PhoneAccount#CAPABILITY_CALL_PROVIDER or PhoneAccount#CAPABILITY_SIM_SUBSCRIPTION. -->
diff --git a/res/values/colors.xml b/res/values/colors.xml
new file mode 100644
index 0000000..e93e855
--- /dev/null
+++ b/res/values/colors.xml
@@ -0,0 +1,19 @@
+<!--
+ ~ Copyright (C) 2014 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
+ -->
+
+<resources>
+ <color name="theme_color">#0288d1</color>
+</resources>
diff --git a/src/com/android/telecomm/CallsManager.java b/src/com/android/telecomm/CallsManager.java
index 75ad17b..80ef854 100644
--- a/src/com/android/telecomm/CallsManager.java
+++ b/src/com/android/telecomm/CallsManager.java
@@ -505,6 +505,17 @@
}
/**
+ * Instructs Telecomm to disconnect all calls.
+ */
+ void disconnectAllCalls() {
+ Log.v(this, "disconnectAllCalls");
+
+ for (Call call : mCalls) {
+ disconnectCall(call);
+ }
+ }
+
+ /**
* Instructs Telecomm to put the specified call on hold. Intended to be invoked by the
* in-call app through {@link InCallAdapter} for an ongoing call. This is usually triggered by
* the user hitting the hold button during an active call.
diff --git a/src/com/android/telecomm/InCallController.java b/src/com/android/telecomm/InCallController.java
index 00ed147..4f022c0 100644
--- a/src/com/android/telecomm/InCallController.java
+++ b/src/com/android/telecomm/InCallController.java
@@ -16,28 +16,36 @@
package com.android.telecomm;
+import android.Manifest;
import android.app.PendingIntent;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
import android.content.ServiceConnection;
-
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.content.pm.ServiceInfo;
import android.content.res.Resources;
import android.net.Uri;
import android.os.IBinder;
import android.os.RemoteException;
import android.os.UserHandle;
import android.telecomm.AudioState;
+import android.telecomm.CallState;
+import android.telecomm.InCallService;
+import android.telecomm.ParcelableCall;
import android.telecomm.PhoneCapabilities;
import android.telecomm.PropertyPresentation;
-import android.telecomm.CallState;
-import android.telecomm.ParcelableCall;
+import android.util.ArrayMap;
import com.android.internal.telecomm.IInCallService;
import com.google.common.collect.ImmutableCollection;
import java.util.ArrayList;
+import java.util.Iterator;
import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
/**
* Binds to {@link IInCallService} and provides the service to {@link CallsManager} through which it
@@ -52,12 +60,12 @@
private class InCallServiceConnection implements ServiceConnection {
/** {@inheritDoc} */
@Override public void onServiceConnected(ComponentName name, IBinder service) {
- onConnected(service);
+ onConnected(name, service);
}
/** {@inheritDoc} */
@Override public void onServiceDisconnected(ComponentName name) {
- onDisconnected();
+ onDisconnected(name);
}
}
@@ -99,11 +107,13 @@
@Override
public void onStartActivityFromInCall(Call call, PendingIntent intent) {
- if (mInCallService != null) {
+ if (!mInCallServices.isEmpty()) {
Log.i(this, "Calling startActivity, intent: %s", intent);
- try {
- mInCallService.startActivity(mCallIdMapper.getCallId(call), intent);
- } catch (RemoteException ignored) {
+ for (IInCallService inCallService : mInCallServices.values()) {
+ try {
+ inCallService.startActivity(mCallIdMapper.getCallId(call), intent);
+ } catch (RemoteException ignored) {
+ }
}
}
}
@@ -119,29 +129,45 @@
}
};
- /** Maintains a binding connection to the in-call app. */
- private final InCallServiceConnection mConnection = new InCallServiceConnection();
+ /**
+ * Maintains a binding connection to the in-call app(s).
+ * ConcurrentHashMap constructor params: 8 is initial table size, 0.9f is
+ * load factor before resizing, 1 means we only expect a single thread to
+ * access the map so make only a single shard
+ */
+ private final Map<ComponentName, InCallServiceConnection> mServiceConnections =
+ new ConcurrentHashMap<ComponentName, InCallServiceConnection>(8, 0.9f, 1);
- /** The in-call app implementation, see {@link IInCallService}. */
- private IInCallService mInCallService;
+ /** The in-call app implementations, see {@link IInCallService}. */
+ private final Map<ComponentName, IInCallService> mInCallServices = new ArrayMap<>();
private final CallIdMapper mCallIdMapper = new CallIdMapper("InCall");
- IInCallService getService() {
- return mInCallService;
+ /** The {@link ComponentName} of the default InCall UI */
+ private ComponentName mInCallComponentName;
+
+ public InCallController() {
+ Context context = TelecommApp.getInstance();
+ Resources resources = context.getResources();
+
+ mInCallComponentName = new ComponentName(
+ resources.getString(R.string.ui_default_package),
+ resources.getString(R.string.incall_default_class));
}
@Override
public void onCallAdded(Call call) {
- if (mInCallService == null) {
+ if (mInCallServices.isEmpty()) {
bind();
} else {
Log.i(this, "Adding call: %s", call);
- if (mCallIdMapper.getCallId(call) == null) {
- mCallIdMapper.addCall(call);
- call.addListener(mCallListener);
+ // Track the call if we don't already know about it.
+ addCall(call);
+
+ ParcelableCall parcelableCall = toParcelableCall(call);
+ for (IInCallService inCallService : mInCallServices.values()) {
try {
- mInCallService.addCall(toParcelableCall(call));
+ inCallService.addCall(parcelableCall);
} catch (RemoteException ignored) {
}
}
@@ -173,22 +199,26 @@
@Override
public void onAudioStateChanged(AudioState oldAudioState, AudioState newAudioState) {
- if (mInCallService != null) {
+ if (!mInCallServices.isEmpty()) {
Log.i(this, "Calling onAudioStateChanged, audioState: %s -> %s", oldAudioState,
newAudioState);
- try {
- mInCallService.onAudioStateChanged(newAudioState);
- } catch (RemoteException ignored) {
+ for (IInCallService inCallService : mInCallServices.values()) {
+ try {
+ inCallService.onAudioStateChanged(newAudioState);
+ } catch (RemoteException ignored) {
+ }
}
}
}
void onPostDialWait(Call call, String remaining) {
- if (mInCallService != null) {
+ if (!mInCallServices.isEmpty()) {
Log.i(this, "Calling onPostDialWait, remaining = %s", remaining);
- try {
- mInCallService.setPostDialWait(mCallIdMapper.getCallId(call), remaining);
- } catch (RemoteException ignored) {
+ for (IInCallService inCallService : mInCallServices.values()) {
+ try {
+ inCallService.setPostDialWait(mCallIdMapper.getCallId(call), remaining);
+ } catch (RemoteException ignored) {
+ }
}
}
}
@@ -200,10 +230,12 @@
}
void bringToForeground(boolean showDialpad) {
- if (mInCallService != null) {
- try {
- mInCallService.bringToForeground(showDialpad);
- } catch (RemoteException ignored) {
+ if (!mInCallServices.isEmpty()) {
+ for (IInCallService inCallService : mInCallServices.values()) {
+ try {
+ inCallService.bringToForeground(showDialpad);
+ } catch (RemoteException ignored) {
+ }
}
} else {
Log.w(this, "Asking to bring unbound in-call UI to foreground.");
@@ -215,10 +247,12 @@
*/
private void unbind() {
ThreadUtil.checkOnMainThread();
- if (mInCallService != null) {
+ if (!mInCallServices.isEmpty()) {
Log.i(this, "Unbinding from InCallService");
- TelecommApp.getInstance().unbindService(mConnection);
- mInCallService = null;
+ for (InCallServiceConnection connection : mServiceConnections.values()) {
+ TelecommApp.getInstance().unbindService(connection);
+ }
+ mInCallServices.clear();
}
}
@@ -228,22 +262,46 @@
*/
private void bind() {
ThreadUtil.checkOnMainThread();
- if (mInCallService == null) {
+ if (mInCallServices.isEmpty()) {
+ mServiceConnections.clear();
Context context = TelecommApp.getInstance();
- Resources resources = context.getResources();
- ComponentName component = new ComponentName(
- resources.getString(R.string.ui_default_package),
- resources.getString(R.string.incall_default_class));
- Log.i(this, "Attempting to bind to InCallService: %s", component);
+ PackageManager packageManager = TelecommApp.getInstance().getPackageManager();
+ Intent intent = new Intent(InCallService.SERVICE_INTERFACE);
- Intent serviceIntent = new Intent(IInCallService.class.getName());
- serviceIntent.setComponent(component);
+ for (ResolveInfo entry : packageManager.queryIntentServices(intent, 0)) {
+ ServiceInfo serviceInfo = entry.serviceInfo;
+ if (serviceInfo != null) {
+ boolean hasServiceBindPermission = serviceInfo.permission != null &&
+ serviceInfo.permission.equals(
+ Manifest.permission.BIND_INCALL_SERVICE);
+ boolean hasControlInCallPermission = packageManager.checkPermission(
+ Manifest.permission.CONTROL_INCALL_EXPERIENCE,
+ serviceInfo.packageName) == PackageManager.PERMISSION_GRANTED;
- if (!context.bindServiceAsUser(serviceIntent, mConnection, Context.BIND_AUTO_CREATE,
- UserHandle.CURRENT)) {
- Log.w(this, "Could not connect to the in-call app (%s)", component);
+ if (!hasServiceBindPermission) {
+ Log.w(this, "InCallService does not have BIND_INCALL_SERVICE permission: " +
+ serviceInfo.packageName);
+ continue;
+ }
- // TODO: Implement retry or fall-back-to-default logic.
+ if (!hasControlInCallPermission) {
+ Log.w(this,
+ "InCall UI does not have CONTROL_INCALL_EXPERIENCE permission: " +
+ serviceInfo.packageName);
+ continue;
+ }
+
+ Log.i(this, "Attempting to bind to InCall " + serviceInfo.packageName);
+ InCallServiceConnection inCallServiceConnection = new InCallServiceConnection();
+ ComponentName componentName = new ComponentName(serviceInfo.packageName,
+ serviceInfo.name);
+ intent.setComponent(componentName);
+
+ if (context.bindServiceAsUser(intent, inCallServiceConnection,
+ Context.BIND_AUTO_CREATE, UserHandle.CURRENT)) {
+ mServiceConnections.put(componentName, inCallServiceConnection);
+ }
+ }
}
}
}
@@ -253,26 +311,34 @@
* this class and in-call app by sending the first update to in-call app. This method is
* called after a successful binding connection is established.
*
+ * @param componentName The service {@link ComponentName}.
* @param service The {@link IInCallService} implementation.
*/
- private void onConnected(IBinder service) {
+ private void onConnected(ComponentName componentName, IBinder service) {
ThreadUtil.checkOnMainThread();
- mInCallService = IInCallService.Stub.asInterface(service);
+
+ IInCallService inCallService = IInCallService.Stub.asInterface(service);
try {
- mInCallService.setInCallAdapter(new InCallAdapter(CallsManager.getInstance(),
+ inCallService.setInCallAdapter(new InCallAdapter(CallsManager.getInstance(),
mCallIdMapper));
+ mInCallServices.put(componentName, inCallService);
} catch (RemoteException e) {
Log.e(this, e, "Failed to set the in-call adapter.");
- mInCallService = null;
return;
}
- // Upon successful connection, send the state of the world to the in-call app.
+ // Upon successful connection, send the state of the world to the service.
ImmutableCollection<Call> calls = CallsManager.getInstance().getCalls();
if (!calls.isEmpty()) {
for (Call call : calls) {
- onCallAdded(call);
+ try {
+ // Track the call if we don't already know about it.
+ addCall(call);
+
+ inCallService.addCall(toParcelableCall(call));
+ } catch (RemoteException ignored) {
+ }
}
onAudioStateChanged(null, CallsManager.getInstance().getAudioState());
} else {
@@ -281,20 +347,50 @@
}
/**
- * Cleans up the instance of in-call app after the service has been unbound.
+ * Cleans up an instance of in-call app after the service has been unbound.
+ *
+ * @param disconnectedComponent The {@link ComponentName} of the service which disconnected.
*/
- private void onDisconnected() {
+ private void onDisconnected(ComponentName disconnectedComponent) {
ThreadUtil.checkOnMainThread();
- mInCallService = null;
+ if (mInCallServices.containsKey(disconnectedComponent)) {
+ mInCallServices.remove(disconnectedComponent);
+ }
+
+ // If the default in-call UI has disconnected, disconnect all calls and un-bind all other
+ // InCallService implementations.
+ if (disconnectedComponent.equals(mInCallComponentName)) {
+ Log.i(this, "In-call UI %s disconnected.", disconnectedComponent);
+ CallsManager.getInstance().disconnectAllCalls();
+
+ // Iterate through the in-call services, removing them as they are un-bound.
+ Iterator<Map.Entry<ComponentName, IInCallService>> it =
+ mInCallServices.entrySet().iterator();
+ while (it.hasNext()) {
+ Map.Entry<ComponentName, IInCallService> entry = it.next();
+ ComponentName componentName = entry.getKey();
+
+ InCallServiceConnection connection = mServiceConnections.remove(componentName);
+ it.remove();
+ if (connection == null) {
+ continue;
+ }
+
+ Log.i(this, "Unbinding other InCallService %s", componentName);
+ TelecommApp.getInstance().unbindService(connection);
+ }
+ }
}
private void updateCall(Call call) {
- if (mInCallService != null) {
- try {
- ParcelableCall parcelableCall = toParcelableCall(call);
- Log.d(this, "updateCall %s ==> %s", call, parcelableCall);
- mInCallService.updateCall(parcelableCall);
- } catch (RemoteException ignored) {
+ if (!mInCallServices.isEmpty()) {
+ ParcelableCall parcelableCall = toParcelableCall(call);
+ Log.v(this, "updateCall %s ==> %s", call, parcelableCall);
+ for (IInCallService inCallService : mInCallServices.values()) {
+ try {
+ inCallService.updateCall(parcelableCall);
+ } catch (RemoteException ignored) {
+ }
}
}
}
@@ -372,4 +468,15 @@
conferenceableCallIds,
call.getExtras());
}
+
+ /**
+ * Adds the call to the list of calls tracked by the {@link InCallController}.
+ * @param call The call to add.
+ */
+ private void addCall(Call call) {
+ if (mCallIdMapper.getCallId(call) == null) {
+ mCallIdMapper.addCall(call);
+ call.addListener(mCallListener);
+ }
+ }
}
diff --git a/src/com/android/telecomm/MissedCallNotifier.java b/src/com/android/telecomm/MissedCallNotifier.java
index 94de312..eede65c 100644
--- a/src/com/android/telecomm/MissedCallNotifier.java
+++ b/src/com/android/telecomm/MissedCallNotifier.java
@@ -121,6 +121,7 @@
// Create the notification.
Notification.Builder builder = new Notification.Builder(mContext);
builder.setSmallIcon(android.R.drawable.stat_notify_missed_call)
+ .setColor(mContext.getResources().getColor(R.color.theme_color))
.setWhen(call.getCreationTimeMillis())
.setContentTitle(mContext.getText(titleResId))
.setContentText(expandedText)
diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml
index bbc3292..c17803f 100644
--- a/tests/AndroidManifest.xml
+++ b/tests/AndroidManifest.xml
@@ -22,6 +22,7 @@
<uses-permission android:name="android.permission.CAMERA" />
<uses-permission
android:name="com.android.telecomm.permission.REGISTER_PROVIDER_OR_SUBSCRIPTION" />
+ <uses-permission android:name="android.permission.CONTROL_INCALL_EXPERIENCE" />
<application android:label="@string/app_name">
<uses-library android:name="android.test.runner" />
@@ -40,6 +41,14 @@
</intent-filter>
</service>
+ <service android:name="com.android.telecomm.testapps.TestInCallServiceImpl"
+ android:process="com.android.telecomm.testapps.TestInCallService"
+ android:permission="android.permission.BIND_INCALL_SERVICE" >
+ <intent-filter>
+ <action android:name="android.telecomm.InCallService"/>
+ </intent-filter>
+ </service>
+
<activity android:name="com.android.telecomm.testapps.TestCallActivity"
android:label="@string/testCallActivityLabel">
<intent-filter>
@@ -58,7 +67,8 @@
</receiver>
<activity android:name="com.android.telecomm.testapps.TestDialerActivity"
- android:label="@string/testDialerActivityLabel" >
+ android:label="@string/testDialerActivityLabel"
+ android:process="com.android.telecomm.testapps.TestInCallService">
<intent-filter>
<action android:name="android.intent.action.DIAL" />
<category android:name="android.intent.category.DEFAULT" />
@@ -89,8 +99,6 @@
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
-
-
</application>
<!--
diff --git a/tests/src/com/android/telecomm/testapps/TestInCallServiceImpl.java b/tests/src/com/android/telecomm/testapps/TestInCallServiceImpl.java
new file mode 100644
index 0000000..e48d5fb
--- /dev/null
+++ b/tests/src/com/android/telecomm/testapps/TestInCallServiceImpl.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright (C) 2014 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.telecomm.testapps;
+
+import android.telecomm.InCallService;
+import android.telecomm.Phone;
+import android.util.Log;
+
+import java.lang.Override;
+import java.lang.String;
+
+/**
+ * Test In-Call service implementation. Logs incoming events. Mainly used to test binding to
+ * multiple {@link InCallService} implementations.
+ */
+public class TestInCallServiceImpl extends InCallService {
+ private static final String TAG = "TestInCallServiceImpl";
+
+ private Phone mPhone;
+
+ private Phone.Listener mPhoneListener = new Phone.Listener() {
+ @Override
+ public void onCallAdded(Phone phone, android.telecomm.Call call) {
+ Log.i(TAG, "onCallAdded: "+call.toString());
+ }
+ @Override
+ public void onCallRemoved(Phone phone, android.telecomm.Call call) {
+ Log.i(TAG, "onCallRemoved: "+call.toString());
+ }
+ };
+
+ @Override
+ public void onPhoneCreated(Phone phone) {
+ Log.i(TAG, "onPhoneCreated");
+ mPhone = phone;
+ mPhone.addListener(mPhoneListener);
+
+ }
+
+ @Override
+ public void onPhoneDestroyed(Phone phone) {
+ Log.i(TAG, "onPhoneDestroyed");
+ mPhone.removeListener(mPhoneListener);
+ mPhone = null;
+ }
+}