commit df40adb5e8e0e55cfbf65a441a420a051a778cc0
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri Aug 30 20:11:20 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Aug 30 20:11:20 2024 +0000
tree 3d070f02ed607c12bf5c38879ad7b506b76caebd
parent a78a77bff456517acafbbbeacee9e411210436c2
parent cc9de747df9d47d942c761f5973cc3b161275b3c

Merge "ueventd: fix confusing indentation" into main am: cc9de747df

Original change: https://android-review.googlesource.com/c/platform/system/core/+/3249129

Change-Id: Ia0f276cc4c623c1564c1c69bc302249d4f70cb09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

init/devices.cpp

diff --git a/init/devices.cpp b/init/devices.cpp
index 5560c20..a478587 100644
--- a/init/devices.cpp
+++ b/init/devices.cpp
@@ -330,11 +330,11 @@
             if (gid != s.st_gid) {
                 new_group = gid;
             }
-        if (mode != s.st_mode) {
-            if (chmod(path.c_str(), mode) != 0) {
-                PLOG(ERROR) << "Cannot chmod " << path << " to " << mode;
+            if (mode != s.st_mode) {
+                if (chmod(path.c_str(), mode) != 0) {
+                    PLOG(ERROR) << "Cannot chmod " << path << " to " << mode;
+                }
             }
-        }
         } else {
             PLOG(ERROR) << "Cannot stat " << path;
         }