Merge "Device ID Attestation: Fix API review" (73b844d8) · Commits · e / os / android_frameworks_base

api/system-current.txt

+2 −2

Original line number	Diff line number	Diff line
		@@ -6189,8 +6189,8 @@ package android.security.keystore {
		}

		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);
		}

		}

+2 −2

Original line number	Diff line number	Diff line
		@@ -2100,8 +2100,8 @@ package android.security.keystore {
		}

		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 {

+3 −2

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@

		package android.security.keystore;

		import android.annotation.Nullable;
		import android.annotation.SystemApi;
		import android.annotation.TestApi;

		@@ -33,7 +34,7 @@ public class DeviceIdAttestationException extends Exception {
		*
		* @param detailMessage the detail message for this exception.
		*/
		public DeviceIdAttestationException(String detailMessage) {
		public DeviceIdAttestationException(@Nullable String detailMessage) {
		super(detailMessage);
		}

		@@ -44,7 +45,7 @@ public class DeviceIdAttestationException extends Exception {
		* @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);
		}
		}