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

Commit c92f2ec6 authored by Mengjun Leng's avatar Mengjun Leng Committed by Linux Build Service Account
Browse files

Fix the protocol check issue when merging similar APNs 

By default, some similar APNs are merged together. When user changes
destination protocol, it is useless due to protocol check is ignored,
source APN is merged into destination APN, so that the protocol of
source APN is replaced with the protocol of detination APN.

CRs-Fixed: 883417
Change-Id: I56636daae1f273abac7f2860abe467230dbacb21
parent 990f5505

src/java/com/android/internal/telephony/dataconnection/DcTracker.java

+2 −0
Original line number Original line Diff line number Diff line
@@ -2477,6 +2477,8 @@ public class DcTracker extends DcTrackerBase { 
                !apnTypeSameAny(first, second) &&

                !apnTypeSameAny(first, second) &&

                xorEquals(first.proxy, second.proxy) &&

                xorEquals(first.proxy, second.proxy) &&

                xorEquals(first.port, second.port) &&

                xorEquals(first.port, second.port) &&

                xorEquals(first.protocol, second.protocol) &&

                xorEquals(first.roamingProtocol, second.roamingProtocol) &&

                first.carrierEnabled == second.carrierEnabled &&

                first.carrierEnabled == second.carrierEnabled &&

                first.bearerBitmask == second.bearerBitmask &&

                first.bearerBitmask == second.bearerBitmask &&

                first.profileId == second.profileId &&

                first.profileId == second.profileId &&