From 0fd06a19bdc56fec8eb736d248abb56fe5a2727d Mon Sep 17 00:00:00 2001
From: Andre Eisenbach <eisenbach@google.com>
Date: Tue, 9 Dec 2014 16:42:14 -0800
Subject: [PATCH] Prevent NullPointerException in getStringValue if no value is
 set

Bug: 18686365
Change-Id: I5f5d07ef49500e0d8118ba04aaf373ae4514f034
---
 core/java/android/bluetooth/BluetoothGattCharacteristic.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/java/android/bluetooth/BluetoothGattCharacteristic.java b/core/java/android/bluetooth/BluetoothGattCharacteristic.java
index a86677cfaabf7..7cdcc2c9b9ff8 100644
--- a/core/java/android/bluetooth/BluetoothGattCharacteristic.java
+++ b/core/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);