Merge "Fix a crash on spring loading folder/roots." into nyc-andromeda-dev (38ccb10e) · Commits · e / os / android_packages_apps_DocumentsUI

src/com/android/documentsui/dirlist/DirectoryFragment.java

+6 −1

Original line number	Diff line number	Diff line
		@@ -1135,8 +1135,13 @@ public class DirectoryFragment extends Fragment
		// When files are selected for dragging, ActionMode is started. This obscures the breadcrumb
		// with an ActionBar. In order to make drag and drop to the breadcrumb possible, we first
		// end ActionMode so the breadcrumb is visible to the user.
		//
		// mActionModeController is null when dragStarted() is called on spring loaded
		// folders/roots.
		if (mActionModeController != null) {
		mActionModeController.finishActionMode();
		}
		}

		void dragStopped(boolean result) {
		if (result) {