From 26b9f22b2d84bc3d457c4a387a570535c501b149 Mon Sep 17 00:00:00 2001
From: Kangping Dong <wgtdkp@google.com>
Date: Thu, 9 Nov 2023 00:09:50 +0800
Subject: [PATCH] suppress unguarded-availability warning for only
 AServiceManager_waitForService

Test: build & presubmit
Change-Id: I4542f3809cb49470290b9b7e3f940a8644c301c7
---
 service/Android.bp                                       | 4 ----
 service/jni/com_android_server_ServiceManagerWrapper.cpp | 6 ++++++
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/service/Android.bp b/service/Android.bp
index 38c0110ae3..7ddf0687c7 100644
--- a/service/Android.bp
+++ b/service/Android.bp
@@ -107,10 +107,6 @@ cc_library_shared {
         "-Werror",
         "-Wno-unused-parameter",
         "-Wthread-safety",
-
-        // AServiceManager_waitForService is available on only 31+, but it's still safe for Thread
-        // service because it's enabled on only 34+
-        "-Wno-unguarded-availability",
     ],
     srcs: [
         ":services.connectivity-netstats-jni-sources",
diff --git a/service/jni/com_android_server_ServiceManagerWrapper.cpp b/service/jni/com_android_server_ServiceManagerWrapper.cpp
index 0cd58f4ea4..0e32726aff 100644
--- a/service/jni/com_android_server_ServiceManagerWrapper.cpp
+++ b/service/jni/com_android_server_ServiceManagerWrapper.cpp
@@ -25,7 +25,13 @@ namespace android {
 static jobject com_android_server_ServiceManagerWrapper_waitForService(
         JNIEnv* env, jobject clazz, jstring serviceName) {
     ScopedUtfChars name(env, serviceName);
+
+// AServiceManager_waitForService is available on only 31+, but it's still safe for Thread
+// service because it's enabled on only 34+
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunguarded-availability"
     return AIBinder_toJavaBinder(env, AServiceManager_waitForService(name.c_str()));
+#pragma clang diagnostic pop
 }
 
 /*