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

Commit 68f6714e authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes from topic "bt-androidx" 

* changes:
  TEST: Use com.android.internal.annotations
  Move Bluetooth to androidx.
parents c2939130 124e9ab8

android/app/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ 
        libprotobuf-java-lite \

        bluetooth-protos-lite



LOCAL_STATIC_ANDROID_LIBRARIES := android-support-v4

LOCAL_STATIC_ANDROID_LIBRARIES := androidx.core_core

LOCAL_REQUIRED_MODULES := libbluetooth

LOCAL_PROGUARD_ENABLED := disabled

include $(BUILD_PACKAGE)

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

+1 −1
Original line number Diff line number Diff line
@@ -25,11 +25,11 @@ import android.bluetooth.BluetoothAdapter; 
import android.bluetooth.BluetoothCodecConfig;

import android.bluetooth.BluetoothCodecStatus;

import android.bluetooth.BluetoothDevice;

import android.support.annotation.VisibleForTesting;

import android.util.Log;



import com.android.bluetooth.Utils;

import com.android.internal.annotations.GuardedBy;

import com.android.internal.annotations.VisibleForTesting;



/**

 * A2DP Native Interface to/from JNI.

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

+3 −3
Original line number Diff line number Diff line
@@ -30,8 +30,6 @@ import android.content.IntentFilter; 
import android.media.AudioManager;

import android.os.HandlerThread;

import android.provider.Settings;

import android.support.annotation.GuardedBy;

import android.support.annotation.VisibleForTesting;

import android.util.Log;



import com.android.bluetooth.BluetoothMetricsProto;
@@ -40,6 +38,8 @@ import com.android.bluetooth.avrcp.AvrcpTargetService; 
import com.android.bluetooth.btservice.AdapterService;

import com.android.bluetooth.btservice.MetricsLogger;

import com.android.bluetooth.btservice.ProfileService;

import com.android.internal.annotations.GuardedBy;

import com.android.internal.annotations.VisibleForTesting;



import java.util.ArrayList;

import java.util.List;
@@ -339,7 +339,7 @@ public class A2dpService extends ProfileService { 
     * request, otherwise is for incoming connection request

     * @return true if connection is allowed, otherwise false

     */

    @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)

    @VisibleForTesting(visibility = VisibleForTesting.Visibility.PACKAGE)

    public boolean okToConnect(BluetoothDevice device, boolean isOutgoingRequest) {

        Log.i(TAG, "okToConnect: device " + device + " isOutgoingRequest: " + isOutgoingRequest);

        // Check if this is an incoming connection in Quiet mode.

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

+1 −1
Original line number Diff line number Diff line
@@ -53,10 +53,10 @@ import android.bluetooth.BluetoothProfile; 
import android.content.Intent;

import android.os.Looper;

import android.os.Message;

import android.support.annotation.VisibleForTesting;

import android.util.Log;



import com.android.bluetooth.btservice.ProfileService;

import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.util.State;

import com.android.internal.util.StateMachine;

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

+3 −2
Original line number Diff line number Diff line
@@ -23,10 +23,11 @@ import android.media.session.PlaybackState; 
import android.os.Handler;

import android.os.Looper;

import android.os.Message;

import android.support.annotation.GuardedBy;

import android.support.annotation.VisibleForTesting;

import android.util.Log;



import com.android.internal.annotations.GuardedBy;

import com.android.internal.annotations.VisibleForTesting;



import java.util.List;

import java.util.Objects;