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

Commit c0deb7da authored by Prem Kumar's avatar Prem Kumar Committed by Android (Google) Code Review
Browse files

Merge "Remove UI for Forget AP as a secondary user." into lmp-dev

parents 2e205e9b 073f07f3

src/com/android/settings/wifi/WifiConfigController.java

+4 −1
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.settings.wifi; 


import static android.net.wifi.WifiConfiguration.INVALID_NETWORK_ID;



import android.app.ActivityManager;

import android.content.Context;

import android.content.res.Resources;

import android.net.IpConfiguration;
@@ -38,6 +39,7 @@ import android.net.wifi.WifiEnterpriseConfig.Eap; 
import android.net.wifi.WifiEnterpriseConfig.Phase2;

import android.net.wifi.WifiInfo;

import android.os.Handler;

import android.os.UserHandle;

import android.security.Credentials;

import android.security.KeyStore;

import android.text.Editable;
@@ -298,7 +300,8 @@ public class WifiConfigController implements TextWatcher, 
                    addRow(group, R.string.wifi_security, mAccessPoint.getSecurityString(false));

                    mView.findViewById(R.id.ip_fields).setVisibility(View.GONE);

                }

                if (mAccessPoint.networkId != INVALID_NETWORK_ID) {

                if (mAccessPoint.networkId != INVALID_NETWORK_ID

                        && ActivityManager.getCurrentUser() == UserHandle.USER_OWNER) {

                    mConfigUi.setForgetButton(res.getString(R.string.wifi_forget));

                }

            }

src/com/android/settings/wifi/WifiSettings.java

+5 −1
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import static android.net.wifi.WifiConfiguration.INVALID_NETWORK_ID; 
import static android.os.UserManager.DISALLOW_CONFIG_WIFI;



import android.app.Activity;

import android.app.ActivityManager;

import android.app.Dialog;

import android.content.BroadcastReceiver;

import android.content.Context;
@@ -45,6 +46,7 @@ import android.os.Build; 
import android.os.Bundle;

import android.os.Handler;

import android.os.Message;

import android.os.UserHandle;

import android.preference.Preference;

import android.preference.PreferenceScreen;

import android.util.Log;
@@ -512,7 +514,9 @@ public class WifiSettings extends RestrictedSettingsFragment 
                    menu.add(Menu.NONE, MENU_ID_CONNECT, 0, R.string.wifi_menu_connect);

                }

                if (mSelectedAccessPoint.networkId != INVALID_NETWORK_ID) {

                    if (ActivityManager.getCurrentUser() == UserHandle.USER_OWNER) {

                        menu.add(Menu.NONE, MENU_ID_FORGET, 0, R.string.wifi_menu_forget);

                    }

                    menu.add(Menu.NONE, MENU_ID_MODIFY, 0, R.string.wifi_menu_modify);



                    if (mSelectedAccessPoint.security != AccessPoint.SECURITY_NONE) {