Merge "Update VcnManagementService javadoc based on new names of classes" am:... (f7df5161) · Commits · e / os / android_frameworks_base

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

+11 −11

Original line number	Original line	Diff line number	Diff line
	@@ -57,12 +57,12 @@ import java.util.Map.Entry;
	*		*
	* <pre>The internal structure of the VCN Management subsystem is as follows:		* <pre>The internal structure of the VCN Management subsystem is as follows:
	*		*
	* +------------------------+ 1:1 +--------------------------------+		* +-------------------------+ 1:1 +--------------------------------+
	* \| VcnManagementService \| ------------ Creates -------------> \| TelephonySubscriptionManager \|		* \| VcnManagementService \| ------------ Creates ------------> \| TelephonySubscriptionManager \|
	* \| \| \| \|		* \| \| \| \|
	* \| Manages configs and \| \| Tracks subscriptions, carrier \|		* \| Manages configs and \| \| Tracks subscriptions, carrier \|
	* \| VcnInstance lifecycles \| <--- Notifies of subscription & --- \| privilege changes, caches maps \|		* \| Vcn instance lifecycles \| <--- Notifies of subscription & -- \| privilege changes, caches maps \|
	* +------------------------+ carrier privilege changes +--------------------------------+		* +-------------------------+ carrier privilege changes +--------------------------------+
	* \| 1:N ^		* \| 1:N ^
	* \| \|		* \| \|
	* \| +-------------------------------+		* \| +-------------------------------+
	@@ -74,19 +74,19 @@ import java.util.Map.Entry;
	* \| mode state changes		* \| mode state changes
	* v \|		* v \|
	* +-----------------------------------------------------------------------+		* +-----------------------------------------------------------------------+
	* \| VcnInstance \|		* \| Vcn \|
	* \| \|		* \| \|
	* \| Manages tunnel lifecycles based on fulfillable NetworkRequest(s) \|		* \| Manages GatewayConnection lifecycles based on fulfillable \|
	* \| and overall safe-mode \|		* \| NetworkRequest(s) and overall safe-mode \|
	* +-----------------------------------------------------------------------+		* +-----------------------------------------------------------------------+
	* \| 1:N ^		* \| 1:N ^
	* Creates to fulfill \|		* Creates to fulfill \|
	* NetworkRequest(s), tears Notifies of VcnTunnel		* NetworkRequest(s), tears Notifies of VcnGatewayConnection
	* down when no longer needed teardown (e.g. Network reaped)		* down when no longer needed teardown (e.g. Network reaped)
	* \| and safe-mode timer changes		* \| and safe-mode timer changes
	* v \|		* v \|
	* +-----------------------------------------------------------------------+		* +-----------------------------------------------------------------------+
	* \| VcnTunnel \|		* \| VcnGatewayConnection \|
	* \| \|		* \| \|
	* \| Manages a single (IKEv2) tunnel session and NetworkAgent, \|		* \| Manages a single (IKEv2) tunnel session and NetworkAgent, \|
	* \| handles mobility events, (IPsec) Tunnel setup and safe-mode timers \|		* \| handles mobility events, (IPsec) Tunnel setup and safe-mode timers \|

Original line number	Original line	Diff line number	Diff line
	@@ -57,12 +57,12 @@ import java.util.Map.Entry;
	*		*
	* <pre>The internal structure of the VCN Management subsystem is as follows:		* <pre>The internal structure of the VCN Management subsystem is as follows:
	*		*
	* +------------------------+ 1:1 +--------------------------------+		* +-------------------------+ 1:1 +--------------------------------+
	* \| VcnManagementService \| ------------ Creates -------------> \| TelephonySubscriptionManager \|		* \| VcnManagementService \| ------------ Creates ------------> \| TelephonySubscriptionManager \|
	* \| \| \| \|		* \| \| \| \|
	* \| Manages configs and \| \| Tracks subscriptions, carrier \|		* \| Manages configs and \| \| Tracks subscriptions, carrier \|
	* \| VcnInstance lifecycles \| <--- Notifies of subscription & --- \| privilege changes, caches maps \|		* \| Vcn instance lifecycles \| <--- Notifies of subscription & -- \| privilege changes, caches maps \|
	* +------------------------+ carrier privilege changes +--------------------------------+		* +-------------------------+ carrier privilege changes +--------------------------------+
	* \| 1:N ^		* \| 1:N ^
	* \| \|		* \| \|
	* \| +-------------------------------+		* \| +-------------------------------+
	@@ -74,19 +74,19 @@ import java.util.Map.Entry;
	* \| mode state changes		* \| mode state changes
	* v \|		* v \|
	* +-----------------------------------------------------------------------+		* +-----------------------------------------------------------------------+
	* \| VcnInstance \|		* \| Vcn \|
	* \| \|		* \| \|
	* \| Manages tunnel lifecycles based on fulfillable NetworkRequest(s) \|		* \| Manages GatewayConnection lifecycles based on fulfillable \|
	* \| and overall safe-mode \|		* \| NetworkRequest(s) and overall safe-mode \|
	* +-----------------------------------------------------------------------+		* +-----------------------------------------------------------------------+
	* \| 1:N ^		* \| 1:N ^
	* Creates to fulfill \|		* Creates to fulfill \|
	* NetworkRequest(s), tears Notifies of VcnTunnel		* NetworkRequest(s), tears Notifies of VcnGatewayConnection
	* down when no longer needed teardown (e.g. Network reaped)		* down when no longer needed teardown (e.g. Network reaped)
	* \| and safe-mode timer changes		* \| and safe-mode timer changes
	* v \|		* v \|
	* +-----------------------------------------------------------------------+		* +-----------------------------------------------------------------------+
	* \| VcnTunnel \|		* \| VcnGatewayConnection \|
	* \| \|		* \| \|
	* \| Manages a single (IKEv2) tunnel session and NetworkAgent, \|		* \| Manages a single (IKEv2) tunnel session and NetworkAgent, \|
	* \| handles mobility events, (IPsec) Tunnel setup and safe-mode timers \|		* \| handles mobility events, (IPsec) Tunnel setup and safe-mode timers \|