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

Commit 370b15c3 authored by Tomasz Wasilczyk's avatar Tomasz Wasilczyk Committed by Android (Google) Code Review
Browse files

Merge "Add support for ApnSetting.TYPE_OEM_PAID and OEM_PRIVATE" into main

parents 6005ed07 203b45c2

flags/data.aconfig

+7 −0
Original line number Diff line number Diff line
@@ -132,3 +132,10 @@ flag { 
  }

}



# OWNER=TBD TARGET=TBD

flag {

  name: "oem_paid_private"

  namespace: "telephony"

  description: "Support OEM_PAID and OEM_PRIVATE networks"

  bug: "366194627"

}

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

+4 −0
Original line number Diff line number Diff line
@@ -287,6 +287,8 @@ public class DataUtils { 
            case NetworkCapabilities.NET_CAPABILITY_VSIM -> ApnSetting.TYPE_VSIM;

            case NetworkCapabilities.NET_CAPABILITY_BIP -> ApnSetting.TYPE_BIP;

            case NetworkCapabilities.NET_CAPABILITY_RCS -> ApnSetting.TYPE_RCS;

            case NetworkCapabilities.NET_CAPABILITY_OEM_PAID -> ApnSetting.TYPE_OEM_PAID;

            case NetworkCapabilities.NET_CAPABILITY_OEM_PRIVATE -> ApnSetting.TYPE_OEM_PRIVATE;

            default -> ApnSetting.TYPE_NONE;

        };

    }
@@ -315,6 +317,8 @@ public class DataUtils { 
            case ApnSetting.TYPE_VSIM -> NetworkCapabilities.NET_CAPABILITY_VSIM;

            case ApnSetting.TYPE_ENTERPRISE -> NetworkCapabilities.NET_CAPABILITY_ENTERPRISE;

            case ApnSetting.TYPE_RCS -> NetworkCapabilities.NET_CAPABILITY_RCS;

            case ApnSetting.TYPE_OEM_PAID -> NetworkCapabilities.NET_CAPABILITY_OEM_PAID;

            case ApnSetting.TYPE_OEM_PRIVATE -> NetworkCapabilities.NET_CAPABILITY_OEM_PRIVATE;

            default -> -1;

        };

    }