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

Merge "Restrict changing wi-fi networks" into oc-dr1-dev

Browse Source 
am: a7e10e0316

Change-Id: Ifcb15f741c4bcb72c32789870bc50027d2fc4cbb
This commit is contained in:
Christine Franks
2017-07-26 02:52:52 +00:00
committed by android-build-merger
parent a60d3ef00c a7e10e0316
commit a1f56b5faa
3 changed files with 41 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/Utils.java
View File

@@ -77,7 +77,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;
@@ -1251,13 +1250,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
*/