commit d8e526391bc10c4ff6dea0a8df3eb22d97b8d706
author Jeff Gaston <jeffrygaston@google.com> Mon Aug 26 19:23:17 2019 -0700
committer android-build-merger <android-build-merger@google.com> Mon Aug 26 19:23:17 2019 -0700
tree 57420b11ed7763af36140a05876c98de25d9967f
parent 780469d2a2c70e7af5726966b7c6b09d86139b66
parent 554f181944d723edd09f3553837d088ee541148b

Merge "Making --warnings-as-errors cause warnings to fail the build"
am: 554f181944

Change-Id: I7b08ac4871945c98ec063cdb41ee5b350a4c93ed

src/main/java/com/android/tools/metalava/Reporter.kt

diff --git a/src/main/java/com/android/tools/metalava/Reporter.kt b/src/main/java/com/android/tools/metalava/Reporter.kt
index 40bb4f2..6ac3b85 100644
--- a/src/main/java/com/android/tools/metalava/Reporter.kt
+++ b/src/main/java/com/android/tools/metalava/Reporter.kt
@@ -258,7 +258,7 @@
         return if (lineNumber > 0) "$path:$lineNumber" else path
     }
 
-    /** Returns the 0-based line number */
+    /** Returns the 0-based line number of character position <offset> in <text> */
     private fun getLineNumber(text: String, offset: Int): Int {
         var line = 0
         var curr = 0
@@ -299,7 +299,7 @@
                 severity
             }
 
-        if (severity == ERROR) {
+        if (effectiveSeverity == ERROR) {
             hasErrors = true
             errorCount++
         } else if (severity == WARNING) {
@@ -386,4 +386,4 @@
     }
 
     fun hasErrors(): Boolean = hasErrors
-}
\ No newline at end of file
+}