drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change 25780 into eclair

Browse Source 
* changes:
  Reject lowercase characters in checkBluetoothAddress().
This commit is contained in:
Android (Google) Code Review
2009-09-18 16:51:36 -04:00
parent 2c22a51072 55e66f1b73
commit d7638e6de2
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/bluetooth/BluetoothAdapter.java
View File

@ -573,6 +573,7 @@ public final class BluetoothAdapter {
/** /**
* Validate a Bluetooth address, such as "00:43:A8:23:10:F0" * Validate a Bluetooth address, such as "00:43:A8:23:10:F0"
* <p>Alphabetic characters must be uppercase to be valid.
* *
* @param address Bluetooth address as string * @param address Bluetooth address as string
* @return true if the address is valid, false otherwise * @return true if the address is valid, false otherwise
@ -586,8 +587,9 @@ public final class BluetoothAdapter {
switch (i % 3) { switch (i % 3) {
case 0: case 0:
case 1: case 1:
if (Character.digit(c, 16) != -1) { if ((c >= '0' && c <= '9') || (c >= 'A' && c <= 'F')) {
break; // hex character, OK // hex character, OK
break;
} }
return false; return false;
case 2: case 2: