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

Commit fc9d6a49 authored by Holly Jiuyu Sun's avatar Holly Jiuyu Sun Committed by Automerger Merge Worker
Browse files

Merge "Solve NPE." into tm-qpr-dev am: 9748eeda am: 1eca45e5 am: ccd99369 

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



Change-Id: Ief79b4d1a7e6d0a7d7473b46335355d84ebb8e5a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 24897f67 ccd99369

packages/SystemUI/plugin/src/com/android/systemui/plugins/qs/QSTile.java

+4 −2
Original line number Diff line number Diff line
@@ -189,10 +189,12 @@ public interface QSTile { 


        /** Get the text for secondaryLabel. */

        public String getSecondaryLabel(String stateText) {

            if (TextUtils.isEmpty(secondaryLabel)) {

            // Use a local reference as the value might change from other threads

            CharSequence localSecondaryLabel = secondaryLabel;

            if (TextUtils.isEmpty(localSecondaryLabel)) {

                return stateText;

            }

            return secondaryLabel.toString();

            return localSecondaryLabel.toString();

        }



        public boolean copyTo(State other) {