diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-07-03 02:52:55 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-07-03 02:52:55 -0700 |
| commit | 7b8f782eaaef392154fe3acd3ffb48c0a81024e9 (patch) | |
| tree | 6a0f7f15bc55d8703fd35b7e3f232adfb0ba05cf | |
| parent | 2f97e984b52b243a5433596c8c291f35778d6b38 (diff) | |
| parent | 116d890aea63a4191a93412f5cecf5defad25201 (diff) | |
| download | frameworks_base-7b8f782eaaef392154fe3acd3ffb48c0a81024e9.zip frameworks_base-7b8f782eaaef392154fe3acd3ffb48c0a81024e9.tar.gz frameworks_base-7b8f782eaaef392154fe3acd3ffb48c0a81024e9.tar.bz2 | |
Merge change 6183 into donut
* changes:
Fix null data handling in ServiceCommand.writeCommand()
| -rw-r--r-- | keystore/java/android/security/ServiceCommand.java | 2 |
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); |