Merge "GetUuids refactor to call in correct order" (f8e93753) · Commits · e / os / android_packages_modules_Bluetooth

framework/java/android/bluetooth/BluetoothAdapter.java

+18 −20

Original line number	Diff line number	Diff line
		@@ -1445,26 +1445,9 @@ public final class BluetoothAdapter {
		@RequiresBluetoothConnectPermission
		@RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)
		public @NonNull ParcelUuid[] getUuids() {
		if (getState() != STATE_ON) {
		return new ParcelUuid[0];
		}
		try {
		mServiceLock.readLock().lock();
		if (mService != null) {
		final SynchronousResultReceiver<List<ParcelUuid>> recv =
		new SynchronousResultReceiver();
		mService.getUuids(mAttributionSource, recv);
		List<ParcelUuid> parcels = recv.awaitResultNoInterrupt(getSyncTimeout())
		.getValue(new ArrayList<>());
		List<ParcelUuid> parcels = getUuidsList();
		return parcels.toArray(new ParcelUuid[parcels.size()]);
		}
		} catch (RemoteException \| TimeoutException e) {
		Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));
		} finally {
		mServiceLock.readLock().unlock();
		}
		return new ParcelUuid[0];
		}

		/**
		* Get the UUIDs supported by the local Bluetooth adapter.
		@@ -1475,7 +1458,22 @@ public final class BluetoothAdapter {
		@SystemApi
		@RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)
		public @NonNull List<ParcelUuid> getUuidsList() {
		return Arrays.asList(getUuids());
		List<ParcelUuid> defaultValue = new ArrayList<>();
		if (getState() != STATE_ON \|\| mService == null) {
		return defaultValue;
		}
		mServiceLock.readLock().lock();
		try {
		final SynchronousResultReceiver<List<ParcelUuid>> recv =
		new SynchronousResultReceiver();
		mService.getUuids(mAttributionSource, recv);
		return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue);
		} catch (RemoteException \| TimeoutException e) {
		Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));
		} finally {
		mServiceLock.readLock().unlock();
		}
		return defaultValue;
		}

		/**