From c96eeb279ee07ec3db2a525cb86d0326540e5d18 Mon Sep 17 00:00:00 2001
From: songkailun <songkailun@xiaomi.com>
Date: Wed, 5 Jul 2017 19:03:05 +0800
Subject: [PATCH] Fix Settings crash when activity is null

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>
---
 .../android/settings/applications/ManageApplications.java   | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/com/android/settings/applications/ManageApplications.java b/src/com/android/settings/applications/ManageApplications.java
index 9edbd8699e0..7ec40f824d7 100644
--- a/src/com/android/settings/applications/ManageApplications.java
+++ b/src/com/android/settings/applications/ManageApplications.java
@@ -651,7 +651,11 @@ public class ManageApplications extends InstrumentedPreferenceFragment
 
     @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();