summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jim Miller <jaggies@google.com> 2015-07-09 04:02:14 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2015-07-09 04:02:14 +0000
commit45ff18ee83e6bcc2eed42b24cfb74dc9ba507bb3 (patch)
tree1ebfc48c2b65ea3d4f9cce1bfdca86cc6269d004
parent5a38c8e96454f690b42732d9f77a4314c5759e3f (diff)
parentb76bbf1b94853917e23668376927587b93a70b56 (diff)
am b76bbf1b: am 253129f9: am 748bc36f: Remove "final" qualifier from AuthenticationResult
* commit 'b76bbf1b94853917e23668376927587b93a70b56': Remove "final" qualifier from AuthenticationResult
-rw-r--r--api/current.txt2
-rw-r--r--api/system-current.txt2
-rw-r--r--core/java/android/hardware/fingerprint/FingerprintManager.java2
3 files changed, 3 insertions, 3 deletions
diff --git a/api/current.txt b/api/current.txt
index af9586756bce..e5b190c7fd64 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -13916,7 +13916,7 @@ package android.hardware.fingerprint {
method public void onAuthenticationSucceeded(android.hardware.fingerprint.FingerprintManager.AuthenticationResult);
}
- public static final class FingerprintManager.AuthenticationResult {
+ public static class FingerprintManager.AuthenticationResult {
method public android.hardware.fingerprint.FingerprintManager.CryptoObject getCryptoObject();
}
diff --git a/api/system-current.txt b/api/system-current.txt
index 9fce166b2153..18cde0880644 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -14256,7 +14256,7 @@ package android.hardware.fingerprint {
method public void onAuthenticationSucceeded(android.hardware.fingerprint.FingerprintManager.AuthenticationResult);
}
- public static final class FingerprintManager.AuthenticationResult {
+ public static class FingerprintManager.AuthenticationResult {
method public android.hardware.fingerprint.FingerprintManager.CryptoObject getCryptoObject();
}
diff --git a/core/java/android/hardware/fingerprint/FingerprintManager.java b/core/java/android/hardware/fingerprint/FingerprintManager.java
index 15c7aaf993c4..c5f142a81487 100644
--- a/core/java/android/hardware/fingerprint/FingerprintManager.java
+++ b/core/java/android/hardware/fingerprint/FingerprintManager.java
@@ -254,7 +254,7 @@ public class FingerprintManager {
* Container for callback data from {@link FingerprintManager#authenticate(CryptoObject,
* CancellationSignal, int, AuthenticationCallback, Handler)}.
*/
- public static final class AuthenticationResult {
+ public static class AuthenticationResult {
private Fingerprint mFingerprint;
private CryptoObject mCryptoObject;