summaryrefslogtreecommitdiff
path: root/services/java
diff options
context:
space:
mode:
author Grace Cheng <graciecheng@google.com> 2024-12-23 22:20:38 +0000
committer Grace Cheng <graciecheng@google.com> 2024-12-23 20:41:25 -0800
commitf185723114cc7f7a5ce9cc0cecdd0b8e0aaf13b3 (patch)
tree6a3bb21c0c1f01c3ee6cd5ebfeaf6f57b182df6b /services/java
parent864ec575a1c2f1380d2531ba61445c2bcc1396ba (diff)
Gating authentication policy service and secure lockdown service
Disabling authentication policy service and secure lockdown service for auto, wear, tv Flag: EXEMPT bugfix Fixes: 381852261 Test: atest com.android.server.security.authenticationpolicy.AuthenticationPolicyServiceTest Change-Id: I0fbd317cedcf27498893bed505004f959562435d
Diffstat (limited to 'services/java')
-rw-r--r--services/java/com/android/server/SystemServer.java20
1 files changed, 11 insertions, 9 deletions
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java
index 30a967c5d4e6..6a58b0cae4e4 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -2712,16 +2712,18 @@ public final class SystemServer implements Dumpable {
mSystemServiceManager.startService(AuthService.class);
t.traceEnd();
- if (android.security.Flags.secureLockdown()) {
- t.traceBegin("StartSecureLockDeviceService.Lifecycle");
- mSystemServiceManager.startService(SecureLockDeviceService.Lifecycle.class);
- t.traceEnd();
- }
+ if (!isWatch && !isTv && !isAutomotive) {
+ if (android.security.Flags.secureLockdown()) {
+ t.traceBegin("StartSecureLockDeviceService.Lifecycle");
+ mSystemServiceManager.startService(SecureLockDeviceService.Lifecycle.class);
+ t.traceEnd();
+ }
- if (android.adaptiveauth.Flags.enableAdaptiveAuth()) {
- t.traceBegin("StartAuthenticationPolicyService");
- mSystemServiceManager.startService(AuthenticationPolicyService.class);
- t.traceEnd();
+ if (android.adaptiveauth.Flags.enableAdaptiveAuth()) {
+ t.traceBegin("StartAuthenticationPolicyService");
+ mSystemServiceManager.startService(AuthenticationPolicyService.class);
+ t.traceEnd();
+ }
}
if (!isWatch) {