Fix touch event parameter order

tools/viewer/sk_app/android/surface_glue_android.cpp

 /*
 * Copyright 2016 Google Inc.
 *
 * Use of this source code is governed by a BSD-style license that can be
 * found in the LICENSE file.
 */
 
 #include "surface_glue_android.h"
 
 #include <jni.h>
@@ skipping 129 matching lines @@
         case kKeyPressed: {
             auto it = ANDROID_TO_WINDOW_KEYMAP.find(message.fKeycode);
             SkASSERT(it != ANDROID_TO_WINDOW_KEYMAP.end());
             // No modifier is supported so far
             skiaAndroidApp->fWindow->onKey(it->second, Window::kDown_InputState, 0);
             skiaAndroidApp->fWindow->onKey(it->second, Window::kUp_InputState, 0);
             break;
         }
         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: {
             skiaAndroidApp->fWindow->onUIStateChanged(*message.stateName, *message.stateValue);
             delete message.stateName;
             delete message.stateValue;
             break;
         }
         default: {
             // do nothing
@@ skipping 72 matching lines @@
                                                                                    jobject activity,
                                                                                    jlong handle,
                                                                                    jint keycode) {
     auto skiaAndroidApp = (SkiaAndroidApp*)handle;
     Message message(kKeyPressed);
     message.fKeycode = keycode;
     skiaAndroidApp->postMessage(message);
 }
 
 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;
     message.fTouchState = state;
     message.fTouchX = x;
     message.fTouchY = y;
     skiaAndroidApp->postMessage(message);
 }
 
 extern "C" JNIEXPORT void JNICALL Java_org_skia_viewer_ViewerActivity_onUIStateChanged(
     JNIEnv* env, jobject activity, jlong handle, jstring stateName, jstring stateValue) {
     auto skiaAndroidApp = (SkiaAndroidApp*)handle;
     Message message(kUIStateChanged);
     const char* nameChars = env->GetStringUTFChars(stateName, nullptr);
     const char* valueChars = env->GetStringUTFChars(stateValue, nullptr);
     message.stateName = new SkString(nameChars);
     message.stateValue = new SkString(valueChars);
     skiaAndroidApp->postMessage(message);
     env->ReleaseStringUTFChars(stateName, nameChars);
     env->ReleaseStringUTFChars(stateValue, valueChars);
 }
 
 }  // namespace sk_app