From 7bd8b48004cfb084cf801e430b806822614e102e Mon Sep 17 00:00:00 2001 From: Anna Bauza Date: Fri, 26 Jul 2024 13:23:30 +0000 Subject: Fix early access to cacheUserSerialNumber API The cacheUserSerialNumber API is a read only flag that is used to fix early access to the API. The flag will be removed after the cacheUserSerialNumberReadOnly is fully rolled out. Change-Id: I690d452820152a8a5f6554479cd4bdb7315240ab Flag: android.multiuser.cache_user_serial_number_read_only Bug: 353134536 Test: atest UserManagerTest --- core/java/android/os/UserManager.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/core/java/android/os/UserManager.java b/core/java/android/os/UserManager.java index 3aa42c6bb594..392b6eb6d51b 100644 --- a/core/java/android/os/UserManager.java +++ b/core/java/android/os/UserManager.java @@ -6442,7 +6442,11 @@ public class UserManager { */ @UnsupportedAppUsage public int getUserSerialNumber(@UserIdInt int userId) { - if (android.multiuser.Flags.cacheUserSerialNumber()) { + // Read only flag should is to fix early access to this API + // cacheUserSerialNumber to be removed after the + // cacheUserSerialNumberReadOnly is fully rolled out + if (android.multiuser.Flags.cacheUserSerialNumberReadOnly() + || android.multiuser.Flags.cacheUserSerialNumber()) { // System user serial number is always 0, and it always exists. // There is no need to call binder for that. if (userId == UserHandle.USER_SYSTEM) { -- cgit v1.2.3-59-g8ed1b