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

Move logic for FR in demo mode out of Settings

Browse Source 
Bug: 62712426
Test: make \
ROBOTEST_FILTER="(MasterClearTest|FactoryResetPreferenceControllerTest
|UtilsTest)" \
RunSettingsRoboTests -j100
Change-Id: I5e287c3d4a6a7050bda78187c52aec19e90b50bc
This commit is contained in:
Christine Franks
2017-06-23 14:28:21 -07:00
parent 50ac1cebc3
commit c6890ab6c5
9 changed files with 59 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -77,6 +77,7 @@ 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;
@@ -1240,14 +1241,13 @@ public final class Utils extends com.android.settingslib.Utils {
}
}
public static boolean isCarrierDemoUser(Context context) {
final String carrierDemoModeSetting =
context.getString(com.android.internal.R.string.config_carrierDemoModeSetting);
return UserManager.isDeviceInDemoMode(context)
&& getUserManager(context).isDemoUser()
&& !TextUtils.isEmpty(carrierDemoModeSetting)
&& (Settings.Secure.getInt(context.getContentResolver(),
carrierDemoModeSetting, 0) == 1);
public static boolean isDemoUser(Context context) {
return UserManager.isDeviceInDemoMode(context) && getUserManager(context).isDemoUser();
}
public static String getDemoModePackageName(Context context) {
return context.getResources().getString(
com.android.internal.R.string.config_demoModePackage);
}
/**