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

Commit 89399d59 authored Aug 01, 2024 by Treehugger Robot Committed by Automerger Merge Worker Aug 01, 2024

Merge "Replace ellipsys by ascii char" into main am: 7d167f25

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

Change-Id: I993ca2dc35d63e06c0a58a7dbfc0244da1ffc7dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 48fa1f54 7d167f25

framework/tests/util/src/BlockingBluetoothAdapter.kt

+1 −1

Original line number	Diff line number	Diff line
		@@ -79,7 +79,7 @@ object BlockingBluetoothAdapter {
		if (adapter.isBleScanAlwaysAvailable()) {
		break
		}
		Log.d(TAG, "Ble scan not yet available… Sleeping 20 ms $i/5")
		Log.d(TAG, "Ble scan not yet available... Sleeping 20 ms $i/5")
		Thread.sleep(20)
		}
		if (!adapter.isBleScanAlwaysAvailable()) {

service/src/LogTest.kt

+1 −1

Original line number	Diff line number	Diff line
		@@ -57,7 +57,7 @@ class LogTest {

		@Test
		fun log_errorThrowable() {
		Log.e(TAG, "Logging error… ", RuntimeException("With a Throwable"))
		Log.e(TAG, "Logging error... ", RuntimeException("With a Throwable"))
		}

		@Test

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -501,14 +501,14 @@ class BluetoothManagerService {
		if (BluetoothAdapter.ACTION_LOCAL_NAME_CHANGED.equals(action)) {
		String newName = intent.getStringExtra(BluetoothAdapter.EXTRA_LOCAL_NAME);
		if (newName != null) {
		Log.d(TAG, "Bluetooth Adapter name changed to " + newName);
		Log.d(TAG, "Local name changed to: " + newName);
		storeNameAndAddress(newName, null);
		}
		} else if (BluetoothAdapter.ACTION_BLUETOOTH_ADDRESS_CHANGED.equals(action)) {
		String newAddress =
		intent.getStringExtra(BluetoothAdapter.EXTRA_BLUETOOTH_ADDRESS);
		if (newAddress != null) {
		Log.d(TAG, "Local address changed to …" + logAddress(newAddress));
		Log.d(TAG, "Local address changed to: " + logAddress(newAddress));
		storeNameAndAddress(null, newAddress);
		} else {
		Log.e(TAG, "No Bluetooth Adapter address parameter found");