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

Make config_devicePolicyManagementUpdater readable by tests

Browse Source 
Bug: 222070271
Test: none
Change-Id: I5b481c3e8e2fb414f7e7bf32d570d06b3e2af15d
This commit is contained in:
arangelov
2022-03-02 17:27:12 +00:00
committed by Antoan Angelov
parent 1b7b191bdf
commit 7023214eb2
2 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/api/test-current.txt
View File

@@ -502,6 +502,7 @@ package android.app.admin {
method public void forceUpdateUserSetupComplete(int);
method @NonNull public java.util.Set<java.lang.String> getDefaultCrossProfilePackages();
method public int getDeviceOwnerType(@NonNull android.content.ComponentName);
method @Nullable public String getDevicePolicyManagementRoleHolderUpdaterPackage();
method @NonNull public java.util.Set<java.lang.String> getDisallowedSystemApps(@NonNull android.content.ComponentName, int, @NonNull String);
method public long getLastBugReportRequestTime();
method public long getLastNetworkLogRetrievalTime();

23
core/java/android/app/admin/DevicePolicyManager.java
View File

@@ -15737,9 +15737,28 @@ public class DevicePolicyManager {
*/
@Nullable
public String getDevicePolicyManagementRoleHolderPackage() {
String deviceManagerConfig = mContext.getString(
String devicePolicyManagementConfig = mContext.getString(
com.android.internal.R.string.config_devicePolicyManagement);
return extractPackageNameFromDeviceManagerConfig(deviceManagerConfig);
return extractPackageNameFromDeviceManagerConfig(devicePolicyManagementConfig);
}
/**
* Returns the package name of the device policy management role holder updater.
*
* <p>If the device policy management role holder updater is not configured for this device,
* returns {@code null}.
*
* @hide
*/
@Nullable
@TestApi
public String getDevicePolicyManagementRoleHolderUpdaterPackage() {
String devicePolicyManagementUpdaterConfig = mContext.getString(
com.android.internal.R.string.config_devicePolicyManagementUpdater);
if (TextUtils.isEmpty(devicePolicyManagementUpdaterConfig)) {
return null;
}
return devicePolicyManagementUpdaterConfig;
}
/**