commit 77ab56ddc375bbc965ff66fe9fcfe14fb9f3a6f2
author Remi NGUYEN VAN <reminv@google.com> Fri Jan 06 10:57:12 2023 +0900
committer Cherrypicker Worker <android-build-cherrypicker-worker@google.com> Wed May 31 05:50:31 2023 +0000
tree 4b918373d6031d899c2b22d5296af6256e003b2c
parent 12cfa774f1a9512fb7bc620e6a6b271fda3cd239

Only allow libconnectivity_native usage on U+

No user of the API is expected before U, so limit its usage to U+.

Bug: 262199896
Test: atest
(cherry picked from https://android-review.googlesource.com/q/commit:2c1b9b8e80c6cb017a03211667b51ee5b1234d1c)
Merged-In: I211f459a729c216eb1ba9e3b983042e4afcbd135
Change-Id: I211f459a729c216eb1ba9e3b983042e4afcbd135

service/libconnectivity/src/connectivity_native.cpp

diff --git a/service/libconnectivity/src/connectivity_native.cpp b/service/libconnectivity/src/connectivity_native.cpp
index a476498..f39bb0a 100644
--- a/service/libconnectivity/src/connectivity_native.cpp
+++ b/service/libconnectivity/src/connectivity_native.cpp
@@ -17,6 +17,7 @@
 #include "connectivity_native.h"
 
 #include <android/binder_manager.h>
+#include <android-modules-utils/sdk_level.h>
 #include <aidl/android/net/connectivity/aidl/ConnectivityNative.h>
 
 using aidl::android::net::connectivity::aidl::IConnectivityNative;
@@ -44,6 +45,7 @@
 }
 
 int AConnectivityNative_blockPortForBind(in_port_t port) {
+    if (!android::modules::sdklevel::IsAtLeastU()) return ENOSYS;
     std::shared_ptr<IConnectivityNative> c = getBinder();
     if (!c) {
         return EAGAIN;
@@ -52,6 +54,7 @@
 }
 
 int AConnectivityNative_unblockPortForBind(in_port_t port) {
+    if (!android::modules::sdklevel::IsAtLeastU()) return ENOSYS;
     std::shared_ptr<IConnectivityNative> c = getBinder();
     if (!c) {
         return EAGAIN;
@@ -60,6 +63,7 @@
 }
 
 int AConnectivityNative_unblockAllPortsForBind() {
+    if (!android::modules::sdklevel::IsAtLeastU()) return ENOSYS;
     std::shared_ptr<IConnectivityNative> c = getBinder();
     if (!c) {
         return EAGAIN;
@@ -68,6 +72,7 @@
 }
 
 int AConnectivityNative_getPortsBlockedForBind(in_port_t *ports, size_t *count) {
+    if (!android::modules::sdklevel::IsAtLeastU()) return ENOSYS;
     std::shared_ptr<IConnectivityNative> c = getBinder();
     if (!c) {
         return EAGAIN;