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

Commit 208f84cc authored by Hani Kazmi's avatar Hani Kazmi Committed by Android (Google) Code Review
Browse files

Merge "[AAPM] Disable for unsupported form factors." into main

parents a12c57da 3ee9acc2

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

+5 −2
Original line number Diff line number Diff line
@@ -1504,6 +1504,8 @@ public final class SystemServer implements Dumpable { 
        boolean isTv = context.getPackageManager().hasSystemFeature(

                PackageManager.FEATURE_LEANBACK);



        boolean isAutomotive = RoSystemFeatures.hasFeatureAutomotive(context);



        boolean enableVrService = context.getPackageManager().hasSystemFeature(

                PackageManager.FEATURE_VR_MODE_HIGH_PERFORMANCE);
@@ -1760,7 +1762,8 @@ public final class SystemServer implements Dumpable { 
                t.traceEnd();

            }



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

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

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

                t.traceBegin("StartAdvancedProtectionService");

                mSystemServiceManager.startService(AdvancedProtectionService.Lifecycle.class);

                t.traceEnd();
@@ -3137,7 +3140,7 @@ public final class SystemServer implements Dumpable { 
                }, WEBVIEW_PREPARATION);

            }



            if (RoSystemFeatures.hasFeatureAutomotive(context)) {

            if (isAutomotive) {

                t.traceBegin("StartCarServiceHelperService");

                final SystemService cshs = mSystemServiceManager

                        .startService(CAR_SERVICE_HELPER_SERVICE_CLASS);