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

Merge "Add additional arguments to PackagesHash." into main

Browse Source
This commit is contained in:
Wentao Wang
2023-07-07 06:42:56 +00:00
committed by Android (Google) Code Review
parent 0e513fb073 0a6779ab97
commit afed24e208
1 changed files with 27 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
services/core/java/com/android/server/policy/role/RoleServicePlatformHelperImpl.java
View File

@@ -19,6 +19,7 @@ package com.android.server.policy.role;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.UserIdInt;
import android.app.admin.DevicePolicyManagerInternal;
import android.app.role.RoleManager;
import android.content.ComponentName;
import android.content.ContentResolver;
@@ -303,6 +304,8 @@ public class RoleServicePlatformHelperImpl implements RoleServicePlatformHelper
public String computePackageStateHash(@UserIdInt int userId) {
PackageManagerInternal packageManagerInternal = LocalServices.getService(
PackageManagerInternal.class);
DevicePolicyManagerInternal devicePolicyManagerInternal = LocalServices.getService(
DevicePolicyManagerInternal.class);
final MessageDigestOutputStream mdos = new MessageDigestOutputStream();
DataOutputStream dataOutputStream = new DataOutputStream(new BufferedOutputStream(mdos));
@@ -342,6 +345,30 @@ public class RoleServicePlatformHelperImpl implements RoleServicePlatformHelper
throw new AssertionError(e);
}
}, userId);
try {
String deviceOwner= "";
if (devicePolicyManagerInternal.getDeviceOwnerUserId() == userId) {
ComponentName deviceOwnerComponent =
devicePolicyManagerInternal.getDeviceOwnerComponent(false);
if (deviceOwnerComponent != null) {
deviceOwner = deviceOwnerComponent.getPackageName();
}
}
dataOutputStream.writeUTF(deviceOwner);
String profileOwner = "";
ComponentName profileOwnerComponent =
devicePolicyManagerInternal.getProfileOwnerAsUser(userId);
if (profileOwnerComponent != null) {
profileOwner = profileOwnerComponent.getPackageName();
}
dataOutputStream.writeUTF(profileOwner);
dataOutputStream.writeInt(Settings.Global.getInt(mContext.getContentResolver(),
Settings.Global.DEVICE_DEMO_MODE, 0));
dataOutputStream.flush();
} catch (IOException e) {
// Never happens for MessageDigestOutputStream and DataOutputStream.
throw new AssertionError(e);
}
return mdos.getDigestAsString();
}