commit 537427bdda177bca1bb9fdd6aa4e583dc27448bb
author Daichi Hirono <hirono@google.com> Thu Jan 14 07:46:43 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jan 14 07:46:43 2016 +0000
tree ef2c62431cfbe12eb9816e93196d803f7169cf0a
parent 5ffb219d80dec6945bcf3add12d49e40623270f9
parent d426ed27857a444c5328613769e4c9b1e7a24c81

Merge "Add a test for createDocument and getPartialObject."

core/java/android/view/KeyEvent.java

diff --git a/core/java/android/view/KeyEvent.java b/core/java/android/view/KeyEvent.java
index f037958..51e1f4b 100644
--- a/core/java/android/view/KeyEvent.java
+++ b/core/java/android/view/KeyEvent.java
@@ -1856,6 +1856,9 @@
             case KeyEvent.KEYCODE_MENU:
             case KeyEvent.KEYCODE_WAKEUP:
             case KeyEvent.KEYCODE_PAIRING:
+            case KeyEvent.KEYCODE_STEM_1:
+            case KeyEvent.KEYCODE_STEM_2:
+            case KeyEvent.KEYCODE_STEM_3:
                 return true;
         }
         return false;

packages/DocumentsUI/src/com/android/documentsui/BaseActivity.java

diff --git a/packages/DocumentsUI/src/com/android/documentsui/BaseActivity.java b/packages/DocumentsUI/src/com/android/documentsui/BaseActivity.java
index dfeef50..be54496 100644
--- a/packages/DocumentsUI/src/com/android/documentsui/BaseActivity.java
+++ b/packages/DocumentsUI/src/com/android/documentsui/BaseActivity.java
@@ -636,7 +636,7 @@
 
         @Override
         protected void onPostExecute(RootInfo homeRoot) {
-            if (homeRoot != null && mHome != null) {
+            if (homeRoot != null && mHome != null && !isDestroyed()) {
                 // Clear entire backstack and start in new root
                 mState.onRootChanged(homeRoot);
                 mSearchManager.update(homeRoot);