diff options
| author | 2023-07-19 05:08:36 +0000 | |
|---|---|---|
| committer | 2023-07-19 05:08:36 +0000 | |
| commit | c9564dfc74acd7822dfdb006ad812e025232b27c (patch) | |
| tree | 9bd6c3d18d21ae20757bd96ab8d8cdedcc23f5bf | |
| parent | 970f6c42f5dfff4bb99daaf08709017ba79265b1 (diff) | |
| parent | 2be625e241cd218e558470cc9dfd0f0a4c08c0a0 (diff) | |
Merge "Fix the NPE in the Settings Tile lib" into udc-d1-dev am: 2be625e241
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24104812
Change-Id: Iaea9b218a6b184992606e9df076c055ed8a56a36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | packages/SettingsLib/Tile/src/com/android/settingslib/drawer/Tile.java | 2 |
1 files changed, 1 insertions, 1 deletions
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 { |