commit fd7a75b699b4940dc0a371f650d15f57218d5fbf
author Priyanka Advani (xWF) <padvani@google.com> Thu Aug 14 15:48:23 2025 -0700
committer Palak Chaudhary <cryptic@google.com> Thu Aug 14 22:26:20 2025 -0700
tree c816b2b80348c3bdfddbdd73fa61c17e2cc8a5d1
parent c6d26f836232ab0b19619361c35a06d9a3020168

Revert "Mock Process.myUid() in tests"

This reverts commit c6d26f836232ab0b19619361c35a06d9a3020168.

Reason for revert: Droidmonitor created revert due to b/438063612. Will be verifying through ABTD before submission.

Fix: 438063612
PS_FLAG: NA
Flag: EXEMPT(bug 337358613)

Change-Id: Ib1201ec6e66359db2d18f2a52114d5036624c707

sdksandbox/tests/unittest/src/android/app/sdksandbox/SandboxedSdkContextUnitTest.java

diff --git a/sdksandbox/tests/unittest/src/android/app/sdksandbox/SandboxedSdkContextUnitTest.java b/sdksandbox/tests/unittest/src/android/app/sdksandbox/SandboxedSdkContextUnitTest.java
index 1ce9c9b..03b650b 100644
--- a/sdksandbox/tests/unittest/src/android/app/sdksandbox/SandboxedSdkContextUnitTest.java
+++ b/sdksandbox/tests/unittest/src/android/app/sdksandbox/SandboxedSdkContextUnitTest.java
@@ -76,7 +76,6 @@
                         .mockStatic(StrictMode.class)
                         .startMocking();
         ExtendedMockito.doReturn(true).when(() -> Process.isSdkSandbox());
-        ExtendedMockito.doReturn(Process.FIRST_SDK_SANDBOX_UID).when(() -> Process.myUid());
         ExtendedMockito.doNothing().when(() -> StrictMode.setVmPolicy(Mockito.any()));
 
         Context context = Mockito.spy(InstrumentationRegistry.getContext());

sdksandbox/tests/unittest/src/com/android/sdksandbox/SdkSandboxTest.java

diff --git a/sdksandbox/tests/unittest/src/com/android/sdksandbox/SdkSandboxTest.java b/sdksandbox/tests/unittest/src/com/android/sdksandbox/SdkSandboxTest.java
index 09e8a48..b7793aa 100644
--- a/sdksandbox/tests/unittest/src/com/android/sdksandbox/SdkSandboxTest.java
+++ b/sdksandbox/tests/unittest/src/com/android/sdksandbox/SdkSandboxTest.java
@@ -50,10 +50,10 @@
 import com.android.modules.utils.build.SdkLevel;
 import com.android.server.sdksandbox.DeviceSupportedBaseTest;
 
-import dalvik.system.PathClassLoader;
-
 import com.google.common.truth.Expect;
 
+import dalvik.system.PathClassLoader;
+
 import org.junit.After;
 import org.junit.Before;
 import org.junit.BeforeClass;
@@ -166,7 +166,6 @@
                         .spyStatic(Process.class)
                         .startMocking();
         ExtendedMockito.doReturn(true).when(() -> Process.isSdkSandbox());
-        ExtendedMockito.doReturn(Process.FIRST_SDK_SANDBOX_UID).when(() -> Process.myUid());
 
         Context context = InstrumentationRegistry.getInstrumentation().getContext();
         mContext = Mockito.spy(context);