From 8b1199c4ddcb1f58be72f78cf766e214b4a7ccdd Mon Sep 17 00:00:00 2001
From: Matt Carroll <matthew-carroll@users.noreply.github.com>
Date: Wed, 29 May 2019 20:19:29 -0700
Subject: [PATCH] Implemented Log proxy that only logs in BuildConfig.DEBUG
 (#25391). (#9122)

---
 ci/licenses_golden/licenses_flutter           |  1 +
 shell/platform/android/BUILD.gn               |  1 +
 shell/platform/android/io/flutter/Log.java    | 74 +++++++++++++++++++
 .../engine/FlutterEnginePluginRegistry.java   |  2 +-
 .../flutter/embedding/engine/FlutterJNI.java  |  2 +-
 5 files changed, 78 insertions(+), 2 deletions(-)
 create mode 100644 shell/platform/android/io/flutter/Log.java

diff --git a/ci/licenses_golden/licenses_flutter b/ci/licenses_golden/licenses_flutter
index 6090a95c6..0cf03df55 100644
--- a/ci/licenses_golden/licenses_flutter
+++ b/ci/licenses_golden/licenses_flutter
@@ -498,6 +498,7 @@ FILE: ../../../flutter/shell/platform/android/apk_asset_provider.cc
 FILE: ../../../flutter/shell/platform/android/apk_asset_provider.h
 FILE: ../../../flutter/shell/platform/android/flutter_main.cc
 FILE: ../../../flutter/shell/platform/android/flutter_main.h
+FILE: ../../../flutter/shell/platform/android/io/flutter/Log.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/app/FlutterActivity.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/app/FlutterActivityDelegate.java
 FILE: ../../../flutter/shell/platform/android/io/flutter/app/FlutterActivityEvents.java
diff --git a/shell/platform/android/BUILD.gn b/shell/platform/android/BUILD.gn
index f11649278..570da3c5d 100644
--- a/shell/platform/android/BUILD.gn
+++ b/shell/platform/android/BUILD.gn
@@ -114,6 +114,7 @@ action("flutter_shell_java") {
   jar_path = "$root_out_dir/flutter_java.jar"
 
   sources = [
+    "io/flutter/Log.java",
     "io/flutter/app/FlutterActivity.java",
     "io/flutter/app/FlutterActivityDelegate.java",
     "io/flutter/app/FlutterActivityEvents.java",
diff --git a/shell/platform/android/io/flutter/Log.java b/shell/platform/android/io/flutter/Log.java
new file mode 100644
index 000000000..a4696c96e
--- /dev/null
+++ b/shell/platform/android/io/flutter/Log.java
@@ -0,0 +1,74 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+package io.flutter;
+
+import android.support.annotation.NonNull;
+
+import io.flutter.BuildConfig;
+
+/**
+ * Port of {@link android.util.Log} that only logs in {@link BuildConfig#DEBUG} mode.
+ */
+public class Log {
+  public static void v(@NonNull String tag, @NonNull String message) {
+    if (BuildConfig.DEBUG) {
+      android.util.Log.v(tag, message);
+    }
+  }
+
+  public static void v(@NonNull String tag, @NonNull String message, @NonNull Throwable tr) {
+    if (BuildConfig.DEBUG) {
+      android.util.Log.v(tag, message, tr);
+    }
+  }
+
+  public static void i(@NonNull String tag, @NonNull String message) {
+    if (BuildConfig.DEBUG) {
+      android.util.Log.i(tag, message);
+    }
+  }
+
+  public static void i(@NonNull String tag, @NonNull String message, @NonNull Throwable tr) {
+    if (BuildConfig.DEBUG) {
+      android.util.Log.i(tag, message, tr);
+    }
+  }
+
+  public static void d(@NonNull String tag, @NonNull String message) {
+    if (BuildConfig.DEBUG) {
+      android.util.Log.d(tag, message);
+    }
+  }
+
+  public static void d(@NonNull String tag, @NonNull String message, @NonNull Throwable tr) {
+    if (BuildConfig.DEBUG) {
+      android.util.Log.d(tag, message, tr);
+    }
+  }
+
+  public static void w(@NonNull String tag, @NonNull String message) {
+    android.util.Log.w(tag, message);
+  }
+
+  public static void w(@NonNull String tag, @NonNull String message, @NonNull Throwable tr) {
+    android.util.Log.w(tag, message, tr);
+  }
+
+  public static void e(@NonNull String tag, @NonNull String message) {
+    android.util.Log.e(tag, message);
+  }
+
+  public static void e(@NonNull String tag, @NonNull String message, @NonNull Throwable tr) {
+    android.util.Log.e(tag, message, tr);
+  }
+
+  public static void wtf(@NonNull String tag, @NonNull String message) {
+    android.util.Log.wtf(tag, message);
+  }
+
+  public static void wtf(@NonNull String tag, @NonNull String message, @NonNull Throwable tr) {
+    android.util.Log.wtf(tag, message, tr);
+  }
+}
diff --git a/shell/platform/android/io/flutter/embedding/engine/FlutterEnginePluginRegistry.java b/shell/platform/android/io/flutter/embedding/engine/FlutterEnginePluginRegistry.java
index f1c449a89..d7c924574 100644
--- a/shell/platform/android/io/flutter/embedding/engine/FlutterEnginePluginRegistry.java
+++ b/shell/platform/android/io/flutter/embedding/engine/FlutterEnginePluginRegistry.java
@@ -13,13 +13,13 @@ import android.content.Context;
 import android.content.Intent;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
-import android.util.Log;
 
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
+import io.flutter.Log;
 import io.flutter.embedding.engine.plugins.FlutterPlugin;
 import io.flutter.embedding.engine.plugins.PluginRegistry;
 import io.flutter.embedding.engine.plugins.activity.ActivityAware;
diff --git a/shell/platform/android/io/flutter/embedding/engine/FlutterJNI.java b/shell/platform/android/io/flutter/embedding/engine/FlutterJNI.java
index e1d8b6446..df4d53b30 100644
--- a/shell/platform/android/io/flutter/embedding/engine/FlutterJNI.java
+++ b/shell/platform/android/io/flutter/embedding/engine/FlutterJNI.java
@@ -11,7 +11,6 @@ import android.os.Looper;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.annotation.UiThread;
-import android.util.Log;
 import android.view.Surface;
 
 import java.nio.ByteBuffer;
@@ -19,6 +18,7 @@ import java.util.HashSet;
 import java.util.Set;
 
 import io.flutter.BuildConfig;
+import io.flutter.Log;
 import io.flutter.embedding.engine.dart.PlatformMessageHandler;
 import io.flutter.embedding.engine.FlutterEngine.EngineLifecycleListener;
 import io.flutter.embedding.engine.renderer.FlutterRenderer;
-- 
GitLab