Fixed logLevel filter bug so that filter now works as expected. (#9460) (#9717)

tvolkert · web-flow · commit 54ad777fd29b · 2019-07-08T17:40:50.000-07:00
diff --git a/shell/platform/android/io/flutter/Log.java b/shell/platform/android/io/flutter/Log.java
@@ -26,37 +26,37 @@ public static void setLogLevel(int logLevel) {
   }
 
   public static void v(@NonNull String tag, @NonNull String message) {
-    if (BuildConfig.DEBUG && logLevel >= android.util.Log.VERBOSE) {
+    if (BuildConfig.DEBUG && logLevel <= android.util.Log.VERBOSE) {
       android.util.Log.v(tag, message);
     }
   }
 
   public static void v(@NonNull String tag, @NonNull String message, @NonNull Throwable tr) {
-    if (BuildConfig.DEBUG && logLevel >= android.util.Log.VERBOSE) {
+    if (BuildConfig.DEBUG && logLevel <= android.util.Log.VERBOSE) {
       android.util.Log.v(tag, message, tr);
     }
   }
 
   public static void i(@NonNull String tag, @NonNull String message) {
-    if (BuildConfig.DEBUG && logLevel >= android.util.Log.INFO) {
+    if (BuildConfig.DEBUG && logLevel <= android.util.Log.INFO) {
       android.util.Log.i(tag, message);
     }
   }
 
   public static void i(@NonNull String tag, @NonNull String message, @NonNull Throwable tr) {
-    if (BuildConfig.DEBUG && logLevel >= android.util.Log.INFO) {
+    if (BuildConfig.DEBUG && logLevel <= android.util.Log.INFO) {
       android.util.Log.i(tag, message, tr);
     }
   }
 
   public static void d(@NonNull String tag, @NonNull String message) {
-    if (BuildConfig.DEBUG && logLevel >= android.util.Log.DEBUG) {
+    if (BuildConfig.DEBUG && logLevel <= android.util.Log.DEBUG) {
       android.util.Log.d(tag, message);
     }
   }
 
   public static void d(@NonNull String tag, @NonNull String message, @NonNull Throwable tr) {
-    if (BuildConfig.DEBUG && logLevel >= android.util.Log.DEBUG) {
+    if (BuildConfig.DEBUG && logLevel <= android.util.Log.DEBUG) {
       android.util.Log.d(tag, message, tr);
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -26,37 +26,37 @@ public static void setLogLevel(int logLevel) {`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`public static void v(@NonNull String tag, @NonNull String message) {`
`29`		`- if (BuildConfig.DEBUG && logLevel >= android.util.Log.VERBOSE) {`
	`29`	`+ if (BuildConfig.DEBUG && logLevel <= android.util.Log.VERBOSE) {`
`30`	`30`	`android.util.Log.v(tag, message);`
`31`	`31`	`}`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`public static void v(@NonNull String tag, @NonNull String message, @NonNull Throwable tr) {`
`35`		`- if (BuildConfig.DEBUG && logLevel >= android.util.Log.VERBOSE) {`
	`35`	`+ if (BuildConfig.DEBUG && logLevel <= android.util.Log.VERBOSE) {`
`36`	`36`	`android.util.Log.v(tag, message, tr);`
`37`	`37`	`}`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`public static void i(@NonNull String tag, @NonNull String message) {`
`41`		`- if (BuildConfig.DEBUG && logLevel >= android.util.Log.INFO) {`
	`41`	`+ if (BuildConfig.DEBUG && logLevel <= android.util.Log.INFO) {`
`42`	`42`	`android.util.Log.i(tag, message);`
`43`	`43`	`}`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`public static void i(@NonNull String tag, @NonNull String message, @NonNull Throwable tr) {`
`47`		`- if (BuildConfig.DEBUG && logLevel >= android.util.Log.INFO) {`
	`47`	`+ if (BuildConfig.DEBUG && logLevel <= android.util.Log.INFO) {`
`48`	`48`	`android.util.Log.i(tag, message, tr);`
`49`	`49`	`}`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`public static void d(@NonNull String tag, @NonNull String message) {`
`53`		`- if (BuildConfig.DEBUG && logLevel >= android.util.Log.DEBUG) {`
	`53`	`+ if (BuildConfig.DEBUG && logLevel <= android.util.Log.DEBUG) {`
`54`	`54`	`android.util.Log.d(tag, message);`
`55`	`55`	`}`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`public static void d(@NonNull String tag, @NonNull String message, @NonNull Throwable tr) {`
`59`		`- if (BuildConfig.DEBUG && logLevel >= android.util.Log.DEBUG) {`
	`59`	`+ if (BuildConfig.DEBUG && logLevel <= android.util.Log.DEBUG) {`
`60`	`60`	`android.util.Log.d(tag, message, tr);`
`61`	`61`	`}`
`62`	`62`	`}`