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

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

Browse Source
This commit is contained in:
Jonathan Scott
2023-05-04 09:03:22 +00:00
committed by Android (Google) Code Review
parent 163fedcd0e dac6de7978
commit be630d3635
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8716,6 +8716,7 @@ public class DevicePolicyManager {
*/ */
@RequiresPermission(value = SET_TIME, conditional = true) @RequiresPermission(value = SET_TIME, conditional = true)
public void setAutoTimeEnabled(@Nullable ComponentName admin, boolean enabled) { public void setAutoTimeEnabled(@Nullable ComponentName admin, boolean enabled) {
throwIfParentInstance("setAutoTimeEnabled");
if (mService != null) { if (mService != null) {
try { try {
mService.setAutoTimeEnabled(admin, mContext.getPackageName(), enabled); mService.setAutoTimeEnabled(admin, mContext.getPackageName(), enabled);
@@ -16938,6 +16939,7 @@ public class DevicePolicyManager {
* android.app.role.RoleManager.ROLE_SYSTEM_SUPERVISION. * android.app.role.RoleManager.ROLE_SYSTEM_SUPERVISION.
*/ */
public boolean isDeviceFinanced() { public boolean isDeviceFinanced() {
throwIfParentInstance("isDeviceFinanced");
if (mService != null) { if (mService != null) {
try { try {
return mService.isDeviceFinanced(mContext.getPackageName()); return mService.isDeviceFinanced(mContext.getPackageName());