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

Commit 9c1c036f authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Repair the incorrect log of disableIms" into main am: b62ecd70 am: 255ae9b8 

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/2665857



Change-Id: Iaa1fabba381149954bd601ef587183b46ce5006f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c4e41063 255ae9b8

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

+2 −2
Original line number Diff line number Diff line
@@ -118,13 +118,13 @@ public class ImsServiceControllerCompat extends ImsServiceController { 
    public final void disableIms(int slotId, int subId) {

        MmTelFeatureCompatAdapter adapter = mMmTelCompatAdapters.get(slotId);

        if (adapter == null) {

            Log.w(TAG, "enableIms: adapter null for slot :" + slotId);

            Log.w(TAG, "disableIms: adapter null for slot :" + slotId);

            return;

        }

        try {

            adapter.disableIms();

        } catch (RemoteException e) {

            Log.w(TAG, "Couldn't enable IMS: " + e.getMessage());

            Log.w(TAG, "Couldn't disableIms IMS: " + e.getMessage());

        }

    }