LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libconnectivity_native add null check

Browse Source 
Return null if service is not yet up.

Bug: 271243867
Test: atest connectivity_native_test
Change-Id: I18c887415e94e44eabcfd1c6bab1d22744f39723
This commit is contained in:
Tyler Wear
2023-03-08 11:22:10 -08:00
parent 0ba615423c
commit df6cf30075
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
service/libconnectivity/src/connectivity_native.cpp
View File

@@ -23,8 +23,8 @@ using aidl::android::net::connectivity::aidl::IConnectivityNative;
static std::shared_ptr<IConnectivityNative> getBinder() {
static ndk::SpAIBinder sBinder = ndk::SpAIBinder(reinterpret_cast<AIBinder*>(
AServiceManager_getService("connectivity_native")));
ndk::SpAIBinder sBinder = ndk::SpAIBinder(reinterpret_cast<AIBinder*>(
AServiceManager_checkService("connectivity_native")));
return aidl::android::net::connectivity::aidl::IConnectivityNative::fromBinder(sBinder);
}
@@ -45,21 +45,33 @@ static int getErrno(const ::ndk::ScopedAStatus& status) {
int AConnectivityNative_blockPortForBind(in_port_t port) {
std::shared_ptr<IConnectivityNative> c = getBinder();
if (!c) {
return EAGAIN;
}
return getErrno(c->blockPortForBind(port));
}
int AConnectivityNative_unblockPortForBind(in_port_t port) {
std::shared_ptr<IConnectivityNative> c = getBinder();
if (!c) {
return EAGAIN;
}
return getErrno(c->unblockPortForBind(port));
}
int AConnectivityNative_unblockAllPortsForBind() {
std::shared_ptr<IConnectivityNative> c = getBinder();
if (!c) {
return EAGAIN;
}
return getErrno(c->unblockAllPortsForBind());
}
int AConnectivityNative_getPortsBlockedForBind(in_port_t *ports, size_t *count) {
std::shared_ptr<IConnectivityNative> c = getBinder();
if (!c) {
return EAGAIN;
}
std::vector<int32_t> actualBlockedPorts;
int err = getErrno(c->getPortsBlockedForBind(&actualBlockedPorts));
if (err) {