Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 88083a3e authored by Fabrice Di Meglio's avatar Fabrice Di Meglio Committed by Android (Google) Code Review
Browse files

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

parents 89845158 ae8d5bdc
Loading
Loading
Loading
Loading
+3 −1
Original line number Diff line number Diff line
@@ -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;