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

Commit c9d38985 authored by Ling Ma's avatar Ling Ma
Browse files

Fix Sync preferred apn and preferred apn set id 

When APN db is reset to default, mPreferredSetId is set to 0 along with
the preferred db is reset to empty. However, we do have preferred
profile that's loaded from carrier config, and the preferred db should
be in sync with the mPreferredDataProfile.

Bug: 232890963
Bug: 234725522
Test: manually verified SIM unlock reboot + checked log
Change-Id: I035bd604391ff2aa684ecca0355be9bc79248204
parent 81009d66

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

+7 −2
Original line number Diff line number Diff line
@@ -312,14 +312,15 @@ public class DataProfileManager extends Handler { 
            profilesChanged = true;

        }



        // Reload the latest preferred data profile from either database or config.

        profilesChanged |= updatePreferredDataProfile();



        int setId = getPreferredDataProfileSetId();

        if (setId != mPreferredDataProfileSetId) {

            logl("Changed preferred data profile set id to " + setId);

            mPreferredDataProfileSetId = setId;

            profilesChanged = true;

        }

        // Reload the latest preferred data profile from either database or config.

        profilesChanged |= updatePreferredDataProfile();



        updateDataProfilesAtModem();

        updateInitialAttachDataProfileAtModem();
@@ -461,6 +462,10 @@ public class DataProfileManager extends Handler { 
            preferredDataProfile = getPreferredDataProfileFromDb();

            if (preferredDataProfile == null) {

                preferredDataProfile = getPreferredDataProfileFromConfig();

                if (preferredDataProfile != null) {

                    // Save the carrier specified preferred data profile into database

                    setPreferredDataProfile(preferredDataProfile);

                }

            }

        } else {

            preferredDataProfile = null;

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

+42 −0
Original line number Diff line number Diff line
@@ -363,6 +363,16 @@ public class DataProfileManagerTest extends TelephonyTest { 
            logd("ApnSettingContentProvider: uri=" + uri + ", values=" + values);

            if (uri.isPathPrefixMatch(Telephony.Carriers.PREFERRED_APN_URI)) {

                mPreferredApnId = values.getAsInteger(Telephony.Carriers.APN_ID);

                if (mPreferredApnId != -1) {

                    for (Object apnSetting : mAllApnSettings) {

                        int id = (int) ((Object[]) apnSetting)[0];

                        if (id == mPreferredApnId) {

                            mPreferredApnSet = (int) ((Object[]) apnSetting)[28]; //update setId too

                        }

                    }

                } else {

                    mPreferredApnSet = 0; // db is emptied

                }

                logd("mPreferredApnId=" + mPreferredApnId);

            }

            return null;
@@ -863,6 +873,38 @@ public class DataProfileManagerTest extends TelephonyTest { 
        assertThat(mDataProfileManagerUT.isDataProfilePreferred(dataProfile)).isFalse();

    }



    @Test

    public void testResetApnWithPreferredConfig() {

        // carrier configured preferred data profile should be picked

        doReturn(GENERAL_PURPOSE_APN1).when(mDataConfigManager).getDefaultPreferredApn();

        TelephonyNetworkRequest tnr = new TelephonyNetworkRequest(

                new NetworkRequest.Builder()

                        .addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)

                        .build(), mPhone);

        mSimInserted = true;

        mDataProfileManagerUT.obtainMessage(2 /*EVENT_APN_DATABASE_CHANGED*/).sendToTarget();

        processAllMessages();



        // The carrier configured data profile should be the preferred APN after APN reset

        DataProfile dataProfile = mDataProfileManagerUT.getDataProfileForNetworkRequest(

                tnr, TelephonyManager.NETWORK_TYPE_LTE);



        assertThat(dataProfile.getApnSetting().getApnName()).isEqualTo(GENERAL_PURPOSE_APN1);

        assertThat(mDataProfileManagerUT.isDataProfilePreferred(dataProfile)).isTrue();



        // APN reset

        mPreferredApnId = -1;

        mDataProfileManagerUT.obtainMessage(2 /*EVENT_APN_DATABASE_CHANGED*/).sendToTarget();

        Mockito.clearInvocations(mDataConfigManager);

        processAllMessages();



        // The carrier configured data profile should be the preferred APN after APN reset

        dataProfile = mDataProfileManagerUT.getDataProfileForNetworkRequest(

                tnr, TelephonyManager.NETWORK_TYPE_LTE);

        assertThat(dataProfile.getApnSetting().getApnName()).isEqualTo(GENERAL_PURPOSE_APN1);

        assertThat(mDataProfileManagerUT.isDataProfilePreferred(dataProfile)).isTrue();

    }



    @Test

    public void testTetheringApnExisting() {

        assertThat(mDataProfileManagerUT.isTetheringDataProfileExisting(