commit 203b45c20760e8df0684adff1b66acdf9ec18f6d
author Tomasz Wasilczyk <twasilczyk@google.com> Thu Sep 12 10:38:18 2024 -0700
committer Tomasz Wasilczyk <twasilczyk@google.com> Thu Sep 12 11:23:52 2024 -0700
tree 737ab9a80e42884d1398a67761bb100529604210
parent e59097e6387d6a7b32b2f611dffe5981d09898ee

Add support for ApnSetting.TYPE_OEM_PAID and OEM_PRIVATE

This change adds a flag oem_paid_private

Bug: 366194627
Test: m
Test: manually add oem_paid APN to telephony.db and verify OEM_PAID
      network capability in adb shell dumpsys connectivity
Flag: com.android.internal.telephony.flags.oem_paid_private
Change-Id: Ibc29e7a49c968eca52f3f4a24b13e854f376245d

flags/data.aconfig

diff --git a/flags/data.aconfig b/flags/data.aconfig
index 0fd094d..ccd5db4 100644
--- a/flags/data.aconfig
+++ b/flags/data.aconfig
@@ -132,3 +132,10 @@
   }
 }
 
+# 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

diff --git a/src/java/com/android/internal/telephony/data/DataUtils.java b/src/java/com/android/internal/telephony/data/DataUtils.java
index 20da97f..c88e0b3 100644
--- a/src/java/com/android/internal/telephony/data/DataUtils.java
+++ b/src/java/com/android/internal/telephony/data/DataUtils.java
@@ -287,6 +287,8 @@
             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 @@
             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;
         };
     }