summaryrefslogtreecommitdiffstats
path: root/src/com
diff options
context:
space:
mode:
authorEtan Cohen <etancohen@google.com>2015-03-31 11:26:45 -0700
committerEtan Cohen <etancohen@google.com>2015-03-31 11:26:45 -0700
commit0ef5c998f2f248195fbc8334e72cfdb87c77e614 (patch)
treea00d56fe25cd3030423b558f06c7c908d47c4b0d /src/com
parentec5a3373db706778d2bcde6700c270f33bf8f7f1 (diff)
parentfe475227efdf69a4342a1e393ae60ca01fe9af30 (diff)
downloadpackages_apps_Settings-0ef5c998f2f248195fbc8334e72cfdb87c77e614.tar.gz
packages_apps_Settings-0ef5c998f2f248195fbc8334e72cfdb87c77e614.tar.bz2
packages_apps_Settings-0ef5c998f2f248195fbc8334e72cfdb87c77e614.zip
Merge commit 'fe47522' into merge
Diffstat (limited to 'src/com')
-rw-r--r--src/com/android/settings/bluetooth/BluetoothNameDialogFragment.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/settings/bluetooth/BluetoothNameDialogFragment.java b/src/com/android/settings/bluetooth/BluetoothNameDialogFragment.java
index 879cd9d9b..250b32605 100644
--- a/src/com/android/settings/bluetooth/BluetoothNameDialogFragment.java
+++ b/src/com/android/settings/bluetooth/BluetoothNameDialogFragment.java
@@ -190,7 +190,7 @@ public final class BluetoothNameDialogFragment extends DialogFragment implements
} else {
mDeviceNameEdited = true;
if (mOkButton != null) {
- mOkButton.setEnabled(s.length() != 0);
+ mOkButton.setEnabled(s.toString().trim().length() != 0);
}
}
}