Merge changes from topic "telecom-3p-cherry-pick" (0cd056fc) · Commits · e / os / android_packages_services_Telecomm

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

+7 −1

Original line number	Diff line number	Diff line
		@@ -74,7 +74,8 @@ import java.util.concurrent.ConcurrentHashMap;
		* connected etc).
		*/
		@VisibleForTesting
		public class Call implements CreateConnectionResponse, EventManager.Loggable {
		public class Call implements CreateConnectionResponse, EventManager.Loggable,
		ConnectionServiceFocusManager.CallFocus {
		public final static String CALL_ID_UNKNOWN = "-1";
		public final static long DATA_USAGE_NOT_SET = -1;

		@@ -748,6 +749,11 @@ public class Call implements CreateConnectionResponse, EventManager.Loggable {
		return sb.toString();
		}

		@Override
		public ConnectionServiceFocusManager.ConnectionServiceFocus getConnectionServiceWrapper() {
		return mConnectionService;
		}

		@VisibleForTesting
		public int getState() {
		return mState;

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

0 → 100644

+404 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright 2017 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.server.telecom;

		import android.annotation.Nullable;
		import android.os.Handler;
		import android.os.Looper;
		import android.os.Message;
		import com.android.internal.annotations.VisibleForTesting;

		import java.util.ArrayList;
		import java.util.List;
		import java.util.Objects;
		import java.util.stream.Collectors;

		public class ConnectionServiceFocusManager {

		private static final String TAG = "ConnectionServiceFocusManager";

		/**
		* Interface used by ConnectionServiceFocusManager to communicate with
		* {@link ConnectionServiceWrapper}.
		*/
		public interface ConnectionServiceFocus {
		/**
		* Notifies the {@link android.telecom.ConnectionService} that it has lose the connection
		* service focus. It should release all call resource i.e camera, audio once it lost the
		* focus.
		*/
		void connectionServiceFocusLost();

		/**
		* Notifies the {@link android.telecom.ConnectionService} that it has gain the connection
		* service focus. It can request the call resource i.e camera, audio as they expected to be
		* free at the moment.
		*/
		void connectionServiceFocusGained();

		/**
		* Sets the ConnectionServiceFocusListener.
		*
		* @see {@link ConnectionServiceFocusListener}.
		*/
		void setConnectionServiceFocusListener(ConnectionServiceFocusListener listener);
		}

		/**
		* Interface used to receive the changed of {@link android.telecom.ConnectionService} that
		* ConnectionServiceFocusManager cares about.
		*/
		public interface ConnectionServiceFocusListener {
		/**
		* Calls when {@link android.telecom.ConnectionService} has released the call resource. This
		* usually happen after the {@link android.telecom.ConnectionService} lost the focus.
		*
		* @param connectionServiceFocus the {@link android.telecom.ConnectionService} that released
		* the call resources.
		*/
		void onConnectionServiceReleased(ConnectionServiceFocus connectionServiceFocus);

		/**
		* Calls when {@link android.telecom.ConnectionService} is disconnected.
		*
		* @param connectionServiceFocus the {@link android.telecom.ConnectionService} which is
		* disconnected.
		*/
		void onConnectionServiceDeath(ConnectionServiceFocus connectionServiceFocus);
		}

		/**
		* Interface define to expose few information of {@link Call} that ConnectionServiceFocusManager
		* cares about.
		*/
		public interface CallFocus {
		/**
		* Returns the ConnectionService associated with the call.
		*/
		ConnectionServiceFocus getConnectionServiceWrapper();

		/**
		* Returns the state of the call.
		*
		* @see {@link CallState}
		*/
		int getState();
		}

		/** Interface define a call back for focus request event. */
		public interface RequestFocusCallback {
		/**
		* Invokes after the focus request is done.
		*
		* @param call the call associated with the focus request.
		*/
		void onRequestFocusDone(CallFocus call);
		}

		/**
		* Interface define to allow the ConnectionServiceFocusManager to communicate with
		* {@link CallsManager}.
		*/
		public interface CallsManagerRequester {
		/**
		* Requests {@link CallsManager} to disconnect a {@link ConnectionServiceFocus}. This
		* usually happen when the connection service doesn't respond to focus lost event.
		*/
		void releaseConnectionService(ConnectionServiceFocus connectionService);

		/**
		* Sets the {@link com.android.server.telecom.CallsManager.CallsManagerListener} to listen
		* the call event that ConnectionServiceFocusManager cares about.
		*/
		void setCallsManagerListener(CallsManager.CallsManagerListener listener);
		}

		private static final int[] PRIORITY_FOCUS_CALL_STATE = new int[] {
		CallState.ACTIVE, CallState.CONNECTING, CallState.DIALING
		};

		private static final int MSG_REQUEST_FOCUS = 1;
		private static final int MSG_RELEASE_CONNECTION_FOCUS = 2;
		private static final int MSG_RELEASE_FOCUS_TIMEOUT = 3;
		private static final int MSG_CONNECTION_SERVICE_DEATH = 4;
		private static final int MSG_ADD_CALL = 5;
		private static final int MSG_REMOVE_CALL = 6;
		private static final int MSG_CALL_STATE_CHANGED = 7;

		@VisibleForTesting
		public static final int RELEASE_FOCUS_TIMEOUT_MS = 5000;

		private final List<CallFocus> mCalls;

		private final CallsManagerListenerBase mCallsManagerListener =
		new CallsManagerListenerBase() {
		@Override
		public void onCallAdded(Call call) {
		if (callShouldBeIgnored(call)) {
		return;
		}

		mEventHandler.obtainMessage(MSG_ADD_CALL, call).sendToTarget();
		}

		@Override
		public void onCallRemoved(Call call) {
		if (callShouldBeIgnored(call)) {
		return;
		}

		mEventHandler.obtainMessage(MSG_REMOVE_CALL, call).sendToTarget();
		}

		@Override
		public void onCallStateChanged(Call call, int oldState, int newState) {
		if (callShouldBeIgnored(call)) {
		return;
		}

		mEventHandler.obtainMessage(MSG_CALL_STATE_CHANGED, oldState, newState, call)
		.sendToTarget();
		}

		@Override
		public void onExternalCallChanged(Call call, boolean isExternalCall) {
		if (isExternalCall) {
		mEventHandler.obtainMessage(MSG_REMOVE_CALL, call).sendToTarget();
		} else {
		mEventHandler.obtainMessage(MSG_ADD_CALL, call).sendToTarget();
		}
		}

		boolean callShouldBeIgnored(Call call) {
		return call.isExternalCall();
		}
		};

		private final ConnectionServiceFocusListener mConnectionServiceFocusListener =
		new ConnectionServiceFocusListener() {
		@Override
		public void onConnectionServiceReleased(ConnectionServiceFocus connectionServiceFocus) {
		mEventHandler.obtainMessage(MSG_RELEASE_CONNECTION_FOCUS, connectionServiceFocus)
		.sendToTarget();
		}

		@Override
		public void onConnectionServiceDeath(ConnectionServiceFocus connectionServiceFocus) {
		mEventHandler.obtainMessage(MSG_CONNECTION_SERVICE_DEATH, connectionServiceFocus)
		.sendToTarget();
		}
		};

		private ConnectionServiceFocus mCurrentFocus;
		private CallFocus mCurrentFocusCall;
		private CallsManagerRequester mCallsManagerRequester;
		private FocusRequest mCurrentFocusRequest;
		private FocusManagerHandler mEventHandler;

		public ConnectionServiceFocusManager(
		CallsManagerRequester callsManagerRequester, Looper looper) {
		mCallsManagerRequester = callsManagerRequester;
		mCallsManagerRequester.setCallsManagerListener(mCallsManagerListener);
		mEventHandler = new FocusManagerHandler(looper);
		mCalls = new ArrayList<>();
		}

		/**
		* Requests the call focus for the given call. The {@code callback} will be invoked once
		* the request is done.
		* @param focus the call need to be focus.
		* @param callback the callback associated with this request.
		*/
		public void requestFocus(CallFocus focus, RequestFocusCallback callback) {
		mEventHandler.obtainMessage(
		MSG_REQUEST_FOCUS, new FocusRequest(focus, callback)).sendToTarget();
		}

		/**
		* Returns the current focus call. The {@link android.telecom.ConnectionService} of the focus
		* call is the current connection service focus. Also the state of the focus call must be one
		* of {@link #PRIORITY_FOCUS_CALL_STATE}.
		*/
		public CallFocus getCurrentFocusCall() {
		return mCurrentFocusCall;
		}

		/** Returns the current connection service focus. */
		public ConnectionServiceFocus getCurrentFocusConnectionService() {
		return mCurrentFocus;
		}

		@VisibleForTesting
		public Handler getHandler() {
		return mEventHandler;
		}

		@VisibleForTesting
		public List<CallFocus> getAllCall() { return mCalls; }

		private void updateConnectionServiceFocus(ConnectionServiceFocus connSvrFocus) {
		if (!Objects.equals(mCurrentFocus, connSvrFocus)) {
		if (connSvrFocus != null) {
		connSvrFocus.setConnectionServiceFocusListener(mConnectionServiceFocusListener);
		connSvrFocus.connectionServiceFocusGained();
		}
		mCurrentFocus = connSvrFocus;
		}
		}

		private void updateCurrentFocusCall() {
		mCurrentFocusCall = null;

		if (mCurrentFocus == null) {
		return;
		}

		List<CallFocus> calls = mCalls
		.stream()
		.filter(call -> mCurrentFocus.equals(call.getConnectionServiceWrapper()))
		.collect(Collectors.toList());

		for (int i = 0; i < PRIORITY_FOCUS_CALL_STATE.length; i++) {
		for (CallFocus call : calls) {
		if (call.getState() == PRIORITY_FOCUS_CALL_STATE[i]) {
		mCurrentFocusCall = call;
		return;
		}
		}
		}
		}

		private void onRequestFocusDone(FocusRequest focusRequest) {
		if (focusRequest.callback != null) {
		focusRequest.callback.onRequestFocusDone(focusRequest.call);
		}
		}

		private void handleRequestFocus(FocusRequest focusRequest) {
		if (mCurrentFocus == null
		\|\| mCurrentFocus.equals(focusRequest.call.getConnectionServiceWrapper())) {
		updateConnectionServiceFocus(focusRequest.call.getConnectionServiceWrapper());
		updateCurrentFocusCall();
		onRequestFocusDone(focusRequest);
		} else {
		mCurrentFocus.connectionServiceFocusLost();
		mCurrentFocusRequest = focusRequest;
		Message msg = mEventHandler.obtainMessage(MSG_RELEASE_FOCUS_TIMEOUT);
		msg.obj = focusRequest;
		mEventHandler.sendMessageDelayed(msg, RELEASE_FOCUS_TIMEOUT_MS);
		}
		}

		private void handleReleasedFocus(ConnectionServiceFocus connectionServiceFocus) {
		// The ConnectionService can call onConnectionServiceFocusReleased even if it's not the
		// current focus connection service, nothing will be changed in this case.
		if (Objects.equals(mCurrentFocus, connectionServiceFocus)) {
		mEventHandler.removeMessages(MSG_RELEASE_FOCUS_TIMEOUT, mCurrentFocusRequest);
		ConnectionServiceFocus newCSF = null;
		if (mCurrentFocusRequest != null) {
		newCSF = mCurrentFocusRequest.call.getConnectionServiceWrapper();
		}
		updateConnectionServiceFocus(newCSF);
		updateCurrentFocusCall();
		if (mCurrentFocusRequest != null) {
		onRequestFocusDone(mCurrentFocusRequest);
		mCurrentFocusRequest = null;
		}
		}
		}

		private void handleReleasedFocusTimeout(FocusRequest focusRequest) {
		mCallsManagerRequester.releaseConnectionService(mCurrentFocus);
		updateConnectionServiceFocus(focusRequest.call.getConnectionServiceWrapper());
		updateCurrentFocusCall();
		onRequestFocusDone(focusRequest);
		mCurrentFocusRequest = null;
		}

		private void handleConnectionServiceDeath(ConnectionServiceFocus connectionServiceFocus) {
		if (Objects.equals(connectionServiceFocus, mCurrentFocus)) {
		updateConnectionServiceFocus(null);
		updateCurrentFocusCall();
		}
		}

		private void handleAddedCall(CallFocus call) {
		if (!mCalls.contains(call)) {
		mCalls.add(call);
		}
		if (Objects.equals(mCurrentFocus, call.getConnectionServiceWrapper())) {
		updateCurrentFocusCall();
		}
		}

		private void handleRemovedCall(CallFocus call) {
		mCalls.remove(call);
		if (call.equals(mCurrentFocusCall)) {
		updateCurrentFocusCall();
		}
		}

		private void handleCallStateChanged(CallFocus call, int oldState, int newState) {
		if (mCalls.contains(call)
		&& Objects.equals(mCurrentFocus, call.getConnectionServiceWrapper())) {
		updateCurrentFocusCall();
		}
		}

		private final class FocusManagerHandler extends Handler {
		FocusManagerHandler(Looper looper) {
		super(looper);
		}

		@Override
		public void handleMessage(Message msg) {
		switch (msg.what) {
		case MSG_REQUEST_FOCUS:
		handleRequestFocus((FocusRequest) msg.obj);
		break;
		case MSG_RELEASE_CONNECTION_FOCUS:
		handleReleasedFocus((ConnectionServiceFocus) msg.obj);
		break;
		case MSG_RELEASE_FOCUS_TIMEOUT:
		handleReleasedFocusTimeout((FocusRequest) msg.obj);
		break;
		case MSG_CONNECTION_SERVICE_DEATH:
		handleConnectionServiceDeath((ConnectionServiceFocus) msg.obj);
		break;
		case MSG_ADD_CALL:
		handleAddedCall((CallFocus) msg.obj);
		break;
		case MSG_REMOVE_CALL:
		handleRemovedCall((CallFocus) msg.obj);
		break;
		case MSG_CALL_STATE_CHANGED:
		handleCallStateChanged((CallFocus) msg.obj, msg.arg1, msg.arg2);
		break;
		}
		}
		}

		private static final class FocusRequest {
		CallFocus call;
		@Nullable RequestFocusCallback callback;

		FocusRequest(CallFocus call, RequestFocusCallback callback) {
		this.call = call;
		this.callback = callback;
		}
		}
		}
		No newline at end of file

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

+33 −1

Original line number	Diff line number	Diff line
		@@ -64,7 +64,8 @@ import java.util.concurrent.ConcurrentHashMap;
		* {@link IConnectionService}.
		*/
		@VisibleForTesting
		public class ConnectionServiceWrapper extends ServiceBinder {
		public class ConnectionServiceWrapper extends ServiceBinder implements
		ConnectionServiceFocusManager.ConnectionServiceFocus {

		private final class Adapter extends IConnectionServiceAdapter.Stub {

		@@ -854,6 +855,13 @@ public class ConnectionServiceWrapper extends ServiceBinder {
		Log.endSession();
		}
		}

		@Override
		public void onConnectionServiceFocusReleased(Session.Info sessionInfo)
		throws RemoteException {
		// TODO(mpq): This method is added to avoid the compiled error. Add the real
		// implementation once ag/3273964 done.
		}
		}

		private final Adapter mAdapter = new Adapter();
		@@ -867,6 +875,8 @@ public class ConnectionServiceWrapper extends ServiceBinder {
		private final CallsManager mCallsManager;
		private final AppOpsManager mAppOpsManager;

		private ConnectionServiceFocusManager.ConnectionServiceFocusListener mConnSvrFocusListener;

		/**
		* Creates a connection service.
		*
		@@ -1406,6 +1416,24 @@ public class ConnectionServiceWrapper extends ServiceBinder {
		mServiceInterface = null;
		}

		@Override
		public void connectionServiceFocusLost() {
		// Immediately response to the Telecom that it has released the call resources.
		// TODO(mpq): Change back to the default implementation once b/69651192 done.
		if (mConnSvrFocusListener != null) {
		mConnSvrFocusListener.onConnectionServiceReleased(this);
		}
		}

		@Override
		public void connectionServiceFocusGained() {}

		@Override
		public void setConnectionServiceFocusListener(
		ConnectionServiceFocusManager.ConnectionServiceFocusListener listener) {
		mConnSvrFocusListener = listener;
		}

		private void handleCreateConnectionComplete(
		String callId,
		ConnectionRequest request,
		@@ -1440,6 +1468,10 @@ public class ConnectionServiceWrapper extends ServiceBinder {
		}
		}
		mCallIdMapper.clear();

		if (mConnSvrFocusListener != null) {
		mConnSvrFocusListener.onConnectionServiceDeath(this);
		}
		}

		private void logIncoming(String msg, Object... params) {

tests/src/com/android/server/telecom/tests/ConnectionServiceFixture.java

+8 −0

Original line number	Diff line number	Diff line
		@@ -354,6 +354,14 @@ public class ConnectionServiceFixture implements TestFixture<IConnectionService>

		}

		@Override
		public void connectionServiceFocusLost(Session.Info sessionInfo) throws RemoteException {
		}

		@Override
		public void connectionServiceFocusGained(Session.Info sessionInfo) throws RemoteException {
		}

		@Override
		public IBinder asBinder() {
		return this;

tests/src/com/android/server/telecom/tests/ConnectionServiceFocusManagerTest.java

0 → 100644

+326 −0

File added.

Preview size limit exceeded, changes collapsed.