commit 45f8837c90a0c63befb848f0427dccade5e41666
author Nikita Ioffe <ioffe@google.com> Mon Feb 21 18:50:23 2022 +0000
committer Samiul Islam <samiul@google.com> Wed Mar 02 16:12:41 2022 +0000
tree 42134d9eadd5c0eea61866b28b454e55b13be8bb
parent b18fea1abb8cf4fe99b0045c05b651dfb9df47ce

Rename SupplementalProcess to SdkSandbox

Ignore-AOSP-First: code is not in AOSP yet
Bug: 220320098
Test: presubmit
Change-Id: I310feb08a903c2ee9cd544e3b9751c2e02ce5951
Merged-In: I310feb08a903c2ee9cd544e3b9751c2e02ce5951
(cherry picked from commit 6e124aac7c0e76a83040bcda8f1a63df20e3d421)

libcutils/multiuser_test.cpp

diff --git a/libcutils/multiuser_test.cpp b/libcutils/multiuser_test.cpp
index 68270de..62dd5e0 100644
--- a/libcutils/multiuser_test.cpp
+++ b/libcutils/multiuser_test.cpp
@@ -31,20 +31,20 @@
     EXPECT_EQ(1050000U, multiuser_get_uid(10, 50000));
 }
 
-TEST(MultiuserTest, TestSupplementalUid) {
-    EXPECT_EQ(ERR_UID, multiuser_get_supplemental_uid(0, 0));
-    EXPECT_EQ(ERR_UID, multiuser_get_supplemental_uid(0, 1000));
-    EXPECT_EQ(20000U, multiuser_get_supplemental_uid(0, 10000));
-    EXPECT_EQ(25000U, multiuser_get_supplemental_uid(0, 15000));
-    EXPECT_EQ(29999U, multiuser_get_supplemental_uid(0, 19999));
-    EXPECT_EQ(ERR_UID, multiuser_get_supplemental_uid(0, 50000));
+TEST(MultiuserTest, TestSdkSandboxUid) {
+    EXPECT_EQ(ERR_UID, multiuser_get_sdk_sandbox_uid(0, 0));
+    EXPECT_EQ(ERR_UID, multiuser_get_sdk_sandbox_uid(0, 1000));
+    EXPECT_EQ(20000U, multiuser_get_sdk_sandbox_uid(0, 10000));
+    EXPECT_EQ(25000U, multiuser_get_sdk_sandbox_uid(0, 15000));
+    EXPECT_EQ(29999U, multiuser_get_sdk_sandbox_uid(0, 19999));
+    EXPECT_EQ(ERR_UID, multiuser_get_sdk_sandbox_uid(0, 50000));
 
-    EXPECT_EQ(ERR_UID, multiuser_get_supplemental_uid(10, 0));
-    EXPECT_EQ(ERR_UID, multiuser_get_supplemental_uid(10, 1000));
-    EXPECT_EQ(1020000U, multiuser_get_supplemental_uid(10, 10000));
-    EXPECT_EQ(1025000U, multiuser_get_supplemental_uid(10, 15000));
-    EXPECT_EQ(ERR_UID, multiuser_get_supplemental_uid(10, 20000));
-    EXPECT_EQ(ERR_UID, multiuser_get_supplemental_uid(10, 50000));
+    EXPECT_EQ(ERR_UID, multiuser_get_sdk_sandbox_uid(10, 0));
+    EXPECT_EQ(ERR_UID, multiuser_get_sdk_sandbox_uid(10, 1000));
+    EXPECT_EQ(1020000U, multiuser_get_sdk_sandbox_uid(10, 10000));
+    EXPECT_EQ(1025000U, multiuser_get_sdk_sandbox_uid(10, 15000));
+    EXPECT_EQ(ERR_UID, multiuser_get_sdk_sandbox_uid(10, 20000));
+    EXPECT_EQ(ERR_UID, multiuser_get_sdk_sandbox_uid(10, 50000));
 }
 
 TEST(MultiuserTest, TestSplitUser) {