diff options
| author | 2024-11-04 19:13:59 +0000 | |
|---|---|---|
| committer | 2024-11-04 19:13:59 +0000 | |
| commit | 2a9533b2c6ecb9ad89dbdffb6acce4c3f019436b (patch) | |
| tree | f9e2097d885cf642a04ef0c0bd23cb355a8af3db | |
| parent | 7b40a103d2b221ffba96525134faa6246bbd6dab (diff) | |
| parent | 03266b5df7e11fcb2a3d16d66d2694cef9d22b19 (diff) | |
Merge "Add oneway_finalizer_close_fixed flag" into main
| -rw-r--r-- | core/java/android/database/BulkCursorNative.java | 2 | ||||
| -rw-r--r-- | core/java/android/database/sqlite/flags.aconfig | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/core/java/android/database/BulkCursorNative.java b/core/java/android/database/BulkCursorNative.java index 41585b3571d6..7d6e7ad857d1 100644 --- a/core/java/android/database/BulkCursorNative.java +++ b/core/java/android/database/BulkCursorNative.java @@ -215,7 +215,7 @@ final class BulkCursorProxy implements IBulkCursor { // If close() is being called from the finalizer thread, do not wait for a reply from // the remote side. final boolean fromFinalizer = - android.database.sqlite.Flags.onewayFinalizerClose() + android.database.sqlite.Flags.onewayFinalizerCloseFixed() && "FinalizerDaemon".equals(Thread.currentThread().getName()); mRemote.transact(CLOSE_TRANSACTION, data, reply, fromFinalizer ? IBinder.FLAG_ONEWAY: 0); diff --git a/core/java/android/database/sqlite/flags.aconfig b/core/java/android/database/sqlite/flags.aconfig index c597895899b6..1b8471dfef4c 100644 --- a/core/java/android/database/sqlite/flags.aconfig +++ b/core/java/android/database/sqlite/flags.aconfig @@ -9,6 +9,14 @@ flag { } flag { + name: "oneway_finalizer_close_fixed" + namespace: "system_performance" + is_fixed_read_only: true + description: "Make BuildCursorNative.close oneway if in the the finalizer" + bug: "368221351" +} + +flag { name: "sqlite_apis_35" is_exported: true namespace: "system_performance" |