Merge "Bug 5151927 - Monkeys should not play with detached lists."

Author: adamp

core/java/android/widget/AbsListView.java

@@ -635,7 +635,7 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te
     /**
      * Track if we are currently attached to a window.
      */
-    private boolean mIsAttached;
+    boolean mIsAttached;
 
     /**
      * Track the item count from the last time we handled a data change.

core/java/android/widget/ListView.java

@@ -2074,7 +2074,7 @@ public boolean onKeyUp(int keyCode, KeyEvent event) {
     }
 
     private boolean commonKey(int keyCode, int count, KeyEvent event) {
-        if (mAdapter == null) {
+        if (mAdapter == null || !mIsAttached) {
             return false;
         }