From 2a80a42d40a2930bee107187dcc121a661b245f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ramos?= <hramos@fb.com>
Date: Mon, 1 Apr 2019 13:06:01 -0700
Subject: [PATCH] Revert D14423742: Use of TraceCompat

Summary:
D14423742 introduced a regression on OSS test_android due to androidx.core.os not being available. I spent some time investigating a fix forward this morning, with no success. Reverting.

Changelog:

[Android] [Changed] - Revert 92f019c666c4933b8553b60038803819f4204e5d

Reviewed By: cpojer

Differential Revision: D14668728

fbshipit-source-id: c7542992805551dc4302626e1536759794efaa82
---
 ReactAndroid/src/main/java/com/facebook/systrace/BUCK |  1 -
 .../src/main/java/com/facebook/systrace/Systrace.java | 11 ++++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/systrace/BUCK b/ReactAndroid/src/main/java/com/facebook/systrace/BUCK
index a5ad996259e..21006f1842c 100644
--- a/ReactAndroid/src/main/java/com/facebook/systrace/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/systrace/BUCK
@@ -3,7 +3,6 @@ load("//tools/build_defs/oss:rn_defs.bzl", "rn_android_library")
 rn_android_library(
     name = "systrace",
     srcs = glob(["*.java"]),
-    is_androidx = True,
     visibility = [
         "PUBLIC",
     ],
diff --git a/ReactAndroid/src/main/java/com/facebook/systrace/Systrace.java b/ReactAndroid/src/main/java/com/facebook/systrace/Systrace.java
index 2d7aa429e3f..fd9a575ae15 100644
--- a/ReactAndroid/src/main/java/com/facebook/systrace/Systrace.java
+++ b/ReactAndroid/src/main/java/com/facebook/systrace/Systrace.java
@@ -7,7 +7,8 @@
 
 package com.facebook.systrace;
 
-import androidx.core.os.TraceCompat;
+import android.os.Build;
+import android.os.Trace;
 
 /**
  * Systrace stub that mostly does nothing but delegates to Trace for beginning/ending sections.
@@ -54,11 +55,15 @@ public class Systrace {
   }
 
   public static void beginSection(long tag, final String sectionName) {
-    TraceCompat.beginSection(sectionName);
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) {
+      Trace.beginSection(sectionName);
+    }
   }
 
   public static void endSection(long tag) {
-    TraceCompat.endSection();
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) {
+      Trace.endSection();
+    }
   }
 
   public static void beginAsyncSection(