Restrict changing wi-fi networks

Bug: 31852835
Test: manual - verify unrestricted as regular user, but that a password
is required in demo mode.
Change-Id: I60f95ccbb10ba728b384b9c8c2ae723934fb2928
This commit is contained in:
Christine Franks
2017-07-11 17:32:57 -07:00
parent 262aacd353
commit a0dd987d20
3 changed files with 41 additions and 16 deletions

View File

@@ -74,7 +74,6 @@ import android.provider.ContactsContract.Data;
import android.provider.ContactsContract.Profile;
import android.provider.ContactsContract.RawContacts;
import android.provider.Settings;
import android.provider.Settings.Secure;
import android.support.annotation.StringRes;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceGroup;
@@ -1282,13 +1281,12 @@ public final class Utils extends com.android.settingslib.Utils {
}
public static String getDemoModePackageName(Context context) {
return context.getResources().getString(
com.android.internal.R.string.config_demoModePackage);
return context.getString(com.android.internal.R.string.config_demoModePackage);
}
/**
* Returns if a given user is a profile of another user.
* @param user The user whose profiles will be checked.
* @param user The user whose profiles wibe checked.
* @param profile The (potential) profile.
* @return if the profile is actually a profile
*/