Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1adcea5c authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix a misleading warning message about sysprop overriding" am: 6c7b75b4 

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

Change-Id: Ic442e2745923b5c6f38525233d0cf9fe9d10de04
parents c66db98e 6c7b75b4

init/property_service.cpp

+2 −2
Original line number Diff line number Diff line
@@ -711,8 +711,8 @@ static void LoadProperties(char* data, const char* filter, const char* filename, 
                if (it == properties->end()) {

                    (*properties)[key] = value;

                } else if (it->second != value) {

                    LOG(WARNING) << "Overriding previous 'ro.' property '" << key << "':'"

                                 << it->second << "' with new value '" << value << "'";

                    LOG(WARNING) << "Overriding previous property '" << key << "':'" << it->second

                                 << "' with new value '" << value << "'";

                    it->second = value;

                }

            } else {