diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-05-21 16:25:25 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-05-21 16:25:25 +0000 |
| commit | 5d6cf38cd13a5ac3ac788ce7a7fafb10bee8a4d1 (patch) | |
| tree | a725e4c3988427bb63a13d17c9a6e4fd31aaa55f /services/devicepolicy | |
| parent | 4586885a638a7c866126b247164d4c950cbef214 (diff) | |
| parent | e6a81b38d61972bbc1c37f191874e8a50a4fb9e8 (diff) | |
Merge "Prevent DPCs from requesting INTERACT_ACROSS_PROFILES" into rvc-dev
Diffstat (limited to 'services/devicepolicy')
| -rw-r--r-- | services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index c1735ffcdbb7..b7a9ba56c013 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java @@ -12730,6 +12730,11 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { Binder.restoreCallingIdentity(ident); } } + + @Override + public ComponentName getProfileOwnerAsUser(int userHandle) { + return DevicePolicyManagerService.this.getProfileOwnerAsUser(userHandle); + } } private Intent createShowAdminSupportIntent(ComponentName admin, int userId) { |