Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 12da9d74: Fix buffer compacting in NativeDaemonConnector

Browse Source 
Merge commit '12da9d7472ae87b841575d5358e19f143d12f900' into gingerbread-plus-aosp

* commit '12da9d7472ae87b841575d5358e19f143d12f900':
  Fix buffer compacting in NativeDaemonConnector
This commit is contained in:
Kenny Root
2010-09-02 22:29:05 -07:00
committed by Android Git Automerger
parent ea16e72bff 12da9d7472
commit fb79b7dab3
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/java/com/android/server/NativeDaemonConnector.java
View File

@@ -109,6 +109,10 @@ final class NativeDaemonConnector implements Runnable {
int count = inputStream.read(buffer, start, BUFFER_SIZE - start); int count = inputStream.read(buffer, start, BUFFER_SIZE - start);
if (count < 0) break; if (count < 0) break;
// Add our starting point to the count and reset the start.
count += start;
start = 0;
for (int i = 0; i < count; i++) { for (int i = 0; i < count; i++) {
if (buffer[i] == 0) { if (buffer[i] == 0) {
String event = new String(buffer, start, i - start); String event = new String(buffer, start, i - start);
@@ -140,6 +144,9 @@ final class NativeDaemonConnector implements Runnable {
start = i + 1; start = i + 1;
} }
} }
// We should end at the amount we read. If not, compact then
// buffer and read again.
if (start != count) { if (start != count) {
final int remaining = BUFFER_SIZE - start; final int remaining = BUFFER_SIZE - start;
System.arraycopy(buffer, start, buffer, 0, remaining); System.arraycopy(buffer, start, buffer, 0, remaining);