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

Commit dd7ae870 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 

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



Change-Id: I7c8924ba467ce22619805ac1c315fb90e4a7af06
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b67122f6 2be625e2

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 {