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

Commit 0203b15a authored by Jason Chiu's avatar Jason Chiu Committed by Automerger Merge Worker
Browse files

Merge "Guard against NPE in the Settings Tile lib" into udc-d1-dev am: 7913e255 

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



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

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

+3 −2
Original line number Diff line number Diff line
@@ -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.