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 am: be630d3635

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

Change-Id: I982295a289033d05174a7796c66e725fe997c22c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jonathan Scott
2023-05-04 09:51:24 +00:00
committed by Automerger Merge Worker
parent 66d1630bcb be630d3635
commit 311c982dac
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)
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());