Merge "Do not add unsolicited events to queue" into gingerbread (4170b463) · Commits · e / os / android_frameworks_base

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

+7 −5

Original line number	Diff line number	Diff line
		@@ -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>();