summaryrefslogtreecommitdiffstats
path: root/obex/javax/obex/ObexHelper.java
diff options
context:
space:
mode:
Diffstat (limited to 'obex/javax/obex/ObexHelper.java')
-rw-r--r--obex/javax/obex/ObexHelper.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/obex/javax/obex/ObexHelper.java b/obex/javax/obex/ObexHelper.java
index e6ade7b..f569595 100644
--- a/obex/javax/obex/ObexHelper.java
+++ b/obex/javax/obex/ObexHelper.java
@@ -875,7 +875,7 @@ public final class ObexHelper {
* @throws IllegalArgumentException if the byte array has an odd length
*/
public static String convertToUnicode(byte[] b, boolean includesNull) {
- if (b == null) {
+ if (b == null || b.length == 0) {
return null;
}
int arrayLength = b.length;