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

Commit 16b05426 authored by Neil Fuller's avatar Neil Fuller Committed by Automerger Merge Worker
Browse files

Merge "Remove configuration of com.android.geotz module" into sc-dev am: 9cdd6897 am: 10e811fa 

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

Change-Id: I828aa0f579f48e40084dde77079adf02f6bb5db2
parents 2e3587d9 10e811fa

core/res/AndroidManifest.xml

+0 −22
Original line number Diff line number Diff line
@@ -1665,11 +1665,6 @@ 
    <permission android:name="android.permission.INSTALL_LOCATION_TIME_ZONE_PROVIDER_SERVICE"

        android:protectionLevel="signature|privileged" />



    <!-- The system server uses this permission to install a default secondary location time zone

         provider.

    -->

    <uses-permission android:name="android.permission.INSTALL_LOCATION_TIME_ZONE_PROVIDER_SERVICE"/>



    <!-- @SystemApi @hide Allows an application to bind to a android.service.TimeZoneProviderService

         for the purpose of detecting the device's time zone. This prevents arbitrary clients

         connecting to the time zone provider service. The system server checks that the provider's
@@ -5811,10 +5806,6 @@ 
             android:label="@string/sensor_notification_service"/>

    <!-- Attribution for Twilight service. -->

    <attribution android:tag="TwilightService" android:label="@string/twilight_service"/>

    <!-- Attribution for the Offline LocationTimeZoneProvider, used to detect time zone using

         on-device data -->

    <attribution android:tag="OfflineLocationTimeZoneProviderService"

                 android:label="@string/offline_location_time_zone_detection_service_attribution"/>

    <!-- Attribution for Gnss Time Update service. -->

    <attribution android:tag="GnssTimeUpdateService"

                 android:label="@string/gnss_time_update_service"/>
@@ -6294,19 +6285,6 @@ 
            </intent-filter>

        </service>



        <!-- 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.location.provider.OfflineLocationTimeZoneProviderService"

                 android:enabled="@bool/config_enableSecondaryLocationTimeZoneProvider"

                 android:permission="android.permission.BIND_TIME_ZONE_PROVIDER_SERVICE"

                 android:exported="false">

            <intent-filter>

                <action android:name="android.service.timezone.SecondaryLocationTimeZoneProviderService" />

            </intent-filter>

            <meta-data android:name="serviceVersion" android:value="1" />

            <meta-data android:name="serviceIsMultiuser" android:value="true" />

        </service>



        <provider

            android:name="com.android.server.textclassifier.IconsContentProvider"

            android:authorities="com.android.textclassifier.icons"

core/res/res/values/strings.xml

+0 −6
Original line number Diff line number Diff line
@@ -444,12 +444,6 @@ 
    <string name="sensor_notification_service">Sensor Notification Service</string>

    <!-- Attribution for Twilight service. [CHAR LIMIT=NONE]-->

    <string name="twilight_service">Twilight Service</string>

    <!-- Attribution for the Offline LocationTimeZoneProvider service, i.e. the service capable of

         performing time zone detection using time zone geospatial information held on the device.

         This text is shown in UIs related to an application name to help users and developers to

         understand which sub-unit of an application is requesting permissions and using power.

         [CHAR LIMIT=NONE]-->

    <string name="offline_location_time_zone_detection_service_attribution">Time Zone Detector (No connectivity)</string>

    <!-- Attribution for Gnss Time Update service. [CHAR LIMIT=NONE]-->

    <string name="gnss_time_update_service">GNSS Time Update Service</string>

services/core/java/com/android/server/timedetector/ServerFlags.java

+0 −4
Original line number Diff line number Diff line
@@ -50,10 +50,6 @@ public final class ServerFlags { 
    /**

     * An annotation used to indicate when a {@link DeviceConfig#NAMESPACE_SYSTEM_TIME} key is

     * required.

     *

     * <p>Note that the com.android.geotz module deployment of the Offline LocationTimeZoneProvider

     * also shares the {@link DeviceConfig#NAMESPACE_SYSTEM_TIME}, and uses the

     * prefix "geotz_" on all of its key strings.

     */

    @StringDef(prefix = "KEY_", value = {

            KEY_LOCATION_TIME_ZONE_DETECTION_FEATURE_SUPPORTED,