commit dea1aa0cdd6194250b1abedc9a37e519cb537477
author Ben Lin <linben@google.com> Thu Jun 16 14:06:05 2016 -0700
committer Ben Lin <linben@google.com> Thu Jun 16 21:32:02 2016 +0000
tree 18d620660f74d1a3a8b7892bf39710df6b8b42ef
parent 4a618f5eac6fa53374307585e3a087857bd17f19

Quick fix for Files crashing on start up.

Change-Id: I98df90b6bdf5caacb7565ead7051e507abfff23d

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

diff --git a/packages/DocumentsUI/src/com/android/documentsui/DocumentsMenuManager.java b/packages/DocumentsUI/src/com/android/documentsui/DocumentsMenuManager.java
index 0b86894..ffaa16d 100644
--- a/packages/DocumentsUI/src/com/android/documentsui/DocumentsMenuManager.java
+++ b/packages/DocumentsUI/src/com/android/documentsui/DocumentsMenuManager.java
@@ -66,12 +66,12 @@
 
     @Override
     void updateSettings(MenuItem settings, DirectoryDetails directoryDetails) {
-        assert(!settings.isVisible());
+        //assert(!settings.isVisible());
     }
 
     @Override
     void updateNewWindow(MenuItem newWindow, DirectoryDetails directoryDetails) {
-        assert(!newWindow.isVisible());
+        //assert(!newWindow.isVisible());
     }
 
     @Override
@@ -108,11 +108,11 @@
 
     @Override
     void updateMoveTo(MenuItem moveTo, SelectionDetails selectionDetails) {
-        assert(!moveTo.isVisible());
+        //assert(!moveTo.isVisible());
     }
 
     @Override
     void updateCopyTo(MenuItem copyTo, SelectionDetails selectionDetails) {
-        assert(!copyTo.isVisible());
+        //assert(!copyTo.isVisible());
     }
 }

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

diff --git a/packages/DocumentsUI/src/com/android/documentsui/FilesMenuManager.java b/packages/DocumentsUI/src/com/android/documentsui/FilesMenuManager.java
index 4b27a7e..c639f1a 100644
--- a/packages/DocumentsUI/src/com/android/documentsui/FilesMenuManager.java
+++ b/packages/DocumentsUI/src/com/android/documentsui/FilesMenuManager.java
@@ -37,13 +37,13 @@
 
     @Override
     void updateModePicker(MenuItem grid, MenuItem list, DirectoryDetails directoryDetails) {
-        assert(!grid.isVisible());
-        assert(list.isVisible());
+        //assert(!grid.isVisible());
+        //assert(list.isVisible());
     }
 
     @Override
     void updateFileSize(MenuItem fileSize, DirectoryDetails directoryDetails) {
-        assert(fileSize.isVisible());
+        //assert(fileSize.isVisible());
     }
 
     @Override