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

Merge "Alter condition for starting RulesManagerService" am: a338679173 am: 3e928af733

Browse Source 
am: 4c1ade06b3

Change-Id: I5e42752fcf6e1bee87db8c78daaa5d6364a15ee5
This commit is contained in:
Neil Fuller
2017-07-27 13:49:21 +00:00
committed by android-build-merger
parent 2b923c07a7 4c1ade06b3
commit a63d879f4c
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1175,8 +1175,13 @@ public final class SystemServer {
traceEnd();
}
if (!disableNonCoreServices && context.getResources().getBoolean(
R.bool.config_enableUpdateableTimeZoneRules)) {
// 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.
final boolean startRulesManagerService =
!mOnlyCore && context.getResources().getBoolean(
R.bool.config_enableUpdateableTimeZoneRules);
if (startRulesManagerService) {
traceBeginAndSlog("StartTimeZoneRulesManagerService");
mSystemServiceManager.startService(TIME_ZONE_RULES_MANAGER_SERVICE_CLASS);
Trace.traceEnd(Trace.TRACE_TAG_SYSTEM_SERVER);