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

Commit 08f0f6f9 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add config_enableTelephonyTimeZoneDetection." into main

parents 1e5e9b7b 858b14a9

core/res/res/values/config.xml

+8 −1
Original line number Diff line number Diff line
@@ -2042,10 +2042,17 @@ 
         provider services. -->

    <string name="config_secondaryLocationTimeZoneProviderPackageName" translatable="false"></string>



    <!-- Whether the telephony time zone detection feature is enabled. Setting this to false means

         the feature cannot be used. Setting this to true means the feature will be enabled on the

         device if FEATURE_TELEPHONY

         (@see https: //developer.android.com/reference/android/content/pm/PackageManager#FEATURE_TELEPHONY)

         is also supported. -->

    <bool name="config_enableTelephonyTimeZoneDetection" translatable="false">true</bool>



    <!-- Whether the time zone detection logic supports fall back from geolocation suggestions to

         telephony suggestions temporarily in certain circumstances. Reduces time zone detection

         latency during some scenarios like air travel. Only useful when both geolocation and

         telephony time zone detection are supported on a device.

         telephony time zone detection are supported and enabled on a device.

         See com.android.server.timezonedetector.TimeZoneDetectorStrategy for more information. -->

    <bool name="config_supportTelephonyTimeZoneFallback" translatable="false">true</bool>

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -2314,6 +2314,7 @@ 
  <java-symbol type="string" name="config_primaryLocationTimeZoneProviderPackageName" />

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

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

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

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

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

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

services/core/java/com/android/server/timezonedetector/ServiceConfigAccessorImpl.java

+2 −1
Original line number Diff line number Diff line
@@ -435,7 +435,8 @@ public final class ServiceConfigAccessorImpl implements ServiceConfigAccessor { 


    @Override

    public boolean isTelephonyTimeZoneDetectionFeatureSupported() {

        return mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_TELEPHONY);

        return getConfigBoolean(com.android.internal.R.bool.config_enableTelephonyTimeZoneDetection)

                && mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_TELEPHONY);

    }



    @Override