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

* commit '51e8febf8c4b522a9704b3ba9bb19a2f7f45a0f5': Supress menu if screen ought to be hidden.
2014-08-19 19:02:52 +00:00
parent 868c7c450e 51e8febf8c
commit 9a49d7af25
1 changed files with 3 additions and 1 deletions
--- a/src/com/android/settings/ApnSettings.java
+++ b/src/com/android/settings/ApnSettings.java
@@ -133,7 +133,9 @@ public class ApnSettings extends SettingsPreferenceFragment implements
        mMobileStateFilter = new IntentFilter(
                TelephonyIntents.ACTION_ANY_DATA_CONNECTION_STATE_CHANGED);

-        setHasOptionsMenu(true);
+        if (!mUm.hasUserRestriction(UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS)) {
+            setHasOptionsMenu(true);
+        }
    }

    @Override