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

Commit f013e59e authored by Jack Yu's avatar Jack Yu
Browse files

Fixed the deadlock in ImsServiceController 

Bug: 403628336
Test: atest FrameworksTelephonyTests
Flag: EXEMPT bug fix
Change-Id: I67b4c585da11b73b7562a6aa4c002c1825d97480
parent ffc6b7e1

src/java/com/android/internal/telephony/ims/ImsServiceController.java

+5 −7
Original line number Original line Diff line number Diff line
@@ -1004,14 +1004,12 @@ public class ImsServiceController { 




    @Override

    @Override

    public String toString() {

    public String toString() {

        synchronized (mLock) {

        return "[ImsServiceController: componentName=" + getComponentName() + ", boundUser="

        return "[ImsServiceController: componentName=" + getComponentName() + ", boundUser="

                + mBoundUser + ", features=" + mImsFeatures + ", isBinding=" + mIsBinding

                + mBoundUser + ", features=" + mImsFeatures + ", isBinding=" + mIsBinding

                + ", isBound=" + mIsBound + ", serviceController=" + getImsServiceController()

                + ", isBound=" + mIsBound + ", serviceController=" + getImsServiceController()

                + ", rebindDelay=" + getRebindDelay() + ", slotToSubIdMap=" + mSlotIdToSubIdMap

                + ", rebindDelay=" + getRebindDelay() + ", slotToSubIdMap=" + mSlotIdToSubIdMap

                + "]";

                + "]";

    }

    }

    }





    public void dump(PrintWriter printWriter) {

    public void dump(PrintWriter printWriter) {

        mLocalLog.dump(printWriter);

        mLocalLog.dump(printWriter);