Merge "Supress menu if screen ought to be hidden." into lmp-dev

This commit is contained in:
Julia Reynolds
2014-08-19 18:43:31 +00:00
committed by Android (Google) Code Review

View File

@@ -133,7 +133,9 @@ 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);
setHasOptionsMenu(true); if (!mUm.hasUserRestriction(UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS)) {
setHasOptionsMenu(true);
}
} }
@Override @Override