From bd9376982eb94cd84e0780620a3a109a55994d79 Mon Sep 17 00:00:00 2001
From: Patrick Rohr <prohr@google.com>
Date: Tue, 25 Mar 2025 14:23:52 -0700
Subject: [PATCH] Add generic createTestInterface to AutoCloseTestInterfaceRule

Test: TH
Change-Id: Ib0519f99417c94f3ae77ab1d56a81fe1fd167c0c
---
 .../com/android/testutils/AutoCloseTestInterfaceRule.kt  | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/staticlibs/testutils/devicetests/com/android/testutils/AutoCloseTestInterfaceRule.kt b/staticlibs/testutils/devicetests/com/android/testutils/AutoCloseTestInterfaceRule.kt
index 89de0b3d7a..2b625f6573 100644
--- a/staticlibs/testutils/devicetests/com/android/testutils/AutoCloseTestInterfaceRule.kt
+++ b/staticlibs/testutils/devicetests/com/android/testutils/AutoCloseTestInterfaceRule.kt
@@ -20,6 +20,7 @@ import android.Manifest.permission.MANAGE_TEST_NETWORKS
 import android.content.Context
 import android.net.TestNetworkInterface
 import android.net.TestNetworkManager
+import android.net.TestNetworkManager.TestInterfaceRequest
 import org.junit.rules.TestRule
 import org.junit.runner.Description
 import org.junit.runners.model.Statement
@@ -40,6 +41,14 @@ class AutoCloseTestInterfaceRule(
         }
     }
 
+    fun createTestInterface(req: TestInterfaceRequest): TestNetworkInterface {
+        return runAsShell(MANAGE_TEST_NETWORKS) {
+            tnm.createTestInterface(req)
+        }.also {
+            ifaces.add(it)
+        }
+    }
+
     private fun closeAllInterfaces() {
         // TODO: wait on RTM_DELLINK before proceeding.
         for (iface in ifaces) {