Permalink
Browse files

Unsolicited informational event should not be put in the response que…

…ue. 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 open.
  • Loading branch information...
1 parent e36d577 commit 4c510ab6d1c55c941024859594b5146737020b5f @nadlabak committed Nov 13, 2010
Showing with 6 additions and 5 deletions.
  1. +6 −5 services/java/com/android/server/NativeDaemonConnector.java
@@ -129,11 +129,12 @@ private void listenToSocket() throws IOException {
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));

0 comments on commit 4c510ab

Please sign in to comment.