Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

revert Change-Id: Ic610a0c38e7bd7c77006a08c7b82fa01957739e5

Browse Source 
can't change return type from void to int.

Change-Id: Iec3d95c731f117aca20b29c719cef7bcc6356ac0
This commit is contained in:
Vasu Nori
2010-09-14 13:36:01 -07:00
parent 5402590f1c
commit b83cb7cda3
2 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/current.xml
View File

@@ -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"

13
core/java/android/database/sqlite/SQLiteDatabase.java
View File

@@ -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 {