From 96c619c826418155e1bfe2c0c3f447a040f2feb0 Mon Sep 17 00:00:00 2001
From: Dan Cashman <dcashman@google.com>
Date: Thu, 8 Jun 2017 13:30:44 -0700
Subject: [PATCH] DO NOT MERGE. Revert "Enable the TimeZoneManagerService"

This reverts commit 50889ce0eb4dda1d777b90321ddce3f8046b740d.

Bug: 62427402
Test: Build and boot.
Change-Id: I32eae7997c901981d3228b61f33322a7c2c84301
---
 private/platform_app.te  | 1 -
 private/service_contexts | 1 -
 public/service.te        | 1 -
 3 files changed, 3 deletions(-)

diff --git a/private/platform_app.te b/private/platform_app.te
index 78af20ef9..fd4634a30 100644
--- a/private/platform_app.te
+++ b/private/platform_app.te
@@ -50,7 +50,6 @@ allow platform_app mediacasserver_service:service_manager find;
 allow platform_app persistent_data_block_service:service_manager find;
 allow platform_app radio_service:service_manager find;
 allow platform_app surfaceflinger_service:service_manager find;
-allow platform_app timezone_service:service_manager find;
 allow platform_app app_api_service:service_manager find;
 allow platform_app system_api_service:service_manager find;
 allow platform_app vr_manager_service:service_manager find;
diff --git a/private/service_contexts b/private/service_contexts
index 82fba7650..dc77cb9c3 100644
--- a/private/service_contexts
+++ b/private/service_contexts
@@ -149,7 +149,6 @@ telecom                                   u:object_r:telecom_service:s0
 telephony.registry                        u:object_r:registry_service:s0
 textclassification                        u:object_r:textclassification_service:s0
 textservices                              u:object_r:textservices_service:s0
-timezone                                  u:object_r:timezone_service:s0
 trust                                     u:object_r:trust_service:s0
 tv_input                                  u:object_r:tv_input_service:s0
 uimode                                    u:object_r:uimode_service:s0
diff --git a/public/service.te b/public/service.te
index b189b0d9f..ee3ffe5fe 100644
--- a/public/service.te
+++ b/public/service.te
@@ -127,7 +127,6 @@ type task_service, system_server_service, service_manager_type;
 type textclassification_service, app_api_service, ephemeral_app_api_service, system_server_service, service_manager_type;
 type textservices_service, app_api_service, ephemeral_app_api_service, system_server_service, service_manager_type;
 type telecom_service, app_api_service, ephemeral_app_api_service, system_server_service, service_manager_type;
-type timezone_service, system_server_service, service_manager_type;
 type trust_service, app_api_service, system_server_service, service_manager_type;
 type tv_input_service, app_api_service, ephemeral_app_api_service, system_server_service, service_manager_type;
 type uimode_service, app_api_service, ephemeral_app_api_service, system_server_service, service_manager_type;
-- 
GitLab