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

Fix Settings crash when activity is null

Browse Source 
in ManageApplications, if getActivity is null, it will cause crash
because in HelpUtils#prepareHelpMenuItem it will call activity's
getString method.

Test: manual
Change-Id: I4c9cf985e94192a936d195ea4279ec1d0f22eb10
Signed-off-by: songkailun <songkailun@xiaomi.com>
This commit is contained in:
songkailun
2017-07-05 19:03:05 +08:00
committed by Fan Zhang
parent aa410eba1d
commit c96eeb279e
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();