From 526a010ad7c7168ee795200abeeb213caa9ed4e5 Mon Sep 17 00:00:00 2001
From: Joshua Gross <joshuagross@fb.com>
Date: Fri, 18 Oct 2019 15:07:11 -0700
Subject: [PATCH] Add `ThreadConfined(UI)` to CatalystInstanceImpl.destroy

Summary:
This already has an assert that `destroy` should only be called on the UI thread. Add an annotation.

Changelog: [Internal]

Reviewed By: mdvacca

Differential Revision: D17989113

fbshipit-source-id: fd44f321cbcb7f0a18383ca6226cce72e5991eea
---
 .../java/com/facebook/react/bridge/CatalystInstanceImpl.java   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java
index dfc52e72d8c..e49a2fe3643 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java
@@ -7,6 +7,7 @@
 
 package com.facebook.react.bridge;
 
+import static com.facebook.infer.annotation.ThreadConfined.UI;
 import static com.facebook.systrace.Systrace.TRACE_TAG_REACT_JAVA_BRIDGE;
 
 import android.content.res.AssetManager;
@@ -15,6 +16,7 @@ import android.util.Log;
 import androidx.annotation.Nullable;
 import com.facebook.common.logging.FLog;
 import com.facebook.infer.annotation.Assertions;
+import com.facebook.infer.annotation.ThreadConfined;
 import com.facebook.jni.HybridData;
 import com.facebook.proguard.annotations.DoNotStrip;
 import com.facebook.react.bridge.queue.MessageQueueThread;
@@ -326,6 +328,7 @@ public class CatalystInstanceImpl implements CatalystInstance {
    * fully shut down other threads.
    */
   @Override
+  @ThreadConfined(UI)
   public void destroy() {
     Log.d(ReactConstants.TAG, "CatalystInstanceImpl.destroy() start");
     UiThreadUtil.assertOnUiThread();