PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "sys user split: first pass updating Settings"

Browse Source
This commit is contained in:
Xiaohui Chen
2015-07-28 17:39:59 +00:00
committed by Android (Google) Code Review
parent 078d21c7da 44879a387a
commit e43640b376
16 changed files with 62 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/wifi/AdvancedWifiSettings.java
View File

@@ -30,6 +30,7 @@ import android.net.wifi.WifiManager;
import android.net.wifi.WpsInfo;
import android.os.Bundle;
import android.os.UserHandle;
import android.os.UserManager;
import android.preference.ListPreference;
import android.preference.Preference;
import android.preference.Preference.OnPreferenceClickListener;
@@ -135,7 +136,7 @@ public class AdvancedWifiSettings extends SettingsPreferenceFragment
mWifiAssistantPreference = (AppListSwitchPreference) findPreference(KEY_WIFI_ASSISTANT);
Collection<NetworkScorerAppData> scorers =
NetworkScorerAppManager.getAllValidScorers(context);
if (UserHandle.myUserId() == UserHandle.USER_OWNER && !scorers.isEmpty()) {
if (UserManager.get(context).isAdminUser() && !scorers.isEmpty()) {
mWifiAssistantPreference.setOnPreferenceChangeListener(this);
initWifiAssistantPreference(scorers);
} else if (mWifiAssistantPreference != null) {