From 2f63ce63bfccb89d4a32cb5d28ab89f20d54fd08 Mon Sep 17 00:00:00 2001
From: Jason Chiu <chiujason@google.com>
Date: Tue, 4 Jul 2023 17:57:47 +0800
Subject: Fix the NPE in the Settings Tile lib

Move the key checker after ensureMetadataNotStale() since it might
update the key to null.

Bug: 286690307
Test: robotest
Change-Id: I6eaae2ca798d2deccea44137846fe9a4e294f26e
Merged-In: I6eaae2ca798d2deccea44137846fe9a4e294f26e
(cherry picked from commit f730153b58cf55d17363f570aa5b3909d27b1e44)
---
 packages/SettingsLib/Tile/src/com/android/settingslib/drawer/Tile.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/SettingsLib/Tile/src/com/android/settingslib/drawer/Tile.java b/packages/SettingsLib/Tile/src/com/android/settingslib/drawer/Tile.java
index 00dd8cc88da2..612a9282fece 100644
--- a/packages/SettingsLib/Tile/src/com/android/settingslib/drawer/Tile.java
+++ b/packages/SettingsLib/Tile/src/com/android/settingslib/drawer/Tile.java
@@ -284,10 +284,10 @@ public abstract class Tile implements Parcelable {
      * Optional key to use for this tile.
      */
     public String getKey(Context context) {
+        ensureMetadataNotStale(context);
         if (!hasKey()) {
             return null;
         }
-        ensureMetadataNotStale(context);
         if (mMetaData.get(META_DATA_PREFERENCE_KEYHINT) instanceof Integer) {
             return context.getResources().getString(mMetaData.getInt(META_DATA_PREFERENCE_KEYHINT));
         } else {
-- 
cgit v1.2.3-59-g8ed1b