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

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

Merge "Rename flag as enable_ni_supl_message_injection_by_carrier_config_bugfix" into main

parents 9637b6d9 6514098d

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -44070,7 +44070,7 @@ package android.telephony { 
  }















  public static final class CarrierConfigManager.Gps {













    field @FlaggedApi("android.location.flags.enable_ni_supl_message_injection_by_carrier_config") public static final String KEY_ENABLE_NI_SUPL_MESSAGE_INJECTION_BOOL = "gps.enable_ni_supl_message_injection_bool";













    field @FlaggedApi("android.location.flags.enable_ni_supl_message_injection_by_carrier_config_bugfix") public static final String KEY_ENABLE_NI_SUPL_MESSAGE_INJECTION_BOOL = "gps.enable_ni_supl_message_injection_bool";















    field public static final String KEY_PERSIST_LPP_MODE_BOOL = "gps.persist_lpp_mode_bool";















    field public static final String KEY_PREFIX = "gps.";















  }

























location/java/android/location/flags/location.aconfig



+11
−0




























Original line number
Diff line number
Diff line








@@ -110,6 +110,17 @@ flag {













    bug: "317734846"















}





























flag {













    name: "enable_ni_supl_message_injection_by_carrier_config_bugfix"













    namespace: "location"













    description: "Flag for enabling NI SUPL message injection by carrier config"













    bug: "242105192"













    is_fixed_read_only: true













    metadata {













        purpose: PURPOSE_BUGFIX













    }













}





























flag {















    name: "enable_ni_supl_message_injection_by_carrier_config"















    namespace: "location"

































services/core/java/com/android/server/location/gnss/GnssLocationProvider.java



+3
−3




























Original line number
Diff line number
Diff line








@@ -389,7 +389,7 @@ public class GnssLocationProvider extends AbstractLocationProvider implements













            // Reload gnss config for no SIM case















            mGnssConfiguration.reloadGpsProperties();















        }













        if (Flags.enableNiSuplMessageInjectionByCarrierConfig()) {













        if (Flags.enableNiSuplMessageInjectionByCarrierConfigBugfix()) {















            updateNiSuplMessageListenerRegistration(















                    mGnssConfiguration.isNiSuplMessageInjectionEnabled());















        }










@@ -538,7 +538,7 @@ public class GnssLocationProvider extends AbstractLocationProvider implements













        intentFilter.addAction(TelephonyManager.ACTION_DEFAULT_DATA_SUBSCRIPTION_CHANGED);















        mContext.registerReceiver(mIntentReceiver, intentFilter, null, mHandler);





























        if (!Flags.enableNiSuplMessageInjectionByCarrierConfig()) {













        if (!Flags.enableNiSuplMessageInjectionByCarrierConfigBugfix()) {















            updateNiSuplMessageListenerRegistration(















                    mGnssConfiguration.isNiSuplMessageInjectionEnabled());















        }










@@ -1672,7 +1672,7 @@ public class GnssLocationProvider extends AbstractLocationProvider implements













        if (dumpAll) {















            mNetworkTimeHelper.dump(pw);















            pw.println("mSupportsPsds=" + mSupportsPsds);













            if (Flags.enableNiSuplMessageInjectionByCarrierConfig()) {













            if (Flags.enableNiSuplMessageInjectionByCarrierConfigBugfix()) {















                pw.println("mNiSuplMessageListenerRegistered="















                        + mNiSuplMessageListenerRegistered);















            }

































telephony/java/android/telephony/CarrierConfigManager.java



+2
−2




























Original line number
Diff line number
Diff line








@@ -5038,7 +5038,7 @@ public class CarrierConfigManager {













         * {@code true} - Enable NI SUPL message injection.















         */















        @FlaggedApi(android.location.flags.Flags













                .FLAG_ENABLE_NI_SUPL_MESSAGE_INJECTION_BY_CARRIER_CONFIG)













                .FLAG_ENABLE_NI_SUPL_MESSAGE_INJECTION_BY_CARRIER_CONFIG_BUGFIX)















        public static final String KEY_ENABLE_NI_SUPL_MESSAGE_INJECTION_BOOL =















                KEY_PREFIX + "enable_ni_supl_message_injection_bool";























@@ -5059,7 +5059,7 @@ public class CarrierConfigManager {













            defaults.putInt(KEY_ES_SUPL_CONTROL_PLANE_SUPPORT_INT,















                    SUPL_EMERGENCY_MODE_TYPE_CP_ONLY);















            defaults.putStringArray(KEY_ES_SUPL_DATA_PLANE_ONLY_ROAMING_PLMN_STRING_ARRAY, null);













            if (android.location.flags.Flags.enableNiSuplMessageInjectionByCarrierConfig()) {













            if (android.location.flags.Flags.enableNiSuplMessageInjectionByCarrierConfigBugfix()) {















                defaults.putBoolean(KEY_ENABLE_NI_SUPL_MESSAGE_INJECTION_BOOL, false);















            }















            return defaults;