diff options
author | Allen Hair <allenhair@google.com> | 2013-11-18 19:30:48 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-11-18 19:30:48 +0000 |
commit | ee94db3b121a3c6715c9f4cea38614f875c4ca2c (patch) | |
tree | 4ba1b12b7d181314a6a58032d7aa52527e2a1dd9 | |
parent | 62ccedc23bd3c3e91b6c5ef0779d7964e74cf199 (diff) | |
parent | b2e353eca3f1309c506bf4ae3cc2bb271f4f7e17 (diff) | |
download | uiautomator-ee94db3b121a3c6715c9f4cea38614f875c4ca2c.tar.gz |
Merge "Removed unnecessary synchronized block in findAccessibilityNodeInfo(..)"android-4.4.2_r2.0.1android-4.4.2_r2android-4.4.2_r1.0.1android-4.4.2_r1android-4.4.1_r1.0.1android-4.4.1_r1kitkat-mr1.1-releasekitkat-mr1-release
-rw-r--r-- | src/com/android/uiautomator/core/QueryController.java | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/src/com/android/uiautomator/core/QueryController.java b/src/com/android/uiautomator/core/QueryController.java index 6931528..194af4c 100644 --- a/src/com/android/uiautomator/core/QueryController.java +++ b/src/com/android/uiautomator/core/QueryController.java @@ -146,17 +146,15 @@ class QueryController { if (DEBUG) Log.d(LOG_TAG, "Searching: " + selector); - synchronized (mLock) { - AccessibilityNodeInfo rootNode = getRootNode(); - if (rootNode == null) { - Log.e(LOG_TAG, "Cannot proceed when root node is null. Aborted search"); - return null; - } - - // Copy so that we don't modify the original's sub selectors - UiSelector uiSelector = new UiSelector(selector); - return translateCompoundSelector(uiSelector, rootNode, isCounting); + AccessibilityNodeInfo rootNode = getRootNode(); + if (rootNode == null) { + Log.e(LOG_TAG, "Cannot proceed when root node is null. Aborted search"); + return null; } + + // Copy so that we don't modify the original's sub selectors + UiSelector uiSelector = new UiSelector(selector); + return translateCompoundSelector(uiSelector, rootNode, isCounting); } /** |