Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4198607e authored by Robin Lee's avatar Robin Lee
Browse files

VPN settings: grey out policy-restricted menus 

setHasOptionsMenu seems unreliable at stopping onCreateOptoinsMenu from
being called.

Change-Id: Ie86da8e35dddb6e3a0e4678defc55bf5776f6c2f
parent bb7eeade

src/com/android/settings/vpn2/VpnSettings.java

+5 −0
Original line number Diff line number Diff line
@@ -129,6 +129,11 @@ public class VpnSettings extends SettingsPreferenceFragment implements 
    public void onPrepareOptionsMenu(Menu menu) {

        super.onPrepareOptionsMenu(menu);



        // Disable all actions if VPN configuration has been disallowed

        for (int i = 0; i < menu.size(); i++) {

            menu.getItem(i).setEnabled(!mUnavailable);

        }



        // Hide lockdown VPN on devices that require IMS authentication

        if (SystemProperties.getBoolean("persist.radio.imsregrequired", false)) {

            menu.findItem(R.id.vpn_lockdown).setVisible(false);