Merge "AdapterProperties: Crash on invalid state transition" am: 4c3fd4ec34 am: 10e0f74431 (8cc0a11c) · Commits · e / os / android_packages_modules_Bluetooth

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

+15 −6

Original line number	Diff line number	Diff line
		@@ -547,24 +547,33 @@ class AdapterProperties {
		private boolean updateCountersAndCheckForConnectionStateChange(int state, int prevState) {
		switch (prevState) {
		case BluetoothProfile.STATE_CONNECTING:
		if (mProfilesConnecting > 0)
		if (mProfilesConnecting > 0) {
		mProfilesConnecting--;
		else
		} else {
		Log.e(TAG, "mProfilesConnecting " + mProfilesConnecting);
		throw new IllegalStateException(
		"Invalid state transition, " + prevState + " -> " + state);
		}
		break;

		case BluetoothProfile.STATE_CONNECTED:
		if (mProfilesConnected > 0)
		if (mProfilesConnected > 0) {
		mProfilesConnected--;
		else
		} else {
		Log.e(TAG, "mProfilesConnected " + mProfilesConnected);
		throw new IllegalStateException(
		"Invalid state transition, " + prevState + " -> " + state);
		}
		break;

		case BluetoothProfile.STATE_DISCONNECTING:
		if (mProfilesDisconnecting > 0)
		if (mProfilesDisconnecting > 0) {
		mProfilesDisconnecting--;
		else
		} else {
		Log.e(TAG, "mProfilesDisconnecting " + mProfilesDisconnecting);
		throw new IllegalStateException(
		"Invalid state transition, " + prevState + " -> " + state);
		}
		break;
		}