commit e4cc903619f27aa746cd788bf7e1b8c81aa34e48
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Feb 01 01:29:41 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Feb 01 01:29:41 2019 +0000
tree 7ef7987e741af16279478c90a2a08ae2716ad215
parent af1eb8ee8fbc9e90325083917d863729ec28cc49
parent 6b5a2b98da3b61c7ea0c7bc3d5a6ae5fd7ddff72

Merge "Fix Native tests for input are broken in postsubmit"

services/inputflinger/tests/InputDispatcher_test.cpp

diff --git a/services/inputflinger/tests/InputDispatcher_test.cpp b/services/inputflinger/tests/InputDispatcher_test.cpp
index e0e211f..0f987c3 100644
--- a/services/inputflinger/tests/InputDispatcher_test.cpp
+++ b/services/inputflinger/tests/InputDispatcher_test.cpp
@@ -444,7 +444,7 @@
     }
 
     virtual bool updateInfo() {
-        mInfo.token = mServerChannel->getToken();
+        mInfo.token = mServerChannel ? mServerChannel->getToken() : nullptr;
         mInfo.name = mName;
         mInfo.layoutParamsFlags = 0;
         mInfo.layoutParamsType = InputWindowInfo::TYPE_APPLICATION;
@@ -474,8 +474,8 @@
     }
 
     void releaseChannel() {
+        mServerChannel.clear();
         InputWindowHandle::releaseChannel();
-        mDispatcher->unregisterInputChannel(mServerChannel);
     }
 protected:
     virtual bool handled() {