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

This commit is contained in:
BK Choi
2023-07-21 20:22:38 +00:00
committed by Android (Google) Code Review

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);