Snap for 13256841 from 7134d8faf92d9abdd3feb9a7bc419881ba289e02 to 25Q2-release

Change-Id: Ic7cacd80bbba3bcb3d9ee18a7fd84a6f833b73e3

stats/aidl/test_client/AidlStatsClient.cpp

diff --git a/stats/aidl/test_client/AidlStatsClient.cpp b/stats/aidl/test_client/AidlStatsClient.cpp
index 3d4085b..fe003ab 100644
--- a/stats/aidl/test_client/AidlStatsClient.cpp
+++ b/stats/aidl/test_client/AidlStatsClient.cpp
@@ -16,7 +16,6 @@
 #include <aidl/android/frameworks/stats/IStats.h>
 #include <android/binder_manager.h>
 #include <getopt.h>
-#include <statslog.h>
 
 #include <iostream>
 
@@ -124,7 +123,7 @@
     // get instance of the aidl version
     const std::string instance = std::string() + IStats::descriptor + "/default";
     std::shared_ptr<IStats> service =
-        IStats::fromBinder(ndk::SpAIBinder(AServiceManager_getService(instance.c_str())));
+        IStats::fromBinder(ndk::SpAIBinder(AServiceManager_waitForService(instance.c_str())));
     if (!service) {
         std::cerr << "No Stats aidl HAL";
         return 1;

stats/aidl/test_client/Android.bp

diff --git a/stats/aidl/test_client/Android.bp b/stats/aidl/test_client/Android.bp
index 5698619..d972e49 100644
--- a/stats/aidl/test_client/Android.bp
+++ b/stats/aidl/test_client/Android.bp
@@ -35,6 +35,5 @@
         "libbase",
         "libbinder_ndk",
         "libutils",
-        "libstatslog",
     ],
 }