Merge "Fix bug #8665924 Native arabic numerals in the bluetooth pairing ui" into jb-mr2-dev
diff --git a/src/com/android/settings/bluetooth/BluetoothPairingDialog.java b/src/com/android/settings/bluetooth/BluetoothPairingDialog.java
index 940d8d0..9b2a3e8 100755
--- a/src/com/android/settings/bluetooth/BluetoothPairingDialog.java
+++ b/src/com/android/settings/bluetooth/BluetoothPairingDialog.java
@@ -43,6 +43,8 @@
import com.android.settings.R;
import android.view.KeyEvent;
+import java.util.Locale;
+
/**
* 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.
@@ -120,7 +122,7 @@
Log.e(TAG, "Invalid Confirmation Passkey received, not showing any dialog");
return;
}
- mPairingKey = String.format("%06d", passkey);
+ mPairingKey = String.format(Locale.US, "%06d", passkey);
createConfirmationDialog(deviceManager);
break;