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

Commit 9c1861f5 authored by William Escande's avatar William Escande Committed by Automerger Merge Worker
Browse files

Merge "Remove hide in the app" into main am: 1a2827c7 am: b116ae01 

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



Change-Id: I4b1aeb5df1be83b0e17261b644f83b3176888d96
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 948ecf84 b116ae01

android/app/src/com/android/bluetooth/DeviceWorkArounds.java

+0 −6
Original line number Diff line number Diff line
@@ -16,9 +16,6 @@ 


package com.android.bluetooth;



/**

 * @hide

 */

public final class DeviceWorkArounds {

    public static final String PCM_CARKIT = "9C:DF:03";

    public static final String FORD_SYNC_CARKIT = "00:1E:AE";
@@ -27,9 +24,6 @@ public final class DeviceWorkArounds { 
    public static final String BREZZA_ZDI_CARKIT = "28:a1:83";

    public static final String MERCEDES_BENZ_CARKIT = "00:26:e8";



    /**

     * @hide

     */

    public static boolean addressStartsWith(String bdAddr, String carkitAddr) {

        return bdAddr.toLowerCase().startsWith(carkitAddr.toLowerCase());

    }

android/app/src/com/android/bluetooth/Utils.java

+0 −3
Original line number Diff line number Diff line
@@ -85,9 +85,6 @@ import java.util.Objects; 
import java.util.UUID;

import java.util.concurrent.TimeUnit;



/**

 * @hide

 */

public final class Utils {

    private static final String TAG = "BluetoothUtils";

    private static final int MICROS_PER_UNIT = 625;

android/app/src/com/android/bluetooth/a2dp/A2dpService.java

+0 −5
Original line number Diff line number Diff line
@@ -684,7 +684,6 @@ public class A2dpService extends ProfileService { 
     *

     * @param device Bluetooth device

     * @return connection policy of the device

     * @hide

     */

    public int getConnectionPolicy(BluetoothDevice device) {

        return mDatabaseManager
@@ -723,7 +722,6 @@ public class A2dpService extends ProfileService { 
     * @param device the remote Bluetooth device. If null, use the current

     * active A2DP Bluetooth device.

     * @return the current codec status

     * @hide

     */

    public BluetoothCodecStatus getCodecStatus(BluetoothDevice device) {

        if (DBG) {
@@ -750,7 +748,6 @@ public class A2dpService extends ProfileService { 
     * @param device the remote Bluetooth device. If null, use the currect

     * active A2DP Bluetooth device.

     * @param codecConfig the codec configuration preference

     * @hide

     */

    public void setCodecConfigPreference(BluetoothDevice device,

                                         BluetoothCodecConfig codecConfig) {
@@ -782,7 +779,6 @@ public class A2dpService extends ProfileService { 
     *

     * @param device the remote Bluetooth device. If null, use the currect

     * active A2DP Bluetooth device.

     * @hide

     */

    public void enableOptionalCodecs(BluetoothDevice device) {

        if (DBG) {
@@ -813,7 +809,6 @@ public class A2dpService extends ProfileService { 
     *

     * @param device the remote Bluetooth device. If null, use the currect

     * active A2DP Bluetooth device.

     * @hide

     */

    public void disableOptionalCodecs(BluetoothDevice device) {

        if (DBG) {

android/app/src/com/android/bluetooth/audio_util/BrowsablePlayerConnector.java

+0 −3
Original line number Diff line number Diff line
@@ -60,9 +60,6 @@ public class BrowsablePlayerConnector extends Handler { 
        void run(List<BrowsedPlayerWrapper> result);

    }



    /**

     * @hide

     */

    @VisibleForTesting

    static void setInstanceForTesting(BrowsablePlayerConnector connector) {

        Utils.enforceInstrumentationTestMode();

android/app/src/com/android/bluetooth/avrcp/AvrcpTargetService.java

+1 −4
Original line number Diff line number Diff line
@@ -53,10 +53,7 @@ import com.android.internal.annotations.VisibleForTesting; 
import java.util.List;

import java.util.Objects;



/**

 * Provides Bluetooth AVRCP Target profile as a service in the Bluetooth application.

 * @hide

 */

/** Provides Bluetooth AVRCP Target profile as a service in the Bluetooth application. */

public class AvrcpTargetService extends ProfileService {

    private static final String TAG = "AvrcpTargetService";

    private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);