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

Commit ed75d602 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Promotion of android_ui.lnx.2.1-00037. 

CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------
1085544   I2210c9ce99871a0188798c5e7eaba2f37f282d13   IMS: Cellular network type is not showing VoLTE enabled
1083472   I857bcc3ce1efc3ce2180cb09e6b34623e53e2ab2   Settings: Fix the thread calling conflict between main t

Change-Id: Ia2c6308d6a0560e0f05b93c8b3fe74038d6f8a52
CRs-Fixed: 1085544, 1083472
parents f0bbd49e 3c317f56

src/com/android/settings/deviceinfo/SimStatus.java

+3 −4
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ import com.android.settings.Utils; 


import java.util.List;



import org.codeaurora.ims.utils.QtiImsExtUtils;



/**

 * Display the following information
@@ -288,12 +289,10 @@ public class SimStatus extends SettingsPreferenceFragment { 
            networktype = "4G";

        }



        String property = SystemProperties.get("persist.radio.atel.carrier");

        boolean isCarrierOneSupported = "405854".equals(property);

        if (isCarrierOneSupported) {

        if (QtiImsExtUtils.isCarrierOneSupported()) {

            if (TelephonyManager.NETWORK_TYPE_LTE == actualDataNetworkType ||

                    TelephonyManager.NETWORK_TYPE_LTE == actualVoiceNetworkType) {

                if (mTelephonyManager.isImsRegistered()) {

                if (mTelephonyManager.isImsRegisteredForSubscriber(subId)) {

                    networktype = getResources().

                            getString(R.string.lte_data_and_voice_calling_enabled);

                } else {

src/com/android/settings/wifi/WifiSettings.java

+2 −2
Original line number Diff line number Diff line
@@ -630,7 +630,7 @@ public class WifiSettings extends RestrictedSettingsFragment 
     * the strength of network and the security for it.

     */

    @Override

    public void onAccessPointsChanged() {

    public synchronized void onAccessPointsChanged() {

        // Safeguard from some delayed event handling

        if (getActivity() == null) return;

        if (isUiRestricted()) {
@@ -903,7 +903,7 @@ public class WifiSettings extends RestrictedSettingsFragment 
    }



    @Override

    public void onAccessPointChanged(AccessPoint accessPoint) {

    public synchronized void onAccessPointChanged(AccessPoint accessPoint) {

        try {

            ((LongPressAccessPointPreference) accessPoint.getTag()).refresh();

        } catch (NullPointerException ig) {}