commit fc97c1b3e042a513fd51e42158539d0f49fe4e7e
author Elliott Hughes <enh@google.com> Wed Aug 26 03:47:42 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Aug 26 03:47:42 2015 +0000
tree 4d1d97b6c1bd8576f99604172b81ed23f777a00e
parent 7a4527c7fd2f45dc231e5d70b7d156b72782a91f
parent 4a8982e80ef7991d6af6292d59046f9005640d50

am 9492db23: am 62643302: Merge "Not all filesystems support setting SELinux labels."

* commit '9492db23b9feeb589be36fece46e55dc66d7f1dd':
  Not all filesystems support setting SELinux labels.

adb/file_sync_service.cpp

diff --git a/adb/file_sync_service.cpp b/adb/file_sync_service.cpp
index ae9e096..536dbbc 100644
--- a/adb/file_sync_service.cpp
+++ b/adb/file_sync_service.cpp
@@ -71,6 +71,7 @@
             if (chown(partial_path.c_str(), uid, gid) == -1) {
                 return false;
             }
+            // Not all filesystems support setting SELinux labels. http://b/23530370.
             selinux_android_restorecon(partial_path.c_str(), 0);
         }
     }
@@ -166,10 +167,8 @@
             goto fail;
         }
 
-        if (selinux_android_restorecon(path, 0) == -1) {
-            SendSyncFailErrno(s, "selinux_android_restorecon failed");
-            goto fail;
-        }
+        // Not all filesystems support setting SELinux labels. http://b/23530370.
+        selinux_android_restorecon(path, 0);
 
         // fchown clears the setuid bit - restore it if present.
         // Ignore the result of calling fchmod. It's not supported