Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove configuration of com.android.geotz module" into sc-dev

Browse Source
This commit is contained in:
Neil Fuller
2021-06-30 10:54:42 +00:00
committed by Android (Google) Code Review
parent 1e13be4c99 a72fe2b22f
commit 9cdd6897f1
3 changed files with 0 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
core/res/AndroidManifest.xml
View File

@@ -1663,11 +1663,6 @@
<permission android:name="android.permission.INSTALL_LOCATION_TIME_ZONE_PROVIDER_SERVICE" <permission android:name="android.permission.INSTALL_LOCATION_TIME_ZONE_PROVIDER_SERVICE"
android:protectionLevel="signature|privileged" /> 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 <!-- @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 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 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"/> android:label="@string/sensor_notification_service"/>
<!-- Attribution for Twilight service. --> <!-- Attribution for Twilight service. -->
<attribution android:tag="TwilightService" android:label="@string/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 for Gnss Time Update service. -->
<attribution android:tag="GnssTimeUpdateService" <attribution android:tag="GnssTimeUpdateService"
android:label="@string/gnss_time_update_service"/> android:label="@string/gnss_time_update_service"/>
@@ -6292,19 +6283,6 @@
</intent-filter> </intent-filter>
</service> </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 <provider
android:name="com.android.server.textclassifier.IconsContentProvider" android:name="com.android.server.textclassifier.IconsContentProvider"
android:authorities="com.android.textclassifier.icons" android:authorities="com.android.textclassifier.icons"

6
core/res/res/values/strings.xml
View File

@@ -444,12 +444,6 @@
<string name="sensor_notification_service">Sensor Notification Service</string> <string name="sensor_notification_service">Sensor Notification Service</string>
<!-- Attribution for Twilight service. [CHAR LIMIT=NONE]--> <!-- Attribution for Twilight service. [CHAR LIMIT=NONE]-->
<string name="twilight_service">Twilight Service</string> <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]--> <!-- Attribution for Gnss Time Update service. [CHAR LIMIT=NONE]-->
<string name="gnss_time_update_service">GNSS Time Update Service</string> <string name="gnss_time_update_service">GNSS Time Update Service</string>

4
services/core/java/com/android/server/timedetector/ServerFlags.java
View File

@@ -50,10 +50,6 @@ public final class ServerFlags {
/** /**
* An annotation used to indicate when a {@link DeviceConfig#NAMESPACE_SYSTEM_TIME} key is * An annotation used to indicate when a {@link DeviceConfig#NAMESPACE_SYSTEM_TIME} key is
* required. * 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 = { @StringDef(prefix = "KEY_", value = {
KEY_LOCATION_TIME_ZONE_DETECTION_FEATURE_SUPPORTED, KEY_LOCATION_TIME_ZONE_DETECTION_FEATURE_SUPPORTED,