Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix a crash happening on a context menu."

Browse Source
This commit is contained in:
Ben Lin
2016-07-15 22:56:43 +00:00
committed by Android (Google) Code Review
parent 1fa74491cc 2e7234ce1d
commit ea70d8d0d0
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/DocumentsUI/src/com/android/documentsui/RootsFragment.java
View File

@@ -298,8 +298,15 @@ public class RootsFragment extends Fragment implements ItemDragListener.DragHost
@Override
public boolean onContextItemSelected(MenuItem item) {
AdapterContextMenuInfo adapterMenuInfo = (AdapterContextMenuInfo) item.getMenuInfo();
// There is a possibility that this is called from DirectoryFragment since
// all fragments' onContextItemSelected gets called when any menu item is selected
// This is to guard against it since DirectoryFragment's RecylerView does not have a
// menuInfo
if (adapterMenuInfo == null) {
return false;
}
final RootItem rootItem = (RootItem) mAdapter.getItem(adapterMenuInfo.position);
switch(item.getItemId()) {
switch (item.getItemId()) {
case R.id.menu_eject_root:
final View ejectIcon = adapterMenuInfo.targetView.findViewById(R.id.eject_icon);
ejectClicked(ejectIcon, rootItem.root);