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

Commit 3db875df authored by Jonathan Scott's avatar Jonathan Scott Committed by Automerger Merge Worker
Browse files

Merge "Fix parent check for isDeviceFinanced." into udc-dev am: be630d36 am:... 

Merge "Fix parent check for isDeviceFinanced." into udc-dev am: be630d36 am: 8353e89f am: 8309b0a5

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



Change-Id: I51412311db19a8da9fe049187ea8f2d322e1e0fa
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e8f0e7a4 8309b0a5

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

+2 −0
Original line number Diff line number Diff line
@@ -8716,6 +8716,7 @@ public class DevicePolicyManager { 
     */

    @RequiresPermission(value = SET_TIME, conditional = true)

    public void setAutoTimeEnabled(@Nullable ComponentName admin, boolean enabled) {

        throwIfParentInstance("setAutoTimeEnabled");

        if (mService != null) {

            try {

                mService.setAutoTimeEnabled(admin, mContext.getPackageName(), enabled);
@@ -16938,6 +16939,7 @@ public class DevicePolicyManager { 
     * android.app.role.RoleManager.ROLE_SYSTEM_SUPERVISION.

     */

    public boolean isDeviceFinanced() {

        throwIfParentInstance("isDeviceFinanced");

        if (mService != null) {

            try {

                return mService.isDeviceFinanced(mContext.getPackageName());