Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 29c0f1e6 authored by Antoan Angelov's avatar Antoan Angelov Committed by Automerger Merge Worker
Browse files

Merge "Make config_devicePolicyManagementUpdater readable by tests" into tm-dev am: 8c241a63 

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

Change-Id: I838e25b7f33919ac7ce25d91b8973da6fae23bb1
parents 587aebd3 8c241a63

core/api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -501,6 +501,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();

core/java/android/app/admin/DevicePolicyManager.java

+21 −2
Original line number Diff line number Diff line
@@ -15772,9 +15772,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;















    }





























    /**