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

Commit b7a07859 authored by Priyanka Advani's avatar Priyanka Advani Committed by Android Build Coastguard Worker
Browse files

Revert "Don't initialize VcnManagementService without telephony subscription" 

This reverts commit da36e706.

Reason for revert: Likely culprit for b/329284271. Will be verifying through ABTD before reverting.
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:f24996db54ae5afbbb0202afa8f93d9c4af1d4d2)
Merged-In: Ib8b54091fc00160871b3e63dae9a06f2981ab395
Change-Id: Ib8b54091fc00160871b3e63dae9a06f2981ab395
parent a6f870f3

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 {