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

Commit 5ca0fb94 authored by Jack Yu's avatar Jack Yu Committed by Gerrit Code Review
Browse files

Merge "Tear down if existing data network no longer matching preferred apn"

parents c6651780 2a2a2b8e

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

+5 −1
Original line number Diff line number Diff line
@@ -983,8 +983,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.