Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 65af66f0 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Replace deprecated ACTION_MASTER_CLEAR by ACTION_FACTORY_RESET."

parents 3477a577 3393dacc

src/com/android/settings/CryptKeeper.java

+2 −2
Original line number Diff line number Diff line
@@ -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,

src/com/android/settings/MasterClearConfirm.java

+1 −1
Original line number Diff line number Diff line
@@ -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");

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

+1 −1
Original line number Diff line number Diff line
@@ -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);