DO NOT MERGE - Ask device owner for master clear in demo mode
Bug: 62712426 Test: make RunSettingsRoboTests -j19 Change-Id: I29f92ff1062590f2c5eb7713e5969da7870fc582
This commit is contained in:
@@ -1280,8 +1280,10 @@ public final class Utils extends com.android.settingslib.Utils {
|
||||
return UserManager.isDeviceInDemoMode(context) && getUserManager(context).isDemoUser();
|
||||
}
|
||||
|
||||
public static String getDemoModePackageName(Context context) {
|
||||
return context.getString(com.android.internal.R.string.config_demoModePackage);
|
||||
public static ComponentName getDeviceOwnerComponent(Context context) {
|
||||
final DevicePolicyManager dpm = (DevicePolicyManager) context.getSystemService(
|
||||
Context.DEVICE_POLICY_SERVICE);
|
||||
return dpm.getDeviceOwnerComponentOnAnyUser();
|
||||
}
|
||||
|
||||
/**
|
||||
|
Reference in New Issue
Block a user