commit 2b36141117c7f2f88a6b83fe6da4983a1019d23c
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Tue Mar 12 16:01:43 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 12 16:01:43 2024 +0000
tree ce379580e14a33fe2639be0dd0c742c7bf68b184
parent b10079a74d94bd6c4d98565e70a9c826981e4aba
parent da36e7066e86105339cbe279b7c76c9cbe5c9384

Merge "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 73d830d..7c669f1 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -2166,14 +2166,16 @@
             }
             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);
+            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.traceEnd();
 
             t.traceBegin("StartSystemUpdateManagerService");
             try {