diff options
| author | Kevin Han <kevhan@google.com> | 2021-02-24 01:09:00 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-24 01:09:00 +0000 |
| commit | 31d1ff3b8dc204f8567461d7579a1f945f85a486 (patch) | |
| tree | 790783e15b8a2a84049deebe298e268e537fa48a /services/java/com/android | |
| parent | 77b8356060efddba8c08f5b2c6c069991cd13617 (diff) | |
| parent | ac520aad0dab093100405119bf994764e946736c (diff) | |
Merge "Support dynamic feature flag config" am: 201737c781 am: b9f0ad138b am: ac520aad0d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1587774
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib612a893e68e50d1abdfd5c788fb46459e329c2d
Diffstat (limited to 'services/java/com/android')
| -rw-r--r-- | services/java/com/android/server/SystemServer.java | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index 2bb5798fba2d..d50db91acc99 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -104,7 +104,6 @@ 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; @@ -2150,11 +2149,9 @@ 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(); - } + t.traceBegin("StartAppHibernationService"); + mSystemServiceManager.startService(APP_HIBERNATION_SERVICE_CLASS); + t.traceEnd(); if (GestureLauncherService.isGestureLauncherEnabled(context.getResources())) { t.traceBegin("StartGestureLauncher"); |