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

Merge "Fix bug #8665924 Native arabic numerals in the bluetooth pairing ui" into jb-mr2-dev

Browse Source
This commit is contained in:
Fabrice Di Meglio
2013-04-19 21:20:03 +00:00
committed by Android (Google) Code Review
parent 89845158de ae8d5bdc5b
commit 88083a3e04
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/bluetooth/BluetoothPairingDialog.java
View File

@@ -43,6 +43,8 @@ import com.android.internal.app.AlertController;
import com.android.settings.R; import com.android.settings.R;
import android.view.KeyEvent; import android.view.KeyEvent;
import java.util.Locale;
/** /**
* BluetoothPairingDialog asks the user to enter a PIN / Passkey / simple confirmation * BluetoothPairingDialog asks the user to enter a PIN / Passkey / simple confirmation
* for pairing with a remote Bluetooth device. It is an activity that appears as a dialog. * for pairing with a remote Bluetooth device. It is an activity that appears as a dialog.
@@ -120,7 +122,7 @@ public final class BluetoothPairingDialog extends AlertActivity implements
Log.e(TAG, "Invalid Confirmation Passkey received, not showing any dialog"); Log.e(TAG, "Invalid Confirmation Passkey received, not showing any dialog");
return; return;
} }
mPairingKey = String.format("%06d", passkey); mPairingKey = String.format(Locale.US, "%06d", passkey);
createConfirmationDialog(deviceManager); createConfirmationDialog(deviceManager);
break; break;