From b3a593eb766ed499274202db0b817f710c09b8b0 Mon Sep 17 00:00:00 2001
From: Amith Yamasani <yamasani@google.com>
Date: Mon, 23 Apr 2012 18:03:52 -0700
Subject: Delay calling setHasOptionsMenu() to avoid a crash in Wifi Settings
If it is called in onCreate(), it's too early for Wifi Settings,
which does its initialization in onActivityCreated().
Change-Id: I3d9b49f63d342e724fd4795fbca48d08faa3c3cc
---
src/com/android/settings/SettingsPreferenceFragment.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
(limited to 'src/com/android')
diff --git a/src/com/android/settings/SettingsPreferenceFragment.java b/src/com/android/settings/SettingsPreferenceFragment.java
index 8500f8d..368976a 100644
--- a/src/com/android/settings/SettingsPreferenceFragment.java
+++ b/src/com/android/settings/SettingsPreferenceFragment.java
@@ -55,15 +55,15 @@ public class SettingsPreferenceFragment extends PreferenceFragment implements Di
int helpResource = getHelpResource();
if (helpResource != 0) {
mHelpUrl = getResources().getString(helpResource);
- if (!TextUtils.isEmpty(mHelpUrl)) {
- setHasOptionsMenu(true);
- }
}
}
@Override
public void onActivityCreated(Bundle savedInstanceState) {
super.onActivityCreated(savedInstanceState);
+ if (!TextUtils.isEmpty(mHelpUrl)) {
+ setHasOptionsMenu(true);
+ }
}
/**
--
cgit v1.1