diff options
author | Henry Fang <quxiangfang@google.com> | 2023-07-19 18:06:40 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-07-19 18:06:40 +0000 |
commit | 5ffa88ac6fb895dc0e41d6e10a97900e1cf2a194 (patch) | |
tree | 862007579650a8dbac3709ef4b1103cdd7ae248f | |
parent | 3fe4d1854ee1bc32190758cd884edcb5673cac87 (diff) | |
parent | 6b0378d616c2c4d55169523e330d66d726274666 (diff) | |
download | TvProvider-5ffa88ac6fb895dc0e41d6e10a97900e1cf2a194.tar.gz |
Merge "TvProvider: Reduce synchronized block" into main am: 6b0378d616
Original change: https://android-review.googlesource.com/c/platform/packages/providers/TvProvider/+/2661677
Change-Id: I2b09c75f7b0b5f2eea0ee7992f751be0dcabc713
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | src/com/android/providers/tv/TransientRowHelper.java | 10 |
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 |