Merge "Fix regression due to default bypass change in IpcDataCache." into main (cef69ae0) · Commits · e / os / android_packages_modules_Bluetooth

framework/java/android/bluetooth/BluetoothAdapter.java

+26 −0

Original line number	Diff line number	Diff line
		@@ -1484,6 +1484,11 @@ public final class BluetoothAdapter {
		throw e.rethrowAsRuntimeException();
		}
		}
		@RequiresNoPermission
		@Override
		public boolean shouldBypassCache(IBluetooth serviceQuery) {
		return false;
		}
		};

		private static final IpcDataCache.QueryHandler<IBluetoothManager, Integer>
		@@ -1498,6 +1503,11 @@ public final class BluetoothAdapter {
		throw e.rethrowAsRuntimeException();
		}
		}
		@RequiresNoPermission
		@Override
		public boolean shouldBypassCache(IBluetoothManager serviceQuery) {
		return false;
		}
		};

		private static final String GET_STATE_API = "BluetoothAdapter_getState";
		@@ -2405,6 +2415,11 @@ public final class BluetoothAdapter {
		throw e.rethrowAsRuntimeException();
		}
		}
		@RequiresNoPermission
		@Override
		public boolean shouldBypassCache(IBluetooth serviceQuery) {
		return false;
		}
		};

		private static final String FILTERING_API = "BluetoothAdapter_isOffloadedFilteringSupported";
		@@ -2948,6 +2963,11 @@ public final class BluetoothAdapter {
		throw e.rethrowAsRuntimeException();
		}
		}
		@RequiresNoPermission
		@Override
		public boolean shouldBypassCache(IBluetooth serviceQuery) {
		return false;
		}
		};

		private static final String GET_CONNECTION_API = "BluetoothAdapter_getConnectionState";
		@@ -3017,6 +3037,12 @@ public final class BluetoothAdapter {
		throw e.rethrowAsRuntimeException();
		}
		}
		@RequiresNoPermission
		@Override
		public boolean shouldBypassCache(
		Pair<IBluetooth, Pair<AttributionSource, Integer>> pairQuery) {
		return false;
		}
		};

		private static final String PROFILE_API = "BluetoothAdapter_getProfileConnectionState";