Fix compilation in Android plugin after rebase to newer master (merging AndroidStudio 3.5)

GitOrigin-RevId: f966a11c817e51ab15e53198255cd40f75e693b8
This commit is contained in:
Andrei Kuznetsov
2019-11-07 02:40:58 +00:00
committed by intellij-monorepo-bot
parent 426a9a870e
commit 5cae85b0aa
2 changed files with 6 additions and 1 deletions
@@ -17,4 +17,9 @@ public interface BuildOutputInstantReader {
void pushBack();
void pushBack(int numberOfLines);
// FIXME-ank: this method should be removed
default String getCurrentLine(){
return null;
}
}
@@ -371,7 +371,7 @@ public abstract class MavenBuildToolLogTestUtils extends UsefulTestCase {
throw new UnsupportedOperationException();
}
private String getCurrentLine() {
public String getCurrentLine() { // FIXME-ank: made public (should be private)
if (myPosition >= myLines.size() || myPosition < 0) {
return null;
}