1 files changed, 4 insertions, 0 deletions
diff --git a/core/java/android/os/Trace.java b/core/java/android/os/Trace.java
index ddb6533547bb..85fad2833e81 100644
--- a/core/java/android/os/Trace.java
+++ b/core/java/android/os/Trace.java
@@ -145,6 +145,10 @@ public final class Trace {
      */
     @UnsupportedAppUsage
     public static boolean isTagEnabled(long traceTag) {
+        if (!Build.IS_DEBUGGABLE) {
+            return false;
+        }
+
         long tags = nativeGetEnabledTags();
         return (tags & traceTag) != 0;
     }