diff options
| author | James Mattis <jmattis@google.com> | 2021-02-13 20:54:57 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-02-13 20:54:57 +0000 |
| commit | 601d16a336db896e5bc91b8538ceb1065848d17a (patch) | |
| tree | 647a4e08363712baac76c678601cc661c0ef0cfe /keystore/java/android/security/KeyStoreSecurityLevel.java | |
| parent | c9a8b2fa8e821b5fe706cdccbe73efd4fa4c0731 (diff) | |
| parent | 0846b40040255e5109a64cf91174368e5bfca1a7 (diff) | |
Merge changes from topics "pans", "pans-permission"
* changes:
Marking setOemNetworkPreference as @SystemApi
Adding permission for OEM managed preferences
Implementation of setOemNetworkPreference
Diffstat (limited to 'keystore/java/android/security/KeyStoreSecurityLevel.java')
0 files changed, 0 insertions, 0 deletions