From b8c40749ea36016f730fca28b16537f2eb0dffb2 Mon Sep 17 00:00:00 2001 From: Eric Rahm Date: Wed, 12 Apr 2023 17:14:27 -0700 Subject: [PATCH] Init WearSettingsService Initializes the `WearSettingsService` in `SystemServer`. This is a cherry-pick and rebase of ag/19716435 and ag/19751030. Test: unit test Bug: 241600584 Bug: 241509962 Fixes: 272529454 Fixes: 272529428 Change-Id: Ie11f82ca51b41ae5d10fafd5590a9d6a1e02f810 --- services/java/com/android/server/SystemServer.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index dbff90a1aee3c..28e05c542be04 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -335,6 +335,8 @@ public final class SystemServer implements Dumpable { "com.android.clockwork.time.WearTimeService"; private static final String WEAR_GLOBAL_ACTIONS_SERVICE_CLASS = "com.android.clockwork.globalactions.GlobalActionsService"; + private static final String WEAR_SETTINGS_SERVICE_CLASS = + "com.android.clockwork.settings.WearSettingsService"; private static final String ACCOUNT_SERVICE_CLASS = "com.android.server.accounts.AccountManagerService$Lifecycle"; private static final String CONTENT_SERVICE_CLASS = @@ -2594,6 +2596,10 @@ public final class SystemServer implements Dumpable { t.traceBegin("StartWearGlobalActionsService"); mSystemServiceManager.startService(WEAR_GLOBAL_ACTIONS_SERVICE_CLASS); t.traceEnd(); + + t.traceBegin("StartWearSettingsService"); + mSystemServiceManager.startService(WEAR_SETTINGS_SERVICE_CLASS); + t.traceEnd(); } if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_SLICES_DISABLED)) {