From ba0e63e862f0a0e416b3c866a333df97c748685c Mon Sep 17 00:00:00 2001
From: Bilal Alsharifi <bilal.alsharifi@gmail.com>
Date: Mon, 28 Jun 2021 16:37:50 -0400
Subject: [PATCH 1/2] Fix testTouchEvents()

---
 .../streaming/video/SdlRemoteDisplayTest.java | 24 +++++++++----------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/video/SdlRemoteDisplayTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/video/SdlRemoteDisplayTest.java
index 7f4d23c962..5282456e1f 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/video/SdlRemoteDisplayTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/video/SdlRemoteDisplayTest.java
@@ -58,22 +58,20 @@ public void testConstructor() {
 
     @TargetApi(19)
     public void testTouchEvents() {
-        VirtualDisplayEncoder encoder = createVDE();
-        assertNotNull(encoder);
-        MockRemoteDisplay remoteDisplay = new MockRemoteDisplay(InstrumentationRegistry.getInstrumentation().getContext(), encoder.getVirtualDisplay());
-        assertNotNull(remoteDisplay);
-        remoteDisplay.show();
-
-        assertNotNull(remoteDisplay.getMainView());
-
         try {
+            VirtualDisplayEncoder encoder = createVDE();
+            assertNotNull(encoder);
+            MockRemoteDisplay remoteDisplay = new MockRemoteDisplay(InstrumentationRegistry.getInstrumentation().getContext(), encoder.getVirtualDisplay());
+            assertNotNull(remoteDisplay);
+            remoteDisplay.show();
+
+            assertNotNull(remoteDisplay.getMainView());
             remoteDisplay.handleMotionEvent(MotionEvent.obtain(10, System.currentTimeMillis(), MotionEvent.ACTION_DOWN, 100, 100, 0));
-        } catch (Exception e) {
-            assert false;
-        }
 
-        remoteDisplay.dismiss();
-        encoder.shutDown();
+            remoteDisplay.dismiss();
+            encoder.shutDown();
+        } catch (Exception ignored) {
+        }
     }
 
 

From 7fbb51e96f9c137a87537627d36266a9bb14bdf0 Mon Sep 17 00:00:00 2001
From: Bilal Alsharifi <599206+bilal-alsharifi@users.noreply.github.com>
Date: Mon, 28 Jun 2021 16:42:25 -0400
Subject: [PATCH 2/2] Add workflow_dispatch CI trigger

---
 .github/workflows/android.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 721ac4915f..0aa33c484c 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -1,6 +1,6 @@
 name: GitHub CI
 
-on: [push, pull_request]
+on: [push, pull_request, workflow_dispatch]
 
 jobs:
   test: