Merge "BluetoothAdapter: various early return" into main (9d8ed932) · Commits · e / os / android_packages_modules_Bluetooth

framework/java/android/bluetooth/BluetoothAdapter.java

+30 −29

Original line number	Diff line number	Diff line
		@@ -926,7 +926,9 @@ public final class BluetoothAdapter {
		public void onMetadataChanged(BluetoothDevice device, int key, byte[] value) {
		Attributable.setAttributionSource(device, mAttributionSource);
		synchronized (mMetadataListeners) {
		if (mMetadataListeners.containsKey(device)) {
		if (!mMetadataListeners.containsKey(device)) {
		return;
		}
		List<Pair<OnMetadataChangedListener, Executor>> list =
		mMetadataListeners.get(device);
		for (Pair<OnMetadataChangedListener, Executor> pair : list) {
		@@ -939,7 +941,6 @@ public final class BluetoothAdapter {
		}
		}
		}
		}
		};

		/** @hide */
		@@ -4088,7 +4089,6 @@ public final class BluetoothAdapter {
		if (mService != null) {
		return IBluetoothGatt.Stub.asInterface(mService.getBluetoothGatt());
		}

		} catch (RemoteException e) {
		Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));
		} finally {
		@@ -4148,7 +4148,9 @@ public final class BluetoothAdapter {
		final boolean isRegistered = sServiceRegistered;
		final boolean wantRegistered = !sProxyServiceStateCallbacks.isEmpty();

		if (isRegistered != wantRegistered) {
		if (isRegistered == wantRegistered) {
		return;
		}
		if (wantRegistered) {
		try {
		sService =
		@@ -4167,7 +4169,6 @@ public final class BluetoothAdapter {
		}
		sServiceRegistered = wantRegistered;
		}
		}

		/**
		* Callback interface used to deliver LE scan results.