Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 69059b53 authored Apr 29, 2020 by Grace Jia Committed by Automerger Merge Worker Apr 29, 2020

Add timeout limitation to Ringer#startRinging and avoid using Telecom am:...

Add timeout limitation to Ringer#startRinging and avoid using Telecom am: 857bbcad am: b9f1557d am: 98be38b5

Change-Id: I6adbd351c880d46527f3d08e497f99fe2ef55ed0

parents 22ea385c 98be38b5

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

+5 −1

Original line number	Original line	Diff line number	Diff line
	@@ -295,4 +295,8 @@ public class DefaultDialerCache {
	public ContentObserver getContentObserver() {		public ContentObserver getContentObserver() {
	return mDefaultDialerObserver;		return mDefaultDialerObserver;
	}		}

			public RoleManagerAdapter getRoleManagerAdapter() {
			return mRoleManagerAdapter;
			}
	}		}
			No newline at end of file

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1705,7 +1705,7 @@ public class InCallController extends CallsManagerListenerBase {

	if (TextUtils.isEmpty(ringingPackage)) {		if (TextUtils.isEmpty(ringingPackage)) {
	// The current in-call UI returned nothing, so lets use the default dialer.		// The current in-call UI returned nothing, so lets use the default dialer.
	ringingPackage = mDefaultDialerCache.getDefaultDialerApplication(		ringingPackage = mDefaultDialerCache.getRoleManagerAdapter().getDefaultDialerApp(
	mCallsManager.getCurrentUserHandle().getIdentifier());		mCallsManager.getCurrentUserHandle().getIdentifier());
	if (ringingPackage != null) {		if (ringingPackage != null) {
	Log.d(this, "doesConnectedDialerSupportRinging: notCurentlyConnectedPackage=%s",		Log.d(this, "doesConnectedDialerSupportRinging: notCurentlyConnectedPackage=%s",