Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Prevent NPE in PulseExpansionHandler" into rvc-dev am: 2b24206ecd

Browse Source 
Change-Id: I60a01ec5e152dbda60c11bbd6e00cb2beabfb7cf
This commit is contained in:
TreeHugger Robot
2020-05-21 02:00:12 +00:00
committed by Automerger Merge Worker
parent 4c21fd60c6 2b24206ecd
commit 210e5aa99e
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
packages/SystemUI/src/com/android/systemui/statusbar/PulseExpansionHandler.kt
View File

@@ -121,14 +121,14 @@ constructor(
} }
override fun onInterceptTouchEvent(event: MotionEvent): Boolean { override fun onInterceptTouchEvent(event: MotionEvent): Boolean {
return maybeStartExpansion(event) return canHandleMotionEvent() && startExpansion(event)
} }
private fun maybeStartExpansion(event: MotionEvent): Boolean { private fun canHandleMotionEvent(): Boolean {
if (!wakeUpCoordinator.canShowPulsingHuns || qsExpanded || return wakeUpCoordinator.canShowPulsingHuns && !qsExpanded && !bouncerShowing
bouncerShowing) { }
return false
} private fun startExpansion(event: MotionEvent): Boolean {
if (velocityTracker == null) { if (velocityTracker == null) {
velocityTracker = VelocityTracker.obtain() velocityTracker = VelocityTracker.obtain()
} }
@@ -177,8 +177,12 @@ constructor(
} }
override fun onTouchEvent(event: MotionEvent): Boolean { override fun onTouchEvent(event: MotionEvent): Boolean {
if (!isExpanding) { if (!canHandleMotionEvent()) {
return maybeStartExpansion(event) return false
}
if (!isExpanding || event.actionMasked == MotionEvent.ACTION_DOWN) {
return startExpansion(event)
} }
velocityTracker!!.addMovement(event) velocityTracker!!.addMovement(event)
val y = event.y val y = event.y