drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Do not add unsolicited events to queue" into gingerbread

Browse Source
This commit is contained in:
Irfan Sheriff
2011-01-18 14:40:18 -08:00
committed by Android (Google) Code Review
parent 41395459e6 1cd94ef957
commit 4170b46329
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -132,12 +132,13 @@ final class NativeDaemonConnector implements Runnable {
Slog.e(TAG, String.format( Slog.e(TAG, String.format(
"Error handling '%s'", event), ex); "Error handling '%s'", event), ex);
} }
} } else {
try { try {
mResponseQueue.put(event); mResponseQueue.put(event);
} catch (InterruptedException ex) { } catch (InterruptedException ex) {
Slog.e(TAG, "Failed to put response onto queue", ex); Slog.e(TAG, "Failed to put response onto queue", ex);
} }
}
} catch (NumberFormatException nfe) { } catch (NumberFormatException nfe) {
Slog.w(TAG, String.format("Bad msg (%s)", event)); Slog.w(TAG, String.format("Bad msg (%s)", event));
} }
@ -219,6 +220,7 @@ final class NativeDaemonConnector implements Runnable {
*/ */
public synchronized ArrayList<String> doCommand(String cmd) public synchronized ArrayList<String> doCommand(String cmd)
throws NativeDaemonConnectorException { throws NativeDaemonConnectorException {
mResponseQueue.clear();
sendCommand(cmd); sendCommand(cmd);
ArrayList<String> response = new ArrayList<String>(); ArrayList<String> response = new ArrayList<String>();