Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove TZUvA feature." am: 10c7acc51d am: 050cc50319

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/953617

Change-Id: I50d4b907cc0d88451b771ff414978dfeaa2e4913
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Almaz Mingaleev
2022-06-24 19:31:24 +00:00
committed by Automerger Merge Worker
parent 38ff7fa099 050cc50319
commit cc4630cdbf
27 changed files with 0 additions and 5618 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
services/java/com/android/server/SystemServer.java
View File

@@ -344,8 +344,6 @@ public final class SystemServer implements Dumpable {
"com.android.server.systemcaptions.SystemCaptionsManagerService";
private static final String TEXT_TO_SPEECH_MANAGER_SERVICE_CLASS =
"com.android.server.texttospeech.TextToSpeechManagerService";
private static final String TIME_ZONE_RULES_MANAGER_SERVICE_CLASS =
"com.android.server.timezone.RulesManagerService$Lifecycle";
private static final String IOT_SERVICE_CLASS =
"com.android.things.server.IoTSystemService";
private static final String SLICE_MANAGER_SERVICE_CLASS =
@@ -2307,19 +2305,6 @@ public final class SystemServer implements Dumpable {
}
t.traceEnd();
// timezone.RulesManagerService will prevent a device starting up if the chain of trust
// required for safe time zone updates might be broken. RuleManagerService cannot do
// this check when mOnlyCore == true, so we don't enable the service in this case.
// This service requires that JobSchedulerService is already started when it starts.
final boolean startRulesManagerService =
!mOnlyCore && context.getResources().getBoolean(
R.bool.config_enableUpdateableTimeZoneRules);
if (startRulesManagerService) {
t.traceBegin("StartTimeZoneRulesManagerService");
mSystemServiceManager.startService(TIME_ZONE_RULES_MANAGER_SERVICE_CLASS);
t.traceEnd();
}
if (!isWatch && !disableNetworkTime) {
t.traceBegin("StartNetworkTimeUpdateService");
try {