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

Commit 2301ee28 authored by Jack Yu's avatar Jack Yu Committed by Automerger Merge Worker
Browse files

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

Merge "Tear down if existing data network no longer matching preferred apn" am: 5ca0fb94 am: 18c01d89 am: 5146ab59 am: c5c6298a

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



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

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.