commit 4534bd9423a1b655d251fd9fb0554380f11789d9
author Android Build Merger (Role) <noreply-android-build-merger@google.com> Fri Jun 01 19:54:47 2018 +0000
committer Android Build Merger (Role) <noreply-android-build-merger@google.com> Fri Jun 01 19:54:47 2018 +0000
tree 4b9880d23e904cfd34b4386d59358755452d68aa
parent edd4f89f4d11955d2a5109138b4b5ee19f83e053
parent 87168ca1f7fc0cbf0f708990b78211c5e5e3b358

[automerger] Skip logging if device profile is not initialized am: 87168ca1f7

Change-Id: I2729ac8d3ac15ac7dd92aba2927c6cbb8dd7b3de

quickstep/src/com/android/quickstep/WindowTransformSwipeHandler.java

diff --git a/quickstep/src/com/android/quickstep/WindowTransformSwipeHandler.java b/quickstep/src/com/android/quickstep/WindowTransformSwipeHandler.java
index 28062cf..c94174b 100644
--- a/quickstep/src/com/android/quickstep/WindowTransformSwipeHandler.java
+++ b/quickstep/src/com/android/quickstep/WindowTransformSwipeHandler.java
@@ -683,15 +683,20 @@
     }
 
     private void doLogGesture(boolean toLauncher) {
+        DeviceProfile dp = mDp;
+        if (dp == null) {
+            // We probably never received an animation controller, skip logging.
+            return;
+        }
         final int direction;
-        if (mDp.isVerticalBarLayout()) {
-            direction = (mDp.isSeascape() ^ toLauncher) ? Direction.LEFT : Direction.RIGHT;
+        if (dp.isVerticalBarLayout()) {
+            direction = (dp.isSeascape() ^ toLauncher) ? Direction.LEFT : Direction.RIGHT;
         } else {
             direction = toLauncher ? Direction.UP : Direction.DOWN;
         }
 
         int dstContainerType = toLauncher ? ContainerType.TASKSWITCHER : ContainerType.APP;
-        UserEventDispatcher.newInstance(mContext, mDp).logStateChangeAction(
+        UserEventDispatcher.newInstance(mContext, dp).logStateChangeAction(
                 mLogAction, direction,
                 ContainerType.NAVBAR, ContainerType.APP,
                 dstContainerType,