diff options
| -rw-r--r-- | core/res/AndroidManifest.xml | 22 | ||||
| -rw-r--r-- | core/res/res/values/strings.xml | 6 | ||||
| -rw-r--r-- | services/core/java/com/android/server/timedetector/ServerFlags.java | 4 |
3 files changed, 0 insertions, 32 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 64b8a1a81e69..14d200d00d56 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -1663,11 +1663,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 @@ -5809,10 +5804,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"/> @@ -6292,19 +6283,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" diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index d1a5cc49be9f..cbc37b4d55b6 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -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> diff --git a/services/core/java/com/android/server/timedetector/ServerFlags.java b/services/core/java/com/android/server/timedetector/ServerFlags.java index 7145f5ea4a64..fe977f8b3921 100644 --- a/services/core/java/com/android/server/timedetector/ServerFlags.java +++ b/services/core/java/com/android/server/timedetector/ServerFlags.java @@ -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, |