commit 208f84cc6ee30373d3681d534e64a1fd6c1d669c
author Hani Kazmi <hanikazmi@google.com> Tue Oct 22 14:50:29 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Oct 22 14:50:29 2024 +0000
tree 5859a1981e3294cdc225be21ccc5adfc8afe78f6
parent a12c57da9fea5098d23819d13506b429ce3c1cda
parent 3ee9acc200f83429a09a6ed0cde0710632121260

Merge "[AAPM] Disable for unsupported form factors." 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 e052f94..2461c1c 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -1504,6 +1504,8 @@
         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 @@
                 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 @@
                 }, WEBVIEW_PREPARATION);
             }
 
-            if (RoSystemFeatures.hasFeatureAutomotive(context)) {
+            if (isAutomotive) {
                 t.traceBegin("StartCarServiceHelperService");
                 final SystemService cshs = mSystemServiceManager
                         .startService(CAR_SERVICE_HELPER_SERVICE_CLASS);