Merge "Revert "servicemanager : Adding abort in servicemanager_fuzzer"" am: e583df8603 am: 9b9469e42a am: 626213017f am: 922599f2af

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2214947

Change-Id: I6d8ec112d0795929958e7dc0000a6a1d668444b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/cmds/servicemanager/ServiceManagerFuzzer.cpp b/cmds/servicemanager/ServiceManagerFuzzer.cpp
index bc48fa9..39f8522 100644
--- a/cmds/servicemanager/ServiceManagerFuzzer.cpp
+++ b/cmds/servicemanager/ServiceManagerFuzzer.cpp
@@ -26,15 +26,9 @@
 using ::android::sp;
 
 extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
-    FuzzedDataProvider provider(data, size);
-
-    // Adding this random abort to check bug pipeline.
-    bool shouldAbort = provider.ConsumeBool();
-    if (shouldAbort) abort();
-
     auto accessPtr = std::make_unique<Access>();
     auto serviceManager = sp<ServiceManager>::make(std::move(accessPtr));
-    fuzzService(serviceManager, std::move(provider));
+    fuzzService(serviceManager, FuzzedDataProvider(data, size));
 
     return 0;
 }