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

Commit 76f01338 authored by Jeff Davidson's avatar Jeff Davidson Committed by Android (Google) Code Review
Browse files

Merge "Don't allow secondary users to change Wi-Fi assistants." into lmp-mr1-dev

parents 095521b2 739ae972

src/com/android/settings/ActiveNetworkScorerDialog.java

+5 −0
Original line number Diff line number Diff line
@@ -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.");

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

+3 −2
Original line number Diff line number Diff line
@@ -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));