Merge "Add a finalizer to LockscreenCredential to wipe the LSKF on GC" into main am: 3539fa7df6

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3063203

Change-Id: Ibce2ce6c7db03fc13a9469642f548b4f4fd8df4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

1 files changed, 5 insertions, 0 deletions

diff --git a/core/java/com/android/internal/widget/LockscreenCredential.java b/core/java/com/android/internal/widget/LockscreenCredential.java
index 18d5f6db6ac9..54b9a225f944 100644
--- a/core/java/com/android/internal/widget/LockscreenCredential.java
+++ b/core/java/com/android/internal/widget/LockscreenCredential.java
@@ -386,6 +386,11 @@ public class LockscreenCredential implements Parcelable, AutoCloseable {
     }
 
     @Override
+    public void finalize() {
+        zeroize();
+    }
+
+    @Override
     public int hashCode() {
         // Effective Java — Always override hashCode when you override equals
         return Objects.hash(mType, Arrays.hashCode(mCredential), mHasInvalidChars);