Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Allow SYSTEM user in Automotive instead of main user." into udc-qpr-dev am: eae7134dde

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24137984

Change-Id: I1acf3cf0fa2b59a0060101fff6bc0edb79757e9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
BK Choi
2023-07-21 20:45:20 +00:00
committed by Automerger Merge Worker
parent b7b7ce0ca0 eae7134dde
commit cbe62efc0e
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/PersistentDataBlockService.java
View File

@@ -159,9 +159,10 @@ public class PersistentDataBlockService extends SystemService {
private int getAllowedUid() { private int getAllowedUid() {
final UserManagerInternal umInternal = LocalServices.getService(UserManagerInternal.class); final UserManagerInternal umInternal = LocalServices.getService(UserManagerInternal.class);
final int mainUserId = umInternal.getMainUserId(); int mainUserId = umInternal.getMainUserId();
if (mainUserId < 0) { if (mainUserId < 0) {
return -1; // If main user is not defined. Use the SYSTEM user instead.
mainUserId = UserHandle.USER_SYSTEM;
} }
String allowedPackage = mContext.getResources() String allowedPackage = mContext.getResources()
.getString(R.string.config_persistentDataPackageName); .getString(R.string.config_persistentDataPackageName);