Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 51e8966e authored by William Escande's avatar William Escande Committed by Automerger Merge Worker
Browse files

Merge changes from topic "phone_state_permission_for_bluetooth" into main am:... 

Merge changes from topic "phone_state_permission_for_bluetooth" into main am: ba7dc459 am: 6bc0a06d

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/3160583



Change-Id: I7dd7e7231814e7bbc130b67b2f86fa6dade1271d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6e1b08e5 6bc0a06d

android/app/Android.bp

+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

android/app/aidl/Android.bp

+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",

android/app/aidl/android/bluetooth/IBluetooth.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);

android/app/aidl/android/bluetooth/IBluetoothAvrcpTarget.aidl

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);

}

android/app/aidl/android/bluetooth/IBluetoothBattery.aidl

deleted100644 → 0
+0 −42
Original line number Diff line number Diff line 
/*

 * Copyright 2022, 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;



import android.bluetooth.BluetoothDevice;

import android.content.AttributionSource;



/**

 * APIs for Bluetooth Battery service

 *

 * @hide

 */

interface IBluetoothBattery {

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)")

    boolean connect(in BluetoothDevice device, in AttributionSource attributionSource);

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)")

    boolean disconnect(in BluetoothDevice device, in AttributionSource attributionSource);

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)")

    List<BluetoothDevice> getConnectedDevices(in AttributionSource attributionSource);

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)")

    List<BluetoothDevice> getDevicesMatchingConnectionStates(in int[] states, in AttributionSource attributionSource);

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)")

    int getConnectionState(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);

}