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

Commit 6be3f281 authored by Ling Ma's avatar Ling Ma Committed by Automerger Merge Worker
Browse files

Revert "Sync preferred apn and preferred apn set id" am: 81009d66 am: e9292e0c 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/18717856



Change-Id: I76586c17a48629032d27bdb98ccfa6440730528d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c2e87eef e9292e0c

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

+3 −6
Original line number Diff line number Diff line
@@ -312,15 +312,14 @@ 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();
@@ -462,8 +461,6 @@ public class DataProfileManager extends Handler { 
            preferredDataProfile = getPreferredDataProfileFromDb();

            if (preferredDataProfile == null) {

                preferredDataProfile = getPreferredDataProfileFromConfig();

                // Save the preferred data profile into database.

                setPreferredDataProfile(preferredDataProfile);

            }

        } else {

            preferredDataProfile = null;
@@ -650,7 +647,7 @@ public class DataProfileManager extends Handler { 
            return null;

        }



        // Check if the remaining data profiles can be used in current data network type.

        // Check if the remaining data profiles can used in current data network type.

        dataProfiles = dataProfiles.stream()

                .filter(dp -> dp.getApnSetting() != null

                        && dp.getApnSetting().canSupportNetworkType(networkType))

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

+1 −37
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ import static com.google.common.truth.Truth.assertThat; 
import static org.mockito.ArgumentMatchers.any;

import static org.mockito.ArgumentMatchers.anyInt;

import static org.mockito.ArgumentMatchers.eq;

import static org.mockito.Mockito.clearInvocations;

import static org.mockito.Mockito.doAnswer;

import static org.mockito.Mockito.doReturn;

import static org.mockito.Mockito.verify;
@@ -841,7 +840,7 @@ public class DataProfileManagerTest extends TelephonyTest { 
    }



    @Test

    public void testResetApnNoPreferredConfig() {

    public void testResetApn() {

        mSimInserted = true;

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

        processAllMessages();
@@ -872,41 +871,6 @@ 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();

        clearInvocations(mDataConfigManager);

        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);



        verify(mDataConfigManager).getDefaultPreferredApn();

        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();

        clearInvocations(mDataConfigManager);

        processAllMessages();



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

        dataProfile = mDataProfileManagerUT.getDataProfileForNetworkRequest(

                tnr, TelephonyManager.NETWORK_TYPE_LTE);

        verify(mDataConfigManager).getDefaultPreferredApn();

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

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

    }



    @Test

    public void testTetheringApnExisting() {

        assertThat(mDataProfileManagerUT.isTetheringDataProfileExisting(