Merge "Remove deprecated close() overloads" into main (30e652fb) · Commits · e / os / android_frameworks_base

core/java/android/database/sqlite/SQLiteConnection.java

+0 −5

Original line number	Diff line number	Diff line
		@@ -183,11 +183,6 @@ public final class SQLiteConnection implements CancellationSignal.OnCancelListen
		private static native long nativeChanges(long connectionPtr);
		private static native long nativeTotalChanges(long connectionPtr);

		// This method is deprecated and should be removed when it is no longer needed by the
		// robolectric tests. It should not be called from any frameworks java code.
		@Deprecated
		private static native void nativeClose(long connectionPtr);

		private SQLiteConnection(SQLiteConnectionPool pool,
		SQLiteDatabaseConfiguration configuration,
		int connectionId, boolean primaryConnection) {

+0 −8

Original line number	Diff line number	Diff line
		@@ -231,12 +231,6 @@ static void nativeClose(JNIEnv* env, jclass clazz, jlong connectionPtr, jboolean
		}
		}

		// This method is deprecated and should be removed when it is no longer needed by the
		// robolectric tests.
		static void nativeClose(JNIEnv* env, jclass clazz, jlong connectionPtr) {
		nativeClose(env, clazz, connectionPtr, false);
		}

		static void sqliteCustomScalarFunctionCallback(sqlite3_context *context,
		int argc, sqlite3_value **argv) {
		JNIEnv* env = AndroidRuntime::getJNIEnv();
		@@ -974,8 +968,6 @@ static const JNINativeMethod sMethods[] =
		(void*)nativeOpen },
		{ "nativeClose", "(JZ)V",
		(void) static_cast<void()(JNIEnv*,jclass,jlong,jboolean)>(nativeClose) },
		{ "nativeClose", "(J)V",
		(void) static_cast<void()(JNIEnv*,jclass,jlong)>(nativeClose) },
		{ "nativeRegisterCustomScalarFunction", "(JLjava/lang/String;Ljava/util/function/UnaryOperator;)V",
		(void*)nativeRegisterCustomScalarFunction },
		{ "nativeRegisterCustomAggregateFunction", "(JLjava/lang/String;Ljava/util/function/BinaryOperator;)V",