am 7138ed74: Merge "Supress menu if screen ought to be hidden." into lmp-dev

* commit '7138ed7404f22862ac7e2fdb29d71833dec9b1a3':
  Supress menu if screen ought to be hidden.
This commit is contained in:
Julia Reynolds
2014-08-19 18:54:36 +00:00
committed by Android Git Automerger

View File

@@ -133,8 +133,10 @@ public class ApnSettings extends SettingsPreferenceFragment implements
mMobileStateFilter = new IntentFilter( mMobileStateFilter = new IntentFilter(
TelephonyIntents.ACTION_ANY_DATA_CONNECTION_STATE_CHANGED); TelephonyIntents.ACTION_ANY_DATA_CONNECTION_STATE_CHANGED);
if (!mUm.hasUserRestriction(UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS)) {
setHasOptionsMenu(true); setHasOptionsMenu(true);
} }
}
@Override @Override
public void onActivityCreated(Bundle savedInstanceState) { public void onActivityCreated(Bundle savedInstanceState) {