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

Merge "Ignore touches during setup to avoid crash." into sc-dev

Browse Source
This commit is contained in:
Jeff DeCew
2021-07-07 12:17:40 +00:00
committed by Android (Google) Code Review
parent f8a49bec00 b4893dcb98
commit f569c404b5
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationShadeWindowViewController.java
View File

@@ -26,6 +26,7 @@ import android.media.session.MediaSessionLegacyHelper;
import android.os.SystemClock; import android.os.SystemClock;
import android.os.UserHandle; import android.os.UserHandle;
import android.provider.Settings; import android.provider.Settings;
import android.util.Log;
import android.view.GestureDetector; import android.view.GestureDetector;
import android.view.InputDevice; import android.view.InputDevice;
import android.view.KeyEvent; import android.view.KeyEvent;
@@ -66,6 +67,7 @@ import javax.inject.Inject;
* Controller for {@link NotificationShadeWindowView}. * Controller for {@link NotificationShadeWindowView}.
*/ */
public class NotificationShadeWindowViewController { public class NotificationShadeWindowViewController {
private static final String TAG = "NotifShadeWindowVC";
private final InjectionInflationController mInjectionInflationController; private final InjectionInflationController mInjectionInflationController;
private final NotificationWakeUpCoordinator mCoordinator; private final NotificationWakeUpCoordinator mCoordinator;
private final PulseExpansionHandler mPulseExpansionHandler; private final PulseExpansionHandler mPulseExpansionHandler;
@@ -213,6 +215,10 @@ public class NotificationShadeWindowViewController {
mView.setInteractionEventHandler(new NotificationShadeWindowView.InteractionEventHandler() { mView.setInteractionEventHandler(new NotificationShadeWindowView.InteractionEventHandler() {
@Override @Override
public Boolean handleDispatchTouchEvent(MotionEvent ev) { public Boolean handleDispatchTouchEvent(MotionEvent ev) {
if (mStatusBarView == null) {
Log.w(TAG, "Ignoring touch while statusBarView not yet set.");
return false;
}
boolean isDown = ev.getActionMasked() == MotionEvent.ACTION_DOWN; boolean isDown = ev.getActionMasked() == MotionEvent.ACTION_DOWN;
boolean isUp = ev.getActionMasked() == MotionEvent.ACTION_UP; boolean isUp = ev.getActionMasked() == MotionEvent.ACTION_UP;
boolean isCancel = ev.getActionMasked() == MotionEvent.ACTION_CANCEL; boolean isCancel = ev.getActionMasked() == MotionEvent.ACTION_CANCEL;