Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6d835755 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "SystemServer: promote failure message as error" into main am: 9d8e6dc3 am: 4d51194b 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/3236278



Change-Id: I235a1950242a5fd86960601b39e7759ebd539492
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c296981c 4d51194b

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");