diff options
author | Andre Eisenbach <eisenbach@google.com> | 2014-12-09 16:42:14 -0800 |
---|---|---|
committer | Andre Eisenbach <eisenbach@google.com> | 2014-12-09 16:42:14 -0800 |
commit | a86bfff223e40f2759ed6cd91ebb7d509ef2fdfa (patch) | |
tree | 40620593cd99e8cd881f51fbad238e6ac8b3a0ea /framework/java/android/bluetooth/BluetoothGattCharacteristic.java | |
parent | 5a20b7c32b3c6b40d1c551dbe48dbad429ddddc0 (diff) |
Prevent NullPointerException in getStringValue if no value is set
Bug: 18686365
Change-Id: I5f5d07ef49500e0d8118ba04aaf373ae4514f034
Diffstat (limited to 'framework/java/android/bluetooth/BluetoothGattCharacteristic.java')
-rw-r--r-- | framework/java/android/bluetooth/BluetoothGattCharacteristic.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/framework/java/android/bluetooth/BluetoothGattCharacteristic.java b/framework/java/android/bluetooth/BluetoothGattCharacteristic.java index a86677cfaa..7cdcc2c9b9 100644 --- a/framework/java/android/bluetooth/BluetoothGattCharacteristic.java +++ b/framework/java/android/bluetooth/BluetoothGattCharacteristic.java @@ -502,7 +502,7 @@ public class BluetoothGattCharacteristic { * @return Cached value of the characteristic */ public String getStringValue(int offset) { - if (offset > mValue.length) return null; + if (mValue == null || offset > mValue.length) return null; byte[] strBytes = new byte[mValue.length - offset]; for (int i=0; i != (mValue.length-offset); ++i) strBytes[i] = mValue[offset+i]; return new String(strBytes); |