Unsolicited informational event should not be put in the response queue. It can break e.g. the reading of the asec list returned from vold - package manager then assumes no secure containers on sdcard, which can result in system_server being killed by vold during sdcard unmount, in case it keeps a recently run pkg.apk file in an asec opened.

Change-Id: I068d8ef8cd244fde03f08b1f6b3f920eb9135aaf

1 files changed, 6 insertions, 5 deletions

diff --git a/services/java/com/android/server/NativeDaemonConnector.java b/services/java/com/android/server/NativeDaemonConnector.java
index e269df5..7f0c4f2 100644
--- a/services/java/com/android/server/NativeDaemonConnector.java
+++ b/services/java/com/android/server/NativeDaemonConnector.java
@@ -129,11 +129,12 @@ final class NativeDaemonConnector implements Runnable {
                                     Slog.e(TAG, String.format(
                                             "Error handling '%s'", event), ex);
                                 }
-                            }
-                            try {
-                                mResponseQueue.put(event);
-                            } catch (InterruptedException ex) {
-                                Slog.e(TAG, "Failed to put response onto queue", 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));