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

Commit 5a9deda7 authored by Philip P. Moltmann's avatar Philip P. Moltmann Committed by android-build-merger
Browse files

resolve merge conflicts of 9ac842a7 to nyc-mr2-dev-plus-aosp 

am: afe6320d

Change-Id: I514cc08bef8ef2b76d90628ae3b21833d3bda206
parents 38c15a53 afe6320d

src/com/android/settings/RadioInfo.java

+2 −2
Original line number Diff line number Diff line
@@ -1164,7 +1164,7 @@ public class RadioInfo extends Activity { 


    void setImsConfigProvisionedState(int configItem, boolean state) {

        if (phone != null && mImsManager != null) {

            QueuedWork.queue(new Runnable() {

            QueuedWork.singleThreadExecutor().submit(new Runnable() {

                public void run() {

                    try {

                        mImsManager.getConfigInterface().setProvisionedValue(
@@ -1174,7 +1174,7 @@ public class RadioInfo extends Activity { 
                        Log.e(TAG, "setImsConfigProvisioned() exception:", e);

                    }

                }

            }, false);

            });

        }

    }