Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6cf93cd8 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Centralise logic for setting credential manager app" am: 353a2c4f 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1549397

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id0b3bf391c8c6db22dd932b785b8de21dbb92d52
parents 199dd9b3 353a2c4f

keystore/java/android/security/IKeyChainService.aidl

+0 −1
Original line number Diff line number Diff line
@@ -60,7 +60,6 @@ interface IKeyChainService { 
    byte[] getEncodedCaCertificate(String alias, boolean includeDeletedSystem);

    List<String> getCaCertificateChainAliases(String rootAlias, boolean includeDeletedSystem);

    void setCredentialManagementApp(String packageName, in AppUriAuthenticationPolicy policy);

    void updateCredentialManagementAppPolicy(in AppUriAuthenticationPolicy policy);

    boolean hasCredentialManagementApp();

    String getCredentialManagementAppPackageName();

    AppUriAuthenticationPolicy getCredentialManagementAppPolicy();