resolve merge conflicts of 9ac842a753 to nyc-mr2-dev-plus-aosp
Test: built
Change-Id: I156db22c13da98bce0077b2acb8d9f1a3d2ce406
diff --git a/src/com/android/settings/RadioInfo.java b/src/com/android/settings/RadioInfo.java
index 15a1709..5752ec6 100644
--- a/src/com/android/settings/RadioInfo.java
+++ b/src/com/android/settings/RadioInfo.java
@@ -1171,7 +1171,7 @@
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(
@@ -1181,7 +1181,7 @@
Log.e(TAG, "setImsConfigProvisioned() exception:", e);
}
}
- }, false);
+ });
}
}