diff --git a/core/java/android/database/sqlite/SQLiteConnection.java b/core/java/android/database/sqlite/SQLiteConnection.java index 45326610fbd00..4b3eb3a000ff6 100644 --- a/core/java/android/database/sqlite/SQLiteConnection.java +++ b/core/java/android/database/sqlite/SQLiteConnection.java @@ -1392,10 +1392,6 @@ public final class SQLiteConnection implements CancellationSignal.OnCancelListen return sql.replaceAll("[\\s]*\\n+[\\s]*", " "); } - void clearPreparedStatementCache() { - mPreparedStatementCache.evictAll(); - } - /** * Holder type for a prepared statement. * diff --git a/core/java/android/database/sqlite/SQLiteConnectionPool.java b/core/java/android/database/sqlite/SQLiteConnectionPool.java index 6023d66b9c883..069c264313e79 100644 --- a/core/java/android/database/sqlite/SQLiteConnectionPool.java +++ b/core/java/android/database/sqlite/SQLiteConnectionPool.java @@ -1126,16 +1126,6 @@ public final class SQLiteConnectionPool implements Closeable { mConnectionWaiterPool = waiter; } - void clearAcquiredConnectionsPreparedStatementCache() { - synchronized (mLock) { - if (!mAcquiredConnections.isEmpty()) { - for (SQLiteConnection connection : mAcquiredConnections.keySet()) { - connection.clearPreparedStatementCache(); - } - } - } - } - /** * Dumps debugging information about this connection pool. * diff --git a/core/java/android/database/sqlite/SQLiteDatabase.java b/core/java/android/database/sqlite/SQLiteDatabase.java index db898c3b7b5d2..c08294f42c45d 100644 --- a/core/java/android/database/sqlite/SQLiteDatabase.java +++ b/core/java/android/database/sqlite/SQLiteDatabase.java @@ -2088,12 +2088,10 @@ public final class SQLiteDatabase extends SQLiteClosable { try (SQLiteStatement statement = new SQLiteStatement(this, sql, bindArgs)) { return statement.executeUpdateDelete(); } finally { - // If schema was updated, close non-primary connections and clear prepared - // statement caches of active connections, otherwise they might have outdated - // schema information. + // If schema was updated, close non-primary connections, otherwise they might + // have outdated schema information if (statementType == DatabaseUtils.STATEMENT_DDL) { mConnectionPoolLocked.closeAvailableNonPrimaryConnectionsAndLogExceptions(); - mConnectionPoolLocked.clearAcquiredConnectionsPreparedStatementCache(); } } } finally {