Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Prevent NullPointerException in getStringValue if no value is set" into lmp-mr1-dev

Browse Source
This commit is contained in:
Andre Eisenbach
2014-12-10 02:31:31 +00:00
committed by Android (Google) Code Review
parent 65bc1125b4 0fd06a19bd
commit c91499842f
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/bluetooth/BluetoothGattCharacteristic.java
View File

@@ -502,7 +502,7 @@ public class BluetoothGattCharacteristic {
* @return Cached value of the characteristic * @return Cached value of the characteristic
*/ */
public String getStringValue(int offset) { 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]; byte[] strBytes = new byte[mValue.length - offset];
for (int i=0; i != (mValue.length-offset); ++i) strBytes[i] = mValue[offset+i]; for (int i=0; i != (mValue.length-offset); ++i) strBytes[i] = mValue[offset+i];
return new String(strBytes); return new String(strBytes);