Merge cherrypicks of ['googleplex-android-review.googlesource.com/31157215',... (9baa91ce) · Commits · e / os / android_packages_services_Telecomm

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -3360,7 +3360,8 @@ public class Call implements CreateConnectionResponse, EventManager.Loggable,
		return Contacts.getLookupUri(mCallerInfo.getContactId(), mCallerInfo.lookupKey);
		}

		Uri getRingtone() {
		@VisibleForTesting
		public Uri getRingtone() {
		return mCallerInfo == null ? null : mCallerInfo.contactRingtoneUri;
		}

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

+31 −10

Original line number	Diff line number	Diff line
		@@ -79,6 +79,7 @@ import java.util.concurrent.CompletableFuture;
		import java.util.concurrent.ConcurrentHashMap;
		import java.util.concurrent.ExecutorService;
		import java.util.concurrent.Executors;
		import java.util.concurrent.RejectedExecutionException;
		import java.util.concurrent.ScheduledExecutorService;
		import java.util.concurrent.ScheduledFuture;
		import java.util.concurrent.TimeUnit;
		@@ -1663,11 +1664,21 @@ public class ConnectionServiceWrapper extends ServiceBinder implements
		}
		}
		};
		// Post cleanup to the executor service and cache the future, so we can cancel it if
		// needed.
		ScheduledFuture<?> future = mScheduledExecutor.schedule(r.getRunnableToCancel(),
		SERVICE_BINDING_TIMEOUT, TimeUnit.MILLISECONDS);
		if (mScheduledExecutor != null && !mScheduledExecutor.isShutdown()) {
		try {
		// Post cleanup to the executor service and cache the future,
		// so we can cancel it if needed.
		ScheduledFuture<?> future = mScheduledExecutor.schedule(
		r.getRunnableToCancel(),SERVICE_BINDING_TIMEOUT,
		TimeUnit.MILLISECONDS);
		mScheduledFutureMap.put(call, future);
		} catch (RejectedExecutionException e) {
		Log.e(this, e, "createConference: mScheduledExecutor was "
		+ "already shutdown");
		}
		} else {
		Log.w(this, "createConference: Scheduled executor is null or shutdown");
		}
		try {
		mServiceInterface.createConference(
		call.getConnectionManagerPhoneAccount(),
		@@ -1786,11 +1797,21 @@ public class ConnectionServiceWrapper extends ServiceBinder implements
		}
		}
		};
		// Post cleanup to the executor service and cache the future, so we can cancel it if
		// needed.
		ScheduledFuture<?> future = mScheduledExecutor.schedule(r.getRunnableToCancel(),
		SERVICE_BINDING_TIMEOUT, TimeUnit.MILLISECONDS);
		if (mScheduledExecutor != null && !mScheduledExecutor.isShutdown()) {
		try {
		// Post cleanup to the executor service and cache the future,
		// so we can cancel it if needed.
		ScheduledFuture<?> future = mScheduledExecutor.schedule(
		r.getRunnableToCancel(),SERVICE_BINDING_TIMEOUT,
		TimeUnit.MILLISECONDS);
		mScheduledFutureMap.put(call, future);
		} catch (RejectedExecutionException e) {
		Log.e(this, e, "createConnection: mScheduledExecutor was "
		+ "already shutdown");
		}
		} else {
		Log.w(this, "createConnection: Scheduled executor is null or shutdown");
		}
		try {
		mServiceInterface.createConnection(
		call.getConnectionManagerPhoneAccount(),

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

+27 −6

Original line number	Diff line number	Diff line
		@@ -74,13 +74,19 @@ public class RingtoneFactory {
		Ringtone ringtone = null;

		if (ringtoneUri != null && userContext != null) {
		// Ringtone URI is explicitly specified. First, try to create a Ringtone with that.
		if (currentUserOwnsRingtone(ringtoneUri, incomingCall)) {
		// Ringtone URI is explicitly specified and owned by the current user - try to
		// create a Ringtone with that.
		try {
		ringtone = RingtoneManager.getRingtone(
		userContext, ringtoneUri, volumeShaperConfig, audioAttrs);
		} catch (Exception e) {
		Log.e(this, e, "getRingtone: exception while getting ringtone.");
		}
		} else {
		Log.w(this, "getRingtone: Failed to verify that the custom ringtone URI"
		+ " is owned by the current user. Falling back to the default ringtone.");
		}
		}
		if (ringtone == null) {
		// Contact didn't specify ringtone or custom Ringtone creation failed. Get default
		@@ -119,6 +125,21 @@ public class RingtoneFactory {
		return new Pair(ringtoneUri, ringtone);
		}

		private static boolean currentUserOwnsRingtone(Uri ringtoneUri, Call incomingCall) {
		if (TextUtils.isEmpty(ringtoneUri.getUserInfo()) \|\|
		incomingCall.getAssociatedUser() == null) {
		return false;
		}

		UserHandle associatedUser = incomingCall.getAssociatedUser();
		if (associatedUser == null) {
		return false;
		}

		String currentUserId = String.valueOf(associatedUser.getIdentifier());
		return currentUserId.equals(ringtoneUri.getUserInfo());
		}

		private AudioAttributes getDefaultRingtoneAudioAttributes(boolean hapticChannelsMuted) {
		return new AudioAttributes.Builder()
		.setUsage(AudioAttributes.USAGE_NOTIFICATION_RINGTONE)

src/com/android/server/telecom/callredirection/CallRedirectionProcessor.java

+8 −0

Original line number	Diff line number	Diff line
		@@ -133,6 +133,14 @@ public class CallRedirectionProcessor implements CallRedirectionCallback {
		+ mServiceType + " call redirection service");
		}
		}
		Log.i(this, "notifyTimeout: call redirection has timed out so "
		+ "unbinding the connection");
		if (mConnection != null) {
		// We still need to call unbind even if the service disconnected.
		mContext.unbindService(mConnection);
		mConnection = null;
		}
		mService = null;
		}

		private class CallRedirectionServiceConnection implements ServiceConnection {

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

+12 −0

Original line number	Diff line number	Diff line
		@@ -221,6 +221,9 @@ public class CallRedirectionProcessorTest extends TelecomTestCase {
		verify(mCallsManager, times(1)).onCallRedirectionComplete(eq(mCall), any(),
		eq(mPhoneAccountHandle), eq(null), eq(SPEAKER_PHONE_ON), eq(VIDEO_STATE),
		eq(false), eq(CallRedirectionProcessor.UI_TYPE_NO_ACTION));
		// Verify service was unbound
		verify(mContext, times(1)).
		unbindService(any(ServiceConnection.class));
		}

		@Test
		@@ -249,6 +252,9 @@ public class CallRedirectionProcessorTest extends TelecomTestCase {
		verify(mCallsManager, times(1)).onCallRedirectionComplete(eq(mCall), any(),
		eq(mPhoneAccountHandle), eq(null), eq(SPEAKER_PHONE_ON), eq(VIDEO_STATE),
		eq(true), eq(CallRedirectionProcessor.UI_TYPE_USER_DEFINED_TIMEOUT));
		// Verify service was unbound
		verify(mContext, times(1)).
		unbindService(any(ServiceConnection.class));
		}

		@Test
		@@ -280,6 +286,9 @@ public class CallRedirectionProcessorTest extends TelecomTestCase {
		verify(mCallsManager, times(1)).onCallRedirectionComplete(eq(mCall), any(),
		eq(mPhoneAccountHandle), eq(null), eq(SPEAKER_PHONE_ON), eq(VIDEO_STATE),
		eq(true), eq(CallRedirectionProcessor.UI_TYPE_USER_DEFINED_TIMEOUT));
		// Verify service was unbound
		verify(mContext, times(1)).
		unbindService(any(ServiceConnection.class));

		// Wait for another carrier timeout time, but should not expect any carrier service request
		// is triggered.
		@@ -289,6 +298,9 @@ public class CallRedirectionProcessorTest extends TelecomTestCase {
		verify(mCallsManager, times(1)).onCallRedirectionComplete(eq(mCall), any(),
		eq(mPhoneAccountHandle), eq(null), eq(SPEAKER_PHONE_ON), eq(VIDEO_STATE),
		eq(true), eq(CallRedirectionProcessor.UI_TYPE_USER_DEFINED_TIMEOUT));
		// Verify service was unbound
		verify(mContext, times(1)).
		unbindService(any(ServiceConnection.class));
		}

		@Test