summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2014-11-17 06:50:14 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2014-11-17 06:50:14 -0800
commitcb37db0af281016d3a4d83bc64b378178d7f65cc (patch)
tree26ee6593d42f0354f9eb88b8c48f335ec028a4d5
parent8351b96c3fdc357f71a15413c3d4991fb4844855 (diff)
parentaf94e8cffa1050a899d0c554e5622b01f1ce8942 (diff)
downloadandroid_packages_apps_BluetoothExt-cb37db0af281016d3a4d83bc64b378178d7f65cc.tar.gz
android_packages_apps_BluetoothExt-cb37db0af281016d3a4d83bc64b378178d7f65cc.tar.bz2
android_packages_apps_BluetoothExt-cb37db0af281016d3a4d83bc64b378178d7f65cc.zip
Merge "HID-C: Fix KW issues in hiddtestapp"
-rw-r--r--hiddtestapp/src/org/codeaurora/bluetooth/hiddtestapp/Keyboard.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/hiddtestapp/src/org/codeaurora/bluetooth/hiddtestapp/Keyboard.java b/hiddtestapp/src/org/codeaurora/bluetooth/hiddtestapp/Keyboard.java
index f2e5967..5d58b71 100644
--- a/hiddtestapp/src/org/codeaurora/bluetooth/hiddtestapp/Keyboard.java
+++ b/hiddtestapp/src/org/codeaurora/bluetooth/hiddtestapp/Keyboard.java
@@ -133,7 +133,8 @@ public class Keyboard extends LinearLayout implements Key.KeyListener {
VISIBLE : INVISIBLE);
key.setKeyListener(this);
- if (attrs != null & attrs.shiftLabel != null & attrs.shiftLabel.length() > 0) {
+ if (attrs != null && attrs.shiftLabel != null &&
+ attrs.shiftLabel.length() > 0) {
mKeysWithShiftLabel.add(key);
}