summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDiego Perez <diegoperez@google.com>2015-09-22 11:08:35 +0100
committerDiego Perez <diegoperez@google.com>2015-09-22 16:44:37 +0000
commit0e766de7c52d7e375e04676c93a872cb2d6eea63 (patch)
treeb5ec44a7b9e723219367e7db17deb7d964eb81e2
parentd8b47855a316700751f7daead0b180005853be33 (diff)
downloadframeworks_base-0e766de7c52d7e375e04676c93a872cb2d6eea63.zip
frameworks_base-0e766de7c52d7e375e04676c93a872cb2d6eea63.tar.gz
frameworks_base-0e766de7c52d7e375e04676c93a872cb2d6eea63.tar.bz2
Avoid calling scrollBy(0,0) on render
Usually scrollBy(0, 0) won't have any effect but when called on the NumberPicker but, in some cases, it seems to cause an endless loop. When called from layoutlib, this will hold the read lock causing all operations trying to acquire the write lock to block forever. Bug: http://b.android.com/182506 Change-Id: Ib25427d3f32d804d1c481d979795eee71fbdbc6d
-rw-r--r--tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderSessionImpl.java4
1 files changed, 0 insertions, 4 deletions
diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderSessionImpl.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderSessionImpl.java
index 24e1ce7..2a4f583 100644
--- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderSessionImpl.java
+++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderSessionImpl.java
@@ -1050,11 +1050,7 @@ public class RenderSessionImpl extends RenderAction<SessionParams> {
}
if (scrollPos != 0) {
view.scrollBy(0, scrollPos);
- } else {
- view.scrollBy(0, scrollPos);
}
- } else {
- view.scrollBy(0, scrollPos);
}
if (!(view instanceof ViewGroup)) {