Snap for 12319997 from 9ff97e6b363260859eb38b28e46b81e192a13cd3 to 24Q4-release (41d269e1) · Commits · e / os / android_packages_modules_Bluetooth

android/app/Android.bp

+2 −0

Original line number	Diff line number	Diff line
		@@ -134,6 +134,7 @@ cc_library_shared {
		"libcutils",
		"libevent",
		"libexpresslog",
		"libflags_rust_cpp_bridge",
		"libflatbuffers-cpp",
		"libfmq",
		"libg722codec",
		@@ -329,6 +330,7 @@ android_app {
		"-Xep:AndroidFrameworkEfficientStrings:ERROR",
		"-Xep:AndroidFrameworkRequiresPermission:ERROR",
		"-Xep:BadImport:ERROR",
		"-Xep:CatchAndPrintStackTrace:ERROR",
		"-Xep:ClassCanBeStatic:ERROR",
		"-Xep:DateFormatConstant:ERROR",
		"-Xep:EmptyBlockTag:ERROR",

android/app/src/com/android/bluetooth/bass_client/BassClientService.java

+424 −57

File changed.

Preview size limit exceeded, changes collapsed.

android/app/src/com/android/bluetooth/hid/HidDeviceService.java

+23 −10

Original line number	Diff line number	Diff line
		@@ -124,8 +124,9 @@ public class HidDeviceService extends ProfileService {
		break;
		}
		} catch (RemoteException e) {
		Log.e(TAG, "e=" + e.toString());
		e.printStackTrace();
		Log.e(
		TAG,
		e.toString() + "\n" + Log.getStackTraceString(new Throwable()));
		}

		if (success) {
		@@ -137,7 +138,11 @@ public class HidDeviceService extends ProfileService {
		binder.linkToDeath(mDeathRcpt, 0);
		Log.i(TAG, "IBinder.linkToDeath() ok");
		} catch (RemoteException e) {
		e.printStackTrace();
		Log.e(
		TAG,
		e.toString()
		+ "\n"
		+ Log.getStackTraceString(new Throwable()));
		}
		}
		} else if (mDeathRcpt != null) {
		@@ -147,7 +152,11 @@ public class HidDeviceService extends ProfileService {
		binder.unlinkToDeath(mDeathRcpt, 0);
		Log.i(TAG, "IBinder.unlinkToDeath() ok");
		} catch (NoSuchElementException e) {
		e.printStackTrace();
		Log.e(
		TAG,
		e.toString()
		+ "\n"
		+ Log.getStackTraceString(new Throwable()));
		}
		mDeathRcpt.cleanup();
		mDeathRcpt = null;
		@@ -178,7 +187,9 @@ public class HidDeviceService extends ProfileService {
		mCallback.onConnectionStateChanged(device, state);
		}
		} catch (RemoteException e) {
		e.printStackTrace();
		Log.e(
		TAG,
		e.toString() + "\n" + Log.getStackTraceString(new Throwable()));
		}
		break;
		}
		@@ -193,7 +204,7 @@ public class HidDeviceService extends ProfileService {
		mCallback.onGetReport(mHidDevice, type, id, bufferSize);
		}
		} catch (RemoteException e) {
		e.printStackTrace();
		Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));
		}
		break;

		@@ -208,7 +219,9 @@ public class HidDeviceService extends ProfileService {
		mCallback.onSetReport(mHidDevice, reportType, reportId, data);
		}
		} catch (RemoteException e) {
		e.printStackTrace();
		Log.e(
		TAG,
		e.toString() + "\n" + Log.getStackTraceString(new Throwable()));
		}
		break;
		}
		@@ -221,7 +234,7 @@ public class HidDeviceService extends ProfileService {
		mCallback.onSetProtocol(mHidDevice, protocol);
		}
		} catch (RemoteException e) {
		e.printStackTrace();
		Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));
		}
		break;

		@@ -234,7 +247,7 @@ public class HidDeviceService extends ProfileService {
		mCallback.onInterruptData(mHidDevice, reportId, data);
		}
		} catch (RemoteException e) {
		e.printStackTrace();
		Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));
		}
		break;

		@@ -244,7 +257,7 @@ public class HidDeviceService extends ProfileService {
		mCallback.onVirtualCableUnplug(mHidDevice);
		}
		} catch (RemoteException e) {
		e.printStackTrace();
		Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));
		}
		mHidDevice = null;
		break;

android/app/src/com/android/bluetooth/le_audio/LeAudioService.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -3632,6 +3632,10 @@ public class LeAudioService extends ProfileService {

		/* Stop here if Broadcast was not in Streaming state before */
		if (previousState != LeAudioStackEvent.BROADCAST_STATE_STREAMING) {
		// Stop Big Monitoring in case that was some actions on extarnal broadcast
		if (bassClientService != null) {
		bassClientService.stopBigMonitoring();
		}
		return;
		}

android/app/src/com/android/bluetooth/mcp/MediaControlProfile.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -761,7 +761,7 @@ public class MediaControlProfile implements MediaControlServiceCallbacks {
		ApplicationInfo info = pm.getApplicationInfo(player.getPackageName(), 0);
		player_name = info.loadLabel(pm).toString();
		} catch (PackageManager.NameNotFoundException e) {
		e.printStackTrace();
		Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));
		}
		return player_name;
		}