[bluetooth] Deprecate Android 6.0 Marshmallow support

Bug: 1363002
Change-Id: Ic88b0cb9bd3eca98a8d53f986ffc1708389a23d6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3890963
Reviewed-by: Fr <beaufort.francois@gmail.com>
Commit-Queue: Fr <beaufort.francois@gmail.com>
Reviewed-by: Reilly Grant <reillyg@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1048969}

device/bluetooth/android/java/src/org/chromium/device/bluetooth/ChromeBluetoothAdapter.java

@@ -17,8 +17,6 @@ import android.os.Build;
 import android.os.ParcelUuid;
 import android.util.SparseArray;
 
-import androidx.annotation.RequiresApi;
-
 import org.chromium.base.Log;
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.JNIAdditionalImport;
@@ -38,7 +36,6 @@ import java.util.Map;
  */
 @JNINamespace("device")
 @JNIAdditionalImport(Wrappers.class)
-@RequiresApi(Build.VERSION_CODES.M)
 final class ChromeBluetoothAdapter extends BroadcastReceiver {
     private static final String TAG = "Bluetooth";
 

device/bluetooth/android/java/src/org/chromium/device/bluetooth/ChromeBluetoothDevice.java

@@ -5,9 +5,6 @@
 package org.chromium.device.bluetooth;
 
 import android.bluetooth.BluetoothDevice;
-import android.os.Build;
-
-import androidx.annotation.RequiresApi;
 
 import org.chromium.base.ContextUtils;
 import org.chromium.base.Log;
@@ -26,7 +23,6 @@ import java.util.HashMap;
  */
 @JNINamespace("device")
 @JNIAdditionalImport(Wrappers.class)
-@RequiresApi(Build.VERSION_CODES.M)
 final class ChromeBluetoothDevice {
     private static final String TAG = "Bluetooth";
 

device/bluetooth/android/java/src/org/chromium/device/bluetooth/ChromeBluetoothRemoteGattCharacteristic.java

@@ -4,10 +4,6 @@
 
 package org.chromium.device.bluetooth;
 
-import android.os.Build;
-
-import androidx.annotation.RequiresApi;
-
 import org.chromium.base.Log;
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.JNIAdditionalImport;
@@ -25,7 +21,6 @@ import java.util.List;
  */
 @JNINamespace("device")
 @JNIAdditionalImport(Wrappers.class)
-@RequiresApi(Build.VERSION_CODES.M)
 final class ChromeBluetoothRemoteGattCharacteristic {
     private static final String TAG = "Bluetooth";
 

device/bluetooth/android/java/src/org/chromium/device/bluetooth/ChromeBluetoothScanFilterBuilder.java

@@ -5,11 +5,8 @@
 package org.chromium.device.bluetooth;
 
 import android.bluetooth.le.ScanFilter;
-import android.os.Build;
 import android.os.ParcelUuid;
 
-import androidx.annotation.RequiresApi;
-
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.JNIAdditionalImport;
 import org.chromium.base.annotations.JNINamespace;
@@ -21,7 +18,6 @@ import org.chromium.base.annotations.JNINamespace;
  */
 @JNINamespace("device")
 @JNIAdditionalImport(Wrappers.class)
-@RequiresApi(Build.VERSION_CODES.M)
 final class ChromeBluetoothScanFilterBuilder {
     private ScanFilter.Builder mBuilder;
 

device/bluetooth/android/java/src/org/chromium/device/bluetooth/ChromeBluetoothScanFilterList.java

@@ -5,9 +5,6 @@
 package org.chromium.device.bluetooth;
 
 import android.bluetooth.le.ScanFilter;
-import android.os.Build;
-
-import androidx.annotation.RequiresApi;
 
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.JNIAdditionalImport;
@@ -20,7 +17,6 @@ import java.util.ArrayList;
  */
 @JNINamespace("device")
 @JNIAdditionalImport(Wrappers.class)
-@RequiresApi(Build.VERSION_CODES.M)
 final class ChromeBluetoothScanFilterList {
     ArrayList<ScanFilter> mFilters;
 

device/bluetooth/android/java/src/org/chromium/device/bluetooth/Wrappers.java

@@ -24,8 +24,6 @@ import android.os.Build;
 import android.os.ParcelUuid;
 import android.util.SparseArray;
 
-import androidx.annotation.RequiresApi;
-
 import org.chromium.base.ContextUtils;
 import org.chromium.base.Log;
 import org.chromium.base.ThreadUtils;
@@ -47,7 +45,6 @@ import java.util.UUID;
  * pass through to the Android object and instead provide fake implementations.
  */
 @JNINamespace("device")
-@RequiresApi(Build.VERSION_CODES.M)
 class Wrappers {
     private static final String TAG = "Bluetooth";
 
@@ -137,9 +134,8 @@ class Wrappers {
 
             // Only Low Energy currently supported, see BluetoothAdapterAndroid class note.
             final boolean hasLowEnergyFeature =
-                    Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2
+                    ContextUtils.getApplicationContext().getPackageManager().hasSystemFeature(
-                    && ContextUtils.getApplicationContext().getPackageManager().hasSystemFeature(
+                            PackageManager.FEATURE_BLUETOOTH_LE);
-                               PackageManager.FEATURE_BLUETOOTH_LE);
             if (!hasLowEnergyFeature) {
                 Log.i(TAG, "BluetoothAdapterWrapper.create failed: No Low Energy support.");
                 return null;

device/bluetooth/test/android/java/src/org/chromium/device/bluetooth/ChromeBluetoothScanFilter.java

@@ -5,9 +5,6 @@
 package org.chromium.device.bluetooth;
 
 import android.bluetooth.le.ScanFilter;
-import android.os.Build;
-
-import androidx.annotation.RequiresApi;
 
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.JNIAdditionalImport;
@@ -21,7 +18,6 @@ import java.util.List;
  */
 @JNINamespace("device")
 @JNIAdditionalImport(Wrappers.class)
-@RequiresApi(Build.VERSION_CODES.M)
 final class ChromeBluetoothScanFilter {
     private ScanFilter mScanFilter;
 

device/bluetooth/test/android/java/src/org/chromium/device/bluetooth/Fakes.java

@@ -13,13 +13,10 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.pm.PackageManager;
-import android.os.Build;
 import android.os.ParcelUuid;
 import android.test.mock.MockContext;
 import android.util.SparseArray;
 
-import androidx.annotation.RequiresApi;
-
 import org.chromium.base.Log;
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.JNINamespace;
@@ -42,7 +39,6 @@ import java.util.UUID;
  * each of these classes.
  */
 @JNINamespace("device")
-@RequiresApi(Build.VERSION_CODES.M)
 class Fakes {
     private static final String TAG = "Bluetooth";