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

Commit 72467361 authored by Dmitry Dementyev's avatar Dmitry Dementyev Committed by Android (Google) Code Review
Browse files

Merge "Get rid of manually created IKeystoreService."

parents 630fc40a efc4311a

core/java/Android.bp

+5 −0
Original line number Original line Diff line number Diff line
@@ -2,3 +2,8 @@ filegroup { 
    name: "IKeyAttestationApplicationIdProvider.aidl",

    name: "IKeyAttestationApplicationIdProvider.aidl",

    srcs: ["android/security/keymaster/IKeyAttestationApplicationIdProvider.aidl"],

    srcs: ["android/security/keymaster/IKeyAttestationApplicationIdProvider.aidl"],

}

}



filegroup {

    name: "IKeystoreService.aidl",

    srcs: ["android/security/IKeystoreService.aidl"],

}

core/java/android/security/KeystoreArguments.aidl

+1 −1
Original line number Original line Diff line number Diff line
@@ -17,4 +17,4 @@ 
package android.security;

package android.security;





/* @hide */

/* @hide */

parcelable KeystoreArguments;
 
parcelable KeystoreArguments cpp_header "keystore/KeystoreArguments.h";

core/java/android/security/keymaster/ExportResult.aidl

+1 −1
Original line number Original line Diff line number Diff line
@@ -17,4 +17,4 @@ 
package android.security.keymaster;

package android.security.keymaster;





/* @hide */

/* @hide */

parcelable ExportResult;
 
parcelable ExportResult cpp_header "keystore/ExportResult.h";

core/java/android/security/keymaster/KeyCharacteristics.aidl

+1 −1
Original line number Original line Diff line number Diff line
@@ -17,4 +17,4 @@ 
package android.security.keymaster;

package android.security.keymaster;





/* @hide */

/* @hide */

parcelable KeyCharacteristics;
 
parcelable KeyCharacteristics cpp_header "keystore/KeyCharacteristics.h";

core/java/android/security/keymaster/KeymasterArguments.aidl

+1 −1
Original line number Original line Diff line number Diff line
@@ -17,4 +17,4 @@ 
package android.security.keymaster;

package android.security.keymaster;





/* @hide */

/* @hide */

parcelable KeymasterArguments;
 
parcelable KeymasterArguments cpp_header "keystore/KeymasterArguments.h";