PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix Settings crash when activity is null"

Browse Source
This commit is contained in:
TreeHugger Robot
2017-10-10 20:35:48 +00:00
committed by Android (Google) Code Review
parent d2b2d2ae0f c96eeb279e
commit 9249707fc9
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/applications/ManageApplications.java
View File

@@ -651,7 +651,11 @@ public class ManageApplications extends InstrumentedPreferenceFragment
@Override @Override
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
HelpUtils.prepareHelpMenuItem(getActivity(), menu, getHelpResource(), getClass().getName()); final Activity activity = getActivity();
if (activity == null) {
return;
}
HelpUtils.prepareHelpMenuItem(activity, menu, getHelpResource(), getClass().getName());
mOptionsMenu = menu; mOptionsMenu = menu;
inflater.inflate(R.menu.manage_apps, menu); inflater.inflate(R.menu.manage_apps, menu);
updateOptionsMenu(); updateOptionsMenu();