PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove calls to APIs no longer being supported

Browse Source 
Bug: 143245666
Test: Manual
Change-Id: Ibec2c9d60ec5c90e9e4f0a03b75c54164f50f42d
This commit is contained in:
Rahul Sabnis
2019-12-04 16:36:21 -08:00
parent ada1f6b10b
commit 9348f31126
2 changed files with 6 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/com/android/settings/bluetooth/BluetoothPairingController.java
View File

@@ -294,8 +294,7 @@ public class BluetoothPairingController implements OnCheckedChangeListener,
if (mType == BluetoothDevice.PAIRING_VARIANT_DISPLAY_PASSKEY) { if (mType == BluetoothDevice.PAIRING_VARIANT_DISPLAY_PASSKEY) {
mDevice.setPairingConfirmation(true); mDevice.setPairingConfirmation(true);
} else if (mType == BluetoothDevice.PAIRING_VARIANT_DISPLAY_PIN) { } else if (mType == BluetoothDevice.PAIRING_VARIANT_DISPLAY_PIN) {
byte[] pinBytes = BluetoothDevice.convertPinToBytes(mPasskeyFormatted); mDevice.setPin(mPasskeyFormatted);
mDevice.setPin(pinBytes);
} }
} }
@@ -391,17 +390,9 @@ public class BluetoothPairingController implements OnCheckedChangeListener,
switch (mType) { switch (mType) {
case BluetoothDevice.PAIRING_VARIANT_PIN: case BluetoothDevice.PAIRING_VARIANT_PIN:
case BluetoothDevice.PAIRING_VARIANT_PIN_16_DIGITS: case BluetoothDevice.PAIRING_VARIANT_PIN_16_DIGITS:
byte[] pinBytes = BluetoothDevice.convertPinToBytes(passkey); mDevice.setPin(passkey);
if (pinBytes == null) {
return;
}
mDevice.setPin(pinBytes);
break; break;
case BluetoothDevice.PAIRING_VARIANT_PASSKEY:
int pass = Integer.parseInt(passkey);
mDevice.setPasskey(pass);
break;
case BluetoothDevice.PAIRING_VARIANT_PASSKEY_CONFIRMATION: case BluetoothDevice.PAIRING_VARIANT_PASSKEY_CONFIRMATION:
case BluetoothDevice.PAIRING_VARIANT_CONSENT: case BluetoothDevice.PAIRING_VARIANT_CONSENT:
@@ -410,11 +401,9 @@ public class BluetoothPairingController implements OnCheckedChangeListener,
case BluetoothDevice.PAIRING_VARIANT_DISPLAY_PASSKEY: case BluetoothDevice.PAIRING_VARIANT_DISPLAY_PASSKEY:
case BluetoothDevice.PAIRING_VARIANT_DISPLAY_PIN: case BluetoothDevice.PAIRING_VARIANT_DISPLAY_PIN:
// Do nothing.
break;
case BluetoothDevice.PAIRING_VARIANT_OOB_CONSENT: case BluetoothDevice.PAIRING_VARIANT_OOB_CONSENT:
mDevice.setRemoteOutOfBandData(); case BluetoothDevice.PAIRING_VARIANT_PASSKEY:
// Do nothing.
break; break;
default: default:
@@ -428,7 +417,7 @@ public class BluetoothPairingController implements OnCheckedChangeListener,
*/ */
public void onCancel() { public void onCancel() {
Log.d(TAG, "Pairing dialog canceled"); Log.d(TAG, "Pairing dialog canceled");
mDevice.cancelPairingUserInput(); mDevice.cancelPairing();
} }
/** /**

2
src/com/android/settings/bluetooth/BluetoothPairingService.java
View File

@@ -85,7 +85,7 @@ public final class BluetoothPairingService extends Service {
} else if (action.equals(ACTION_DISMISS_PAIRING)) { } else if (action.equals(ACTION_DISMISS_PAIRING)) {
Log.d(TAG, "Notification cancel " + mDevice.getAddress() + " (" + Log.d(TAG, "Notification cancel " + mDevice.getAddress() + " (" +
mDevice.getName() + ")"); mDevice.getName() + ")");
mDevice.cancelPairingUserInput(); mDevice.cancelPairing();
} else { } else {
int bondState = intent.getIntExtra(BluetoothDevice.EXTRA_BOND_STATE, int bondState = intent.getIntExtra(BluetoothDevice.EXTRA_BOND_STATE,
BluetoothDevice.ERROR); BluetoothDevice.ERROR);