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

* commit '88083a3e04efcba725c721b0bcc60faa6b673bee':
  Fix bug #8665924 Native arabic numerals in the bluetooth pairing ui
This commit is contained in:
Fabrice Di Meglio
2013-04-19 14:23:10 -07:00
committed by Android Git Automerger

View File

@@ -43,6 +43,8 @@ import com.android.internal.app.AlertController;
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 @@ public final class BluetoothPairingDialog extends AlertActivity implements
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;