diff options
| author | 2023-03-13 21:50:22 +0000 | |
|---|---|---|
| committer | 2023-03-13 21:50:22 +0000 | |
| commit | 1eca45e58de4f02dd3a14e0e6a08bf334e29f440 (patch) | |
| tree | 6bb9632e9ee71acdcd11d724feaa561b6fc82c84 | |
| parent | a96b721a0ed217226792de0c0cdc999bb116652d (diff) | |
| parent | 9748eedae02f33b3c4ab29c5e2c6f25a56877f58 (diff) | |
Merge "Solve NPE." into tm-qpr-dev am: 9748eedae0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21752777
Change-Id: I9a31c32b8e07a260fdd709782be785cf763b9578
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | packages/SystemUI/plugin/src/com/android/systemui/plugins/qs/QSTile.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/packages/SystemUI/plugin/src/com/android/systemui/plugins/qs/QSTile.java b/packages/SystemUI/plugin/src/com/android/systemui/plugins/qs/QSTile.java index 1d28c63f8398..c0b69c169ccd 100644 --- 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) { |