Merge "Solve NPE." into tm-qpr-dev

2023-03-13 21:45:25 +00:00
parent 3d2e83aa6d 4c76f8db29
commit 9748eedae0
1 changed files with 4 additions and 2 deletions
--- a/packages/SystemUI/plugin/src/com/android/systemui/plugins/qs/QSTile.java
+++ b/packages/SystemUI/plugin/src/com/android/systemui/plugins/qs/QSTile.java
@@ -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) {