Merge "SystemServer: promote failure message as error" into main (9d8e6dc3) · Commits · e / os / android_packages_modules_Bluetooth

service/src/com/android/server/bluetooth/BluetoothManagerService.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -2016,7 +2016,7 @@ class BluetoothManagerService {

		private void offToBleOn() {
		if (!mState.oneOf(STATE_OFF)) {
		Log.d(TAG, "offToBleOn: Impossible transition from " + mState);
		Log.e(TAG, "offToBleOn: Impossible transition from " + mState);
		return;
		}
		Log.d(TAG, "offToBleOn: Sending request");
		@@ -2029,7 +2029,7 @@ class BluetoothManagerService {

		private void onToBleOn() {
		if (!mState.oneOf(STATE_ON)) {
		Log.d(TAG, "onToBleOn: Impossible transition from " + mState);
		Log.e(TAG, "onToBleOn: Impossible transition from " + mState);
		return;
		}
		Log.d(TAG, "onToBleOn: Sending request");
		@@ -2042,7 +2042,7 @@ class BluetoothManagerService {

		private void bleOnToOn() {
		if (!mState.oneOf(STATE_BLE_ON)) {
		Log.d(TAG, "bleOnToOn: Impossible transition from " + mState);
		Log.e(TAG, "bleOnToOn: Impossible transition from " + mState);
		return;
		}
		Log.d(TAG, "bleOnToOn: sending request");
		@@ -2055,7 +2055,7 @@ class BluetoothManagerService {

		private void bleOnToOff() {
		if (!mState.oneOf(STATE_BLE_ON)) {
		Log.d(TAG, "bleOnToOff: Impossible transition from " + mState);
		Log.e(TAG, "bleOnToOff: Impossible transition from " + mState);
		return;
		}
		Log.d(TAG, "bleOnToOff: Sending request");