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

Commit a2fb5f3a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "APN anomaly report - allow UNKNOWN lingering network" into tm-qpr-dev... 

Merge "APN anomaly report - allow UNKNOWN lingering network" into tm-qpr-dev am: 00498a88 am: b6e90142

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



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

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

+10 −3
Original line number Diff line number Diff line
@@ -804,10 +804,17 @@ public class DataProfileManager extends Handler { 
        for (int i = 0; i < profiles.size(); i++) {

            ApnSetting a = profiles.get(i).getApnSetting();

            if (a == null) continue;

            if ((a.getNetworkTypeBitmask() | a.getLingeringNetworkTypeBitmask())

            if (// Lingering network is not the default and doesn't cover all the regular networks

                    (int) TelephonyManager.NETWORK_TYPE_BITMASK_UNKNOWN

                    != a.getLingeringNetworkTypeBitmask()

                            && (a.getNetworkTypeBitmask() | a.getLingeringNetworkTypeBitmask())

                    != a.getLingeringNetworkTypeBitmask()) {

                reportAnomaly("Apn[" + a.getApnName()

                                + "] supported network should be a subset of the lingering network",

                reportAnomaly("Apn[" + a.getApnName() + "] network "

                                + TelephonyManager.convertNetworkTypeBitmaskToString(

                                        a.getNetworkTypeBitmask()) + " should be a subset of "

                                + "the lingering network "

                                + TelephonyManager.convertNetworkTypeBitmaskToString(

                                a.getLingeringNetworkTypeBitmask()),

                        "9af73e18-b523-4dc5-adab-4bb24355d838");

            }

            for (int j = i + 1; j < profiles.size(); j++) {