summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jeff Vander Stoep <jeffv@google.com> 2021-06-28 18:59:47 +0200
committer Jeff Vander Stoep <jeffv@google.com> 2021-06-28 19:01:20 +0200
commit4689cdc29a1ab5f281d886e6198556b1e8b9109c (patch)
treea7abfce69fbbaa966ecdb91dbe43b17433c460d0
parent6ddea999d0ac36facf4ecbdce5f6b65da32b126a (diff)
Revert "Installd: restorecon mislabeled gsf"
This reverts commit 9c4f39e9f3d591c302b059a275f16284770e07a7. Fixes: 190711180 Test: build and boot Change-Id: I779b1500f7d53bd02e3c7d8adbc0f6364270c9be
-rw-r--r--cmds/installd/InstalldNativeService.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/cmds/installd/InstalldNativeService.cpp b/cmds/installd/InstalldNativeService.cpp
index 59311a012a..74be7cedc7 100644
--- a/cmds/installd/InstalldNativeService.cpp
+++ b/cmds/installd/InstalldNativeService.cpp
@@ -342,8 +342,7 @@ static int restorecon_app_data_lazy(const std::string& path, const std::string&
// 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";