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

Fire pending intent from Confirm Credentials flow

Browse Source 
Add support in the Confirm Credentials flow to read an Intent extra
and fire it when authentication succeeds.

This is part of the Separate Work Challenge feature.

Change-Id: I52c203735fa9b53fd2f7df971824747eeb930f36
This commit is contained in:
Clara Bayarri
2015-10-22 17:24:43 +01:00
parent 990c08e3af
commit c5cde05562
6 changed files with 80 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/com/android/settings/ChooseLockSettingsHelper.java
View File

@@ -21,6 +21,7 @@ import android.app.Activity;
import android.app.Fragment;
import android.app.admin.DevicePolicyManager;
import android.content.Intent;
import android.content.IntentSender;
import com.android.internal.widget.LockPatternUtils;
@@ -112,6 +113,27 @@ public final class ChooseLockSettingsHelper {
returnCredentials, external, false, 0, Utils.getEffectiveUserId(mActivity));
}
/**
* If a pattern, password or PIN exists, prompt the user before allowing them to change it.
*
* @param title title of the confirmation screen; shown in the action bar
* @param header header of the confirmation screen; shown as large text
* @param description description of the confirmation screen
* @param returnCredentials if true, put credentials into intent. Note that if this is true,
* this can only be called internally.
* @param external specifies whether this activity is launched externally, meaning that it will
* get a dark theme and allow fingerprint authentication
* @param userId The userId for whom the lock should be confirmed.
* @return true if one exists and we launched an activity to confirm it
* @see Activity#onActivityResult(int, int, android.content.Intent)
*/
boolean launchConfirmationActivity(int request, @Nullable CharSequence title,
@Nullable CharSequence header, @Nullable CharSequence description,
boolean returnCredentials, boolean external, int userId) {
return launchConfirmationActivity(request, title, header, description,
returnCredentials, external, false, 0, Utils.getSameOwnerUserId(mActivity, userId));
}
/**
* If a pattern, password or PIN exists, prompt the user before allowing them to change it.
* @param message optional message to display about the action about to be done
@@ -175,8 +197,18 @@ public final class ChooseLockSettingsHelper {
if (external) {
intent.addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT);
if (mFragment != null) {
IntentSender intentSender = mFragment.getActivity().getIntent()
.getParcelableExtra(Intent.EXTRA_INTENT);
if (intentSender != null) {
intent.putExtra(Intent.EXTRA_INTENT, intentSender);
}
mFragment.startActivity(intent);
} else {
IntentSender intentSender = mActivity.getIntent()
.getParcelableExtra(Intent.EXTRA_INTENT);
if (intentSender != null) {
intent.putExtra(Intent.EXTRA_INTENT, intentSender);
}
mActivity.startActivity(intent);
}
} else {