commit 7acb5f8e1052513022265f19ac50a890e8e0975f
author Elliott Hughes <enh@google.com> Fri Sep 08 18:18:16 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Sep 08 18:18:16 2017 +0000
tree 2f4c29fae9e4eac74c15f24433f254280b7db1df
parent 36f27fa6f846a79b6a949964a30da6470a9914b7
parent b8877a981a44783f3e5ad3a406a85d64813aac66

Merge "support chinese character for ota package's path"
am: b8877a981a

Change-Id: I49188d97d04c69ac225422279d393b53c4966984

services/core/java/com/android/server/RecoverySystemService.java

diff --git a/services/core/java/com/android/server/RecoverySystemService.java b/services/core/java/com/android/server/RecoverySystemService.java
index 3c8c699..1517887 100644
--- a/services/core/java/com/android/server/RecoverySystemService.java
+++ b/services/core/java/com/android/server/RecoverySystemService.java
@@ -285,8 +285,9 @@
 
                 // Send the BCB commands if it's to setup BCB.
                 if (isSetup) {
-                    dos.writeInt(command.length());
-                    dos.writeBytes(command);
+                    byte[] cmdUtf8 = command.getBytes("UTF-8");
+                    dos.writeInt(cmdUtf8.length);
+                    dos.write(cmdUtf8, 0, cmdUtf8.length);
                     dos.flush();
                 }