Snap for 12085179 from 4f45f703ee6a6ba89a11ddb6ab2e0dfea5596c68 to 24Q4-release (19fb1120) · Commits · e / os / android_packages_modules_Bluetooth

android/apishim/Android.bp

+6 −8

Original line number	Diff line number	Diff line
		@@ -21,9 +21,7 @@ java_defaults {
		name: "BluetoothShimsDefaults",
		libs: [
		"androidx.annotation_annotation",
		],
		static_libs : [
		"modules-utils-build_system"
		"modules-utils-build",
		],
		apex_available: [
		"com.android.btservices",
		@@ -40,7 +38,7 @@ java_library {
		"BluetoothShimsDefaults",
		],
		srcs: ["common/*/.java"],
		sdk_version: "system_current",
		sdk_version: "module_current",
		visibility: ["//visibility:private"],
		}

		@@ -70,10 +68,10 @@ java_library {
		"34/*/.java",
		],
		libs: [
		"BluetoothShimsCommon",
		"BluetoothApi33Shims",
		"BluetoothShimsCommon",
		],
		sdk_version: "module_current",
		sdk_version: "module_34",
		visibility: ["//visibility:private"],
		}

		@@ -83,9 +81,9 @@ java_library {
		"BluetoothShimsDefaults",
		],
		static_libs: [
		"BluetoothShimsCommon",
		"BluetoothApi33Shims",
		"BluetoothApi34Shims",
		"BluetoothShimsCommon",
		],
		visibility: [
		"//packages/modules/Bluetooth/android/app",

+1 −0

Original line number	Diff line number	Diff line
		@@ -284,6 +284,7 @@ android_app {

		plugins: [
		"androidx.room_room-compiler-plugin",
		"error_prone_android_framework",
		],

		// Export schemas to the test directory so that we have an history

+0 −2

Original line number	Diff line number	Diff line
		@@ -17,8 +17,6 @@ filegroup {
		"android/bluetooth/IBluetoothA2dpSink.aidl",
		"android/bluetooth/IBluetoothActivityEnergyInfoListener.aidl",
		"android/bluetooth/IBluetoothAvrcpController.aidl",
		"android/bluetooth/IBluetoothAvrcpTarget.aidl",
		"android/bluetooth/IBluetoothBattery.aidl",
		"android/bluetooth/IBluetoothCallback.aidl",
		"android/bluetooth/IBluetoothConnectionCallback.aidl",
		"android/bluetooth/IBluetoothCsipSetCoordinator.aidl",

+1 −1

Original line number	Diff line number	Diff line
		@@ -49,7 +49,7 @@ interface IBluetooth
		@JavaPassthrough(annotation="@android.annotation.RequiresNoPermission")
		int getState();

		@JavaPassthrough(annotation="@android.annotation.RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT},anyOf={android.Manifest.permission.INTERACT_ACROSS_USERS,android.Manifest.permission.MANAGE_USERS})")
		@JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)")
		oneway void enable(boolean quietMode, in AttributionSource attributionSource);
		@JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)")
		oneway void disable(in AttributionSource attributionSource);

deleted100644 → 0

+0 −30

Original line number	Diff line number	Diff line
		/*
		* Copyright 2018 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package android.bluetooth;

		/**
		* API for Bluetooth AVRCP Target Interface
		*
		* @hide
		*/
		interface IBluetoothAvrcpTarget {
		/**
		* @hide
		*/
		@JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)")
		void sendVolumeChanged(in int volume);
		}