From 5f8fa45e8037ef03bf409dff55bf4f5c5f014d85 Mon Sep 17 00:00:00 2001
From: Calvin Pan <calvinpan@google.com>
Date: Wed, 25 May 2022 02:47:23 +0000
Subject: [PATCH] Fix using incorrect view in app language selection

Bug: 233175025
Test: By manual
Change-Id: Idd5b277cdfb737acf9262ff5efbeca93afaa100f
---
 .../java/com/android/internal/app/SuggestedLocaleAdapter.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/java/com/android/internal/app/SuggestedLocaleAdapter.java b/core/java/com/android/internal/app/SuggestedLocaleAdapter.java
index 30836e4ab5c25..ff188dc6f2b9b 100644
--- a/core/java/com/android/internal/app/SuggestedLocaleAdapter.java
+++ b/core/java/com/android/internal/app/SuggestedLocaleAdapter.java
@@ -261,7 +261,7 @@ public class SuggestedLocaleAdapter extends BaseAdapter implements Filterable {
                         updatedView = mInflater.inflate(
                                 R.layout.app_language_picker_current_locale_item,
                                 parent, false);
-                        addStateDescriptionIntoCurrentLocaleItem(convertView);
+                        addStateDescriptionIntoCurrentLocaleItem(updatedView);
                     }
                 } else {
                     shouldReuseView = convertView instanceof TextView
@@ -278,7 +278,7 @@ public class SuggestedLocaleAdapter extends BaseAdapter implements Filterable {
                 if (!shouldReuseView) {
                     updatedView = mInflater.inflate(
                             R.layout.app_language_picker_current_locale_item, parent, false);
-                    addStateDescriptionIntoCurrentLocaleItem(convertView);
+                    addStateDescriptionIntoCurrentLocaleItem(updatedView);
                 }
                 break;
             default: