Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(54)

Unified Diff: device/bluetooth/android/java/src/org/chromium/device/bluetooth/Wrappers.java

Issue 2706763002: bluetooth: Increase min api for Android (Closed)
Patch Set: Increase min API for other classes Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: device/bluetooth/android/java/src/org/chromium/device/bluetooth/Wrappers.java
diff --git a/device/bluetooth/android/java/src/org/chromium/device/bluetooth/Wrappers.java b/device/bluetooth/android/java/src/org/chromium/device/bluetooth/Wrappers.java
index 4b3b3a828f57c95dd921b78db40d4687caf2363c..e389baa8f16ea8d8da3fcae8e33d7acdbd7c60cc 100644
--- a/device/bluetooth/android/java/src/org/chromium/device/bluetooth/Wrappers.java
+++ b/device/bluetooth/android/java/src/org/chromium/device/bluetooth/Wrappers.java
@@ -42,7 +42,7 @@ import java.util.UUID;
* pass through to the Android object and instead provide fake implementations.
*/
@JNINamespace("device")
-@TargetApi(Build.VERSION_CODES.LOLLIPOP)
+@TargetApi(Build.VERSION_CODES.M)
class Wrappers {
private static final String TAG = "Bluetooth";
@@ -110,7 +110,7 @@ class Wrappers {
*/
@CalledByNative("BluetoothAdapterWrapper")
public static BluetoothAdapterWrapper createWithDefaultAdapter(Context context) {
- final boolean hasMinAPI = Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP;
+ final boolean hasMinAPI = Build.VERSION.SDK_INT >= Build.VERSION_CODES.M;
if (!hasMinAPI) {
Log.i(TAG, "BluetoothAdapterWrapper.create failed: SDK version (%d) too low.",
Build.VERSION.SDK_INT);
@@ -315,11 +315,11 @@ class Wrappers {
new HashMap<BluetoothGattDescriptor, BluetoothGattDescriptorWrapper>();
}
- public BluetoothGattWrapper connectGatt(
- Context context, boolean autoConnect, BluetoothGattCallbackWrapper callback) {
+ public BluetoothGattWrapper connectGatt(Context context, boolean autoConnect,
+ BluetoothGattCallbackWrapper callback, int transport) {
return new BluetoothGattWrapper(
mDevice.connectGatt(context, autoConnect,
- new ForwardBluetoothGattCallbackToWrapper(callback, this)),
+ new ForwardBluetoothGattCallbackToWrapper(callback, this), transport),
this);
}

Powered by Google App Engine
This is Rietveld 408576698