| commit | de25999fda55b8f68e4ae0fa77f1c1c10f1ec37a | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Tue Jun 29 08:45:36 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jun 29 08:45:36 2021 +0000 |
| tree | 7b8d4f649cb96fa8b1696ad1d8411be6a9a63a40 | |
| parent | ec52313745b5141b08784fcfbe32697be988c43f [diff] | |
| parent | bfaff60702dd12c7e8259eff86f0be2f20c6ad0c [diff] |
Merge "Revert "Installd: restorecon mislabeled gsf"" into sc-dev am: bfaff60702 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/15110199 Change-Id: I597656bafd7e76bf62b86d09c779a6d0ed30eb39
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";