Merge "Long-tail of AttributionSource plumbing." into sc-dev (8d34b94c) · Commits · e / os / android_packages_modules_Bluetooth

system/binder/android/bluetooth/IBluetooth.aidl

+6 −6

Original line number	Diff line number	Diff line
		@@ -58,7 +58,7 @@ interface IBluetooth
		@JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)")
		String getName(in AttributionSource attributionSource);
		@JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_ADVERTISE)")
		int getNameLengthForAdvertise();
		int getNameLengthForAdvertise(in AttributionSource attributionSource);
		@JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)")
		BluetoothClass getBluetoothClass(in AttributionSource attributionSource);
		@JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED)")
		@@ -127,7 +127,7 @@ interface IBluetooth
		@JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)")
		String getRemoteAliasWithAttribution(in BluetoothDevice device, in AttributionSource attributionSource);
		@JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)")
		boolean setRemoteAlias(in BluetoothDevice device, in String name, in String callingPackage, in AttributionSource attributionSource);
		boolean setRemoteAlias(in BluetoothDevice device, in String name, in AttributionSource attributionSource);
		@JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)")
		int getRemoteClass(in BluetoothDevice device, in AttributionSource attributionSource);
		@JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)")
		@@ -228,16 +228,16 @@ interface IBluetooth
		void onBrEdrDown();

		@JavaPassthrough(annotation="@android.annotation.RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT,android.Manifest.permission.BLUETOOTH_PRIVILEGED,android.Manifest.permission.MODIFY_PHONE_STATE})")
		boolean connectAllEnabledProfiles(in BluetoothDevice device);
		boolean connectAllEnabledProfiles(in BluetoothDevice device, in AttributionSource attributionSource);
		@JavaPassthrough(annotation="@android.annotation.RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT,android.Manifest.permission.BLUETOOTH_PRIVILEGED})")
		boolean disconnectAllEnabledProfiles(in BluetoothDevice device);
		boolean disconnectAllEnabledProfiles(in BluetoothDevice device, in AttributionSource attributionSource);

		@JavaPassthrough(annotation="@android.annotation.RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT,android.Manifest.permission.BLUETOOTH_PRIVILEGED,android.Manifest.permission.MODIFY_PHONE_STATE})")
		boolean setActiveDevice(in BluetoothDevice device, in int profiles);
		boolean setActiveDevice(in BluetoothDevice device, in int profiles, in AttributionSource attributionSource);
		@JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)")
		List<BluetoothDevice> getMostRecentlyConnectedDevices(in AttributionSource attributionSource);
		@JavaPassthrough(annotation="@android.annotation.RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT,android.Manifest.permission.BLUETOOTH_PRIVILEGED,android.Manifest.permission.MODIFY_PHONE_STATE})")
		boolean removeActiveDevice(in int profiles);
		boolean removeActiveDevice(in int profiles, in AttributionSource attributionSource);

		@JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED)")
		boolean registerBluetoothConnectionCallback(in IBluetoothConnectionCallback callback);

system/binder/android/bluetooth/IBluetoothA2dp.aidl

+32 −22

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@ import android.bluetooth.BluetoothCodecConfig;
		import android.bluetooth.BluetoothCodecStatus;
		import android.bluetooth.BluetoothDevice;
		import android.bluetooth.BufferConstraints;
		import android.content.AttributionSource;

		/**
		* APIs for Bluetooth A2DP service
		@@ -31,53 +32,62 @@ interface IBluetoothA2dp {
		@UnsupportedAppUsage
		@JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)")
		boolean connect(in BluetoothDevice device);
		@JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)")
		boolean connectWithAttribution(in BluetoothDevice device, in AttributionSource attributionSource);
		@UnsupportedAppUsage
		@JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)")
		boolean disconnect(in BluetoothDevice device);
		@JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)")
		boolean disconnectWithAttribution(in BluetoothDevice device, in AttributionSource attributionSource);
		@UnsupportedAppUsage
		@JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)")
		List<BluetoothDevice> getConnectedDevices();
		@JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)")
		List<BluetoothDevice> getConnectedDevicesWithAttribution(in AttributionSource attributionSource);
		@UnsupportedAppUsage
		@JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)")
		List<BluetoothDevice> getDevicesMatchingConnectionStates(in int[] states);
		@JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)")
		List<BluetoothDevice> getDevicesMatchingConnectionStatesWithAttribution(in int[] states, in AttributionSource attributionSource);
		@UnsupportedAppUsage
		@JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)")
		int getConnectionState(in BluetoothDevice device);
		@JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)")
		boolean setActiveDevice(in BluetoothDevice device);
		int getConnectionStateWithAttribution(in BluetoothDevice device, in AttributionSource attributionSource);
		@JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)")
		boolean setActiveDevice(in BluetoothDevice device, in AttributionSource attributionSource);
		@JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)")
		BluetoothDevice getActiveDevice();
		BluetoothDevice getActiveDevice(in AttributionSource attributionSource);
		@JavaPassthrough(annotation="@android.annotation.RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT,android.Manifest.permission.BLUETOOTH_PRIVILEGED})")
		boolean setConnectionPolicy(in BluetoothDevice device, int connectionPolicy);
		@JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED)")
		int getConnectionPolicy(in BluetoothDevice device);
		boolean setConnectionPolicy(in BluetoothDevice device, int connectionPolicy, in AttributionSource attributionSource);
		@JavaPassthrough(annotation="@android.annotation.RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT,android.Manifest.permission.BLUETOOTH_PRIVILEGED})")
		int getConnectionPolicy(in BluetoothDevice device, in AttributionSource attributionSource);
		@JavaPassthrough(annotation="@android.annotation.RequiresNoPermission")
		boolean isAvrcpAbsoluteVolumeSupported();
		@JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)")
		oneway void setAvrcpAbsoluteVolume(int volume);
		oneway void setAvrcpAbsoluteVolume(int volume, in AttributionSource attributionSource);
		@JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)")
		boolean isA2dpPlaying(in BluetoothDevice device);
		boolean isA2dpPlaying(in BluetoothDevice device, in AttributionSource attributionSource);
		@JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)")
		BluetoothCodecStatus getCodecStatus(in BluetoothDevice device);
		BluetoothCodecStatus getCodecStatus(in BluetoothDevice device, in AttributionSource attributionSource);
		@JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)")
		oneway void setCodecConfigPreference(in BluetoothDevice device,
		in BluetoothCodecConfig codecConfig);
		oneway void setCodecConfigPreference(in BluetoothDevice device, in BluetoothCodecConfig codecConfig, in AttributionSource attributionSource);
		@JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)")
		oneway void enableOptionalCodecs(in BluetoothDevice device);
		oneway void enableOptionalCodecs(in BluetoothDevice device, in AttributionSource attributionSource);
		@JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)")
		oneway void disableOptionalCodecs(in BluetoothDevice device);
		oneway void disableOptionalCodecs(in BluetoothDevice device, in AttributionSource attributionSource);
		@JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)")
		int supportsOptionalCodecs(in BluetoothDevice device);
		int supportsOptionalCodecs(in BluetoothDevice device, in AttributionSource attributionSource);
		@JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)")
		int getOptionalCodecsEnabled(in BluetoothDevice device);
		int getOptionalCodecsEnabled(in BluetoothDevice device, in AttributionSource attributionSource);
		@JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)")
		oneway void setOptionalCodecsEnabled(in BluetoothDevice device, int value);
		@JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED)")
		int getDynamicBufferSupport();
		@JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED)")
		BufferConstraints getBufferConstraints();
		@JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED)")
		boolean setBufferLengthMillis(int codec, int size);
		oneway void setOptionalCodecsEnabled(in BluetoothDevice device, int value, in AttributionSource attributionSource);
		@JavaPassthrough(annotation="@android.annotation.RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT,android.Manifest.permission.BLUETOOTH_PRIVILEGED})")
		int getDynamicBufferSupport(in AttributionSource attributionSource);
		@JavaPassthrough(annotation="@android.annotation.RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT,android.Manifest.permission.BLUETOOTH_PRIVILEGED})")
		BufferConstraints getBufferConstraints(in AttributionSource attributionSource);
		@JavaPassthrough(annotation="@android.annotation.RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT,android.Manifest.permission.BLUETOOTH_PRIVILEGED})")
		boolean setBufferLengthMillis(int codec, int size, in AttributionSource attributionSource);
		@JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)")
		int getPriority(in BluetoothDevice device);
		int getPriority(in BluetoothDevice device, in AttributionSource attributionSource);
		}

system/binder/android/bluetooth/IBluetoothA2dpSink.aidl

+13 −12

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@ package android.bluetooth;

		import android.bluetooth.BluetoothAudioConfig;
		import android.bluetooth.BluetoothDevice;
		import android.content.AttributionSource;

		/**
		* APIs for Bluetooth A2DP sink service
		@@ -25,22 +26,22 @@ import android.bluetooth.BluetoothDevice;
		* @hide
		*/
		interface IBluetoothA2dpSink {
		@JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED)")
		boolean connect(in BluetoothDevice device);
		@JavaPassthrough(annotation="@android.annotation.RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT,android.Manifest.permission.BLUETOOTH_PRIVILEGED})")
		boolean connect(in BluetoothDevice device, in AttributionSource attributionSource);
		@JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)")
		boolean disconnect(in BluetoothDevice device);
		boolean disconnect(in BluetoothDevice device, in AttributionSource attributionSource);
		@JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)")
		List<BluetoothDevice> getConnectedDevices();
		List<BluetoothDevice> getConnectedDevices(in AttributionSource attributionSource);
		@JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)")
		List<BluetoothDevice> getDevicesMatchingConnectionStates(in int[] states);
		List<BluetoothDevice> getDevicesMatchingConnectionStates(in int[] states, in AttributionSource attributionSource);
		@JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)")
		int getConnectionState(in BluetoothDevice device);
		int getConnectionState(in BluetoothDevice device, in AttributionSource attributionSource);
		@JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)")
		BluetoothAudioConfig getAudioConfig(in BluetoothDevice device);
		BluetoothAudioConfig getAudioConfig(in BluetoothDevice device, in AttributionSource attributionSource);
		@JavaPassthrough(annotation="@android.annotation.RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT,android.Manifest.permission.BLUETOOTH_PRIVILEGED})")
		boolean setConnectionPolicy(in BluetoothDevice device, int connectionPolicy, in AttributionSource attributionSource);
		@JavaPassthrough(annotation="@android.annotation.RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT,android.Manifest.permission.BLUETOOTH_PRIVILEGED})")
		int getConnectionPolicy(in BluetoothDevice device, in AttributionSource attributionSource);
		@JavaPassthrough(annotation="@android.annotation.RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT,android.Manifest.permission.BLUETOOTH_PRIVILEGED})")
		boolean setConnectionPolicy(in BluetoothDevice device, int connectionPolicy);
		@JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED)")
		int getConnectionPolicy(in BluetoothDevice device);
		@JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED)")
		boolean isA2dpPlaying(in BluetoothDevice device);
		boolean isA2dpPlaying(in BluetoothDevice device, in AttributionSource attributionSource);
		}

system/binder/android/bluetooth/IBluetoothAvrcpController.aidl

+7 −6

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@ package android.bluetooth;

		import android.bluetooth.BluetoothAvrcpPlayerSettings;
		import android.bluetooth.BluetoothDevice;
		import android.content.AttributionSource;
		import android.media.MediaMetadata;
		import android.media.session.PlaybackState;

		@@ -28,15 +29,15 @@ import android.media.session.PlaybackState;
		*/
		interface IBluetoothAvrcpController {
		@JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)")
		List<BluetoothDevice> getConnectedDevices();
		List<BluetoothDevice> getConnectedDevices(in AttributionSource attributionSource);
		@JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)")
		List<BluetoothDevice> getDevicesMatchingConnectionStates(in int[] states);
		List<BluetoothDevice> getDevicesMatchingConnectionStates(in int[] states, in AttributionSource attributionSource);
		@JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)")
		int getConnectionState(in BluetoothDevice device);
		int getConnectionState(in BluetoothDevice device, in AttributionSource attributionSource);
		@JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)")
		BluetoothAvrcpPlayerSettings getPlayerSettings(in BluetoothDevice device);
		BluetoothAvrcpPlayerSettings getPlayerSettings(in BluetoothDevice device, in AttributionSource attributionSource);
		@JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)")
		boolean setPlayerApplicationSetting(in BluetoothAvrcpPlayerSettings plAppSetting);
		boolean setPlayerApplicationSetting(in BluetoothAvrcpPlayerSettings plAppSetting, in AttributionSource attributionSource);
		@JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)")
		void sendGroupNavigationCmd(in BluetoothDevice device, int keyCode, int keyState);
		void sendGroupNavigationCmd(in BluetoothDevice device, int keyCode, int keyState, in AttributionSource attributionSource);
		}

system/binder/android/bluetooth/IBluetoothHeadset.aidl

+35 −29

File changed.

Preview size limit exceeded, changes collapsed.