From 18d64f963129ae374be9b5f3eaba7c4945860eb9 Mon Sep 17 00:00:00 2001 From: Michel Weststrate Date: Fri, 13 May 2022 07:08:52 -0700 Subject: [PATCH] Fix NPE during search Summary: `getChilAt` can return `null` (see also line 671), probably when the UI changes during the inspection process. Added a null check that should protect against the failure reported in P501013941 Changelog: Fixed NPE during search in layout plugin (Android) Reviewed By: lblasa Differential Revision: D36369508 fbshipit-source-id: 1f066d1a73bdfe875d66f7200ded0d0776af8321 --- .../flipper/plugins/inspector/InspectorFlipperPlugin.java | 3 +++ 1 file changed, 3 insertions(+) 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 1ef66efc0..2b0fced5b 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 @@ -624,6 +624,9 @@ public class InspectorFlipperPlugin implements FlipperPlugin { } public SearchResultNode searchTree(String query, Object obj, boolean axEnabled) throws Exception { + if (obj == null) { + return null; + } final NodeDescriptor descriptor = descriptorForObject(obj); List childTrees = null; boolean isMatch = descriptor.matches(query, obj);