diff --git a/src/plugins/android/android.pro b/src/plugins/android/android.pro
index 6fffdcc081a..18b2c7543df 100644
--- a/src/plugins/android/android.pro
+++ b/src/plugins/android/android.pro
@@ -42,7 +42,6 @@ HEADERS += \
     androidsignaloperation.h \
     javaeditor.h \
     javaindenter.h \
-    javaautocompleter.h \
     javacompletionassistprovider.h \
     avddialog.h \
     android_global.h \
@@ -84,7 +83,6 @@ SOURCES += \
     androidsignaloperation.cpp \
     javaeditor.cpp \
     javaindenter.cpp \
-    javaautocompleter.cpp \
     javacompletionassistprovider.cpp \
     avddialog.cpp \
     androidbuildapkstep.cpp \
diff --git a/src/plugins/android/android.qbs b/src/plugins/android/android.qbs
index 4251bd023b8..fd7636c5f3d 100644
--- a/src/plugins/android/android.qbs
+++ b/src/plugins/android/android.qbs
@@ -92,8 +92,6 @@ QtcPlugin {
         "avddialog.h",
         "certificatesmodel.cpp",
         "certificatesmodel.h",
-        "javaautocompleter.cpp",
-        "javaautocompleter.h",
         "javacompletionassistprovider.cpp",
         "javacompletionassistprovider.h",
         "javaeditor.cpp",
diff --git a/src/plugins/android/javaautocompleter.cpp b/src/plugins/android/javaautocompleter.cpp
deleted file mode 100644
index ca9468f3483..00000000000
--- a/src/plugins/android/javaautocompleter.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of Qt Creator.
-**
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-****************************************************************************/
-
-#include "javaautocompleter.h"
-#include <QTextCursor>
-
-using namespace Android;
-using namespace Android::Internal;
-
-JavaAutoCompleter::JavaAutoCompleter()
-{
-}
-
-bool JavaAutoCompleter::contextAllowsAutoParentheses(const QTextCursor &cursor, const QString &textToInsert) const
-{
-    Q_UNUSED(cursor)
-    Q_UNUSED(textToInsert)
-    return true;
-}
diff --git a/src/plugins/android/javaautocompleter.h b/src/plugins/android/javaautocompleter.h
deleted file mode 100644
index ed088c033d2..00000000000
--- a/src/plugins/android/javaautocompleter.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of Qt Creator.
-**
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-****************************************************************************/
-
-#pragma once
-
-#include <texteditor/autocompleter.h>
-
-namespace Android {
-namespace Internal {
-
-class JavaAutoCompleter : public TextEditor::AutoCompleter
-{
-public:
-    // TODO What does the base class do?
-    // I only need the contextAllowsAutoParenthses change
-    JavaAutoCompleter();
-    bool contextAllowsAutoParentheses(const QTextCursor &cursor,
-                                      const QString &textToInsert = QString()) const;
-};
-}
-}
diff --git a/src/plugins/android/javaeditor.cpp b/src/plugins/android/javaeditor.cpp
index 0aef948f439..73981409225 100644
--- a/src/plugins/android/javaeditor.cpp
+++ b/src/plugins/android/javaeditor.cpp
@@ -25,7 +25,6 @@
 
 #include "javaeditor.h"
 #include "javaindenter.h"
-#include "javaautocompleter.h"
 #include "androidconstants.h"
 #include "javacompletionassistprovider.h"
 
@@ -74,7 +73,6 @@ JavaEditorFactory::JavaEditorFactory()
     addMimeType(Constants::JAVA_MIMETYPE);
 
     setDocumentCreator([]() { return new JavaDocument; });
-    setAutoCompleterCreator([]() { return new JavaAutoCompleter; });
     setUseGenericHighlighter(true);
     setCommentStyle(Utils::CommentDefinition::CppStyle);
     setEditorActionHandlers(TextEditor::TextEditorActionHandler::UnCommentSelection);