From 511460474367c5658cba30a21232f614efe6924b Mon Sep 17 00:00:00 2001 From: Carlos Valdivia Date: Tue, 23 Jan 2018 17:17:56 -0800 Subject: [PATCH] AR/FR: Updated resources to confirm via component. Due to issues with an Intent filter not being configured with a category. We needed to move to launching the confirmation activity via Component targeting Intent. Hopefully this can be addressed post IC. Manual Testing: Start by navigating in Settings to: Settings > System > Reset Options > Erase Then click on "Reset Phone." At this point the behavior depends on the state of GmsCore. With forthcoming GmsCore changes (and accompanying SettingsGoogle changes), the user will see a prompt telling them that they can confirm their credentials. Regardless of whether the user successfully confirms or hits back, they will end up in the MasterClearConfirm UX. As per the feature spec. Test: make RunSettingsRoboTests -j40 Bug: 6393703 Change-Id: Idca02bda1fa2e388d612bd2014e16e2b6665fe70 --- res/values/strings.xml | 8 ++++++-- src/com/android/settings/MasterClear.java | 17 ++++++++++++----- .../com/android/settings/MasterClearTest.java | 8 ++++++-- 3 files changed, 24 insertions(+), 9 deletions(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index 1fc8e41f618..f5622dea95d 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -9231,11 +9231,15 @@ directory access - + - + + + My Phone diff --git a/src/com/android/settings/MasterClear.java b/src/com/android/settings/MasterClear.java index b7fb69404cd..687e6458361 100644 --- a/src/com/android/settings/MasterClear.java +++ b/src/com/android/settings/MasterClear.java @@ -123,17 +123,21 @@ public class MasterClear extends InstrumentedPreferenceFragment { return !((requestCode != KEYGUARD_REQUEST) && (requestCode != CREDENTIAL_CONFIRM_REQUEST)); } + @VisibleForTesting + boolean isShowFinalConfirmation(int requestCode, int resultCode) { + return (resultCode == Activity.RESULT_OK) || (requestCode == CREDENTIAL_CONFIRM_REQUEST); + } + @Override public void onActivityResult(int requestCode, int resultCode, Intent data) { super.onActivityResult(requestCode, resultCode, data); - if (!isValidRequestCode(requestCode)) { return; } // If the user entered a valid keyguard trace, present the final // confirmation prompt; otherwise, go back to the initial state. - if (resultCode == Activity.RESULT_OK) { + if (isShowFinalConfirmation(requestCode, resultCode)) { showFinalConfirmation(); } else { establishInitialState(); @@ -155,7 +159,10 @@ public class MasterClear extends InstrumentedPreferenceFragment { final Context context = getActivity(); final String accountType = context.getString(R.string.account_type); final String packageName = context.getString(R.string.account_confirmation_package); - if (TextUtils.isEmpty(accountType) || TextUtils.isEmpty(packageName)) { + final String className = context.getString(R.string.account_confirmation_class); + if (TextUtils.isEmpty(accountType) + || TextUtils.isEmpty(packageName) + || TextUtils.isEmpty(className)) { return false; } final AccountManager am = AccountManager.get(context); @@ -163,7 +170,7 @@ public class MasterClear extends InstrumentedPreferenceFragment { if (accounts != null && accounts.length > 0) { final Intent requestAccountConfirmation = new Intent() .setPackage(packageName) - .setAction("android.accounts.action.PRE_FACTORY_RESET"); + .setComponent(new ComponentName(packageName, className)); // Check to make sure that the intent is supported. final PackageManager pm = context.getPackageManager(); final ResolveInfo resolution = pm.resolveActivity(requestAccountConfirmation, 0); @@ -172,7 +179,7 @@ public class MasterClear extends InstrumentedPreferenceFragment { && packageName.equals(resolution.activityInfo.packageName)) { // Note that we need to check the packagename to make sure that an Activity resolver // wasn't returned. - getActivity().startActivityForResult( + startActivityForResult( requestAccountConfirmation, CREDENTIAL_CONFIRM_REQUEST); return true; } diff --git a/tests/robotests/src/com/android/settings/MasterClearTest.java b/tests/robotests/src/com/android/settings/MasterClearTest.java index 9bf3310c6b8..776025f1fad 100644 --- a/tests/robotests/src/com/android/settings/MasterClearTest.java +++ b/tests/robotests/src/com/android/settings/MasterClearTest.java @@ -66,7 +66,8 @@ import org.robolectric.shadows.ShadowActivity; ) public class MasterClearTest { private static final String TEST_ACCOUNT_TYPE = "android.test.account.type"; - private static final String TEST_CONFIRMATION_PACKAGE = "android.test.confirmation.pkg"; + private static final String TEST_CONFIRMATION_PACKAGE = "android.test.conf.pkg"; + private static final String TEST_CONFIRMATION_CLASS = "android.test.conf.pkg.ConfActivity"; private static final String TEST_ACCOUNT_NAME = "test@example.com"; @Mock @@ -223,6 +224,7 @@ public class MasterClearTest { when(mMasterClear.getActivity()).thenReturn(mMockActivity); when(mMockActivity.getString(R.string.account_type)).thenReturn(TEST_ACCOUNT_TYPE); when(mMockActivity.getString(R.string.account_confirmation_package)).thenReturn(TEST_CONFIRMATION_PACKAGE); + when(mMockActivity.getString(R.string.account_confirmation_class)).thenReturn(TEST_CONFIRMATION_CLASS); Account[] accounts = new Account[0]; when(mMockActivity.getSystemService(Context.ACCOUNT_SERVICE)).thenReturn(mAccountManager); @@ -235,6 +237,7 @@ public class MasterClearTest { when(mMasterClear.getActivity()).thenReturn(mMockActivity); when(mMockActivity.getString(R.string.account_type)).thenReturn(TEST_ACCOUNT_TYPE); when(mMockActivity.getString(R.string.account_confirmation_package)).thenReturn(TEST_CONFIRMATION_PACKAGE); + when(mMockActivity.getString(R.string.account_confirmation_class)).thenReturn(TEST_CONFIRMATION_CLASS); Account[] accounts = new Account[] { new Account(TEST_ACCOUNT_NAME, TEST_ACCOUNT_TYPE) }; when(mMockActivity.getSystemService(Context.ACCOUNT_SERVICE)).thenReturn(mAccountManager); when(mAccountManager.getAccountsByType(TEST_ACCOUNT_TYPE)).thenReturn(accounts); @@ -250,6 +253,7 @@ public class MasterClearTest { // Only try to show account confirmation if the appropriate resource overlays are available. when(mMockActivity.getString(R.string.account_type)).thenReturn(TEST_ACCOUNT_TYPE); when(mMockActivity.getString(R.string.account_confirmation_package)).thenReturn(TEST_CONFIRMATION_PACKAGE); + when(mMockActivity.getString(R.string.account_confirmation_class)).thenReturn(TEST_CONFIRMATION_CLASS); // Add accounts to trigger the search for a resolving intent. Account[] accounts = new Account[] { new Account(TEST_ACCOUNT_NAME, TEST_ACCOUNT_TYPE) }; when(mMockActivity.getSystemService(Context.ACCOUNT_SERVICE)).thenReturn(mAccountManager); @@ -265,7 +269,7 @@ public class MasterClearTest { when(mPackageManager.resolveActivity(any(), eq(0))).thenReturn(resolveInfo); // Finally mock out the startActivityForResultCall - doNothing().when(mMockActivity).startActivityForResult(any(), eq(MasterClear.CREDENTIAL_CONFIRM_REQUEST)); + doNothing().when(mMasterClear).startActivityForResult(any(), eq(MasterClear.CREDENTIAL_CONFIRM_REQUEST)); assertThat(mMasterClear.tryShowAccountConfirmation()).isTrue(); }