joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Move #nativeWaitForService into CommonConnectivityJni

Browse source 
AServiceManager_waitForService sytem APIs currently only callable
via dlsym(): b/376759605. When built with sdk_version current,
the NDK stubs for "sdk" variants only include NDK APIs,
excluding #systemapi APIs.

Flag: EXEMPT Mechanical refactors
Test: atest ServiceManagerWrapperIntegrationTest
Change-Id: I48f690d771c7905e79e463617ded772f753cc854
This commit is contained in:
Mark Chien 2025-08-04 10:56:38 +00:00 • committed by Patrick Rohr
commit f250ade6fa
1 changed files with 53 additions and 115 deletions
Download patch file Download diff file Expand all files Collapse all files

11
service/jni/onload.cpp
View file

@ -21,10 +21,9 @@
namespace android {
int register_com_android_server_connectivity_ClatCoordinator(JNIEnv* env);
int register_android_server_net_NetworkStatsFactory(JNIEnv* env);
int register_android_server_net_NetworkStatsService(JNIEnv* env);
int register_com_android_server_ServiceManagerWrapper(JNIEnv* env);
int register_com_android_server_connectivity_ClatCoordinator(JNIEnv *env);
int register_android_server_net_NetworkStatsFactory(JNIEnv *env);
int register_android_server_net_NetworkStatsService(JNIEnv *env);
int register_com_android_net_module_util_ServiceConnectivityJni(JNIEnv *env,
char const *class_name);
@ -35,10 +34,6 @@ extern "C" jint JNI_OnLoad(JavaVM* vm, void*) {
return JNI_ERR;
}
if (register_com_android_server_ServiceManagerWrapper(env) < 0) {
return JNI_ERR;
}
if (android::modules::sdklevel::IsAtLeastT()) {
if (register_com_android_server_connectivity_ClatCoordinator(env) < 0) {
return JNI_ERR;