Merge "Catch null handler in PlayerViewHolder.marquee."
diff --git a/packages/SystemUI/src/com/android/systemui/media/PlayerViewHolder.kt b/packages/SystemUI/src/com/android/systemui/media/PlayerViewHolder.kt
index 042a337..1322ade 100644
--- a/packages/SystemUI/src/com/android/systemui/media/PlayerViewHolder.kt
+++ b/packages/SystemUI/src/com/android/systemui/media/PlayerViewHolder.kt
@@ -16,6 +16,7 @@
package com.android.systemui.media
+import android.util.Log
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
@@ -26,6 +27,8 @@
import com.android.systemui.R
import com.android.systemui.util.animation.TransitionLayout
+private const val TAG = "PlayerViewHolder"
+
/**
* ViewHolder for a media player.
*/
@@ -94,7 +97,12 @@
}
fun marquee(start: Boolean, delay: Long) {
- longPressText.getHandler().postDelayed({ longPressText.setSelected(start) }, delay)
+ val longPressTextHandler = longPressText.getHandler()
+ if (longPressTextHandler == null) {
+ Log.d(TAG, "marquee while longPressText.getHandler() is null", Exception())
+ return
+ }
+ longPressTextHandler.postDelayed({ longPressText.setSelected(start) }, delay)
}
companion object {