Merge "Add Enterprise restriction check for Wi-Fi QR code sharing"

2022-01-07 01:51:56 +00:00
parent b43d872018 c13303c585
commit 6c59266ef4
2 changed files with 52 additions and 1 deletions
--- a/src/com/android/settings/network/NetworkProviderSettings.java
+++ b/src/com/android/settings/network/NetworkProviderSettings.java
@@ -566,7 +566,9 @@ public class NetworkProviderSettings extends RestrictedSettingsFragment
        }

        if (mSelectedWifiEntry.canDisconnect()) {
-            menu.add(Menu.NONE, MENU_ID_SHARE, 0 /* order */, R.string.share);
+            if (mSelectedWifiEntry.canShare()) {
+                menu.add(Menu.NONE, MENU_ID_SHARE, 0 /* order */, R.string.share);
+            }
            menu.add(Menu.NONE, MENU_ID_DISCONNECT, 1 /* order */,
                    R.string.wifi_disconnect_button_text);
        }