summaryrefslogtreecommitdiff
path: root/core/java/android/widget/Magnifier.java
diff options
context:
space:
mode:
authorMihai Popa <popam@google.com>2020-06-05 22:24:14 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-06-05 22:24:14 +0000
commit7bd1fc8b4ee946ccd59323faec6658a235771281 (patch)
treecf1bedfd93bca06b4bea6a3b4d6858cfbe5ea3a5 /core/java/android/widget/Magnifier.java
parent7b5d5fe082e9536bfea2996dd297cbc6a44f15ec (diff)
parent202dd72169141e16cb12a3e8003528131df0eaf0 (diff)
Merge "Remove reduntant variable" am: 5241a207fb am: 202dd72169
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1318280 Change-Id: Ie8bd86ae505cddb133844c6808b1e9e3cba5e32b
Diffstat (limited to 'core/java/android/widget/Magnifier.java')
-rw-r--r--core/java/android/widget/Magnifier.java2
1 files changed, 0 insertions, 2 deletions
diff --git a/core/java/android/widget/Magnifier.java b/core/java/android/widget/Magnifier.java
index 8ea824d3ce82..c63e20f1a010 100644
--- a/core/java/android/widget/Magnifier.java
+++ b/core/java/android/widget/Magnifier.java
@@ -140,8 +140,6 @@ public final class Magnifier {
// Lock to synchronize between the UI thread and the thread that handles pixel copy results.
// Only sync mWindow writes from UI thread with mWindow reads from sPixelCopyHandlerThread.
private final Object mLock = new Object();
- // The lock used to synchronize the UI and render threads when a #dismiss is performed.
- private final Object mDestroyLock = new Object();
// Members for new styled magnifier (Eloquent style).