From 4b6b2aa123b0b14439bc73643129af729be4bd83 Mon Sep 17 00:00:00 2001 From: Jaikumar Ganesh Date: Fri, 25 Sep 2009 09:54:35 -0700 Subject: [PATCH] Restrict Bluetooth adapater name length to 200 characters. The max allowed as per spec is 248. Change-Id: I287fb7f861a30e736d6078923712433c52f3031a --- .../android/settings/bluetooth/BluetoothNamePreference.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/com/android/settings/bluetooth/BluetoothNamePreference.java b/src/com/android/settings/bluetooth/BluetoothNamePreference.java index 89f801b39be..7a9a0c1d881 100644 --- a/src/com/android/settings/bluetooth/BluetoothNamePreference.java +++ b/src/com/android/settings/bluetooth/BluetoothNamePreference.java @@ -26,7 +26,9 @@ import android.content.Intent; import android.content.IntentFilter; import android.preference.EditTextPreference; import android.text.Editable; +import android.text.InputFilter; import android.text.TextWatcher; +import android.text.InputFilter.LengthFilter; import android.util.AttributeSet; import android.widget.Button; import android.widget.EditText; @@ -38,6 +40,8 @@ import android.widget.EditText; */ public class BluetoothNamePreference extends EditTextPreference implements TextWatcher { private static final String TAG = "BluetoothNamePreference"; + // TODO(): Investigate bluetoothd/dbus crash when length is set to 248, limit as per spec. + private static final int BLUETOOTH_NAME_MAX_LENGTH = 200; private LocalBluetoothManager mLocalManager; @@ -71,6 +75,7 @@ public class BluetoothNamePreference extends EditTextPreference implements TextW // Make sure the OK button is disabled (if necessary) after rotation EditText et = getEditText(); + et.setFilters(new InputFilter[] {new LengthFilter(BLUETOOTH_NAME_MAX_LENGTH)}); if (et != null) { et.addTextChangedListener(this); Dialog d = getDialog();