Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 600d041e authored by Neil Fuller's avatar Neil Fuller Committed by Automerger Merge Worker
Browse files

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2ac37fe5c7376a9502fbe699a64d666c6dffbd7f
parents 934760b7 bd651f9f

core/res/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -5912,7 +5912,7 @@ 


        <!-- AOSP configures a default secondary LocationTimeZoneProvider that uses an on-device

             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:permission="android.permission.BIND_TIME_ZONE_PROVIDER_SERVICE"

                 android:exported="false">