diff options
| author | 2023-07-19 05:08:41 +0000 | |
|---|---|---|
| committer | 2023-07-19 05:08:41 +0000 | |
| commit | 0203b15a9a7b26f6b502caf8a461d1a546b73901 (patch) | |
| tree | 32da180e73a30f80d0caa948a87d46c62539351b | |
| parent | c9564dfc74acd7822dfdb006ad812e025232b27c (diff) | |
| parent | 7913e255035cff2a3df18f884d40647fc7b4a513 (diff) | |
Merge "Guard against NPE in the Settings Tile lib" into udc-d1-dev am: 7913e25503
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24112146
Change-Id: Iaedbeae1a37ff1ba2cf6e232f6093b8b6940e45a
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 | 5 |
1 files changed, 3 insertions, 2 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 612a9282fece..1a938d6ec37e 100644 --- a/packages/SettingsLib/Tile/src/com/android/settingslib/drawer/Tile.java +++ b/packages/SettingsLib/Tile/src/com/android/settingslib/drawer/Tile.java @@ -179,7 +179,8 @@ public abstract class Tile implements Parcelable { * Check whether tile has order. */ public boolean hasOrder() { - return mMetaData.containsKey(META_DATA_KEY_ORDER) + return mMetaData != null + && mMetaData.containsKey(META_DATA_KEY_ORDER) && mMetaData.get(META_DATA_KEY_ORDER) instanceof Integer; } @@ -204,7 +205,7 @@ public abstract class Tile implements Parcelable { CharSequence title = null; ensureMetadataNotStale(context); final PackageManager packageManager = context.getPackageManager(); - if (mMetaData.containsKey(META_DATA_PREFERENCE_TITLE)) { + if (mMetaData != null && mMetaData.containsKey(META_DATA_PREFERENCE_TITLE)) { if (mMetaData.containsKey(META_DATA_PREFERENCE_TITLE_URI)) { // If has as uri to provide dynamic title, skip loading here. UI will later load // at tile binding time. |