summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2014-10-28 11:51:03 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2014-10-28 11:51:03 -0700
commit4ee50302450ad34f44d3516323f36b4c6f1e25f0 (patch)
tree66616615b31edc6f889d115a134c85dd799ce3ec
parent85feb6ca0e52decc387a3849c59cba500be918eb (diff)
parent9ea168c1e12c355bbe2cfe88c2fa202b1fac9ca9 (diff)
downloadandroid_packages_apps_BluetoothExt-4ee50302450ad34f44d3516323f36b4c6f1e25f0.tar.gz
android_packages_apps_BluetoothExt-4ee50302450ad34f44d3516323f36b4c6f1e25f0.tar.bz2
android_packages_apps_BluetoothExt-4ee50302450ad34f44d3516323f36b4c6f1e25f0.zip
Merge "HID-C: Fix KW issues in hiddtestapp"staging/cm-12.0-caf
-rw-r--r--hiddtestapp/src/org/codeaurora/bluetooth/hiddtestapp/Keyboard.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/hiddtestapp/src/org/codeaurora/bluetooth/hiddtestapp/Keyboard.java b/hiddtestapp/src/org/codeaurora/bluetooth/hiddtestapp/Keyboard.java
index ffdcc68..f2e5967 100644
--- a/hiddtestapp/src/org/codeaurora/bluetooth/hiddtestapp/Keyboard.java
+++ b/hiddtestapp/src/org/codeaurora/bluetooth/hiddtestapp/Keyboard.java
@@ -133,7 +133,7 @@ public class Keyboard extends LinearLayout implements Key.KeyListener {
VISIBLE : INVISIBLE);
key.setKeyListener(this);
- if (attrs.shiftLabel != null & attrs.shiftLabel.length() > 0) {
+ if (attrs != null & attrs.shiftLabel != null & attrs.shiftLabel.length() > 0) {
mKeysWithShiftLabel.add(key);
}