From 34536183f4d7062ec2c8e80013bdc71e445ded6f Mon Sep 17 00:00:00 2001 From: Jaikumar Ganesh Date: Mon, 23 Aug 2010 18:32:03 -0700 Subject: [PATCH] Add BNEP_SVC UUID for incoming tethering connections. Change-Id: I90c24edfd133ac9fa89c3467383cd61fa23954c6 --- core/java/android/bluetooth/BluetoothUuid.java | 10 ++++++++-- core/java/android/server/BluetoothEventLoop.java | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/core/java/android/bluetooth/BluetoothUuid.java b/core/java/android/bluetooth/BluetoothUuid.java index fb3dfe43181e7..3fbfc70bdb148 100644 --- a/core/java/android/bluetooth/BluetoothUuid.java +++ b/core/java/android/bluetooth/BluetoothUuid.java @@ -55,6 +55,8 @@ public final class BluetoothUuid { ParcelUuid.fromString("00001115-0000-1000-8000-00805F9B34FB"); public static final ParcelUuid NAP = ParcelUuid.fromString("00001116-0000-1000-8000-00805F9B34FB"); + public static final ParcelUuid BNEP = + ParcelUuid.fromString("0000000f-0000-1000-8000-00805F9B34FB"); public static final ParcelUuid[] RESERVED_UUIDS = { AudioSink, AudioSource, AdvAudioDist, HSP, Handsfree, AvrcpController, AvrcpTarget, @@ -92,13 +94,17 @@ public final class BluetoothUuid { return uuid.equals(Hid); } - public static boolean isPANU(ParcelUuid uuid) { + public static boolean isPanu(ParcelUuid uuid) { return uuid.equals(PANU); } - public static boolean isNAP(ParcelUuid uuid) { + public static boolean isNap(ParcelUuid uuid) { return uuid.equals(NAP); } + + public static boolean isBnep(ParcelUuid uuid) { + return uuid.equals(BNEP); + } /** * Returns true if ParcelUuid is present in uuidArray * diff --git a/core/java/android/server/BluetoothEventLoop.java b/core/java/android/server/BluetoothEventLoop.java index 9948060510581..3861ef549924c 100644 --- a/core/java/android/server/BluetoothEventLoop.java +++ b/core/java/android/server/BluetoothEventLoop.java @@ -644,7 +644,7 @@ class BluetoothEventLoop { } else { Log.i(TAG, "Rejecting incoming HID connection from " + address); } - } else if (BluetoothUuid.isNAP(uuid)){ + } else if (BluetoothUuid.isBnep(uuid) || BluetoothUuid.isNap(uuid)){ authorized = true; } else { Log.i(TAG, "Rejecting incoming " + deviceUuid + " connection from " + address);