Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5e204acd authored by Jason Chiu's avatar Jason Chiu Committed by Automerger Merge Worker
Browse files

Merge "Fix the NPE in the Settings Tile lib" into udc-d1-dev am: 2be625e2 am: c9564dfc 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24104812



Change-Id: I16b584b3b20c2647a3913709ecb56f9ce44c8260
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 20736b4c c9564dfc

packages/SettingsLib/Tile/src/com/android/settingslib/drawer/Tile.java

+1 −1
Original line number Diff line number Diff line
@@ -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 {