From 0ebfffb8976d291b49b83410b821d60f5aa8c4aa Mon Sep 17 00:00:00 2001
From: Nikolas Havrikov <havrikov@google.com>
Date: Thu, 10 Feb 2022 14:50:42 +0100
Subject: [PATCH] Recycle obtained TypedArrays

Bug: 218835043
Test: make
Change-Id: I2c19ca3b6e4773de533cceac6b5341ae964b4fd4
---
 core/java/android/inputmethodservice/Keyboard.java     | 1 +
 core/java/android/inputmethodservice/KeyboardView.java | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/core/java/android/inputmethodservice/Keyboard.java b/core/java/android/inputmethodservice/Keyboard.java
index c85fcd990564f..59c9c5064b1e0 100644
--- a/core/java/android/inputmethodservice/Keyboard.java
+++ b/core/java/android/inputmethodservice/Keyboard.java
@@ -217,6 +217,7 @@ public class Keyboard {
             rowEdgeFlags = a.getInt(com.android.internal.R.styleable.Keyboard_Row_rowEdgeFlags, 0);
             mode = a.getResourceId(com.android.internal.R.styleable.Keyboard_Row_keyboardMode,
                     0);
+            a.recycle();
         }
     }
 
diff --git a/core/java/android/inputmethodservice/KeyboardView.java b/core/java/android/inputmethodservice/KeyboardView.java
index b780b21bf3d05..af63dd3a6feda 100644
--- a/core/java/android/inputmethodservice/KeyboardView.java
+++ b/core/java/android/inputmethodservice/KeyboardView.java
@@ -326,9 +326,11 @@ public class KeyboardView extends View implements View.OnClickListener {
             }
         }
 
+        a.recycle();
         a = mContext.obtainStyledAttributes(
                 com.android.internal.R.styleable.Theme);
         mBackgroundDimAmount = a.getFloat(android.R.styleable.Theme_backgroundDimAmount, 0.5f);
+        a.recycle();
 
         mPreviewPopup = new PopupWindow(context);
         if (previewLayout != 0) {