commit 4689cdc29a1ab5f281d886e6198556b1e8b9109c
author Jeff Vander Stoep <jeffv@google.com> Mon Jun 28 18:59:47 2021 +0200
committer Jeff Vander Stoep <jeffv@google.com> Mon Jun 28 19:01:20 2021 +0200
tree a7abfce69fbbaa966ecdb91dbe43b17433c460d0
parent 6ddea999d0ac36facf4ecbdce5f6b65da32b126a

Revert "Installd: restorecon mislabeled gsf"

This reverts commit 9c4f39e9f3d591c302b059a275f16284770e07a7.

Fixes: 190711180
Test: build and boot
Change-Id: I779b1500f7d53bd02e3c7d8adbc0f6364270c9be

cmds/installd/InstalldNativeService.cpp

diff --git a/cmds/installd/InstalldNativeService.cpp b/cmds/installd/InstalldNativeService.cpp
index 59311a0..74be7ce 100644
--- a/cmds/installd/InstalldNativeService.cpp
+++ b/cmds/installd/InstalldNativeService.cpp
@@ -342,8 +342,7 @@
 
     // If the initial top-level restorecon above changed the label, then go
     // back and restorecon everything recursively
-    // TODO(b/190567190, b/188141923) Remove recursive fixup of com.google.android.gsf.
-    if (strcmp(before, after) || (path.find("com.google.android.gsf") != std::string::npos)) {
+    if (strcmp(before, after)) {
         if (existing) {
             LOG(DEBUG) << "Detected label change from " << before << " to " << after << " at "
                     << path << "; running recursive restorecon";