Merge "Don't return from inside log tag enforced blocks" into main (65da211f) · Commits · e / os / android_packages_modules_Bluetooth

android/app/src/com/android/bluetooth/hfpclient/HeadsetClientStateMachine.java

+6 −10

Original line number	Diff line number	Diff line
		@@ -1372,12 +1372,10 @@ public class HeadsetClientStateMachine extends StateMachine {
		@Override
		public synchronized boolean processMessage(Message message) {
		logD("Connected process message: " + message.what);
		if (DBG) {
		if (mCurrentDevice == null) {
		Log.e(TAG, "ERROR: mCurrentDevice is null in Connected");
		return NOT_HANDLED;
		}
		}

		switch (message.what) {
		case CONNECT:
		@@ -1886,12 +1884,10 @@ public class HeadsetClientStateMachine extends StateMachine {
		@Override
		public synchronized boolean processMessage(Message message) {
		logD("AudioOn process message: " + message.what);
		if (DBG) {
		if (mCurrentDevice == null) {
		Log.e(TAG, "ERROR: mCurrentDevice is null in Connected");
		return NOT_HANDLED;
		}
		}

		switch (message.what) {
		case DISCONNECT:

+2 −2

Original line number	Diff line number	Diff line
		@@ -2197,8 +2197,8 @@ public class LeAudioService extends ProfileService {
		if (mAudioServersScanner == null \|\| mScanCallback == null) {
		if (DBG) {
		Log.d(TAG, "stopAudioServersBackgroundScan: already stopped");
		return;
		}
		return;
		}

		try {
		@@ -2232,8 +2232,8 @@ public class LeAudioService extends ProfileService {
		if (mScanCallback != null) {
		if (DBG) {
		Log.d(TAG, "startAudioServersBackgroundScan: Scanning already enabled");
		return;
		}
		return;
		}
		mScanCallback = new AudioServerScanCallback();
		}