diff options
| author | Vasu Nori <vnori@google.com> | 2010-09-14 13:37:57 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-09-14 13:37:57 -0700 |
| commit | a4ab724b48dc927800d633004162267a9d30b6fe (patch) | |
| tree | 98faf6a8e03f1f0533eb303ce7bd9032498baa89 | |
| parent | cbce2e7da474116b57dc3b5a8c581c7ffa20fa0c (diff) | |
| parent | b83cb7cda3947fb35e126eab1530732fcd797ad0 (diff) | |
| download | frameworks_base-a4ab724b48dc927800d633004162267a9d30b6fe.zip frameworks_base-a4ab724b48dc927800d633004162267a9d30b6fe.tar.gz frameworks_base-a4ab724b48dc927800d633004162267a9d30b6fe.tar.bz2 | |
Merge "revert Change-Id: Ic610a0c38e7bd7c77006a08c7b82fa01957739e5"
| -rw-r--r-- | api/current.xml | 4 | ||||
| -rw-r--r-- | core/java/android/database/sqlite/SQLiteDatabase.java | 13 |
2 files changed, 6 insertions, 11 deletions
diff --git a/api/current.xml b/api/current.xml index 425befb..310944f 100644 --- a/api/current.xml +++ b/api/current.xml @@ -65351,7 +65351,7 @@ > </method> <method name="execSQL" - return="int" + return="void" abstract="false" native="false" synchronized="false" @@ -65366,7 +65366,7 @@ </exception> </method> <method name="execSQL" - return="int" + return="void" abstract="false" native="false" synchronized="false" diff --git a/core/java/android/database/sqlite/SQLiteDatabase.java b/core/java/android/database/sqlite/SQLiteDatabase.java index 7a6695e..4200701 100644 --- a/core/java/android/database/sqlite/SQLiteDatabase.java +++ b/core/java/android/database/sqlite/SQLiteDatabase.java @@ -1825,18 +1825,16 @@ public class SQLiteDatabase extends SQLiteClosable { * * @param sql the SQL statement to be executed. Multiple statements separated by semicolons are * not supported. - * @return the number of rows affected by this SQL statement execution, if this SQL statement - * caused data updates/deletes/inserts. * @throws SQLException If the SQL string is invalid for some reason */ - public int execSQL(String sql) throws SQLException { + public void execSQL(String sql) throws SQLException { int stmtType = DatabaseUtils.getSqlStatementType(sql); if (stmtType == DatabaseUtils.STATEMENT_ATTACH) { disableWriteAheadLogging(); } long timeStart = SystemClock.uptimeMillis(); logTimeStat(mLastSqlStatement, timeStart, GET_LOCK_LOG_PREFIX); - int n = executeSql(sql, null); + executeSql(sql, null); // Log commit statements along with the most recently executed // SQL statement for disambiguation. @@ -1845,7 +1843,6 @@ public class SQLiteDatabase extends SQLiteClosable { } else { logTimeStat(sql, timeStart, null); } - return n; } /** @@ -1889,15 +1886,13 @@ public class SQLiteDatabase extends SQLiteClosable { * @param sql the SQL statement to be executed. Multiple statements separated by semicolons are * not supported. * @param bindArgs only byte[], String, Long and Double are supported in bindArgs. - * @return the number of rows affected by this SQL statement execution, if this SQL statement - * caused data updates/deletes/inserts. * @throws SQLException If the SQL string is invalid for some reason */ - public int execSQL(String sql, Object[] bindArgs) throws SQLException { + public void execSQL(String sql, Object[] bindArgs) throws SQLException { if (bindArgs == null) { throw new IllegalArgumentException("Empty bindArgs"); } - return executeSql(sql, bindArgs); + executeSql(sql, bindArgs); } private int executeSql(String sql, Object[] bindArgs) throws SQLException { |