resolve merge conflicts of 81758edffa to nyc-mr2-dev-plus-aosp (5d409ace) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/RadioInfo.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -1171,7 +1171,7 @@ public class RadioInfo extends Activity {

		void setImsConfigProvisionedState(int configItem, boolean state) {
		if (phone != null && mImsManager != null) {
		QueuedWork.singleThreadExecutor().submit(new Runnable() {
		QueuedWork.queue(new Runnable() {
		public void run() {
		try {
		mImsManager.getConfigInterface().setProvisionedValue(
		@@ -1181,7 +1181,7 @@ public class RadioInfo extends Activity {
		Log.e(TAG, "setImsConfigProvisioned() exception:", e);
		}
		}
		});
		}, false);
		}
		}

+14 −0

Original line number	Diff line number	Diff line
		@@ -148,6 +148,20 @@ final class LocalBluetoothPreferences {
		editor.apply();
		}

		static void persistDiscoveringTimestamp(final Context context) {
		// Load the shared preferences and edit it on a background
		// thread (but serialized!).
		QueuedWork.queue(new Runnable() {
		public void run() {
		SharedPreferences.Editor editor = getSharedPreferences(context).edit();
		editor.putLong(
		KEY_DISCOVERING_TIMESTAMP,
		System.currentTimeMillis());
		editor.apply();
		}
		}, false);
		}

		static boolean hasDockAutoConnectSetting(Context context, String addr) {
		return getSharedPreferences(context).contains(KEY_DOCK_AUTO_CONNECT + addr);
		}