commit 9249707fc9245e0b0dda1dfe3b3e1111c0b9efde
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Oct 10 20:35:48 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Oct 10 20:35:48 2017 +0000
tree 6b1cea546218032a8f691294957be94f660d5a3d
parent d2b2d2ae0f9a4cec0742eef86b36f03ca95a9e15
parent c96eeb279ee07ec3db2a525cb86d0326540e5d18

Merge "Fix Settings crash when activity is null"

src/com/android/settings/applications/ManageApplications.java

diff --git a/src/com/android/settings/applications/ManageApplications.java b/src/com/android/settings/applications/ManageApplications.java
index 9edbd86..7ec40f8 100644
--- a/src/com/android/settings/applications/ManageApplications.java
+++ b/src/com/android/settings/applications/ManageApplications.java
@@ -651,7 +651,11 @@
 
     @Override
     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;
         inflater.inflate(R.menu.manage_apps, menu);
         updateOptionsMenu();