Revert "Initial support of 2.1 pairing."
This reverts commit 228b2f3a813e93413a0f9e2f29dfbfc54590a356.
diff --git a/core/java/android/bluetooth/BluetoothDevice.java b/core/java/android/bluetooth/BluetoothDevice.java
index a64c6d7..c942a27 100644
--- a/core/java/android/bluetooth/BluetoothDevice.java
+++ b/core/java/android/bluetooth/BluetoothDevice.java
@@ -74,14 +74,6 @@
/** An existing bond was explicitly revoked */
public static final int UNBOND_REASON_REMOVED = 6;
- /* The user will be prompted to enter a pin */
- public static final int PAIRING_VARIANT_PIN = 0;
- /* The user will be prompted to enter a passkey */
- public static final int PAIRING_VARIANT_PASSKEY = 1;
- /* The user will be prompted to confirm the passkey displayed on the screen */
- public static final int PAIRING_VARIANT_CONFIRMATION = 2;
-
-
private static final String TAG = "BluetoothDevice";
private final IBluetoothDevice mService;
@@ -366,24 +358,9 @@
} catch (RemoteException e) {Log.e(TAG, "", e);}
return false;
}
-
- public boolean setPasskey(String address, int passkey) {
+ public boolean cancelPin(String address) {
try {
- return mService.setPasskey(address, passkey);
- } catch (RemoteException e) {Log.e(TAG, "", e);}
- return false;
- }
-
- public boolean setPairingConfirmation(String address, boolean confirm) {
- try {
- return mService.setPairingConfirmation(address, confirm);
- } catch (RemoteException e) {Log.e(TAG, "", e);}
- return false;
- }
-
- public boolean cancelPairingUserInput(String address) {
- try {
- return mService.cancelPairingUserInput(address);
+ return mService.cancelPin(address);
} catch (RemoteException e) {Log.e(TAG, "", e);}
return false;
}
diff --git a/core/java/android/bluetooth/BluetoothIntent.java b/core/java/android/bluetooth/BluetoothIntent.java
index d6c79b4..344601b 100644
--- a/core/java/android/bluetooth/BluetoothIntent.java
+++ b/core/java/android/bluetooth/BluetoothIntent.java
@@ -57,10 +57,6 @@
"android.bluetooth.intent.BOND_PREVIOUS_STATE";
public static final String REASON =
"android.bluetooth.intent.REASON";
- public static final String PAIRING_VARIANT =
- "android.bluetooth.intent.PAIRING_VARIANT";
- public static final String PASSKEY =
- "android.bluetooth.intent.PASSKEY";
/** Broadcast when the local Bluetooth device state changes, for example
* when Bluetooth is enabled. Will contain int extra's BLUETOOTH_STATE and
diff --git a/core/java/android/bluetooth/IBluetoothDevice.aidl b/core/java/android/bluetooth/IBluetoothDevice.aidl
index a78752b..c249c81 100644
--- a/core/java/android/bluetooth/IBluetoothDevice.aidl
+++ b/core/java/android/bluetooth/IBluetoothDevice.aidl
@@ -54,8 +54,5 @@
int getRemoteServiceChannel(in String address, String uuid);
boolean setPin(in String address, in byte[] pin);
- boolean setPasskey(in String address, int passkey);
- boolean setPairingConfirmation(in String address, boolean confirm);
- boolean cancelPairingUserInput(in String address);
-
+ boolean cancelPin(in String address);
}