Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f58f4966 authored by Jeff DeCew's avatar Jeff DeCew Committed by Automerger Merge Worker
Browse files

Merge "Ignore touches during setup to avoid crash." into sc-dev am: f569c404 am: 1a01c7a9 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15189494

Change-Id: Icfb7a80a2bb3419317aaf35db3a2e65b926d0332
parents 986cb521 1a01c7a9

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

+6 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import android.media.session.MediaSessionLegacyHelper; 
import android.os.SystemClock;

import android.os.UserHandle;

import android.provider.Settings;

import android.util.Log;

import android.view.GestureDetector;

import android.view.InputDevice;

import android.view.KeyEvent;
@@ -66,6 +67,7 @@ import javax.inject.Inject; 
 * Controller for {@link NotificationShadeWindowView}.

 */

public class NotificationShadeWindowViewController {

    private static final String TAG = "NotifShadeWindowVC";

    private final InjectionInflationController mInjectionInflationController;

    private final NotificationWakeUpCoordinator mCoordinator;

    private final PulseExpansionHandler mPulseExpansionHandler;
@@ -213,6 +215,10 @@ public class NotificationShadeWindowViewController { 
        mView.setInteractionEventHandler(new NotificationShadeWindowView.InteractionEventHandler() {

            @Override

            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 isUp = ev.getActionMasked() == MotionEvent.ACTION_UP;

                boolean isCancel = ev.getActionMasked() == MotionEvent.ACTION_CANCEL;