From 3393daccd9b08c29928e7d71b6f6e1c7388c60b3 Mon Sep 17 00:00:00 2001 From: Lenka Trochtova Date: Mon, 13 Feb 2017 15:05:27 +0100 Subject: [PATCH] Replace deprecated ACTION_MASTER_CLEAR by ACTION_FACTORY_RESET. Both do the same, ACTION_FACTORY_RESET is the new name. Test: manual - reset the device BUG: 33656232 Change-Id: I30cedea600bfcbeffa5d1094a6e0e83326f7ccfc --- src/com/android/settings/CryptKeeper.java | 4 ++-- src/com/android/settings/MasterClearConfirm.java | 2 +- .../android/settings/applications/ConfirmConvertToFbe.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/com/android/settings/CryptKeeper.java b/src/com/android/settings/CryptKeeper.java index c2ea6ac7586..94ea2e736fa 100644 --- a/src/com/android/settings/CryptKeeper.java +++ b/src/com/android/settings/CryptKeeper.java @@ -209,7 +209,7 @@ public class CryptKeeper extends Activity implements TextView.OnEditorActionList hide(R.id.emergencyCallButton); } else if (failedAttempts == MAX_FAILED_ATTEMPTS) { // Factory reset the device. - Intent intent = new Intent(Intent.ACTION_MASTER_CLEAR); + Intent intent = new Intent(Intent.ACTION_FACTORY_RESET); intent.setPackage("android"); intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND); intent.putExtra(Intent.EXTRA_REASON, "CryptKeeper.MAX_FAILED_ATTEMPTS"); @@ -612,7 +612,7 @@ public class CryptKeeper extends Activity implements TextView.OnEditorActionList @Override public void onClick(View v) { // Factory reset the device. - Intent intent = new Intent(Intent.ACTION_MASTER_CLEAR); + Intent intent = new Intent(Intent.ACTION_FACTORY_RESET); intent.setPackage("android"); intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND); intent.putExtra(Intent.EXTRA_REASON, diff --git a/src/com/android/settings/MasterClearConfirm.java b/src/com/android/settings/MasterClearConfirm.java index b143171762f..218ebbbb3e8 100644 --- a/src/com/android/settings/MasterClearConfirm.java +++ b/src/com/android/settings/MasterClearConfirm.java @@ -120,7 +120,7 @@ public class MasterClearConfirm extends OptionsMenuFragment { }; private void doMasterClear() { - Intent intent = new Intent(Intent.ACTION_MASTER_CLEAR); + Intent intent = new Intent(Intent.ACTION_FACTORY_RESET); intent.setPackage("android"); intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND); intent.putExtra(Intent.EXTRA_REASON, "MasterClearConfirm"); diff --git a/src/com/android/settings/applications/ConfirmConvertToFbe.java b/src/com/android/settings/applications/ConfirmConvertToFbe.java index a243f04ae3a..7ebca1dce8f 100644 --- a/src/com/android/settings/applications/ConfirmConvertToFbe.java +++ b/src/com/android/settings/applications/ConfirmConvertToFbe.java @@ -38,7 +38,7 @@ public class ConfirmConvertToFbe extends SettingsPreferenceFragment { final Button button = (Button) rootView.findViewById(R.id.button_confirm_convert_fbe); button.setOnClickListener(new View.OnClickListener() { public void onClick(View v) { - Intent intent = new Intent(Intent.ACTION_MASTER_CLEAR); + Intent intent = new Intent(Intent.ACTION_FACTORY_RESET); intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND); intent.putExtra(Intent.EXTRA_REASON, "convert_fbe"); getActivity().sendBroadcast(intent);