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

Commit 2117dfff authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of ['googleplex-android-review.googlesource.com/26552641'] into 24Q3-release. 

Change-Id: Ib75a4f8a4edfd224558a5324d14ae8b044de48cc
parents a6f870f3 b7a07859

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

+7 −9
Original line number Diff line number Diff line
@@ -2166,7 +2166,6 @@ public final class SystemServer implements Dumpable { 
            }

            t.traceEnd();



            if (mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY_SUBSCRIPTION)) {

            t.traceBegin("StartVcnManagementService");

            try {

                vcnManagement = VcnManagementService.create(context);
@@ -2175,7 +2174,6 @@ public final class SystemServer implements Dumpable { 
                reportWtf("starting VCN Management Service", e);

            }

            t.traceEnd();

            }



            t.traceBegin("StartSystemUpdateManagerService");

            try {