Merge "Prevent VCN service from being registered twice" into main am: f73ff252a8

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

Change-Id: Ie6a049152549efe650c5a820637962e1b6097478
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

2 files changed, 23 insertions, 2 deletions

diff --git a/packages/Vcn/service-b/Android.bp b/packages/Vcn/service-b/Android.bp
index 97574e6e35e3..aad534c3289c 100644
--- a/packages/Vcn/service-b/Android.bp
+++ b/packages/Vcn/service-b/Android.bp
@@ -29,7 +29,10 @@ filegroup {
             "vcn-location-flag/platform/com/android/server/vcn/VcnLocation.java",
         ],
     }),
-    visibility: ["//frameworks/base/services/core"],
+    visibility: [
+        "//frameworks/base/services/core",
+        "//packages/modules/Connectivity/service-t",
+    ],
 }
 
 // TODO: b/374174952 This library is only used in "service-connectivity-b-platform"
diff --git a/packages/Vcn/service-b/src/com/android/server/ConnectivityServiceInitializerB.java b/packages/Vcn/service-b/src/com/android/server/ConnectivityServiceInitializerB.java
index 81c7edf4adf1..b3f7eb5590c1 100644
--- a/packages/Vcn/service-b/src/com/android/server/ConnectivityServiceInitializerB.java
+++ b/packages/Vcn/service-b/src/com/android/server/ConnectivityServiceInitializerB.java
@@ -38,9 +38,27 @@ public final class ConnectivityServiceInitializerB extends SystemService {
     private static final String TAG = ConnectivityServiceInitializerB.class.getSimpleName();
     private final VcnManagementService mVcnManagementService;
 
+    // STOPSHIP: b/385203616 This static flag is for handling a temporary case when the mainline
+    // module prebuilt has updated to register the VCN but the platform change to remove
+    // registration is not merged. After mainline prebuilt is updated, we should merge the platform
+    // ASAP and remove this static check. This check is safe because both mainline and platform
+    // registration are triggered from the same method on the same thread.
+    private static boolean sIsRegistered = false;
+
     public ConnectivityServiceInitializerB(Context context) {
         super(context);
-        mVcnManagementService = VcnManagementService.create(context);
+
+        if (!sIsRegistered) {
+            mVcnManagementService = VcnManagementService.create(context);
+            sIsRegistered = true;
+        } else {
+            mVcnManagementService = null;
+            Log.e(
+                    TAG,
+                    "Ignore this registration since VCN is already registered. It will happen when"
+                        + " the mainline module prebuilt has updated to register the VCN but the"
+                        + " platform change to remove registration is not merged.");
+        }
     }
 
     @Override