release-request-42a2a3ad-8c90-4c84-a0ad-5d067beb8e30-for-git_oc-mr1-release-43... (0a086a1d) · Commits · e / os / android_packages_apps_Bluetooth

src/com/android/bluetooth/btservice/AdapterProperties.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -454,8 +454,8 @@ class AdapterProperties {
		"PROFILE_CONNECTION_STATE_CHANGE: profile=" + profile + ", device=" + device + ", "
		+ prevState + " -> " + state);
		if (!isNormalStateTransition(prevState, state)) {
		Log.e(TAG,
		"PROFILE_CONNECTION_STATE_CHANGE: invalid transition for profile=" + profile
		Log.w(TAG,
		"PROFILE_CONNECTION_STATE_CHANGE: unexpected transition for profile=" + profile
		+ ", device=" + device + ", " + prevState + " -> " + state);
		}
		sendConnectionStateChange(device, profile, state, prevState);
		@@ -489,8 +489,8 @@ class AdapterProperties {
		"ADAPTER_CONNECTION_STATE_CHANGE: " + device + ": " + prevAdapterState
		+ " -> " + newAdapterState);
		if (!isNormalStateTransition(prevState, state)) {
		Log.e(TAG,
		"ADAPTER_CONNECTION_STATE_CHANGE: invalid transition for profile="
		Log.w(TAG,
		"ADAPTER_CONNECTION_STATE_CHANGE: unexpected transition for profile="
		+ profile + ", device=" + device + ", " + prevState + " -> "
		+ state);
		}

+1 −0

Original line number	Diff line number	Diff line
		@@ -472,6 +472,7 @@ public class PanService extends ProfileService {
		// will fail until the caller explicitly calls BluetoothPan#disconnect.
		if (prevState == BluetoothProfile.STATE_DISCONNECTED && state == BluetoothProfile.STATE_DISCONNECTING) {
		Log.d(TAG, "Ignoring state change from " + prevState + " to " + state);
		mPanDevices.remove(device);
		return;
		}