Merge "Fix the NPE in the Settings Tile lib" into udc-d1-dev

2023-07-19 03:59:08 +00:00
parent c88e4605a8 2f63ce63bf
commit 2be625e241
1 changed files with 1 additions and 1 deletions
--- 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 {