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

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

Merge "Clean up gnss_configuration_from_resource flag." into main

parents 2ec5f298 8dd1359e

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

+0 −7
Original line number Diff line number Diff line
@@ -77,13 +77,6 @@ flag { 
    is_exported: true

}



flag {

    name: "gnss_configuration_from_resource"

    namespace: "location"

    description: "Flag for GNSS configuration from resource"

    bug: "317734846"

}



flag {

    name: "enable_ni_supl_message_injection_by_carrier_config_bugfix"

    namespace: "location"

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

+2 −5
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
package com.android.server.location.gnss;



import android.content.Context;

import android.location.flags.Flags;

import android.os.PersistableBundle;

import android.os.SystemProperties;

import android.telephony.CarrierConfigManager;
@@ -278,10 +277,8 @@ public class GnssConfiguration { 
        }

        loadPropertiesFromCarrierConfig(inEmergency, activeSubId);



        if (Flags.gnssConfigurationFromResource()) {

        // Overlay carrier properties from resources.

        loadPropertiesFromResource(mContext, mProperties);

        }



        if (isSimAbsent(mContext)) {

            // Use the default SIM's LPP profile when SIM is absent.