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

Commit c9032d7b authored by Aurimas Liutikas's avatar Aurimas Liutikas Committed by Jack He
Browse files

Move Bluetooth to androidx. 

Bug: 76692459
Test: make -j Bluetooth
Change-Id: Ieefae6fa080b345f69215a3a983d08e522ed4bcd
Merged-In: Ieefae6fa080b345f69215a3a983d08e522ed4bcd
(cherry picked from commit 5aa8bedd)
parent c2939130

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.legacy_legacy-support-v4

LOCAL_REQUIRED_MODULES := libbluetooth

LOCAL_PROGUARD_ENABLED := disabled

include $(BUILD_PACKAGE)

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

+2 −1
Original line number Diff line number Diff line
@@ -25,9 +25,10 @@ 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 androidx.annotation.VisibleForTesting;



import com.android.bluetooth.Utils;

import com.android.internal.annotations.GuardedBy;

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

+3 −2
Original line number Diff line number Diff line
@@ -30,10 +30,11 @@ 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 androidx.annotation.GuardedBy;

import androidx.annotation.VisibleForTesting;



import com.android.bluetooth.BluetoothMetricsProto;

import com.android.bluetooth.Utils;

import com.android.bluetooth.avrcp.AvrcpTargetService;

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

+2 −1
Original line number Diff line number Diff line
@@ -53,9 +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 androidx.annotation.VisibleForTesting;



import com.android.bluetooth.btservice.ProfileService;

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 androidx.annotation.GuardedBy;

import androidx.annotation.VisibleForTesting;



import java.util.List;

import java.util.Objects;