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

Merge "Ask device owner for master clear in demo mode" into oc-mr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-08-09 19:40:03 +00:00
committed by Android (Google) Code Review
parent e0c0616d6f 3025727e16
commit d59854de24
4 changed files with 27 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -144,10 +144,10 @@ public class MasterClear extends OptionsMenuFragment {
public void onClick(View view) {
final Context context = view.getContext();
if (Utils.isDemoUser(context)) {
final String packageName = Utils.getDemoModePackageName(context);
if (!TextUtils.isEmpty(packageName)) {
final ComponentName componentName = Utils.getDeviceOwnerComponent(context);
if (componentName != null) {
final Intent requestFactoryReset = new Intent()
.setPackage(packageName)
.setPackage(componentName.getPackageName())
.setAction(Intent.ACTION_FACTORY_RESET);
context.startActivity(requestFactoryReset);
}

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

@@ -1249,8 +1249,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();
}
/**