LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not add unsolicited events to queue

Browse Source 
Adding unsolicited events to response queue
results in doCommand() returning the wrong
result.

Pulling this change from master.

Bug: 3258529
Change-Id: I2a4b0bd8bb30b31682d7d61ee94a0d246bf10de2
This commit is contained in:
Irfan Sheriff
2011-01-16 14:31:55 -08:00
parent 56451a4477
commit bc1c40a484
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>();