Skip to content

Commit 3b55e1e

Browse files
Emily Janzerfacebook-github-bot
Emily Janzer
authored andcommitted
Back out "Add @UiThread annotation to methods that update DisplayMetrics"
Summary: Original commit changeset: f1d464f22877 Changelog: [Internal] Reviewed By: JoshuaGross Differential Revision: D19608308 fbshipit-source-id: 506f25654f9879d9000aa188bc3cf59582d855df
1 parent f501ed6 commit 3b55e1e

File tree

1 file changed

+0
-8
lines changed

1 file changed

+0
-8
lines changed

ReactAndroid/src/main/java/com/facebook/react/uimanager/DisplayMetricsHolder.java

-8
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,7 @@
1313
import android.view.Display;
1414
import android.view.WindowManager;
1515
import androidx.annotation.Nullable;
16-
import androidx.annotation.UiThread;
1716
import com.facebook.infer.annotation.Assertions;
18-
import com.facebook.react.bridge.UiThreadUtil;
1917
import com.facebook.react.bridge.WritableNativeMap;
2018
import java.lang.reflect.InvocationTargetException;
2119
import java.lang.reflect.Method;
@@ -39,9 +37,7 @@ public class DisplayMetricsHolder {
3937
* @deprecated Use {@link #setScreenDisplayMetrics(DisplayMetrics)} instead. See comment above as
4038
* to why this is not correct to use.
4139
*/
42-
@UiThread
4340
public static void setWindowDisplayMetrics(DisplayMetrics displayMetrics) {
44-
UiThreadUtil.assertOnUiThread();
4541
sWindowDisplayMetrics = displayMetrics;
4642
}
4743

@@ -52,9 +48,7 @@ public static void initDisplayMetricsIfNotInitialized(Context context) {
5248
initDisplayMetrics(context);
5349
}
5450

55-
@UiThread
5651
public static void initDisplayMetrics(Context context) {
57-
UiThreadUtil.assertOnUiThread();
5852
DisplayMetrics displayMetrics = context.getResources().getDisplayMetrics();
5953
DisplayMetricsHolder.setWindowDisplayMetrics(displayMetrics);
6054

@@ -101,9 +95,7 @@ public static DisplayMetrics getWindowDisplayMetrics() {
10195
return sWindowDisplayMetrics;
10296
}
10397

104-
@UiThread
10598
public static void setScreenDisplayMetrics(DisplayMetrics screenDisplayMetrics) {
106-
UiThreadUtil.assertOnUiThread();
10799
sScreenDisplayMetrics = screenDisplayMetrics;
108100
}
109101

0 commit comments

Comments
 (0)