From 1e99f0ce412db497475f7e220090b9c522be6e79 Mon Sep 17 00:00:00 2001 From: Christopher Tate Date: Wed, 25 Jan 2017 14:46:48 -0800 Subject: [PATCH] Properly target the factory-reset broadcasts Bug 34587823 Test: attempt factory reset from UI Change-Id: I4ba65f4b7e07792b37e7587008ad0ab1bc6c1fb0 --- src/com/android/settings/CryptKeeper.java | 2 ++ src/com/android/settings/MasterClearConfirm.java | 1 + 2 files changed, 3 insertions(+) diff --git a/src/com/android/settings/CryptKeeper.java b/src/com/android/settings/CryptKeeper.java index 49142d7c26c..c2ea6ac7586 100644 --- a/src/com/android/settings/CryptKeeper.java +++ b/src/com/android/settings/CryptKeeper.java @@ -210,6 +210,7 @@ public class CryptKeeper extends Activity implements TextView.OnEditorActionList } else if (failedAttempts == MAX_FAILED_ATTEMPTS) { // Factory reset the device. Intent intent = new Intent(Intent.ACTION_MASTER_CLEAR); + intent.setPackage("android"); intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND); intent.putExtra(Intent.EXTRA_REASON, "CryptKeeper.MAX_FAILED_ATTEMPTS"); sendBroadcast(intent); @@ -612,6 +613,7 @@ public class CryptKeeper extends Activity implements TextView.OnEditorActionList public void onClick(View v) { // Factory reset the device. Intent intent = new Intent(Intent.ACTION_MASTER_CLEAR); + intent.setPackage("android"); intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND); intent.putExtra(Intent.EXTRA_REASON, "CryptKeeper.showFactoryReset() corrupt=" + corrupt); diff --git a/src/com/android/settings/MasterClearConfirm.java b/src/com/android/settings/MasterClearConfirm.java index bc230d10133..b143171762f 100644 --- a/src/com/android/settings/MasterClearConfirm.java +++ b/src/com/android/settings/MasterClearConfirm.java @@ -121,6 +121,7 @@ public class MasterClearConfirm extends OptionsMenuFragment { private void doMasterClear() { Intent intent = new Intent(Intent.ACTION_MASTER_CLEAR); + intent.setPackage("android"); intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND); intent.putExtra(Intent.EXTRA_REASON, "MasterClearConfirm"); intent.putExtra(Intent.EXTRA_WIPE_EXTERNAL_STORAGE, mEraseSdCard);