summaryrefslogtreecommitdiffstats
path: root/keystore
diff options
context:
space:
mode:
authorHung-ying Tyan <tyanh@google.com>2009-07-03 17:38:59 +0800
committerHung-ying Tyan <tyanh@google.com>2009-07-03 17:38:59 +0800
commit116d890aea63a4191a93412f5cecf5defad25201 (patch)
treeb0bd5d04e6cce6717ecb3d62e19ead62d3fd1a26 /keystore
parent4bca97ecaf04c50d5ed49920d119f9ffa6c29402 (diff)
downloadframeworks_base-116d890aea63a4191a93412f5cecf5defad25201.zip
frameworks_base-116d890aea63a4191a93412f5cecf5defad25201.tar.gz
frameworks_base-116d890aea63a4191a93412f5cecf5defad25201.tar.bz2
Fix null data handling in ServiceCommand.writeCommand()
Diffstat (limited to 'keystore')
-rw-r--r--keystore/java/android/security/ServiceCommand.java2
1 files changed, 1 insertions, 1 deletions
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);