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

am d39dc5c3: am 76f01338: Merge "Don\'t allow secondary users to change Wi-Fi assistants." into lmp-mr1-dev

Browse Source 
* commit 'd39dc5c36b6f7a356f488f94fad74cd8c2ea6125':
  Don't allow secondary users to change Wi-Fi assistants.
This commit is contained in:
Jeff Davidson
2014-11-10 17:45:46 +00:00
committed by Android Git Automerger
parent ac62d70080 d39dc5c36b
commit a8b154f2f0
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/ActiveNetworkScorerDialog.java
View File

@@ -23,6 +23,7 @@ import android.net.NetworkScoreManager;
import android.net.NetworkScorerAppManager;
import android.net.NetworkScorerAppManager.NetworkScorerAppData;
import android.os.Bundle;
import android.os.UserHandle;
import android.text.TextUtils;
import android.util.Log;
@@ -69,6 +70,10 @@ public final class ActiveNetworkScorerDialog extends AlertActivity implements
}
private boolean buildDialog() {
if (UserHandle.myUserId() != UserHandle.USER_OWNER) {
Log.i(TAG, "Can only set scorer for owner user.");
return false;
}
NetworkScorerAppData newScorer = NetworkScorerAppManager.getScorer(this, mNewPackageName);
if (newScorer == null) {
Log.e(TAG, "New package " + mNewPackageName + " is not a valid scorer.");

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

@@ -29,6 +29,7 @@ import android.net.wifi.WifiInfo;
import android.net.wifi.WifiManager;
import android.net.wifi.WpsInfo;
import android.os.Bundle;
import android.os.UserHandle;
import android.preference.ListPreference;
import android.preference.Preference;
import android.preference.Preference.OnPreferenceClickListener;
@@ -129,9 +130,9 @@ public class AdvancedWifiSettings extends SettingsPreferenceFragment
pref.setIntent(intent);
final Context context = getActivity();
NetworkScorerAppData scorer = getWifiAssistantApp(context);
SwitchPreference wifiAssistant = (SwitchPreference)findPreference(KEY_WIFI_ASSISTANT);
if (scorer != null) {
NetworkScorerAppData scorer = getWifiAssistantApp(context);
if (UserHandle.myUserId() == UserHandle.USER_OWNER && scorer != null) {
final boolean checked = NetworkScorerAppManager.getActiveScorer(context) != null;
wifiAssistant.setSummary(getResources().getString(
R.string.wifi_automatically_manage_summary, scorer.mScorerName));