servicemanager: set consistent flags for self-reg am: 6c86b6c am: c5a9cce am: d96c1ca am: db00dfa

Steven Moreland · android-build-merge-worker-robot · commit f7f924b1e7aa · 2024-12-12T16:05:15.000-08:00
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/30772450 Change-Id: I9a17c43d56a34bad0c764c27c575ecf06ac5d538 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/cmds/servicemanager/main.cpp b/cmds/servicemanager/main.cpp
@@ -126,6 +126,7 @@ int main(int argc, char** argv) {
     ps->setCallRestriction(ProcessState::CallRestriction::FATAL_IF_NOT_ONEWAY);
 
     sp<ServiceManager> manager = sp<ServiceManager>::make(std::make_unique<Access>());
+    manager->setRequestingSid(true);
     if (!manager->addService("manager", manager, false /*allowIsolated*/, IServiceManager::DUMP_FLAG_PRIORITY_DEFAULT).isOk()) {
         LOG(ERROR) << "Could not self register servicemanager";
     }

Original file line number	Diff line number	Diff line change
`@@ -126,6 +126,7 @@ int main(int argc, char** argv) {`
`126`	`126`	`ps->setCallRestriction(ProcessState::CallRestriction::FATAL_IF_NOT_ONEWAY);`
`127`	`127`
`128`	`128`	`sp<ServiceManager> manager = sp<ServiceManager>::make(std::make_unique<Access>());`
	`129`	`+ manager->setRequestingSid(true);`
`129`	`130`	`if (!manager->addService("manager", manager, false /allowIsolated/, IServiceManager::DUMP_FLAG_PRIORITY_DEFAULT).isOk()) {`
`130`	`131`	`LOG(ERROR) << "Could not self register servicemanager";`
`131`	`132`	`}`