Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fcae8f10 authored by Evisceration's avatar Evisceration Committed by Alexander Martinz
Browse files

ResolverActivity: fix null pointer exception 

if alwaysUseOption is true but mAdapter.hasFilteredItem() is not, we try
to set a LongClickListener on a non existant view.

move the assingment of the LongClickListener down to ensure
mAdapter.hasFilteredItem() is true.

Change-Id: I04df845325a9a21f5563292e56728dcc51e91623
parent d30a0e6c

core/java/com/android/internal/app/ResolverActivity.java

+15 −14
Original line number Diff line number Diff line
@@ -304,6 +304,12 @@ public class ResolverActivity extends Activity implements AdapterView.OnItemClic 
                buttonLayout.setVisibility(View.VISIBLE);

                mAlwaysButton = (Button) buttonLayout.findViewById(R.id.button_always);

                mOnceButton = (Button) buttonLayout.findViewById(R.id.button_once);

            } else {

                mAlwaysUseOption = false;

            }

        }



        if (mAdapter.hasFilteredItem()) {

            mFilteredItemContainer = (ViewGroup) findViewById(R.id.filtered_item_container);

            mFilteredItemContainer.setOnLongClickListener(new View.OnLongClickListener() {

                @Override
@@ -318,12 +324,7 @@ public class ResolverActivity extends Activity implements AdapterView.OnItemClic 
                    return true;

                }

            });

            } else {

                mAlwaysUseOption = false;

            }

        }



        if (mAdapter.hasFilteredItem()) {

            setAlwaysButtonEnabled(true, mAdapter.getFilteredPosition(), false);

            mOnceButton.setEnabled(true);

        }