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

Commit 50474562 authored by Sarah Chin's avatar Sarah Chin Committed by Jack Yu
Browse files

Combine data roaming from user action into one preference 

Instead of using DATA_ROAMING_IS_USER_SETTING_KEY for SSSS and
DATA_ROAMING + subId for DSDS, combine both into
DATA_ROAMING_IS_USER_SETTING_KEY + subId.

Test: verify data roaming settings persisted across reboots
Test: verify data roaming settings persisted across upgrades
Test: verify data roaming settings correct based on carrier configs
Test: atest DataSettingsManagerTest
Bug: 259604889
Merged-In: Id73e66b2fd96a367ff469b464bf01bedddf6fdd3
Change-Id: Id73e66b2fd96a367ff469b464bf01bedddf6fdd3
parent c66a5f80

src/java/com/android/internal/telephony/data/DataSettingsManager.java

+28 −31
Original line number Diff line number Diff line
@@ -528,42 +528,37 @@ public class DataSettingsManager extends Handler { 
     * has not manually set the value. The default value is {@link #isDefaultDataRoamingEnabled()}.

     */

    public void setDefaultDataRoamingEnabled() {

        // For SSSS, this is a per-phone property from DATA_ROAMING_IS_USER_SETTING_KEY.

        // For DSDS, this is a per-sub property from Settings.Global.DATA_ROAMING + subId.

        // If the user has not manually set the value, use the default value.

        boolean useCarrierSpecificDefault = false;

        if (mPhone.getContext().getSystemService(TelephonyManager.class).getSimCount() != 1) {

            String setting = Settings.Global.DATA_ROAMING + mPhone.getSubId();

            try {

                Settings.Global.getInt(mResolver, setting);

            } catch (Settings.SettingNotFoundException ex) {

                // For multi-SIM phones, use the default value if uninitialized.

                useCarrierSpecificDefault = true;

            }

        } else if (!isDataRoamingFromUserAction()) {

            // For single-SIM phones, use the default value if user action is not set.

            useCarrierSpecificDefault = true;

        }

        log("setDefaultDataRoamingEnabled: useCarrierSpecificDefault=" + useCarrierSpecificDefault);

        if (useCarrierSpecificDefault) {

            boolean defaultVal = isDefaultDataRoamingEnabled();

            setDataRoamingEnabledInternal(defaultVal);

        if (!isDataRoamingFromUserAction()) {

            setDataRoamingEnabledInternal(isDefaultDataRoamingEnabled());

        }

    }



    /**

     * Get whether the user has manually enabled or disabled data roaming from settings.

     * @return {@code true} if the user has enabled data roaming and {@code false} if they have not.

     * Get whether the user has manually enabled or disabled data roaming from settings for the

     * current subscription.

     * @return {@code true} if the user has manually enabled data roaming for the current

     *         subscription and {@code false} if they have not.

     */

    private boolean isDataRoamingFromUserAction() {

        final SharedPreferences sp = PreferenceManager

                .getDefaultSharedPreferences(mPhone.getContext());

        // Since we don't want to unset user preferences after a system update, default to true if

        // the preference does not exist and set it to false explicitly from factory reset.

        if (!sp.contains(Phone.DATA_ROAMING_IS_USER_SETTING_KEY)) {

            sp.edit().putBoolean(Phone.DATA_ROAMING_IS_USER_SETTING_KEY, false).commit();

        String key = Phone.DATA_ROAMING_IS_USER_SETTING_KEY + mPhone.getSubId();

        final SharedPreferences sp =

                PreferenceManager.getDefaultSharedPreferences(mPhone.getContext());



        // Set the default roaming from user action value if the preference doesn't exist

        if (!sp.contains(key)) {

            if (sp.contains(Phone.DATA_ROAMING_IS_USER_SETTING_KEY)) {

                log("Reusing previous roaming from user action value for backwards compatibility.");

                sp.edit().putBoolean(key, true).commit();

            } else {

                log("Clearing roaming from user action value for new or upgrading devices.");

                sp.edit().putBoolean(key, false).commit();

            }

        }

        return sp.getBoolean(Phone.DATA_ROAMING_IS_USER_SETTING_KEY, true);



        boolean isUserSetting = sp.getBoolean(key, true);

        log("isDataRoamingFromUserAction: key=" + key + ", isUserSetting=" + isUserSetting);

        return isUserSetting;

    }



    /**
@@ -572,9 +567,11 @@ public class DataSettingsManager extends Handler { 
     * {@link #isDefaultDataRoamingEnabled()} will continue to be used.

     */

    private void setDataRoamingFromUserAction() {

        final SharedPreferences.Editor sp = PreferenceManager

                .getDefaultSharedPreferences(mPhone.getContext()).edit();

        sp.putBoolean(Phone.DATA_ROAMING_IS_USER_SETTING_KEY, true).commit();

        String key = Phone.DATA_ROAMING_IS_USER_SETTING_KEY + mPhone.getSubId();

        log("setDataRoamingFromUserAction: key=" + key);

        final SharedPreferences.Editor sp =

                PreferenceManager.getDefaultSharedPreferences(mPhone.getContext()).edit();

        sp.putBoolean(key, true).commit();

    }



    /** Refresh the enabled mobile data policies from Telephony database */

tests/telephonytests/src/com/android/internal/telephony/data/DataSettingsManagerTest.java

+30 −0
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@ package com.android.internal.telephony.data; 
import static com.google.common.truth.Truth.assertThat;



import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertFalse;

import static org.junit.Assert.assertTrue;

import static org.mockito.ArgumentMatchers.anyInt;

import static org.mockito.ArgumentMatchers.anyString;

import static org.mockito.Mockito.doReturn;
@@ -26,6 +28,7 @@ import static org.mockito.Mockito.times; 
import static org.mockito.Mockito.verify;



import android.os.Looper;

import android.os.PersistableBundle;

import android.testing.AndroidTestingRunner;

import android.testing.TestableLooper;
@@ -44,17 +47,21 @@ import java.util.Set; 
@RunWith(AndroidTestingRunner.class)

@TestableLooper.RunWithLooper

public class DataSettingsManagerTest extends TelephonyTest {

    private static final String DATA_ROAMING_IS_USER_SETTING = "data_roaming_is_user_setting_key0";



    // Mocked

    DataSettingsManagerCallback mMockedDataSettingsManagerCallback;



    DataSettingsManager mDataSettingsManagerUT;

    PersistableBundle mBundle;



    @Before

    public void setUp() throws Exception {

        logd("DataSettingsManagerTest +Setup!");

        super.setUp(getClass().getSimpleName());

        mMockedDataSettingsManagerCallback = Mockito.mock(DataSettingsManagerCallback.class);

        mBundle = mContextFixture.getCarrierConfigBundle();

        doReturn(true).when(mDataConfigManager).isConfigCarrierSpecific();



        doReturn("").when(mSubscriptionController).getEnabledMobileDataPolicies(anyInt());

        doReturn(true).when(mSubscriptionController).setEnabledMobileDataPolicies(
@@ -102,4 +109,27 @@ public class DataSettingsManagerTest extends TelephonyTest { 
                .setEnabledMobileDataPolicies(anyInt(), stringArgumentCaptor.capture());

        assertEquals("1,2", stringArgumentCaptor.getValue());

    }



    @Test

    public void testDefaultDataRoamingEnabled() {

        doReturn(true).when(mDataConfigManager).isDataRoamingEnabledByDefault();

        mDataSettingsManagerUT.setDefaultDataRoamingEnabled();

        assertTrue(mDataSettingsManagerUT.isDataRoamingEnabled());



        mDataSettingsManagerUT.setDataRoamingEnabled(false);

        processAllMessages();

        assertFalse(mDataSettingsManagerUT.isDataRoamingEnabled());



        mDataSettingsManagerUT.setDefaultDataRoamingEnabled();

        assertFalse(mDataSettingsManagerUT.isDataRoamingEnabled());

    }



    @Test

    public void testDefaultDataRoamingEnabledFromUpgrade() {

        doReturn(true).when(mDataConfigManager).isDataRoamingEnabledByDefault();

        mContext.getSharedPreferences("", 0).edit()

                .putBoolean(DATA_ROAMING_IS_USER_SETTING, true).commit();

        mDataSettingsManagerUT.setDefaultDataRoamingEnabled();

        assertFalse(mDataSettingsManagerUT.isDataRoamingEnabled());

    }

}