Merge "Add shell VcnManagementService" am: fa2c588ab5 am: 1ee8f22e8a am: e0eb89cf66 am: 3eda5ec4f9 (76062fa4) · Commits · e / os / android_frameworks_base

core/java/android/app/SystemServiceRegistry.java

+10 −0

Original line number	Original line	Diff line number	Diff line
	@@ -136,6 +136,8 @@ import android.net.lowpan.ILowpanManager;
	import android.net.lowpan.LowpanManager;		import android.net.lowpan.LowpanManager;
	import android.net.nsd.INsdManager;		import android.net.nsd.INsdManager;
	import android.net.nsd.NsdManager;		import android.net.nsd.NsdManager;
			import android.net.vcn.IVcnManagementService;
			import android.net.vcn.VcnManager;
	import android.net.wifi.WifiFrameworkInitializer;		import android.net.wifi.WifiFrameworkInitializer;
	import android.net.wifi.nl80211.WifiNl80211Manager;		import android.net.wifi.nl80211.WifiNl80211Manager;
	import android.nfc.NfcManager;		import android.nfc.NfcManager;
	@@ -385,6 +387,14 @@ public final class SystemServiceRegistry {
	ctx, () -> ServiceManager.getService(Context.TETHERING_SERVICE));		ctx, () -> ServiceManager.getService(Context.TETHERING_SERVICE));
	}});		}});

			registerService(Context.VCN_MANAGEMENT_SERVICE, VcnManager.class,
			new CachedServiceFetcher<VcnManager>() {
			@Override
			public VcnManager createService(ContextImpl ctx) throws ServiceNotFoundException {
			IBinder b = ServiceManager.getService(Context.VCN_MANAGEMENT_SERVICE);
			IVcnManagementService service = IVcnManagementService.Stub.asInterface(b);
			return new VcnManager(ctx, service);
			}});

	registerService(Context.IPSEC_SERVICE, IpSecManager.class,		registerService(Context.IPSEC_SERVICE, IpSecManager.class,
	new CachedServiceFetcher<IpSecManager>() {		new CachedServiceFetcher<IpSecManager>() {

core/java/android/content/Context.java

+11 −0

Original line number	Original line	Diff line number	Diff line
	@@ -3416,6 +3416,7 @@ public abstract class Context {
	VIBRATOR_SERVICE,		VIBRATOR_SERVICE,
	//@hide: STATUS_BAR_SERVICE,		//@hide: STATUS_BAR_SERVICE,
	CONNECTIVITY_SERVICE,		CONNECTIVITY_SERVICE,
			VCN_MANAGEMENT_SERVICE,
	//@hide: IP_MEMORY_STORE_SERVICE,		//@hide: IP_MEMORY_STORE_SERVICE,
	IPSEC_SERVICE,		IPSEC_SERVICE,
	VPN_MANAGEMENT_SERVICE,		VPN_MANAGEMENT_SERVICE,
	@@ -3994,6 +3995,16 @@ public abstract class Context {
	*/		*/
	public static final String CONNECTIVITY_SERVICE = "connectivity";		public static final String CONNECTIVITY_SERVICE = "connectivity";

			/**
			* Use with {@link #getSystemService(String)} to retrieve a {@link android.net.vcn.VcnManager}
			* for managing Virtual Carrier Networks
			*
			* @see #getSystemService(String)
			* @see android.net.vcn.VcnManager
			* @hide
			*/
			public static final String VCN_MANAGEMENT_SERVICE = "vcn_management";

	/**		/**
	* Use with {@link #getSystemService(String)} to retrieve a		* Use with {@link #getSystemService(String)} to retrieve a
	* {@link android.net.INetd} for communicating with the network stack		* {@link android.net.INetd} for communicating with the network stack

core/java/android/net/vcn/IVcnManagementService.aidl

0 → 100644

+23 −0

Original line number	Original line	Diff line number	Diff line
			/*
			* Copyright 2020, 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.vcn;

			/**
			* @hide
			*/
			interface IVcnManagementService {
			}

core/java/android/net/vcn/VcnManager.java

0 → 100644

+48 −0

Original line number	Original line	Diff line number	Diff line
			/*
			* Copyright (C) 2020 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.vcn;

			import static java.util.Objects.requireNonNull;

			import android.annotation.NonNull;
			import android.annotation.SystemService;
			import android.content.Context;

			/**
			* VcnManager publishes APIs for applications to configure and manage Virtual Carrier Networks
			*
			* @hide
			*/
			@SystemService(Context.VCN_MANAGEMENT_SERVICE)
			public final class VcnManager {
			@NonNull private static final String TAG = VcnManager.class.getSimpleName();

			@NonNull private final Context mContext;
			@NonNull private final IVcnManagementService mService;

			/**
			* Construct an instance of VcnManager within an application context.
			*
			* @param ctx the application context for this manager
			* @param service the VcnManagementService binder backing this manager
			*
			* @hide
			*/
			public VcnManager(@NonNull Context ctx, @NonNull IVcnManagementService service) {
			mContext = requireNonNull(ctx, "missing context");
			mService = requireNonNull(service, "missing service");
			}
			}

services/core/java/com/android/server/VcnManagementService.java

0 → 100644

+103 −0

Original line number	Original line	Diff line number	Diff line
			/*
			* Copyright (C) 2020 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;

			import static java.util.Objects.requireNonNull;

			import android.annotation.NonNull;
			import android.content.Context;
			import android.net.vcn.IVcnManagementService;

			/**
			* VcnManagementService manages Virtual Carrier Network profiles and lifecycles.
			*
			* <pre>The internal structure of the VCN Management subsystem is as follows:
			*
			* +------------------------+ 1:1 +--------------------------------+
			* \| VcnManagementService \| ------------ Creates -------------> \| TelephonySubscriptionManager \|
			* \| \| \| \|
			* \| Manages configs and \| \| Tracks subscriptions, carrier \|
			* \| VcnInstance lifecycles \| <--- Notifies of subscription & --- \| privilege changes, caches maps \|
			* +------------------------+ carrier privilege changes +--------------------------------+
			* \| 1:N ^
			* \| \|
			* \| +-------------------------------+
			* +---------------+ \|
			* \| \|
			* Creates when config present, \|
			* subscription group active, and \|
			* providing app is carrier privileged Notifies of safe
			* \| mode state changes
			* v \|
			* +-----------------------------------------------------------------------+
			* \| VcnInstance \|
			* \| \|
			* \| Manages tunnel lifecycles based on fulfillable NetworkRequest(s) \|
			* \| and overall safe-mode \|
			* +-----------------------------------------------------------------------+
			* \| 1:N ^
			* Creates to fulfill \|
			* NetworkRequest(s), tears Notifies of VcnTunnel
			* down when no longer needed teardown (e.g. Network reaped)
			* \| and safe-mode timer changes
			* v \|
			* +-----------------------------------------------------------------------+
			* \| VcnTunnel \|
			* \| \|
			* \| Manages a single (IKEv2) tunnel session and NetworkAgent, \|
			* \| handles mobility events, (IPsec) Tunnel setup and safe-mode timers \|
			* +-----------------------------------------------------------------------+
			* \| 1:1 ^
			* \| \|
			* Creates upon instantiation Notifies of changes in
			* \| selected underlying network
			* \| or its properties
			* v \|
			* +-----------------------------------------------------------------------+
			* \| UnderlyingNetworkTracker \|
			* \| \|
			* \| Manages lifecycle of underlying physical networks, filing requests to \|
			* \| bring them up, and releasing them as they become no longer necessary \|
			* +-----------------------------------------------------------------------+
			* </pre>
			*
			* @hide
			*/
			public class VcnManagementService extends IVcnManagementService.Stub {
			@NonNull private static final String TAG = VcnManagementService.class.getSimpleName();

			public static final boolean VDBG = false; // STOPSHIP: if true

			/* Binder context for this service */
			@NonNull private final Context mContext;
			@NonNull private final Dependencies mDeps;

			private VcnManagementService(@NonNull Context context, @NonNull Dependencies deps) {
			mContext = requireNonNull(context, "Missing context");
			mDeps = requireNonNull(deps, "Missing dependencies");
			}

			// Package-visibility for SystemServer to create instances.
			static VcnManagementService create(@NonNull Context context) {
			return new VcnManagementService(context, new Dependencies());
			}

			private static class Dependencies {}

			/** Notifies the VcnManagementService that external dependencies can be set up */
			public void systemReady() {}
			}