commit 842d883f05706d3a453433b55cb2815e09dddd79
author Eran Messeri <eranm@google.com> Tue Mar 05 14:33:50 2019 +0000
committer Eran Messeri <eranm@google.com> Tue Mar 05 22:34:29 2019 +0000
tree 4ea8d12beb021895e6e2c4e88b0a364ced227360
parent 5c73d2a82d4f5beb9f9b063a39302dba8067280f

Device ID Attestation: Fix API review

Mark the c'tor parameters as nullable to comply with Exception's
behaviour.

Bug: 126702366
Test: That it compiles
Change-Id: I96a7c03cb79e7180872de02bee143b67f7a408ec

api/system-current.txt

diff --git a/api/system-current.txt b/api/system-current.txt
index 8dedd2c..4ee52d1 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -6187,8 +6187,8 @@
   }
 
   public class DeviceIdAttestationException extends java.lang.Exception {
-    ctor public DeviceIdAttestationException(String);
-    ctor public DeviceIdAttestationException(String, Throwable);
+    ctor public DeviceIdAttestationException(@Nullable String);
+    ctor public DeviceIdAttestationException(@Nullable String, @Nullable Throwable);
   }
 
 }

api/test-current.txt

diff --git a/api/test-current.txt b/api/test-current.txt
index 684524e..b4d550a 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -2099,8 +2099,8 @@
   }
 
   public class DeviceIdAttestationException extends java.lang.Exception {
-    ctor public DeviceIdAttestationException(String);
-    ctor public DeviceIdAttestationException(String, Throwable);
+    ctor public DeviceIdAttestationException(@Nullable String);
+    ctor public DeviceIdAttestationException(@Nullable String, @Nullable Throwable);
   }
 
   public static final class KeyGenParameterSpec.Builder {

keystore/java/android/security/keystore/DeviceIdAttestationException.java

diff --git a/keystore/java/android/security/keystore/DeviceIdAttestationException.java b/keystore/java/android/security/keystore/DeviceIdAttestationException.java
index 13f50b1..8ba0317 100644
--- a/keystore/java/android/security/keystore/DeviceIdAttestationException.java
+++ b/keystore/java/android/security/keystore/DeviceIdAttestationException.java
@@ -16,6 +16,7 @@
 
 package android.security.keystore;
 
+import android.annotation.Nullable;
 import android.annotation.SystemApi;
 import android.annotation.TestApi;
 
@@ -33,7 +34,7 @@
      *
      * @param detailMessage the detail message for this exception.
      */
-    public DeviceIdAttestationException(String detailMessage) {
+    public DeviceIdAttestationException(@Nullable String detailMessage) {
         super(detailMessage);
     }
 
@@ -44,7 +45,7 @@
      * @param message the detail message for this exception.
      * @param cause the cause of this exception, may be {@code null}.
      */
-    public DeviceIdAttestationException(String message, Throwable cause) {
+    public DeviceIdAttestationException(@Nullable String message, @Nullable Throwable cause) {
         super(message, cause);
     }
 }