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

Commit fed6551a authored by Neil Fuller's avatar Neil Fuller Committed by Android (Google) Code Review
Browse files

Merge "Add config for the LocationTimeZoneManagerService"

parents 56be1690 d82ef68e

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -95,6 +95,7 @@ package android { 
    field public static final String INJECT_EVENTS = "android.permission.INJECT_EVENTS";

    field public static final String INSTALL_DYNAMIC_SYSTEM = "android.permission.INSTALL_DYNAMIC_SYSTEM";

    field public static final String INSTALL_GRANT_RUNTIME_PERMISSIONS = "android.permission.INSTALL_GRANT_RUNTIME_PERMISSIONS";

    field public static final String INSTALL_LOCATION_TIME_ZONE_PROVIDER = "android.permission.INSTALL_LOCATION_TIME_ZONE_PROVIDER";

    field public static final String INSTALL_PACKAGE_UPDATES = "android.permission.INSTALL_PACKAGE_UPDATES";

    field public static final String INSTALL_SELF_UPDATES = "android.permission.INSTALL_SELF_UPDATES";

    field public static final String INTENT_FILTER_VERIFICATION_AGENT = "android.permission.INTENT_FILTER_VERIFICATION_AGENT";

core/res/AndroidManifest.xml

+7 −0
Original line number Diff line number Diff line
@@ -1575,6 +1575,13 @@ 
    <permission android:name="android.permission.INSTALL_LOCATION_PROVIDER"

        android:protectionLevel="signature|privileged" />



    <!-- @SystemApi @hide Allows an application to install a LocationTimeZoneProvider into the

         LocationTimeZoneProviderManager.

         <p>Not for use by third-party applications.

    -->

    <permission android:name="android.permission.INSTALL_LOCATION_TIME_ZONE_PROVIDER"

        android:protectionLevel="signature|privileged" />



    <!-- @SystemApi @hide Allows HDMI-CEC service to access device and configuration files.

         This should only be used by HDMI-CEC service.

    -->

core/res/res/values/config.xml

+10 −0
Original line number Diff line number Diff line
@@ -1578,6 +1578,16 @@ 
         config_timeZoneRulesUpdateTrackingEnabled are true.] -->

    <integer name="config_timeZoneRulesCheckRetryCount">5</integer>



    <!-- Whether to enable primary location time zone provider overlay which allows the primary

         location time zone provider to be replaced by an app at run-time. When disabled, only the

         config_primaryLocationTimeZoneProviderPackageName package will be searched for the primary

         location time zone provider, otherwise any system package is eligible. Anyone who wants to

         disable the overlay mechanism can set it to false. -->

    <bool name="config_enablePrimaryLocationTimeZoneOverlay" translatable="false">false</bool>

    <!-- Package name providing the primary location time zone provider. Used only when

         config_enablePrimaryLocationTimeZoneOverlay is false. -->

    <string name="config_primaryLocationTimeZoneProviderPackageName" translatable="false">@null</string>



    <!-- Whether to enable network location overlay which allows network location provider to be

         replaced by an app at run-time. When disabled, only the

         config_networkLocationProviderPackageName package will be searched for network location

core/res/res/values/symbols.xml

+2 −0
Original line number Diff line number Diff line
@@ -2158,6 +2158,8 @@ 
  <java-symbol type="string" name="config_defaultNetworkScorerPackageName" />

  <java-symbol type="string" name="config_persistentDataPackageName" />

  <java-symbol type="string" name="config_deviceConfiguratorPackageName" />

  <java-symbol type="bool" name="config_enablePrimaryLocationTimeZoneOverlay" />

  <java-symbol type="string" name="config_primaryLocationTimeZoneProviderPackageName" />



  <java-symbol type="layout" name="resolver_list" />

  <java-symbol type="id" name="resolver_list" />

non-updatable-api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -95,6 +95,7 @@ package android { 
    field public static final String INJECT_EVENTS = "android.permission.INJECT_EVENTS";

    field public static final String INSTALL_DYNAMIC_SYSTEM = "android.permission.INSTALL_DYNAMIC_SYSTEM";

    field public static final String INSTALL_GRANT_RUNTIME_PERMISSIONS = "android.permission.INSTALL_GRANT_RUNTIME_PERMISSIONS";

    field public static final String INSTALL_LOCATION_TIME_ZONE_PROVIDER = "android.permission.INSTALL_LOCATION_TIME_ZONE_PROVIDER";

    field public static final String INSTALL_PACKAGE_UPDATES = "android.permission.INSTALL_PACKAGE_UPDATES";

    field public static final String INSTALL_SELF_UPDATES = "android.permission.INSTALL_SELF_UPDATES";

    field public static final String INTENT_FILTER_VERIFICATION_AGENT = "android.permission.INTENT_FILTER_VERIFICATION_AGENT";