Revert "Replace remaining enforceXXX methods"

Browse Source

This reverts commit 2cc14d046e.

Reason for revert: Factory reset function can not work
This was caused by the method getCallerIdentityOptionalAdmin().
When the component name is null and no active admin is found,
getCallerIdentity() should be called instead of throwing a
security exception.

Bug: 170057677
Change-Id: I46f181a5be5bf6cff7be6ea0f8965c4cd7be1f01

...

This commit is contained in:

Alex Johnston

2020-10-05 11:01:47 +00:00

parent 2cc14d046e

commit 25e26d9055

1 changed files with 443 additions and 394 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

837

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

File diff suppressed because it is too large Load Diff