am 7b8f782e: Merge change 6183 into donut

Merge commit '7b8f782eaaef392154fe3acd3ffb48c0a81024e9'

* commit '7b8f782eaaef392154fe3acd3ffb48c0a81024e9':
  Fix null data handling in ServiceCommand.writeCommand()

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);