commit c8df03ffd78052bd26ced368c2b4c08b10fd05e5
author Patrick Rohr <prohr@google.com> Wed Oct 30 16:29:15 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Oct 30 16:29:15 2024 +0000
tree f1b6c802a7b56113775071b5e844581f4c775b1b
parent 462703c85008761149c1d3f841283c3dc3b5d2c9

Revert "Add UID and package name to TetheringRequest"

This reverts commit 462703c85008761149c1d3f841283c3dc3b5d2c9.

Reason for revert: b/375535923

Change-Id: I7f77959490e8243bb95985bd28b67efcf0f3eb00

tests/cts/tethering/Android.bp

diff --git a/tests/cts/tethering/Android.bp b/tests/cts/tethering/Android.bp
index d9bc7f7..83818be 100644
--- a/tests/cts/tethering/Android.bp
+++ b/tests/cts/tethering/Android.bp
@@ -19,10 +19,7 @@
 
 java_defaults {
     name: "CtsTetheringTestDefaults",
-    defaults: [
-        "cts_defaults",
-        "framework-connectivity-test-defaults",
-    ],
+    defaults: ["cts_defaults"],
 
     libs: [
         "android.test.base.stubs.system",

tests/cts/tethering/src/android/tethering/cts/TetheringManagerTest.java

diff --git a/tests/cts/tethering/src/android/tethering/cts/TetheringManagerTest.java b/tests/cts/tethering/src/android/tethering/cts/TetheringManagerTest.java
index a07c9ea..1454d9a 100644
--- a/tests/cts/tethering/src/android/tethering/cts/TetheringManagerTest.java
+++ b/tests/cts/tethering/src/android/tethering/cts/TetheringManagerTest.java
@@ -32,7 +32,6 @@
 import static android.net.TetheringManager.TETHER_ERROR_NO_CHANGE_TETHERING_PERMISSION;
 import static android.net.TetheringManager.TETHER_ERROR_NO_ERROR;
 import static android.net.cts.util.CtsTetheringUtils.isAnyIfaceMatch;
-import static android.os.Process.INVALID_UID;
 
 import static com.android.testutils.TestPermissionUtil.runAsShell;
 
@@ -245,35 +244,24 @@
         assertFalse(tr.isExemptFromEntitlementCheck());
         assertTrue(tr.getShouldShowEntitlementUi());
         assertEquals(softApConfiguration, tr.getSoftApConfiguration());
-        assertEquals(INVALID_UID, tr.getUid());
-        assertNull(tr.getPackageName());
 
         final LinkAddress localAddr = new LinkAddress("192.168.24.5/24");
         final LinkAddress clientAddr = new LinkAddress("192.168.24.100/24");
         final TetheringRequest tr2 = new TetheringRequest.Builder(TETHERING_USB)
                 .setStaticIpv4Addresses(localAddr, clientAddr)
                 .setExemptFromEntitlementCheck(true)
-                .setShouldShowEntitlementUi(false)
-                .build();
-        int uid = 1000;
-        String packageName = "package";
-        tr2.setUid(uid);
-        tr2.setPackageName(packageName);
+                .setShouldShowEntitlementUi(false).build();
 
         assertEquals(localAddr, tr2.getLocalIpv4Address());
         assertEquals(clientAddr, tr2.getClientStaticIpv4Address());
         assertEquals(TETHERING_USB, tr2.getTetheringType());
         assertTrue(tr2.isExemptFromEntitlementCheck());
         assertFalse(tr2.getShouldShowEntitlementUi());
-        assertEquals(uid, tr2.getUid());
-        assertEquals(packageName, tr2.getPackageName());
 
         final TetheringRequest tr3 = new TetheringRequest.Builder(TETHERING_USB)
                 .setStaticIpv4Addresses(localAddr, clientAddr)
                 .setExemptFromEntitlementCheck(true)
                 .setShouldShowEntitlementUi(false).build();
-        tr3.setUid(uid);
-        tr3.setPackageName(packageName);
         assertEquals(tr2, tr3);
     }