TEST: Use com.android.internal.annotations
* find . -name \*.java -exec sed -i "s/androidx\.annotation\.VisibleForTesting/com\.android\.internal\.annotations\.VisibleForTesting/g" {} \;
* find . -name \*.java -exec sed -i "s/androidx\.annotation\.GuardedBy/com\.android\.internal\.annotations\.GuardedBy/g" {} \;
* find . -name \*.java -exec sed -i "s/VisibleForTesting\ [(]/VisibleForTesting(/g" {} \;
* find . -name \*.java -exec sed -i "s/VisibleForTesting[(]otherwise/VisibleForTesting(visibility/g" {} \;
* find . -name \*.java -exec sed -i "s/VisibleForTesting\.PACKAGE_PRIVATE/VisibleForTesting\.Visibility\.PACKAGE/g" {} \;
* Optimize import order
Fixes: 63078245
Test: make, atest BluetoothInstrumentationTests
Change-Id: I144cc32c38510fa9bad005298f08b1649051fcb5
diff --git a/Android.mk b/Android.mk
index b66598e..23dd1f8 100644
--- a/Android.mk
+++ b/Android.mk
@@ -27,7 +27,7 @@
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)
diff --git a/src/com/android/bluetooth/a2dp/A2dpNativeInterface.java b/src/com/android/bluetooth/a2dp/A2dpNativeInterface.java
index 1fbd157..04d3b37 100644
--- a/src/com/android/bluetooth/a2dp/A2dpNativeInterface.java
+++ b/src/com/android/bluetooth/a2dp/A2dpNativeInterface.java
@@ -27,10 +27,9 @@
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.
diff --git a/src/com/android/bluetooth/a2dp/A2dpService.java b/src/com/android/bluetooth/a2dp/A2dpService.java
index c747d05..478c6d7 100644
--- a/src/com/android/bluetooth/a2dp/A2dpService.java
+++ b/src/com/android/bluetooth/a2dp/A2dpService.java
@@ -32,15 +32,14 @@
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 @@
* 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.
diff --git a/src/com/android/bluetooth/a2dp/A2dpStateMachine.java b/src/com/android/bluetooth/a2dp/A2dpStateMachine.java
index a6b31b0..4cc04e6 100644
--- a/src/com/android/bluetooth/a2dp/A2dpStateMachine.java
+++ b/src/com/android/bluetooth/a2dp/A2dpStateMachine.java
@@ -55,9 +55,8 @@
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;
diff --git a/src/com/android/bluetooth/avrcp/MediaPlayerWrapper.java b/src/com/android/bluetooth/avrcp/MediaPlayerWrapper.java
index 76e5ddd..883b6ef 100644
--- a/src/com/android/bluetooth/avrcp/MediaPlayerWrapper.java
+++ b/src/com/android/bluetooth/avrcp/MediaPlayerWrapper.java
@@ -25,8 +25,8 @@
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;
diff --git a/src/com/android/bluetooth/btservice/ActiveDeviceManager.java b/src/com/android/bluetooth/btservice/ActiveDeviceManager.java
index 8f5f580..69381c5 100644
--- a/src/com/android/bluetooth/btservice/ActiveDeviceManager.java
+++ b/src/com/android/bluetooth/btservice/ActiveDeviceManager.java
@@ -35,11 +35,10 @@
import android.os.Message;
import android.util.Log;
-import androidx.annotation.VisibleForTesting;
-
import com.android.bluetooth.a2dp.A2dpService;
import com.android.bluetooth.hearingaid.HearingAidService;
import com.android.bluetooth.hfp.HeadsetService;
+import com.android.internal.annotations.VisibleForTesting;
import java.util.LinkedList;
import java.util.List;
diff --git a/src/com/android/bluetooth/btservice/PhonePolicy.java b/src/com/android/bluetooth/btservice/PhonePolicy.java
index 0be83f5..e20bfa5 100644
--- a/src/com/android/bluetooth/btservice/PhonePolicy.java
+++ b/src/com/android/bluetooth/btservice/PhonePolicy.java
@@ -33,14 +33,13 @@
import android.os.Parcelable;
import android.util.Log;
-import androidx.annotation.VisibleForTesting;
-
import com.android.bluetooth.a2dp.A2dpService;
import com.android.bluetooth.hearingaid.HearingAidService;
import com.android.bluetooth.hfp.HeadsetService;
import com.android.bluetooth.hid.HidHostService;
import com.android.bluetooth.pan.PanService;
import com.android.internal.R;
+import com.android.internal.annotations.VisibleForTesting;
import java.util.HashSet;
import java.util.List;
diff --git a/src/com/android/bluetooth/btservice/RemoteDevices.java b/src/com/android/bluetooth/btservice/RemoteDevices.java
index b41fb71..f32c7cc 100644
--- a/src/com/android/bluetooth/btservice/RemoteDevices.java
+++ b/src/com/android/bluetooth/btservice/RemoteDevices.java
@@ -32,11 +32,10 @@
import android.os.ParcelUuid;
import android.util.Log;
-import androidx.annotation.VisibleForTesting;
-
import com.android.bluetooth.R;
import com.android.bluetooth.Utils;
import com.android.bluetooth.hfp.HeadsetHalConstants;
+import com.android.internal.annotations.VisibleForTesting;
import java.util.ArrayList;
import java.util.HashMap;
diff --git a/src/com/android/bluetooth/hdp/HealthService.java b/src/com/android/bluetooth/hdp/HealthService.java
index 66c13d0..6b44103 100644
--- a/src/com/android/bluetooth/hdp/HealthService.java
+++ b/src/com/android/bluetooth/hdp/HealthService.java
@@ -30,12 +30,11 @@
import android.os.RemoteException;
import android.util.Log;
-import androidx.annotation.VisibleForTesting;
-
import com.android.bluetooth.BluetoothMetricsProto;
import com.android.bluetooth.Utils;
import com.android.bluetooth.btservice.MetricsLogger;
import com.android.bluetooth.btservice.ProfileService;
+import com.android.internal.annotations.VisibleForTesting;
import java.io.FileDescriptor;
import java.io.IOException;
diff --git a/src/com/android/bluetooth/hearingaid/HearingAidNativeInterface.java b/src/com/android/bluetooth/hearingaid/HearingAidNativeInterface.java
index 64e277c..1b56e81 100644
--- a/src/com/android/bluetooth/hearingaid/HearingAidNativeInterface.java
+++ b/src/com/android/bluetooth/hearingaid/HearingAidNativeInterface.java
@@ -25,10 +25,9 @@
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;
/**
* HearingAid Native Interface to/from JNI.
@@ -70,7 +69,7 @@
*
* priorities to configure.
*/
- @VisibleForTesting (otherwise = VisibleForTesting.PACKAGE_PRIVATE)
+ @VisibleForTesting(visibility = VisibleForTesting.Visibility.PACKAGE)
public void init() {
initNative();
}
@@ -78,7 +77,7 @@
/**
* Cleanup the native interface.
*/
- @VisibleForTesting (otherwise = VisibleForTesting.PACKAGE_PRIVATE)
+ @VisibleForTesting(visibility = VisibleForTesting.Visibility.PACKAGE)
public void cleanup() {
cleanupNative();
}
@@ -89,7 +88,7 @@
* @param device the remote device
* @return true on success, otherwise false.
*/
- @VisibleForTesting (otherwise = VisibleForTesting.PACKAGE_PRIVATE)
+ @VisibleForTesting(visibility = VisibleForTesting.Visibility.PACKAGE)
public boolean connectHearingAid(BluetoothDevice device) {
return connectHearingAidNative(getByteAddress(device));
}
@@ -100,7 +99,7 @@
* @param device the remote device
* @return true on success, otherwise false.
*/
- @VisibleForTesting (otherwise = VisibleForTesting.PACKAGE_PRIVATE)
+ @VisibleForTesting(visibility = VisibleForTesting.Visibility.PACKAGE)
public boolean disconnectHearingAid(BluetoothDevice device) {
return disconnectHearingAidNative(getByteAddress(device));
}
@@ -109,7 +108,7 @@
* Sets the HearingAid volume
* @param volume
*/
- @VisibleForTesting (otherwise = VisibleForTesting.PACKAGE_PRIVATE)
+ @VisibleForTesting(visibility = VisibleForTesting.Visibility.PACKAGE)
public void setVolume(int volume) {
setVolumeNative(volume);
}
diff --git a/src/com/android/bluetooth/hearingaid/HearingAidService.java b/src/com/android/bluetooth/hearingaid/HearingAidService.java
index e90935e..738da08 100644
--- a/src/com/android/bluetooth/hearingaid/HearingAidService.java
+++ b/src/com/android/bluetooth/hearingaid/HearingAidService.java
@@ -31,13 +31,12 @@
import android.provider.Settings;
import android.util.Log;
-import androidx.annotation.VisibleForTesting;
-
import com.android.bluetooth.BluetoothMetricsProto;
import com.android.bluetooth.Utils;
import com.android.bluetooth.btservice.AdapterService;
import com.android.bluetooth.btservice.MetricsLogger;
import com.android.bluetooth.btservice.ProfileService;
+import com.android.internal.annotations.VisibleForTesting;
import java.util.ArrayList;
import java.util.HashMap;
@@ -327,7 +326,7 @@
* @param device the peer device to connect to
* @return true if connection is allowed, otherwise false
*/
- @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)
+ @VisibleForTesting(visibility = VisibleForTesting.Visibility.PACKAGE)
public boolean okToConnect(BluetoothDevice device) {
// Check if this is an incoming connection in Quiet mode.
if (mAdapterService.isQuietModeEnabled()) {
diff --git a/src/com/android/bluetooth/hearingaid/HearingAidStateMachine.java b/src/com/android/bluetooth/hearingaid/HearingAidStateMachine.java
index ecca5e3..06a8aee 100644
--- a/src/com/android/bluetooth/hearingaid/HearingAidStateMachine.java
+++ b/src/com/android/bluetooth/hearingaid/HearingAidStateMachine.java
@@ -53,9 +53,8 @@
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;
diff --git a/src/com/android/bluetooth/hfp/HeadsetNativeInterface.java b/src/com/android/bluetooth/hfp/HeadsetNativeInterface.java
index 19a1964..61c1163 100644
--- a/src/com/android/bluetooth/hfp/HeadsetNativeInterface.java
+++ b/src/com/android/bluetooth/hfp/HeadsetNativeInterface.java
@@ -20,9 +20,8 @@
import android.bluetooth.BluetoothDevice;
import android.util.Log;
-import androidx.annotation.VisibleForTesting;
-
import com.android.bluetooth.Utils;
+import com.android.internal.annotations.VisibleForTesting;
/**
* Defines native calls that are used by state machine/service to either send or receive
diff --git a/src/com/android/bluetooth/hfp/HeadsetPhoneState.java b/src/com/android/bluetooth/hfp/HeadsetPhoneState.java
index 7e50a73..a1fb2fd 100644
--- a/src/com/android/bluetooth/hfp/HeadsetPhoneState.java
+++ b/src/com/android/bluetooth/hfp/HeadsetPhoneState.java
@@ -30,8 +30,7 @@
import android.telephony.TelephonyManager;
import android.util.Log;
-import androidx.annotation.VisibleForTesting;
-
+import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.telephony.IccCardConstants;
import com.android.internal.telephony.TelephonyIntents;
@@ -193,7 +192,7 @@
return mNumActive;
}
- @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)
+ @VisibleForTesting(visibility = VisibleForTesting.Visibility.PACKAGE)
public void setNumActiveCall(int numActive) {
mNumActive = numActive;
}
@@ -202,7 +201,7 @@
return mCallState;
}
- @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)
+ @VisibleForTesting(visibility = VisibleForTesting.Visibility.PACKAGE)
public void setCallState(int callState) {
mCallState = callState;
}
@@ -211,7 +210,7 @@
return mNumHeld;
}
- @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)
+ @VisibleForTesting(visibility = VisibleForTesting.Visibility.PACKAGE)
public void setNumHeldCall(int numHeldCall) {
mNumHeld = numHeldCall;
}
@@ -229,7 +228,7 @@
*
* @param batteryLevel battery level value
*/
- @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)
+ @VisibleForTesting(visibility = VisibleForTesting.Visibility.PACKAGE)
public void setCindBatteryCharge(int batteryLevel) {
if (mCindBatteryCharge != batteryLevel) {
mCindBatteryCharge = batteryLevel;
diff --git a/src/com/android/bluetooth/hfp/HeadsetStateMachine.java b/src/com/android/bluetooth/hfp/HeadsetStateMachine.java
index a442200..2ac2429 100644
--- a/src/com/android/bluetooth/hfp/HeadsetStateMachine.java
+++ b/src/com/android/bluetooth/hfp/HeadsetStateMachine.java
@@ -30,10 +30,9 @@
import android.telephony.PhoneStateListener;
import android.util.Log;
-import androidx.annotation.VisibleForTesting;
-
import com.android.bluetooth.btservice.AdapterService;
import com.android.bluetooth.btservice.ProfileService;
+import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.util.State;
import com.android.internal.util.StateMachine;
diff --git a/src/com/android/bluetooth/hfpclient/HeadsetClientStateMachine.java b/src/com/android/bluetooth/hfpclient/HeadsetClientStateMachine.java
index bc1b188..de23b46 100644
--- a/src/com/android/bluetooth/hfpclient/HeadsetClientStateMachine.java
+++ b/src/com/android/bluetooth/hfpclient/HeadsetClientStateMachine.java
@@ -51,14 +51,13 @@
import android.util.Log;
import android.util.Pair;
-import androidx.annotation.VisibleForTesting;
-
import com.android.bluetooth.BluetoothMetricsProto;
import com.android.bluetooth.R;
import com.android.bluetooth.Utils;
import com.android.bluetooth.btservice.AdapterService;
import com.android.bluetooth.btservice.MetricsLogger;
import com.android.bluetooth.btservice.ProfileService;
+import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.util.IState;
import com.android.internal.util.State;
import com.android.internal.util.StateMachine;
diff --git a/src/com/android/bluetooth/hid/HidDeviceNativeInterface.java b/src/com/android/bluetooth/hid/HidDeviceNativeInterface.java
index 8310db9..db72a59 100644
--- a/src/com/android/bluetooth/hid/HidDeviceNativeInterface.java
+++ b/src/com/android/bluetooth/hid/HidDeviceNativeInterface.java
@@ -26,10 +26,9 @@
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;
/**
* HID Device Native Interface to/from JNI.
diff --git a/src/com/android/bluetooth/map/BluetoothMapService.java b/src/com/android/bluetooth/map/BluetoothMapService.java
index f4d3514..d50005d 100644
--- a/src/com/android/bluetooth/map/BluetoothMapService.java
+++ b/src/com/android/bluetooth/map/BluetoothMapService.java
@@ -41,13 +41,12 @@
import android.util.Log;
import android.util.SparseArray;
-import androidx.annotation.VisibleForTesting;
-
import com.android.bluetooth.BluetoothMetricsProto;
import com.android.bluetooth.R;
import com.android.bluetooth.Utils;
import com.android.bluetooth.btservice.MetricsLogger;
import com.android.bluetooth.btservice.ProfileService;
+import com.android.internal.annotations.VisibleForTesting;
import java.io.IOException;
import java.util.ArrayList;
diff --git a/src/com/android/bluetooth/mapclient/MapClientService.java b/src/com/android/bluetooth/mapclient/MapClientService.java
index 97df8f1..d97f744 100644
--- a/src/com/android/bluetooth/mapclient/MapClientService.java
+++ b/src/com/android/bluetooth/mapclient/MapClientService.java
@@ -33,10 +33,9 @@
import android.provider.Settings;
import android.util.Log;
-import androidx.annotation.VisibleForTesting;
-
import com.android.bluetooth.Utils;
import com.android.bluetooth.btservice.ProfileService;
+import com.android.internal.annotations.VisibleForTesting;
import java.util.ArrayList;
import java.util.Arrays;
diff --git a/src/com/android/bluetooth/mapclient/MapUtils.java b/src/com/android/bluetooth/mapclient/MapUtils.java
index 9eec042..b0a603b 100644
--- a/src/com/android/bluetooth/mapclient/MapUtils.java
+++ b/src/com/android/bluetooth/mapclient/MapUtils.java
@@ -15,7 +15,7 @@
*/
package com.android.bluetooth.mapclient;
-import androidx.annotation.VisibleForTesting;
+import com.android.internal.annotations.VisibleForTesting;
class MapUtils {
private static MnsService sMnsService = null;
diff --git a/src/com/android/bluetooth/opp/BluetoothOppService.java b/src/com/android/bluetooth/opp/BluetoothOppService.java
index 2f82bce..545f1ec 100644
--- a/src/com/android/bluetooth/opp/BluetoothOppService.java
+++ b/src/com/android/bluetooth/opp/BluetoothOppService.java
@@ -54,13 +54,12 @@
import android.os.Process;
import android.util.Log;
-import androidx.annotation.VisibleForTesting;
-
import com.android.bluetooth.BluetoothObexTransport;
import com.android.bluetooth.IObexConnectionHandler;
import com.android.bluetooth.ObexServerSockets;
import com.android.bluetooth.btservice.ProfileService;
import com.android.bluetooth.sdp.SdpManager;
+import com.android.internal.annotations.VisibleForTesting;
import com.google.android.collect.Lists;
diff --git a/src/com/android/bluetooth/pbap/BluetoothPbapService.java b/src/com/android/bluetooth/pbap/BluetoothPbapService.java
index 2fba563..e7dba2a 100644
--- a/src/com/android/bluetooth/pbap/BluetoothPbapService.java
+++ b/src/com/android/bluetooth/pbap/BluetoothPbapService.java
@@ -53,8 +53,6 @@
import android.text.TextUtils;
import android.util.Log;
-import androidx.annotation.VisibleForTesting;
-
import com.android.bluetooth.IObexConnectionHandler;
import com.android.bluetooth.ObexServerSockets;
import com.android.bluetooth.R;
@@ -62,6 +60,7 @@
import com.android.bluetooth.btservice.ProfileService;
import com.android.bluetooth.sdp.SdpManager;
import com.android.bluetooth.util.DevicePolicyUtils;
+import com.android.internal.annotations.VisibleForTesting;
import java.util.ArrayList;
import java.util.HashMap;
@@ -684,7 +683,7 @@
* Send the result to the state machine.
* @param stateMachine PbapStateMachine which sends the request
*/
- @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)
+ @VisibleForTesting(visibility = VisibleForTesting.Visibility.PACKAGE)
public void checkOrGetPhonebookPermission(PbapStateMachine stateMachine) {
BluetoothDevice device = stateMachine.getRemoteDevice();
int permission = device.getPhonebookAccessPermission();
diff --git a/src/com/android/bluetooth/sap/SapService.java b/src/com/android/bluetooth/sap/SapService.java
index 6e24c5d..4b95d3f 100644
--- a/src/com/android/bluetooth/sap/SapService.java
+++ b/src/com/android/bluetooth/sap/SapService.java
@@ -24,14 +24,13 @@
import android.text.TextUtils;
import android.util.Log;
-import androidx.annotation.VisibleForTesting;
-
import com.android.bluetooth.BluetoothMetricsProto;
import com.android.bluetooth.R;
import com.android.bluetooth.Utils;
import com.android.bluetooth.btservice.MetricsLogger;
import com.android.bluetooth.btservice.ProfileService;
import com.android.bluetooth.sdp.SdpManager;
+import com.android.internal.annotations.VisibleForTesting;
import java.io.IOException;
import java.util.ArrayList;
