From 4198607ee274ffc9749ac069f7047d9e3a4da43e Mon Sep 17 00:00:00 2001
From: Robin Lee <rgl@google.com>
Date: Fri, 16 Oct 2015 12:37:59 +0100
Subject: [PATCH] VPN settings: grey out policy-restricted menus

setHasOptionsMenu seems unreliable at stopping onCreateOptoinsMenu from
being called.

Change-Id: Ie86da8e35dddb6e3a0e4678defc55bf5776f6c2f
---
 src/com/android/settings/vpn2/VpnSettings.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/com/android/settings/vpn2/VpnSettings.java b/src/com/android/settings/vpn2/VpnSettings.java
index b0a08c8b57e..98b915d11a1 100644
--- a/src/com/android/settings/vpn2/VpnSettings.java
+++ b/src/com/android/settings/vpn2/VpnSettings.java
@@ -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);