diff --git a/tools/viewer/sk_app/android/surface_glue_android.cpp b/tools/viewer/sk_app/android/surface_glue_android.cpp
index d001cd5367..29d9ff089c 100644
--- a/tools/viewer/sk_app/android/surface_glue_android.cpp
+++ b/tools/viewer/sk_app/android/surface_glue_android.cpp
@@ -147,9 +147,12 @@ int SkiaAndroidApp::message_callback(int fd, int events, void* data) {
         }
         case kTouched: {
             auto it = ANDROID_TO_WINDOW_STATEMAP.find(message.fTouchState);
-            SkASSERT(it != ANDROID_TO_WINDOW_STATEMAP.end());
-            skiaAndroidApp->fWindow->onTouch(message.fTouchOwner, it->second, message.fTouchX,
-                                             message.fTouchY);
+            if (it != ANDROID_TO_WINDOW_STATEMAP.end()) {
+                skiaAndroidApp->fWindow->onTouch(message.fTouchOwner, it->second, message.fTouchX,
+                                                 message.fTouchY);
+            } else {
+                SkDebugf("Unknown Touch State: %d\n", message.fTouchState);
+            }
             break;
         }
         case kUIStateChanged: {
@@ -242,7 +245,7 @@ extern "C" JNIEXPORT void JNICALL Java_org_skia_viewer_ViewerActivity_onKeyPress
 }
 
 extern "C" JNIEXPORT void JNICALL Java_org_skia_viewer_ViewerActivity_onTouched(
-    JNIEnv* env, jobject activity, jlong handle, jint owner, jfloat x, jfloat y, jint state) {
+    JNIEnv* env, jobject activity, jlong handle, jint owner, jint state, jfloat x, jfloat y) {
     auto skiaAndroidApp = (SkiaAndroidApp*)handle;
     Message message(kTouched);
     message.fTouchOwner = owner;