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

Commit 48ecb65f authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add ApnType.ENTERPRISE" am: 21258c3e 

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

Change-Id: Ib9312ede878fe56cde3f48a86b1045aedff4190c
parents 705aff97 21258c3e

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

+4 −1
Original line number Diff line number Diff line
@@ -207,6 +207,8 @@ public class DataUtils { 
                return ApnSetting.TYPE_MCX;

            case NetworkCapabilities.NET_CAPABILITY_IA:

                return ApnSetting.TYPE_IA;

            case NetworkCapabilities.NET_CAPABILITY_ENTERPRISE:

                return ApnSetting.TYPE_ENTERPRISE;

            default:

                return ApnSetting.TYPE_NONE;

        }
@@ -243,7 +245,8 @@ public class DataUtils { 
            case ApnSetting.TYPE_IA:

                return NetworkCapabilities.NET_CAPABILITY_IA;

            // Do not add TYPE_VSIM, TYPE_BIP, TYPE_HIPRI

            // TODO: Add ENTERPRISE here if needed.

            case ApnSetting.TYPE_ENTERPRISE:

                return NetworkCapabilities.NET_CAPABILITY_ENTERPRISE;

            default:

                return -1;

        }