commit 721ca9e5ff8634d0ea746f8e0d6a8b2ac217f4f0
author Pechetty Sravani <pechetty@google.com> Thu Jun 06 03:02:08 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jun 06 03:02:08 2024 +0000
tree bc22a4dc1566aef193b68b21ee0cdfcf9aaec90a
parent acb3a5a9b214fbb7c54e94afe77bf4fb0f0793eb

Revert "Add addService to pass in dump priority flags."

This reverts commit acb3a5a9b214fbb7c54e94afe77bf4fb0f0793eb.

Reason for revert: Droidmonitor triggered revert due to build breakage in b/345331905. Will be verifying through ABTD before submission.

Change-Id: Ib873ec3ba04f2457b9bee69e2f64a0f70ecb1784

libs/binder/ndk/include_platform/android/binder_manager.h

diff --git a/libs/binder/ndk/include_platform/android/binder_manager.h b/libs/binder/ndk/include_platform/android/binder_manager.h
index 41b30a0..52edae4 100644
--- a/libs/binder/ndk/include_platform/android/binder_manager.h
+++ b/libs/binder/ndk/include_platform/android/binder_manager.h
@@ -30,11 +30,7 @@
      * Services with methods that perform file IO, web socket creation or ways to egress data must
      * not be added with this flag for privacy concerns.
      */
-    ADD_SERVICE_ALLOW_ISOLATED = 1 << 0,
-    ADD_SERVICE_DUMP_FLAG_PRIORITY_CRITICAL = 1 << 1,
-    ADD_SERVICE_DUMP_FLAG_PRIORITY_HIGH = 1 << 2,
-    ADD_SERVICE_DUMP_FLAG_PRIORITY_NORMAL = 1 << 3,
-    ADD_SERVICE_DUMP_FLAG_PRIORITY_DEFAULT = 1 << 4,
+    ADD_SERVICE_ALLOW_ISOLATED = 1,
 };
 
 /**

libs/binder/ndk/service_manager.cpp

diff --git a/libs/binder/ndk/service_manager.cpp b/libs/binder/ndk/service_manager.cpp
index 4436dbe..5529455 100644
--- a/libs/binder/ndk/service_manager.cpp
+++ b/libs/binder/ndk/service_manager.cpp
@@ -49,25 +49,7 @@
     sp<IServiceManager> sm = defaultServiceManager();
 
     bool allowIsolated = flags & AServiceManager_AddServiceFlag::ADD_SERVICE_ALLOW_ISOLATED;
-    int dumpFlags = 0;
-    if (flags & AServiceManager_AddServiceFlag::ADD_SERVICE_DUMP_FLAG_PRIORITY_CRITICAL) {
-        dumpFlags |= IServiceManager::DUMP_FLAG_PRIORITY_CRITICAL;
-    }
-    if (flags & AServiceManager_AddServiceFlag::ADD_SERVICE_DUMP_FLAG_PRIORITY_HIGH) {
-        dumpFlags |= IServiceManager::DUMP_FLAG_PRIORITY_HIGH;
-    }
-    if (flags & AServiceManager_AddServiceFlag::ADD_SERVICE_DUMP_FLAG_PRIORITY_NORMAL) {
-        dumpFlags |= IServiceManager::DUMP_FLAG_PRIORITY_NORMAL;
-    }
-    if (flags & AServiceManager_AddServiceFlag::ADD_SERVICE_DUMP_FLAG_PRIORITY_DEFAULT) {
-        dumpFlags |= IServiceManager::DUMP_FLAG_PRIORITY_DEFAULT;
-    }
-    if (dumpFlags == 0) {
-        dumpFlags = IServiceManager::DUMP_FLAG_PRIORITY_DEFAULT;
-    }
-    status_t exception =
-            sm->addService(String16(instance), binder->getBinder(), allowIsolated, dumpFlags);
-
+    status_t exception = sm->addService(String16(instance), binder->getBinder(), allowIsolated);
     return PruneException(exception);
 }