Merge "Track renames in system/timezone" into sc-dev am: d094141baf

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13417626

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I82c6d402af7f9a5c03e3c6b351c4c5cee84f3662
This commit is contained in:
Neil Fuller
2021-01-28 12:35:17 +00:00
committed by Automerger Merge Worker

View File

@@ -5912,7 +5912,7 @@
<!-- AOSP configures a default secondary LocationTimeZoneProvider that uses an on-device <!-- AOSP configures a default secondary LocationTimeZoneProvider that uses an on-device
data set from the com.android.geotz APEX. --> data set from the com.android.geotz APEX. -->
<service android:name="com.android.timezone.geotz.provider.OfflineLocationTimeZoneProviderService" <service android:name="com.android.timezone.location.provider.OfflineLocationTimeZoneProviderService"
android:enabled="@bool/config_enableSecondaryLocationTimeZoneProvider" android:enabled="@bool/config_enableSecondaryLocationTimeZoneProvider"
android:permission="android.permission.BIND_TIME_ZONE_PROVIDER_SERVICE" android:permission="android.permission.BIND_TIME_ZONE_PROVIDER_SERVICE"
android:exported="false"> android:exported="false">