From 116d890aea63a4191a93412f5cecf5defad25201 Mon Sep 17 00:00:00 2001
From: Hung-ying Tyan <tyanh@google.com>
Date: Fri, 3 Jul 2009 17:38:59 +0800
Subject: Fix null data handling in ServiceCommand.writeCommand()

---
 keystore/java/android/security/ServiceCommand.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'keystore')

diff --git a/keystore/java/android/security/ServiceCommand.java b/keystore/java/android/security/ServiceCommand.java
index 2f335be..6178d59 100644
--- a/keystore/java/android/security/ServiceCommand.java
+++ b/keystore/java/android/security/ServiceCommand.java
@@ -140,7 +140,7 @@ public class ServiceCommand {
 
     private boolean writeCommand(int cmd, String _data) {
         byte buf[] = new byte[8];
-        byte[] data = _data.getBytes();
+        byte[] data = (_data == null) ? new byte[0] : _data.getBytes();
         int len = data.length;
         // the length of data
         buf[0] = (byte) (len & 0xff);
-- 
cgit v1.1