Merge "TvProvider: Reduce synchronized block" into main am: 6b0378d616 am: 5ffa88ac6f

Original change: https://android-review.googlesource.com/c/platform/packages/providers/TvProvider/+/2661677

Change-Id: I073d072396078f4d7b1c3577c3367c7ae4c3a0da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

1 files changed, 6 insertions, 4 deletions

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 @@ public class TransientRowHelper {
     /**
      * 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