Merge "Disable factory reset in DSU mode" into tm-dev am: 692f794e6f
am: d498d8b580
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29110306 Change-Id: I3a815a0a9f65ad1814741e58f781301f9b9f6fb8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -26,11 +26,13 @@ import android.accounts.AccountManager;
|
||||
import android.accounts.AuthenticatorDescription;
|
||||
import android.app.ActionBar;
|
||||
import android.app.Activity;
|
||||
import android.app.AlertDialog;
|
||||
import android.app.admin.DevicePolicyManager;
|
||||
import android.app.settings.SettingsEnums;
|
||||
import android.content.ComponentName;
|
||||
import android.content.ContentResolver;
|
||||
import android.content.Context;
|
||||
import android.content.DialogInterface;
|
||||
import android.content.Intent;
|
||||
import android.content.pm.PackageManager;
|
||||
import android.content.pm.ResolveInfo;
|
||||
@@ -43,6 +45,7 @@ import android.os.Environment;
|
||||
import android.os.SystemProperties;
|
||||
import android.os.UserHandle;
|
||||
import android.os.UserManager;
|
||||
import android.os.image.DynamicSystemManager;
|
||||
import android.provider.Settings;
|
||||
import android.telephony.euicc.EuiccManager;
|
||||
import android.text.TextUtils;
|
||||
@@ -266,6 +269,19 @@ public class MainClear extends InstrumentedFragment implements OnGlobalLayoutLis
|
||||
return;
|
||||
}
|
||||
|
||||
final DynamicSystemManager dsuManager = (DynamicSystemManager)
|
||||
getActivity().getSystemService(Context.DYNAMIC_SYSTEM_SERVICE);
|
||||
if (dsuManager.isInUse()) {
|
||||
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
|
||||
builder.setTitle(R.string.dsu_is_running);
|
||||
builder.setPositiveButton(R.string.okay, new DialogInterface.OnClickListener() {
|
||||
public void onClick(DialogInterface dialog, int id) {}
|
||||
});
|
||||
AlertDialog dsuAlertdialog = builder.create();
|
||||
dsuAlertdialog.show();
|
||||
return;
|
||||
}
|
||||
|
||||
if (runKeyguardConfirmation(KEYGUARD_REQUEST)) {
|
||||
return;
|
||||
}
|
||||
|
Reference in New Issue
Block a user