Do not add unsolicited events to queue

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

Pulling this change from master.

Bug: 3258529
Change-Id: I2a4b0bd8bb30b31682d7d61ee94a0d246bf10de2

services/java/com/android/server/NativeDaemonConnector.java

@@ -132,12 +132,13 @@ final class NativeDaemonConnector implements Runnable {
                                     Slog.e(TAG, String.format(
                                             "Error handling '%s'", event), ex);
                                 }
-                            }
+                            } else {
                                 try {
                                     mResponseQueue.put(event);
                                 } catch (InterruptedException ex) {
                                     Slog.e(TAG, "Failed to put response onto queue", ex);
                                 }
+                            }
                         } catch (NumberFormatException nfe) {
                             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)
             throws NativeDaemonConnectorException  {
+        mResponseQueue.clear();
         sendCommand(cmd);
 
         ArrayList<String> response = new ArrayList<String>();