Add SensitiveData annotation.
Mark IKeystoreAuthorization and IKeystoreMaintenance with
@SensitiveData.
Bug: 176110256
Test: N/A
Change-Id: I6620f30d275a6d36eb6c59d50ccb0c6e6c2b31dc
diff --git a/keystore2/aidl/Android.bp b/keystore2/aidl/Android.bp
index 183096c..0db2f9d 100644
--- a/keystore2/aidl/Android.bp
+++ b/keystore2/aidl/Android.bp
@@ -55,6 +55,7 @@
},
ndk: {
enabled: true,
+ apps_enabled: false,
}
},
}
@@ -93,6 +94,7 @@
},
ndk: {
enabled: true,
+ apps_enabled: false,
}
},
}
@@ -135,6 +137,7 @@
},
ndk: {
enabled: true,
+ apps_enabled: false,
}
},
}
diff --git a/keystore2/aidl/android/security/authorization/IKeystoreAuthorization.aidl b/keystore2/aidl/android/security/authorization/IKeystoreAuthorization.aidl
index 86472eb..01616b1 100644
--- a/keystore2/aidl/android/security/authorization/IKeystoreAuthorization.aidl
+++ b/keystore2/aidl/android/security/authorization/IKeystoreAuthorization.aidl
@@ -25,6 +25,7 @@
* provide keystore with the information required to enforce authorizations on key usage.
* @hide
*/
+ @SensitiveData
interface IKeystoreAuthorization {
/**
diff --git a/keystore2/aidl/android/security/maintenance/IKeystoreMaintenance.aidl b/keystore2/aidl/android/security/maintenance/IKeystoreMaintenance.aidl
index 280500c..21ddd9b 100644
--- a/keystore2/aidl/android/security/maintenance/IKeystoreMaintenance.aidl
+++ b/keystore2/aidl/android/security/maintenance/IKeystoreMaintenance.aidl
@@ -17,13 +17,12 @@
import android.system.keystore2.Domain;
import android.security.maintenance.UserState;
-// TODO: mark the interface with @SensitiveData when the annotation is ready (b/176110256).
-
/**
* IKeystoreMaintenance interface exposes the methods for adding/removing users and changing the
* user's password.
* @hide
*/
+ @SensitiveData
interface IKeystoreMaintenance {
/**