commit 459ed769928fa7a1594fc5afcbda61608d7e6dc3
author Priyanka Advani <padvani@google.com> Tue Mar 12 22:18:14 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 12 22:18:14 2024 +0000
tree 25690278394edab0c8d1f12c4fa14244bbf5eb58
parent f9bbea5fe789f5553b5dab75f19e3752e7973736
parent f24996db54ae5afbbb0202afa8f93d9c4af1d4d2

Merge "Revert "Don't initialize VcnManagementService without telephony subscription"" into main

services/java/com/android/server/SystemServer.java

diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java
index 7c669f1..73d830d 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -2166,16 +2166,14 @@
             }
             t.traceEnd();
 
-            if (mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY_SUBSCRIPTION)) {
-                t.traceBegin("StartVcnManagementService");
-                try {
-                    vcnManagement = VcnManagementService.create(context);
-                    ServiceManager.addService(Context.VCN_MANAGEMENT_SERVICE, vcnManagement);
-                } catch (Throwable e) {
-                    reportWtf("starting VCN Management Service", e);
-                }
-                t.traceEnd();
+            t.traceBegin("StartVcnManagementService");
+            try {
+                vcnManagement = VcnManagementService.create(context);
+                ServiceManager.addService(Context.VCN_MANAGEMENT_SERVICE, vcnManagement);
+            } catch (Throwable e) {
+                reportWtf("starting VCN Management Service", e);
             }
+            t.traceEnd();
 
             t.traceBegin("StartSystemUpdateManagerService");
             try {