summaryrefslogtreecommitdiffstats
path: root/core/java/android/widget/AdapterView.java
diff options
context:
space:
mode:
authorSvet Ganov <svetoslavganov@google.com>2014-10-25 00:16:57 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-10-25 00:16:58 +0000
commitb32f04b785306f06d7d07b824fb8dcc1b4a61aa6 (patch)
tree536d58ff12a7a08a1af5ecd74fb7390a0e371b10 /core/java/android/widget/AdapterView.java
parent9167652e442ae979d1af24ccb3d786d0c96298ab (diff)
parent99a82437ed8e0537d9a355a124d2bb30aea46ad8 (diff)
downloadframeworks_base-b32f04b785306f06d7d07b824fb8dcc1b4a61aa6.zip
frameworks_base-b32f04b785306f06d7d07b824fb8dcc1b4a61aa6.tar.gz
frameworks_base-b32f04b785306f06d7d07b824fb8dcc1b4a61aa6.tar.bz2
Merge "Printing from two apps at the same time not working." into lmp-mr1-dev
Diffstat (limited to 'core/java/android/widget/AdapterView.java')
-rw-r--r--core/java/android/widget/AdapterView.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/widget/AdapterView.java b/core/java/android/widget/AdapterView.java
index 5fa6e60..5e2394c 100644
--- a/core/java/android/widget/AdapterView.java
+++ b/core/java/android/widget/AdapterView.java
@@ -861,7 +861,8 @@ public abstract class AdapterView<T extends Adapter> extends ViewGroup {
public void run() {
mPendingSelectionNotifier = null;
- if (mDataChanged) {
+ if (mDataChanged && getViewRootImpl() != null
+ && getViewRootImpl().isLayoutRequested()) {
// Data has changed between when this SelectionNotifier was
// posted and now. Postpone the notification until the next
// layout is complete and we run checkSelectionChanged().