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

Replace deprecated ACTION_MASTER_CLEAR by ACTION_FACTORY_RESET.

Browse Source 
Both do the same, ACTION_FACTORY_RESET is the new name.

Test: manual - reset the device
BUG: 33656232

Change-Id: I30cedea600bfcbeffa5d1094a6e0e83326f7ccfc
This commit is contained in:
Lenka Trochtova
2017-02-13 15:05:27 +01:00
parent ac3b32932a
commit 3393daccd9
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/CryptKeeper.java
View File

@@ -209,7 +209,7 @@ public class CryptKeeper extends Activity implements TextView.OnEditorActionList
hide(R.id.emergencyCallButton); hide(R.id.emergencyCallButton);
} else if (failedAttempts == MAX_FAILED_ATTEMPTS) { } else if (failedAttempts == MAX_FAILED_ATTEMPTS) {
// Factory reset the device. // Factory reset the device.
Intent intent = new Intent(Intent.ACTION_MASTER_CLEAR); Intent intent = new Intent(Intent.ACTION_FACTORY_RESET);
intent.setPackage("android"); intent.setPackage("android");
intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND); intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND);
intent.putExtra(Intent.EXTRA_REASON, "CryptKeeper.MAX_FAILED_ATTEMPTS"); intent.putExtra(Intent.EXTRA_REASON, "CryptKeeper.MAX_FAILED_ATTEMPTS");
@@ -612,7 +612,7 @@ public class CryptKeeper extends Activity implements TextView.OnEditorActionList
@Override @Override
public void onClick(View v) { public void onClick(View v) {
// Factory reset the device. // Factory reset the device.
Intent intent = new Intent(Intent.ACTION_MASTER_CLEAR); Intent intent = new Intent(Intent.ACTION_FACTORY_RESET);
intent.setPackage("android"); intent.setPackage("android");
intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND); intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND);
intent.putExtra(Intent.EXTRA_REASON, intent.putExtra(Intent.EXTRA_REASON,

2
src/com/android/settings/MasterClearConfirm.java
View File

@@ -120,7 +120,7 @@ public class MasterClearConfirm extends OptionsMenuFragment {
}; };
private void doMasterClear() { private void doMasterClear() {
Intent intent = new Intent(Intent.ACTION_MASTER_CLEAR); Intent intent = new Intent(Intent.ACTION_FACTORY_RESET);
intent.setPackage("android"); intent.setPackage("android");
intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND); intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND);
intent.putExtra(Intent.EXTRA_REASON, "MasterClearConfirm"); intent.putExtra(Intent.EXTRA_REASON, "MasterClearConfirm");

2
src/com/android/settings/applications/ConfirmConvertToFbe.java
View File

@@ -38,7 +38,7 @@ public class ConfirmConvertToFbe extends SettingsPreferenceFragment {
final Button button = (Button) rootView.findViewById(R.id.button_confirm_convert_fbe); final Button button = (Button) rootView.findViewById(R.id.button_confirm_convert_fbe);
button.setOnClickListener(new View.OnClickListener() { button.setOnClickListener(new View.OnClickListener() {
public void onClick(View v) { 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.addFlags(Intent.FLAG_RECEIVER_FOREGROUND);
intent.putExtra(Intent.EXTRA_REASON, "convert_fbe"); intent.putExtra(Intent.EXTRA_REASON, "convert_fbe");
getActivity().sendBroadcast(intent); getActivity().sendBroadcast(intent);