diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-01-27 07:56:38 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-27 07:56:38 +0000 |
| commit | ed907b9203b18ac358ac87fe83fe29c1cf316aeb (patch) | |
| tree | 89341a236c73602fb3755bbfb4c718c03c58537f /services/java/com/android | |
| parent | 4bcc91667cf4c2d7380ef38b5c8855020ce59491 (diff) | |
| parent | 1438f59fb03c9359790a9a231d6e01af6bf735f7 (diff) | |
Merge "Add app hibernation service stubs" am: d7bac025fb am: d131f3737d am: 1438f59fb0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1544924
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I938d23eada77c80966b710a373de927adf72fae4
Diffstat (limited to 'services/java/com/android')
| -rw-r--r-- | services/java/com/android/server/SystemServer.java | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index ad2bc65c0d01..4b772ed80a89 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -103,6 +103,7 @@ import com.android.internal.util.FrameworkStatsLog; import com.android.internal.widget.ILockSettings; import com.android.server.am.ActivityManagerService; import com.android.server.appbinding.AppBindingService; +import com.android.server.apphibernation.AppHibernationService; import com.android.server.attention.AttentionManagerService; import com.android.server.audio.AudioService; import com.android.server.biometrics.AuthService; @@ -236,6 +237,8 @@ public final class SystemServer implements Dumpable { "com.android.server.appwidget.AppWidgetService"; private static final String VOICE_RECOGNITION_MANAGER_SERVICE_CLASS = "com.android.server.voiceinteraction.VoiceInteractionManagerService"; + private static final String APP_HIBERNATION_SERVICE_CLASS = + "com.android.server.apphibernation.AppHibernationService"; private static final String PRINT_MANAGER_SERVICE_CLASS = "com.android.server.print.PrintManagerService"; private static final String COMPANION_DEVICE_MANAGER_SERVICE_CLASS = @@ -2047,6 +2050,12 @@ public final class SystemServer implements Dumpable { mSystemServiceManager.startService(VOICE_RECOGNITION_MANAGER_SERVICE_CLASS); t.traceEnd(); + if (AppHibernationService.isAppHibernationEnabled()) { + t.traceBegin("StartAppHibernationService"); + mSystemServiceManager.startService(APP_HIBERNATION_SERVICE_CLASS); + t.traceEnd(); + } + if (GestureLauncherService.isGestureLauncherEnabled(context.getResources())) { t.traceBegin("StartGestureLauncher"); mSystemServiceManager.startService(GestureLauncherService.class); |