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

Commit dba8cd83 authored by Jack He's avatar Jack He
Browse files

resolve merge conflicts of 5d1ed69c to master 

Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I0d0ce0d663adba45d6697b493bca52d5dd6db483
parents 582ea6e9 5d1ed69c

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 := androidx.legacy_legacy-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 −2
Original line number Diff line number Diff line
@@ -27,10 +27,9 @@ import android.bluetooth.BluetoothCodecStatus; 
import android.bluetooth.BluetoothDevice;

import android.util.Log;



import androidx.annotation.VisibleForTesting;



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 −4
Original line number Diff line number Diff line
@@ -32,15 +32,14 @@ import android.os.HandlerThread; 
import android.provider.Settings;

import android.util.Log;



import androidx.annotation.GuardedBy;

import androidx.annotation.VisibleForTesting;



import com.android.bluetooth.BluetoothMetricsProto;

import com.android.bluetooth.Utils;

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;
@@ -340,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 −2
Original line number Diff line number Diff line
@@ -55,9 +55,8 @@ import android.os.Looper; 
import android.os.Message;

import android.util.Log;



import androidx.annotation.VisibleForTesting;



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

+2 −2
Original line number Diff line number Diff line
@@ -25,8 +25,8 @@ import android.os.Looper; 
import android.os.Message;

import android.util.Log;



import androidx.annotation.GuardedBy;

import androidx.annotation.VisibleForTesting;

import com.android.internal.annotations.GuardedBy;

import com.android.internal.annotations.VisibleForTesting;



import java.util.List;

import java.util.Objects;