Merge "TvProvider: Reduce synchronized block" into main am: 6b0378d616 am: 5ffa88ac6f am: 3afae03f80 am: b14765a250 am: 7c826a7d3a
Original change: https://android-review.googlesource.com/c/platform/packages/providers/TvProvider/+/2661677
Change-Id: Iaf5fdea598418670cbd1bb3b53d73bf05f0ad0a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/src/com/android/providers/tv/TransientRowHelper.java b/src/com/android/providers/tv/TransientRowHelper.java
index 7054a0c..c289633 100644
--- a/src/com/android/providers/tv/TransientRowHelper.java
+++ b/src/com/android/providers/tv/TransientRowHelper.java
@@ -71,11 +71,13 @@
/**
* Ensures that transient rows, inserted previously before current boot, are deleted.
*/
- public synchronized void ensureOldTransientRowsDeleted() {
- if (mTransientRowsDeleted) {
- return;
+ public void ensureOldTransientRowsDeleted() {
+ synchronized (this) {
+ if (mTransientRowsDeleted) {
+ return;
+ }
+ mTransientRowsDeleted = true;
}
- mTransientRowsDeleted = true;
if (getLastDeletionBootCount() >= getBootCount()) {
// This can be the second execution of TvProvider after boot since system kills
// TvProvider in low memory conditions. If this is the case, we shouldn't delete
