commit 856f63c0df9cd4e8783ca65140fe386e3a98a274
author Brian Carlstrom <bdc@google.com> Fri Jul 01 13:43:33 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jul 01 13:43:33 2011 -0700
tree d0621b07ce338aa0d49c36ba05ebe0f4e2535062
parent 8648c3797538573091d6ec72303371015909b0be
parent 04918930236981a6d2a096a73854caa96cb94bda

Merge "Revert "Add keychain user""

init/property_service.c

diff --git a/init/property_service.c b/init/property_service.c
index c8d6c09..d2f174d 100644
--- a/init/property_service.c
+++ b/init/property_service.c
@@ -374,11 +374,11 @@
         return;
     }
 
-    r = recv(s, &msg, sizeof(msg), 0);
+    r = TEMP_FAILURE_RETRY(recv(s, &msg, sizeof(msg), 0));
     if(r != sizeof(prop_msg)) {
+        ERROR("sys_prop: mis-match msg size recieved: %d expected: %d errno: %d\n",
+              r, sizeof(prop_msg), errno);
         close(s);
-        ERROR("sys_prop: mis-match msg size recieved: %d expected: %d\n",
-              r, sizeof(prop_msg));
         return;
     }
 

rootdir/init.rc

diff --git a/rootdir/init.rc b/rootdir/init.rc
index a1f5581..247529f 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -19,7 +19,7 @@
     export ANDROID_DATA /data
     export ASEC_MOUNTPOINT /mnt/asec
     export LOOP_MOUNTPOINT /mnt/obb
-    export BOOTCLASSPATH /system/framework/core.jar:/system/framework/core-junit.jar:/system/framework/bouncycastle.jar:/system/framework/ext.jar:/system/framework/framework.jar:/system/framework/android.policy.jar:/system/framework/services.jar:/system/framework/apache-xml.jar
+    export BOOTCLASSPATH /system/framework/core.jar:/system/framework/core-junit.jar:/system/framework/bouncycastle.jar:/system/framework/ext.jar:/system/framework/framework.jar:/system/framework/android.policy.jar:/system/framework/services.jar:/system/framework/apache-xml.jar:/system/framework/filterfw.jar
 
 # Backward compatibility
     symlink /system/etc /etc