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

Commit b9f1557d authored by Grace Jia's avatar Grace Jia Committed by Automerger Merge Worker
Browse files

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

Change-Id: I6b369e7e34c3380d9201f6d9047c7a9797724da2
parents c885982f 857bbcad

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

+5 −1
Original line number Diff line number Diff line
@@ -295,4 +295,8 @@ public class DefaultDialerCache { 
    public ContentObserver getContentObserver() {

        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 Diff line number Diff line
@@ -1705,7 +1705,7 @@ public class InCallController extends CallsManagerListenerBase { 


        if (TextUtils.isEmpty(ringingPackage)) {

            // The current in-call UI returned nothing, so lets use the default dialer.

            ringingPackage = mDefaultDialerCache.getDefaultDialerApplication(

            ringingPackage = mDefaultDialerCache.getRoleManagerAdapter().getDefaultDialerApp(

                    mCallsManager.getCurrentUserHandle().getIdentifier());

            if (ringingPackage != null) {

                Log.d(this, "doesConnectedDialerSupportRinging: notCurentlyConnectedPackage=%s",