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

Commit 2e8b3815 authored by Bryan Yu's avatar Bryan Yu
Browse files

Remove the use of isDesktop in SystemServer 

As per the discussion in go/disable-sss-al, we will remove all
references to isDesktop and use another way to conditionally start
services.

Bug: 400878260
Test: Manual
Flag: EXEMPT desktop only
Change-Id: I42a914f41a9adc79d4bb33952ebd53b75a800899
parent 40683b8d

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

+3 −5
Original line number Diff line number Diff line
@@ -1540,8 +1540,6 @@ public final class SystemServer implements Dumpable { 
        boolean disableCameraService = SystemProperties.getBoolean("config.disable_cameraservice",

                false);



        boolean isDesktop = context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_PC);



        boolean isWatch = RoSystemFeatures.hasFeatureWatch(context);



        boolean isArc = context.getPackageManager().hasSystemFeature(
@@ -1663,7 +1661,7 @@ public final class SystemServer implements Dumpable { 
                t.traceEnd();

            }



            if (!isTv && !isDesktop) {

            if (!isTv) {

                t.traceBegin("StartVibratorManagerService");

                mSystemServiceManager.startService(VibratorManagerService.Lifecycle.class);

                t.traceEnd();
@@ -1804,7 +1802,7 @@ public final class SystemServer implements Dumpable { 
            mSystemServiceManager.startService(LogcatManagerService.class);

            t.traceEnd();



            if (!isWatch && !isTv && !isAutomotive && !isDesktop

            if (!isWatch && !isTv && !isAutomotive

                    && android.security.Flags.aflApi()) {

                t.traceBegin("StartIntrusionDetectionService");

                mSystemServiceManager.startService(IntrusionDetectionService.class);
@@ -1817,7 +1815,7 @@ public final class SystemServer implements Dumpable { 
                t.traceEnd();

            }



            if (!isWatch && !isTv && !isAutomotive && !isDesktop

            if (!isWatch && !isTv && !isAutomotive

                    && android.security.Flags.aapmApi()) {

                t.traceBegin("StartAdvancedProtectionService");

                mSystemServiceManager.startService(AdvancedProtectionService.Lifecycle.class);