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

Commit 857bbcad authored by Grace Jia's avatar Grace Jia
Browse files

Add timeout limitation to Ringer#startRinging and avoid using Telecom 

lock in process that get RingerAttributes.

Bug: 141772716, 154184130
Test: atest TelecomUnitTests:RingerTest, BasicCallTests
Change-Id: I82da9309e3a2cfd257cc305e5734c75a614f2cb4
Merged-In: I82da9309e3a2cfd257cc305e5734c75a614f2cb4
Exempt-From-Owner-Approval: CP from internal master
parent 112599dd

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",