Merge changes Ie868d599,I7cb9edb9
* changes:
gn2bp: Remove unused imports
gn2bp: Run ./update_results.sh
diff --git a/Tethering/Android.bp b/Tethering/Android.bp
index 829e66a..d2f6d15 100644
--- a/Tethering/Android.bp
+++ b/Tethering/Android.bp
@@ -34,6 +34,7 @@
// Libraries not including Tethering's own framework-tethering (different flavors of that one
// are needed depending on the build rule)
libs: [
+ "connectivity-internal-api-util",
"framework-configinfrastructure",
"framework-connectivity.stubs.module_lib",
"framework-connectivity-t.stubs.module_lib",
diff --git a/Tethering/apex/Android.bp b/Tethering/apex/Android.bp
index e59c8e4..8840394 100644
--- a/Tethering/apex/Android.bp
+++ b/Tethering/apex/Android.bp
@@ -199,6 +199,7 @@
"android.net.connectivity",
"android.net.netstats.provider",
"android.net.nsd",
+ "android.net.wear",
],
},
}
diff --git a/Tethering/common/TetheringLib/Android.bp b/Tethering/common/TetheringLib/Android.bp
index 9ca3f14..481557b 100644
--- a/Tethering/common/TetheringLib/Android.bp
+++ b/Tethering/common/TetheringLib/Android.bp
@@ -22,6 +22,10 @@
defaults: ["framework-module-defaults"],
impl_library_visibility: [
"//packages/modules/Connectivity/Tethering:__subpackages__",
+ "//packages/modules/Connectivity/framework",
+ "//packages/modules/Connectivity/framework-t",
+ "//packages/modules/Connectivity/service",
+ "//packages/modules/Connectivity/service-t",
// Using for test only
"//cts/tests/netlegacy22.api",
@@ -64,19 +68,8 @@
filegroup {
name: "framework-tethering-srcs",
srcs: [
- "src/android/net/TetheredClient.aidl",
- "src/android/net/TetheredClient.java",
- "src/android/net/TetheringManager.java",
- "src/android/net/TetheringConstants.java",
- "src/android/net/IIntResultListener.aidl",
- "src/android/net/ITetheringEventCallback.aidl",
- "src/android/net/ITetheringConnector.aidl",
- "src/android/net/TetheringCallbackStartedParcel.aidl",
- "src/android/net/TetheringConfigurationParcel.aidl",
- "src/android/net/TetheringRequestParcel.aidl",
- "src/android/net/TetherStatesParcel.aidl",
- "src/android/net/TetheringInterface.aidl",
- "src/android/net/TetheringInterface.java",
+ "src/**/*.aidl",
+ "src/**/*.java",
],
path: "src"
}
diff --git a/Tethering/common/TetheringLib/src/android/net/wear/ICompanionDeviceManagerProxy.aidl b/Tethering/common/TetheringLib/src/android/net/wear/ICompanionDeviceManagerProxy.aidl
new file mode 100644
index 0000000..f8c39bf
--- /dev/null
+++ b/Tethering/common/TetheringLib/src/android/net/wear/ICompanionDeviceManagerProxy.aidl
@@ -0,0 +1,24 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.net.wear;
+
+import android.companion.AssociationInfo;
+
+/** @hide */
+interface ICompanionDeviceManagerProxy {
+ List<AssociationInfo> getAllAssociations();
+}
diff --git a/Tethering/src/android/net/ip/NeighborPacketForwarder.java b/Tethering/src/android/net/ip/NeighborPacketForwarder.java
index 8384562..04cb710 100644
--- a/Tethering/src/android/net/ip/NeighborPacketForwarder.java
+++ b/Tethering/src/android/net/ip/NeighborPacketForwarder.java
@@ -18,12 +18,14 @@
import static android.system.OsConstants.AF_INET6;
import static android.system.OsConstants.AF_PACKET;
+import static android.system.OsConstants.ENODEV;
import static android.system.OsConstants.ETH_P_IPV6;
import static android.system.OsConstants.IPPROTO_RAW;
import static android.system.OsConstants.SOCK_DGRAM;
import static android.system.OsConstants.SOCK_NONBLOCK;
import static android.system.OsConstants.SOCK_RAW;
-import static android.system.OsConstants.ENODEV;
+
+import static com.android.net.module.util.SocketUtils.closeSocketQuietly;
import android.net.util.SocketUtils;
import android.os.Handler;
@@ -36,7 +38,6 @@
import com.android.networkstack.tethering.util.TetheringUtils;
import java.io.FileDescriptor;
-import java.io.IOException;
import java.net.Inet6Address;
import java.net.InetSocketAddress;
import java.net.SocketAddress;
@@ -105,15 +106,6 @@
}
}
- // TODO: move NetworkStackUtils.closeSocketQuietly to
- // frameworks/libs/net/common/device/com/android/net/module/util/[someclass].
- private void closeSocketQuietly(FileDescriptor fd) {
- try {
- SocketUtils.closeSocket(fd);
- } catch (IOException ignored) {
- }
- }
-
@Override
protected FileDescriptor createFd() {
try {
diff --git a/Tethering/src/com/android/networkstack/tethering/wear/CompanionDeviceManagerProxy.java b/Tethering/src/com/android/networkstack/tethering/wear/CompanionDeviceManagerProxy.java
new file mode 100644
index 0000000..e94febb
--- /dev/null
+++ b/Tethering/src/com/android/networkstack/tethering/wear/CompanionDeviceManagerProxy.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.networkstack.tethering.wear;
+
+import android.companion.AssociationInfo;
+import android.companion.CompanionDeviceManager;
+import android.content.Context;
+import android.net.connectivity.TiramisuConnectivityInternalApiUtil;
+import android.net.wear.ICompanionDeviceManagerProxy;
+import android.os.Build;
+import android.os.RemoteException;
+
+import androidx.annotation.RequiresApi;
+
+import java.util.List;
+
+/**
+ * A proxy for {@link android.companion.CompanionDeviceManager}, allowing Tethering to call it with
+ * a different set of permissions.
+ * @hide
+ */
+public class CompanionDeviceManagerProxy {
+ private final ICompanionDeviceManagerProxy mService;
+
+ @RequiresApi(Build.VERSION_CODES.TIRAMISU)
+ public CompanionDeviceManagerProxy(Context context) {
+ mService = ICompanionDeviceManagerProxy.Stub.asInterface(
+ TiramisuConnectivityInternalApiUtil.getCompanionDeviceManagerProxyService(context));
+ }
+
+ /**
+ * @see CompanionDeviceManager#getAllAssociations()
+ */
+ public List<AssociationInfo> getAllAssociations() {
+ try {
+ return mService.getAllAssociations();
+ } catch (RemoteException e) {
+ throw e.rethrowFromSystemServer();
+ }
+ }
+}
diff --git a/bpf_progs/netd.c b/bpf_progs/netd.c
index 8e99b8d..3eb4e02 100644
--- a/bpf_progs/netd.c
+++ b/bpf_progs/netd.c
@@ -31,7 +31,7 @@
#include <stdbool.h>
#include <stdint.h>
#include "bpf_net_helpers.h"
-#include "bpf_shared.h"
+#include "netd.h"
// This is defined for cgroup bpf filter only.
static const int DROP = 0;
diff --git a/bpf_progs/bpf_shared.h b/bpf_progs/netd.h
similarity index 100%
rename from bpf_progs/bpf_shared.h
rename to bpf_progs/netd.h
diff --git a/framework/Android.bp b/framework/Android.bp
index 485961c..3950dba 100644
--- a/framework/Android.bp
+++ b/framework/Android.bp
@@ -80,7 +80,9 @@
"framework-connectivity-t.stubs.module_lib",
],
impl_only_libs: [
- "framework-tethering.stubs.module_lib",
+ // TODO: figure out why just using "framework-tethering" uses the stubs, even though both
+ // framework-connectivity and framework-tethering are in the same APEX.
+ "framework-tethering.impl",
"framework-wifi.stubs.module_lib",
"net-utils-device-common",
],
@@ -109,9 +111,9 @@
libs: [
// This cannot be in the defaults clause above because if it were, it would be used
// to generate the connectivity stubs. That would create a circular dependency
- // because the tethering stubs depend on the connectivity stubs (e.g.,
+ // because the tethering impl depend on the connectivity stubs (e.g.,
// TetheringRequest depends on LinkAddress).
- "framework-tethering.stubs.module_lib",
+ "framework-tethering.impl",
"framework-wifi.stubs.module_lib",
],
visibility: ["//packages/modules/Connectivity:__subpackages__"]
@@ -243,3 +245,24 @@
"//packages/modules/Connectivity/service",
],
}
+
+// Library providing limited APIs within the connectivity module, so that R+ components like
+// Tethering have a controlled way to depend on newer components like framework-connectivity that
+// are not loaded on R.
+java_library {
+ name: "connectivity-internal-api-util",
+ sdk_version: "module_current",
+ libs: [
+ "androidx.annotation_annotation",
+ "framework-connectivity.impl",
+ ],
+ jarjar_rules: ":framework-connectivity-jarjar-rules",
+ srcs: [
+ // Files listed here MUST all be annotated with @RequiresApi(Build.VERSION_CODES.TIRAMISU),
+ // so that API checks are enforced for R+ users of this library
+ "src/android/net/connectivity/TiramisuConnectivityInternalApiUtil.java",
+ ],
+ visibility: [
+ "//packages/modules/Connectivity/Tethering:__subpackages__",
+ ],
+}
diff --git a/framework/src/android/net/ConnectivityManager.java b/framework/src/android/net/ConnectivityManager.java
index 39c5af2..1b4b42f 100644
--- a/framework/src/android/net/ConnectivityManager.java
+++ b/framework/src/android/net/ConnectivityManager.java
@@ -5992,4 +5992,13 @@
throw e.rethrowFromSystemServer();
}
}
+
+ /** @hide */
+ public IBinder getCompanionDeviceManagerProxyService() {
+ try {
+ return mService.getCompanionDeviceManagerProxyService();
+ } catch (RemoteException e) {
+ throw e.rethrowFromSystemServer();
+ }
+ }
}
diff --git a/framework/src/android/net/IConnectivityManager.aidl b/framework/src/android/net/IConnectivityManager.aidl
index 29fea00..43d2f07 100644
--- a/framework/src/android/net/IConnectivityManager.aidl
+++ b/framework/src/android/net/IConnectivityManager.aidl
@@ -247,4 +247,6 @@
boolean getFirewallChainEnabled(int chain);
void replaceFirewallChain(int chain, in int[] uids);
+
+ IBinder getCompanionDeviceManagerProxyService();
}
diff --git a/framework/src/android/net/connectivity/TiramisuConnectivityInternalApiUtil.java b/framework/src/android/net/connectivity/TiramisuConnectivityInternalApiUtil.java
new file mode 100644
index 0000000..d65858f
--- /dev/null
+++ b/framework/src/android/net/connectivity/TiramisuConnectivityInternalApiUtil.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.net.connectivity;
+
+import android.content.Context;
+import android.net.ConnectivityManager;
+import android.os.Build;
+import android.os.IBinder;
+
+import androidx.annotation.RequiresApi;
+
+/**
+ * Utility providing limited access to module-internal APIs which are only available on Android T+,
+ * as this class is only in the bootclasspath on T+ as part of framework-connectivity.
+ *
+ * R+ module components like Tethering cannot depend on all hidden symbols from
+ * framework-connectivity. They only have access to stable API stubs where newer APIs can be
+ * accessed after an API level check (enforced by the linter), or to limited hidden symbols in this
+ * class which is also annotated with @RequiresApi (so API level checks are also enforced by the
+ * linter).
+ * @hide
+ */
+@RequiresApi(Build.VERSION_CODES.TIRAMISU)
+public class TiramisuConnectivityInternalApiUtil {
+
+ /**
+ * Get a service binder token for
+ * {@link com.android.server.connectivity.wear.CompanionDeviceManagerProxyService}.
+ */
+ public static IBinder getCompanionDeviceManagerProxyService(Context ctx) {
+ final ConnectivityManager cm = ctx.getSystemService(ConnectivityManager.class);
+ return cm.getCompanionDeviceManagerProxyService();
+ }
+}
diff --git a/netd/BpfHandler.h b/netd/BpfHandler.h
index 925a725..a6da4eb 100644
--- a/netd/BpfHandler.h
+++ b/netd/BpfHandler.h
@@ -18,7 +18,7 @@
#include <netdutils/Status.h>
#include "bpf/BpfMap.h"
-#include "bpf_shared.h"
+#include "netd.h"
using android::bpf::BpfMap;
using android::bpf::BpfMapRO;
diff --git a/service-t/Android.bp b/service-t/Android.bp
index 2e7a4f3..d876166 100644
--- a/service-t/Android.bp
+++ b/service-t/Android.bp
@@ -50,7 +50,8 @@
"framework-configinfrastructure",
"framework-connectivity-pre-jarjar",
"framework-connectivity-t-pre-jarjar",
- "framework-tethering",
+ // TODO: use framework-tethering-pre-jarjar when it is separated from framework-tethering
+ "framework-tethering.impl",
"service-connectivity-pre-jarjar",
"service-nearby-pre-jarjar",
"ServiceConnectivityResources",
diff --git a/service-t/native/libs/libnetworkstats/BpfNetworkStats.cpp b/service-t/native/libs/libnetworkstats/BpfNetworkStats.cpp
index 28de881..122c2d4 100644
--- a/service-t/native/libs/libnetworkstats/BpfNetworkStats.cpp
+++ b/service-t/native/libs/libnetworkstats/BpfNetworkStats.cpp
@@ -26,7 +26,7 @@
#include "android-base/strings.h"
#include "android-base/unique_fd.h"
#include "bpf/BpfMap.h"
-#include "bpf_shared.h"
+#include "netd.h"
#include "netdbpf/BpfNetworkStats.h"
#ifdef LOG_TAG
diff --git a/service-t/native/libs/libnetworkstats/include/netdbpf/BpfNetworkStats.h b/service-t/native/libs/libnetworkstats/include/netdbpf/BpfNetworkStats.h
index 8ab7e25..03a1a44 100644
--- a/service-t/native/libs/libnetworkstats/include/netdbpf/BpfNetworkStats.h
+++ b/service-t/native/libs/libnetworkstats/include/netdbpf/BpfNetworkStats.h
@@ -18,7 +18,7 @@
#define _BPF_NETWORKSTATS_H
#include <bpf/BpfMap.h>
-#include "bpf_shared.h"
+#include "netd.h"
namespace android {
namespace bpf {
diff --git a/service/Android.bp b/service/Android.bp
index 98bbbac..224fa19 100644
--- a/service/Android.bp
+++ b/service/Android.bp
@@ -157,7 +157,9 @@
// against the implementation because the two libraries are in the same
// APEX.
"framework-connectivity-t.stubs.module_lib",
- "framework-tethering",
+ // TODO: figure out why just using "framework-tethering" uses the stubs, even though both
+ // service-connectivity and framework-tethering are in the same APEX.
+ "framework-tethering.impl",
"framework-wifi",
"unsupportedappusage",
"ServiceConnectivityResources",
@@ -166,6 +168,7 @@
static_libs: [
// Do not add libs here if they are already included
// in framework-connectivity
+ "androidx.annotation_annotation",
"connectivity-net-module-utils-bpf",
"connectivity_native_aidl_interface-lateststable-java",
"dnsresolver_aidl_interface-V9-java",
@@ -258,7 +261,7 @@
"framework-annotations-lib",
"framework-connectivity.impl",
"framework-connectivity-t.impl",
- "framework-tethering",
+ "framework-tethering.impl",
"framework-wifi",
"libprotobuf-java-nano",
],
diff --git a/service/jni/com_android_server_BpfNetMaps.cpp b/service/jni/com_android_server_BpfNetMaps.cpp
index 799ac5c..05f50b0 100644
--- a/service/jni/com_android_server_BpfNetMaps.cpp
+++ b/service/jni/com_android_server_BpfNetMaps.cpp
@@ -18,7 +18,8 @@
#include "TrafficController.h"
-#include <bpf_shared.h>
+#include "netd.h"
+
#include <jni.h>
#include <log/log.h>
#include <nativehelper/JNIHelp.h>
diff --git a/service/jni/com_android_server_connectivity_ClatCoordinator.cpp b/service/jni/com_android_server_connectivity_ClatCoordinator.cpp
index 5cd6e5d..18d2311 100644
--- a/service/jni/com_android_server_connectivity_ClatCoordinator.cpp
+++ b/service/jni/com_android_server_connectivity_ClatCoordinator.cpp
@@ -30,7 +30,6 @@
#include <bpf/BpfMap.h>
#include <bpf/BpfUtils.h>
-#include <bpf_shared.h>
#include <netjniutils/netjniutils.h>
#include <private/android_filesystem_config.h>
diff --git a/service/native/include/TrafficController.h b/service/native/include/TrafficController.h
index b44d795..cb6c836 100644
--- a/service/native/include/TrafficController.h
+++ b/service/native/include/TrafficController.h
@@ -21,7 +21,7 @@
#include "android-base/thread_annotations.h"
#include "bpf/BpfMap.h"
-#include "bpf_shared.h"
+#include "netd.h"
#include "netdutils/DumpWriter.h"
#include "netdutils/NetlinkListener.h"
#include "netdutils/StatusOr.h"
diff --git a/service/src/com/android/server/BpfNetMaps.java b/service/src/com/android/server/BpfNetMaps.java
index b8a8fb4..bce9f53 100644
--- a/service/src/com/android/server/BpfNetMaps.java
+++ b/service/src/com/android/server/BpfNetMaps.java
@@ -139,7 +139,7 @@
@VisibleForTesting public static final long OEM_DENY_1_MATCH = (1 << 9);
@VisibleForTesting public static final long OEM_DENY_2_MATCH = (1 << 10);
@VisibleForTesting public static final long OEM_DENY_3_MATCH = (1 << 11);
- // LINT.ThenChange(packages/modules/Connectivity/bpf_progs/bpf_shared.h)
+ // LINT.ThenChange(packages/modules/Connectivity/bpf_progs/netd.h)
private static final List<Pair<Integer, String>> PERMISSION_LIST = Arrays.asList(
Pair.create(PERMISSION_INTERNET, "PERMISSION_INTERNET"),
diff --git a/service/src/com/android/server/ConnectivityService.java b/service/src/com/android/server/ConnectivityService.java
index d547d83..e3e12fd 100755
--- a/service/src/com/android/server/ConnectivityService.java
+++ b/service/src/com/android/server/ConnectivityService.java
@@ -286,6 +286,7 @@
import com.android.server.connectivity.ProxyTracker;
import com.android.server.connectivity.QosCallbackTracker;
import com.android.server.connectivity.UidRangeUtils;
+import com.android.server.connectivity.wear.CompanionDeviceManagerProxyService;
import libcore.io.IoUtils;
@@ -435,6 +436,7 @@
*/
@GuardedBy("mTNSLock")
private TestNetworkService mTNS;
+ private final CompanionDeviceManagerProxyService mCdmps;
private final Object mTNSLock = new Object();
@@ -1586,6 +1588,12 @@
mIngressRateLimit = ConnectivitySettingsManager.getIngressRateLimitInBytesPerSecond(
mContext);
+
+ if (SdkLevel.isAtLeastT()) {
+ mCdmps = new CompanionDeviceManagerProxyService(context);
+ } else {
+ mCdmps = null;
+ }
}
/**
@@ -11491,4 +11499,10 @@
mBpfNetMaps.replaceUidChain(chain, uids);
}
+
+ @Override
+ public IBinder getCompanionDeviceManagerProxyService() {
+ enforceNetworkStackPermission(mContext);
+ return mCdmps;
+ }
}
diff --git a/service/src/com/android/server/connectivity/wear/CompanionDeviceManagerProxyService.java b/service/src/com/android/server/connectivity/wear/CompanionDeviceManagerProxyService.java
new file mode 100644
index 0000000..d3e3843
--- /dev/null
+++ b/service/src/com/android/server/connectivity/wear/CompanionDeviceManagerProxyService.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.server.connectivity.wear;
+
+import android.annotation.SuppressLint;
+import android.companion.AssociationInfo;
+import android.companion.CompanionDeviceManager;
+import android.content.Context;
+import android.net.wear.ICompanionDeviceManagerProxy;
+import android.os.Binder;
+import android.os.Build;
+
+import androidx.annotation.RequiresApi;
+
+import com.android.net.module.util.PermissionUtils;
+
+import java.util.List;
+
+/**
+ * A proxy for {@link CompanionDeviceManager}, for use by Tethering with NetworkStack permissions.
+ */
+public class CompanionDeviceManagerProxyService extends ICompanionDeviceManagerProxy.Stub {
+ private final Context mContext;
+
+ @RequiresApi(Build.VERSION_CODES.TIRAMISU)
+ public CompanionDeviceManagerProxyService(Context context) {
+ mContext = context;
+ }
+
+ // TODO(b/193460475): Android Lint handles change from SystemApi to public incorrectly.
+ // CompanionDeviceManager#getAllAssociations() is made public in U,
+ // but existed in T as an identical SystemApi.
+ @SuppressLint("NewApi")
+ @Override
+ public List<AssociationInfo> getAllAssociations() {
+ PermissionUtils.enforceNetworkStackPermission(mContext);
+ final long token = Binder.clearCallingIdentity();
+ try {
+ final CompanionDeviceManager cdm = mContext.getSystemService(
+ CompanionDeviceManager.class);
+ return cdm.getAllAssociations();
+ } finally {
+ Binder.restoreCallingIdentity(token);
+ }
+ }
+}
diff --git a/tests/native/utilities/firewall.h b/tests/native/utilities/firewall.h
index 185559b..1e7e987 100644
--- a/tests/native/utilities/firewall.h
+++ b/tests/native/utilities/firewall.h
@@ -19,7 +19,7 @@
#include <android-base/thread_annotations.h>
#include <bpf/BpfMap.h>
-#include <bpf_shared.h>
+#include "netd.h"
using android::base::Result;
using android::bpf::BpfMap;