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

Commit 2a2a2b8e authored by Honggang Luo's avatar Honggang Luo Committed by takeshi tanigawa
Browse files

Tear down if existing data network no longer matching preferred apn 

Add check that matches preferred data profile set id when evaluate data
network. This will tear down existing data networks if they no longer
match the preferred apn.

Test: manual
Test: atest FrameworksTelephonyTests:DataProfileManagerTest
Bug: 241789687

Change-Id: I13c8619b6543a882dafe28db3eeafcb89da19b38
parent d1b3d3c6

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

+5 −1
Original line number Diff line number Diff line
@@ -979,8 +979,12 @@ public class DataProfileManager extends Handler { 
            return true;

        }



        // Only check the APN from the profile is compatible or not.

        // Check the APN from the profile is compatible and matches preferred data profile set id.

        return mAllDataProfiles.stream()

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

                        && (dp.getApnSetting().getApnSetId()

                        == Telephony.Carriers.MATCH_ALL_APN_SET_ID

                        || dp.getApnSetting().getApnSetId() == mPreferredDataProfileSetId))

                .anyMatch(dp -> areDataProfileSharingApn(dataProfile, dp));

    }

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

+324 −6

File changed.

Preview size limit exceeded, changes collapsed.