Merge "Add @UnsupportedAppUsage to test apis that are known to be used by apps."

2019-11-13 15:46:27 +00:00
parent e03e78a9ff f0b7d0ba51
commit bc7671b9fb
34 changed files with 114 additions and 23 deletions
--- a/keystore/java/android/security/keystore/KeyGenParameterSpec.java
+++ b/keystore/java/android/security/keystore/KeyGenParameterSpec.java
@@ -1261,6 +1261,7 @@ public final class KeyGenParameterSpec implements AlgorithmParameterSpec, UserAu
         *
         * Sets whether to include a temporary unique ID field in the attestation certificate.
         */
+        @UnsupportedAppUsage
        @TestApi
        @NonNull
        public Builder setUniqueIdIncluded(boolean uniqueIdIncluded) {