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.cpp

diff --git a/libcutils/multiuser.cpp b/libcutils/multiuser.cpp
index 76ae4ce..979cbf4 100644
--- a/libcutils/multiuser.cpp
+++ b/libcutils/multiuser.cpp
@@ -29,10 +29,10 @@
     return (user_id * AID_USER_OFFSET) + (app_id % AID_USER_OFFSET);
 }
 
-uid_t multiuser_get_supplemental_uid(userid_t user_id, appid_t app_id) {
-    int supplementalProcessOffset = AID_SUPPLEMENTAL_PROCESS_START - AID_APP_START;
+uid_t multiuser_get_sdk_sandbox_uid(userid_t user_id, appid_t app_id) {
+    int sdk_sandbox_offset = AID_SDK_SANDBOX_PROCESS_START - AID_APP_START;
     if (app_id >= AID_APP_START && app_id <= AID_APP_END) {
-        return (user_id * AID_USER_OFFSET) + (app_id % AID_USER_OFFSET) + supplementalProcessOffset;
+        return (user_id * AID_USER_OFFSET) + (app_id % AID_USER_OFFSET) + sdk_sandbox_offset;
     } else {
         return -1;
     }