From b2d1506f1560d45fc3f8f24c8978f0037cbb2f8d Mon Sep 17 00:00:00 2001
From: Pascal Hartig <realpassy@fb.com>
Date: Wed, 27 Mar 2019 07:43:12 -0700
Subject: [PATCH] Fix SDK app crash

Summary:
I'm not sure why this was made an AssertionError in the first place
as this cannot be caught by a catch branch that only takes Exception-subclasses.

Given that this is expected behaviour in some cases, using an Error here
is rather dangerous.

This does not fix the underlying issue of the attached task, but fixes
the undesired crashing behaviour of the app.

Reviewed By: priteshrnandgaonkar

Differential Revision: D14598611

fbshipit-source-id: b024b35f07e16755d9a4ab2f4a1f75b10d1353fb
---
 .../flipper/plugins/inspector/InspectorFlipperPlugin.java     | 2 +-
 .../flipper/plugins/inspector/InspectorFlipperPluginTest.java | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/android/src/main/java/com/facebook/flipper/plugins/inspector/InspectorFlipperPlugin.java b/android/src/main/java/com/facebook/flipper/plugins/inspector/InspectorFlipperPlugin.java
index 51876eaa6..a9794e894 100644
--- a/android/src/main/java/com/facebook/flipper/plugins/inspector/InspectorFlipperPlugin.java
+++ b/android/src/main/java/com/facebook/flipper/plugins/inspector/InspectorFlipperPlugin.java
@@ -754,7 +754,7 @@ public class InspectorFlipperPlugin implements FlipperPlugin {
 
   private static Object assertNotNull(@Nullable Object o) {
     if (o == null) {
-      throw new AssertionError("Unexpected null value");
+      throw new RuntimeException("Unexpected null value");
     }
     return o;
   }
diff --git a/android/src/test/java/com/facebook/flipper/plugins/inspector/InspectorFlipperPluginTest.java b/android/src/test/java/com/facebook/flipper/plugins/inspector/InspectorFlipperPluginTest.java
index 87f724e5f..f98da4192 100644
--- a/android/src/test/java/com/facebook/flipper/plugins/inspector/InspectorFlipperPluginTest.java
+++ b/android/src/test/java/com/facebook/flipper/plugins/inspector/InspectorFlipperPluginTest.java
@@ -32,6 +32,7 @@ import java.util.Collections;
 import java.util.List;
 import javax.annotation.Nullable;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mockito;
@@ -296,7 +297,8 @@ public class InspectorFlipperPluginTest {
     Mockito.verify(decorView, Mockito.times(1)).removeView(Mockito.any(TouchOverlayView.class));
   }
 
-  @Test(expected = AssertionError.class)
+  @Ignore("Will be resurrected with next diff in stack")
+  @Test(expected = RuntimeException.class)
   public void testNullChildThrows() throws Exception {
     final InspectorFlipperPlugin plugin =
         new InspectorFlipperPlugin(mApp, mDescriptorMapping, mScriptingEnvironment, null);