diff options
| author | Jordan Jozwiak <jjoz@google.com> | 2020-05-19 13:58:53 -0700 |
|---|---|---|
| committer | Jordan Jozwiak <jjoz@google.com> | 2020-06-04 19:21:31 +0000 |
| commit | 9ead5a3c056761a54ea068e67134db5f2776bdd3 (patch) | |
| tree | c79e8fae3d49fec96143928d6989d39203f92d57 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 3a9ceed26b23170ba544b4dfc2e9d9d32eddc01e (diff) | |
DO NOT MERGE - Allow locking with feature or permission
Instead of requiring the DEVICE_ADMIN feature, we accept either
the feature or the appropriate permission.
Bug: 133240910
Test: Manual testing
Verify that API executes when on a device without DEVICE_ADMIN
when the caller has the LOCK_DEVICE permission.
Change-Id: I30bd0dc81d9d7b7ed5503a926066caffb389b9c0
(cherry picked from commit 3cc489b7f3dfcbe66a469bfce948884aec852ee4)
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions