resolve merge conflicts of 9ac842a753
to nyc-mr2-dev-plus-aosp
am: afe6320d70
Change-Id: I514cc08bef8ef2b76d90628ae3b21833d3bda206
This commit is contained in:
@@ -1164,7 +1164,7 @@ public class RadioInfo extends Activity {
|
|||||||
|
|
||||||
void setImsConfigProvisionedState(int configItem, boolean state) {
|
void setImsConfigProvisionedState(int configItem, boolean state) {
|
||||||
if (phone != null && mImsManager != null) {
|
if (phone != null && mImsManager != null) {
|
||||||
QueuedWork.queue(new Runnable() {
|
QueuedWork.singleThreadExecutor().submit(new Runnable() {
|
||||||
public void run() {
|
public void run() {
|
||||||
try {
|
try {
|
||||||
mImsManager.getConfigInterface().setProvisionedValue(
|
mImsManager.getConfigInterface().setProvisionedValue(
|
||||||
@@ -1174,7 +1174,7 @@ public class RadioInfo extends Activity {
|
|||||||
Log.e(TAG, "setImsConfigProvisioned() exception:", e);
|
Log.e(TAG, "setImsConfigProvisioned() exception:", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}, false);
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user