commit 3393daccd9b08c29928e7d71b6f6e1c7388c60b3
author Lenka Trochtova <ltrochtova@google.com> Mon Feb 13 15:05:27 2017 +0100
committer Lenka Trochtova <ltrochtova@google.com> Mon Feb 13 16:02:13 2017 +0100
tree d832495f1ebe444a93bf4e23ced70126dfde9b4b
parent ac3b32932a6e1a6b1e94ccf2ad6adfb5dff9b78d

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

diff --git a/src/com/android/settings/CryptKeeper.java b/src/com/android/settings/CryptKeeper.java
index c2ea6ac..94ea2e7 100644
--- a/src/com/android/settings/CryptKeeper.java
+++ b/src/com/android/settings/CryptKeeper.java
@@ -209,7 +209,7 @@
                 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 @@
                 @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,

src/com/android/settings/MasterClearConfirm.java

diff --git a/src/com/android/settings/MasterClearConfirm.java b/src/com/android/settings/MasterClearConfirm.java
index b143171..218ebbb 100644
--- a/src/com/android/settings/MasterClearConfirm.java
+++ b/src/com/android/settings/MasterClearConfirm.java
@@ -120,7 +120,7 @@
     };
 
     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");

src/com/android/settings/applications/ConfirmConvertToFbe.java

diff --git a/src/com/android/settings/applications/ConfirmConvertToFbe.java b/src/com/android/settings/applications/ConfirmConvertToFbe.java
index a243f04..7ebca1d 100644
--- a/src/com/android/settings/applications/ConfirmConvertToFbe.java
+++ b/src/com/android/settings/applications/ConfirmConvertToFbe.java
@@ -38,7 +38,7 @@
         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);