Merge changes from topic "tether_migrate" (e8401aff) · Commits · e / os / android_frameworks_base

core/java/android/os/ResultReceiver.aidl

+9 −9

Original line number	Diff line number	Diff line
		@@ -17,4 +17,4 @@

		package android.os;

		parcelable ResultReceiver;
		@JavaOnlyStableParcelable parcelable ResultReceiver;

packages/Tethering/Android.bp

+29 −41

Original line number	Diff line number	Diff line
		@@ -22,13 +22,12 @@ java_defaults {
		":framework-tethering-shared-srcs",
		":net-module-utils-srcs",
		":services-tethering-shared-srcs",
		":servicescore-tethering-src",
		],
		static_libs: [
		"androidx.annotation_annotation",
		"netd_aidl_interface-java",
		"netd_aidl_interface-unstable-java",
		"netlink-client",
		"networkstack-aidl-interfaces-java",
		"networkstack-aidl-interfaces-unstable-java",
		"android.hardware.tetheroffload.control-V1.0-java",
		"tethering-client",
		],
		@@ -41,20 +40,26 @@ android_library {
		defaults: ["TetheringAndroidLibraryDefaults"],
		}

		cc_library_shared {
		// Due to b/143733063, APK can't access a jni lib that is in APEX (but not in the APK).
		cc_library {
		name: "libtetheroffloadjni",
		srcs: [
		"jni/com_android_server_connectivity_tethering_OffloadHardwareInterface.cpp",
		],
		shared_libs: [
		"libnativehelper",
		"libcutils",
		"android.hardware.tetheroffload.config@1.0",
		"libcgrouprc",
		"libnativehelper_compat_libc++",
		"libvndksupport",
		],
		static_libs: [
		"android.hardware.tetheroffload.config@1.0",
		"liblog",
		"libbase",
		"libbinderthreadstate",
		"libcutils",
		"libhidlbase",
		"libjsoncpp",
		"libprocessgroup",
		"libutils",
		],

		@@ -64,6 +69,8 @@ cc_library_shared {
		"-Wno-unused-parameter",
		"-Wthread-safety",
		],

		ldflags: ["-Wl,--exclude-libs=ALL,-error-limit=0"],
		}

		// Common defaults for compiling the actual APK.
		@@ -71,7 +78,12 @@ java_defaults {
		name: "TetheringAppDefaults",
		platform_apis: true,
		privileged: true,
		// Build system doesn't track transitive dependeicies for jni_libs, list all the dependencies
		// explicitly.
		jni_libs: [
		"libcgrouprc",
		"libnativehelper_compat_libc++",
		"libvndksupport",
		"libtetheroffloadjni",
		],
		resource_dirs: [
		@@ -83,7 +95,16 @@ java_defaults {
		}

		// Non-updatable tethering running in the system server process for devices not using the module
		// TODO: build in-process tethering APK here.
		android_app {
		name: "InProcessTethering",
		defaults: ["TetheringAppDefaults"],
		static_libs: ["TetheringApiCurrentLib"],
		certificate: "platform",
		manifest: "AndroidManifest_InProcess.xml",
		// InProcessTethering is a replacement for Tethering
		overrides: ["Tethering"],
		// TODO: use PlatformNetworkPermissionConfig.
		}

		// Updatable tethering packaged as an application
		android_app {
		@@ -96,36 +117,3 @@ android_app {
		// The permission configuration must be included to ensure security of the device
		required: ["NetworkPermissionConfig"],
		}

		// This group will be removed when tethering migration is done.
		filegroup {
		name: "tethering-servicescore-srcs",
		srcs: [
		"src/com/android/server/connectivity/tethering/EntitlementManager.java",
		"src/com/android/server/connectivity/tethering/OffloadController.java",
		"src/com/android/server/connectivity/tethering/OffloadHardwareInterface.java",
		"src/com/android/server/connectivity/tethering/TetheringConfiguration.java",
		"src/com/android/server/connectivity/tethering/UpstreamNetworkMonitor.java",
		],
		}

		// This group will be removed when tethering migration is done.
		filegroup {
		name: "tethering-servicesnet-srcs",
		srcs: [
		"src/android/net/dhcp/DhcpServerCallbacks.java",
		"src/android/net/dhcp/DhcpServingParamsParcelExt.java",
		"src/android/net/ip/IpServer.java",
		"src/android/net/ip/RouterAdvertisementDaemon.java",
		"src/android/net/util/InterfaceSet.java",
		"src/android/net/util/PrefixUtils.java",
		],
		}

		// This group would be removed when tethering migration is done.
		filegroup {
		name: "tethering-jni-srcs",
		srcs: [
		"jni/com_android_server_connectivity_tethering_OffloadHardwareInterface.cpp",
		],
		}

packages/Tethering/AndroidManifest.xml

+6 −0

Original line number	Diff line number	Diff line
		@@ -25,5 +25,11 @@
		android:process="com.android.networkstack.process"
		android:extractNativeLibs="false"
		android:persistent="true">
		<service android:name="com.android.server.connectivity.tethering.TetheringService"
		android:permission="android.permission.MAINLINE_NETWORK_STACK">
		<intent-filter>
		<action android:name="android.net.ITetheringConnector"/>
		</intent-filter>
		</service>
		</application>
		</manifest>

packages/Tethering/AndroidManifest_InProcess.xml

0 → 100644

+35 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		/*
		* Copyright (C) 2019 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.
		*/
		-->
		<manifest xmlns:android="http://schemas.android.com/apk/res/android"
		package="com.android.tethering.inprocess"
		android:sharedUserId="android.uid.system"
		android:process="system">
		<uses-sdk android:minSdkVersion="29" android:targetSdkVersion="29" />
		<application>
		<!-- TODO: Using MAINLINE_NETWORK_STACK instead of NETWORK_STACK when tethering run in the
		same process with networkstack -->
		<service android:name="com.android.server.connectivity.tethering.TetheringService"
		android:process="system"
		android:permission="android.permission.NETWORK_STACK">
		<intent-filter>
		<action android:name="android.net.ITetheringConnector.InProcess"/>
		</intent-filter>
		</service>
		</application>
		</manifest>

packages/Tethering/CleanSpec.mk

0 → 100644

+52 −0

Original line number	Diff line number	Diff line
		# Copyright (C) 2019 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.
		#

		# If you don't need to do a full clean build but would like to touch
		# a file or delete some intermediate files, add a clean step to the end
		# of the list. These steps will only be run once, if they haven't been
		# run before.
		#
		# E.g.:
		# $(call add-clean-step, touch -c external/sqlite/sqlite3.h)
		# $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libz_intermediates)
		#
		# Always use "touch -c" and "rm -f" or "rm -rf" to gracefully deal with
		# files that are missing or have been moved.
		#
		# Use $(PRODUCT_OUT) to get to the "out/target/product/blah/" directory.
		# Use $(OUT_DIR) to refer to the "out" directory.
		#
		# If you need to re-do something that's already mentioned, just copy
		# the command and add it to the bottom of the list. E.g., if a change
		# that you made last week required touching a file and a change you
		# made today requires touching the same file, just copy the old
		# touch step and add it to the end of the list.
		#
		# *****************************************************************
		# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST ABOVE THE BANNER
		# *****************************************************************

		# For example:
		#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/AndroidTests_intermediates)
		#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/core_intermediates)
		#$(call add-clean-step, find $(OUT_DIR) -type f -name "IGTalkSession*" -print0 \| xargs -0 rm -f)
		#$(call add-clean-step, rm -rf $(PRODUCT_OUT)/data/*)

		$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/priv-app/Tethering)
		$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/priv-app/InProcessTethering)

		# ******************************************************************
		# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST ABOVE THIS BANNER
		# ******************************************************************