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

Merge change 27057 into eclair

Browse Source 
* changes:
  Restrict Bluetooth adapater name length to 200 characters.
This commit is contained in:
Android (Google) Code Review
2009-09-25 13:28:10 -04:00
parent 0f8e20f122 4b6b2aa123
commit 51a81002ec
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/bluetooth/BluetoothNamePreference.java
View File

@@ -26,7 +26,9 @@ import android.content.Intent;
import android.content.IntentFilter; import android.content.IntentFilter;
import android.preference.EditTextPreference; import android.preference.EditTextPreference;
import android.text.Editable; import android.text.Editable;
import android.text.InputFilter;
import android.text.TextWatcher; import android.text.TextWatcher;
import android.text.InputFilter.LengthFilter;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.widget.Button; import android.widget.Button;
import android.widget.EditText; import android.widget.EditText;
@@ -38,6 +40,8 @@ import android.widget.EditText;
*/ */
public class BluetoothNamePreference extends EditTextPreference implements TextWatcher { public class BluetoothNamePreference extends EditTextPreference implements TextWatcher {
private static final String TAG = "BluetoothNamePreference"; 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; 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 // Make sure the OK button is disabled (if necessary) after rotation
EditText et = getEditText(); EditText et = getEditText();
et.setFilters(new InputFilter[] {new LengthFilter(BLUETOOTH_NAME_MAX_LENGTH)});
if (et != null) { if (et != null) {
et.addTextChangedListener(this); et.addTextChangedListener(this);
Dialog d = getDialog(); Dialog d = getDialog();