Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f7df5161 authored by Benedict Wong's avatar Benedict Wong Committed by Automerger Merge Worker
Browse files

Merge "Update VcnManagementService javadoc based on new names of classes" am:... 

Merge "Update VcnManagementService javadoc based on new names of classes" am: 7a7308b5 am: dc69815d am: f8168cd1

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1515253

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id0e1798962502a51241084c6d634b0c3ff5c9f9a
parents 520883b1 f8168cd1

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

+11 −11
Original line number 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:

 *

 * +------------------------+ 1:1                                 +--------------------------------+

 * |  VcnManagementService  | ------------ Creates -------------> |  TelephonySubscriptionManager  |

 * +-------------------------+ 1:1                                +--------------------------------+

 * |  VcnManagementService   | ------------ Creates ------------> |  TelephonySubscriptionManager  |

 * |                         |                                    |                                |

 * |   Manages configs and   |                                    | Tracks subscriptions, carrier  |

 * | VcnInstance lifecycles | <--- Notifies of subscription & --- | privilege changes, caches maps |

 * +------------------------+      carrier privilege changes      +--------------------------------+

 * | Vcn instance lifecycles | <--- Notifies of subscription & -- | privilege changes, caches maps |

 * +-------------------------+      carrier privilege changes     +--------------------------------+

 *      | 1:N          ^

 *      |              |

 *      |              +-------------------------------+
@@ -74,19 +74,19 @@ import java.util.Map.Entry; 
 *                      |                      mode state changes

 *                      v                              |

 * +-----------------------------------------------------------------------+

 * |                              VcnInstance                              |

 * |                                  Vcn                                  |

 * |                                                                       |

 * |   Manages tunnel lifecycles based on fulfillable NetworkRequest(s)    |

 * |                        and overall safe-mode                          |

 * |       Manages GatewayConnection lifecycles based on fulfillable       |

 * |                NetworkRequest(s) and overall safe-mode                |

 * +-----------------------------------------------------------------------+

 *                      | 1:N                          ^

 *              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)

 *                      |                 and safe-mode timer changes

 *                      v                              |

 * +-----------------------------------------------------------------------+

 * |                               VcnTunnel                               |

 * |                          VcnGatewayConnection                         |

 * |                                                                       |

 * |       Manages a single (IKEv2) tunnel session and NetworkAgent,       |

 * |  handles mobility events, (IPsec) Tunnel setup and safe-mode timers   |