| 5e0a46bff6d801a52d9c50d19e25286a2afc8b40 |
|
13-May-2016 |
Victor Chang <vichang@google.com> |
Fix Continous loop in unifed screenlock when trying to Trust a CA cert
Cause: with unified screenlock, ConfirmDeviceCredentialActivity didn't
forward result with FLAG_ACTIVITY_FORWARD_RESULT
Also, fixed that ConfirmDeviceCredentialActivity didn't allow fingerprint
authenication in unified screenlock after keystore unlocked.
In ChooseLockSettingsHelper, add one new util function to allow
extra option to set returnCredentials to false while external to true.
Set StrongAuth to "not required" when it has been successfully unlocked.
Test:
1. PO Unified Screenlock/Work Challenge x fingerprint -> ok to trust cert
(Also, no credential is returned in intent)
2. WorkMode off -> Reboot -> turn on Work mode
-> no fingerprint option, PIN unlock successful to turn work mode on
Bug: 28752364
Change-Id: I6dc8865e8f005545f8577d7731afb4495647062b
/packages/apps/Settings/src/com/android/settings/ConfirmDeviceCredentialActivity.java
|
| b4d52ec370810aa0ebf9e769497d90f6e67d37b3 |
|
18-Apr-2016 |
Ricky Wai <rickywai@google.com> |
Make "work mode on dialog" show personal challenge in unified work lock
Bug: 28183335
Change-Id: I905158c83f410cc9f6b1bf01c57ac2a98fdc9e58
/packages/apps/Settings/src/com/android/settings/ConfirmDeviceCredentialActivity.java
|
| 435ec6e6f4f49b7f7d968203724966c1f28281d7 |
|
12-Apr-2016 |
Michal Karpinski <mkarpinski@google.com> |
Adjusting getTitleFromOrganizationName() after API changes
Bug: 27531295
Change-Id: I566aae079451ea3d001fd517f5fafc0991f55ad2
/packages/apps/Settings/src/com/android/settings/ConfirmDeviceCredentialActivity.java
|
| 0e111e69228f310187e02e5abeb82ab184845f77 |
|
01-Feb-2016 |
Benjamin Franz <bfranz@google.com> |
Revert "Revert "Read default confirm credentials title from policy""
This reverts commit ff3d76dfd4c88bdf52ae9467307a86651bf7cd98.
Change-Id: Ibdfdc880629ace541744c2ba1f46393e70ae53f5
/packages/apps/Settings/src/com/android/settings/ConfirmDeviceCredentialActivity.java
|
| ff3d76dfd4c88bdf52ae9467307a86651bf7cd98 |
|
01-Feb-2016 |
Benjamin Franz <bfranz@google.com> |
Revert "Read default confirm credentials title from policy"
This reverts commit 6e2821dc1ab96de168a057d25acc1ad87e50e606.
Bug: 26895493
Change-Id: I27e7199dc25d423219d966f9f2cbd671bbf094c7
/packages/apps/Settings/src/com/android/settings/ConfirmDeviceCredentialActivity.java
|
| 6e2821dc1ab96de168a057d25acc1ad87e50e606 |
|
25-Jan-2016 |
Benjamin Franz <bfranz@google.com> |
Read default confirm credentials title from policy
Use the organization name as default header text for the work
challenge. If an app passes a different header text, this will get
priority.
Bug: 26638631
Change-Id: I09a5bd7172ff1eed0ff97be02818e838a1a0a520
/packages/apps/Settings/src/com/android/settings/ConfirmDeviceCredentialActivity.java
|
| 194300dff340d67255d12762ffb376b7ba201c87 |
|
13-Jan-2016 |
Benjamin Franz <bfranz@google.com> |
Add background image for work challenge
If the challenge shown is for a work profile, add the default image and
color to the background of the fragment.
Change-Id: I148c6cd3a835a84c7bac78b020839dfdae4a6c36
/packages/apps/Settings/src/com/android/settings/ConfirmDeviceCredentialActivity.java
|
| c5cde055629a55475601b7e077c432e563258507 |
|
22-Oct-2015 |
Clara Bayarri <clarabayarri@google.com> |
Fire pending intent from Confirm Credentials flow
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
/packages/apps/Settings/src/com/android/settings/ConfirmDeviceCredentialActivity.java
|
| 74a2283d2425107f7b39a29d8db7947d8c6f8c7c |
|
11-Sep-2015 |
Jorim Jaggi <jjaggi@google.com> |
Finish trampoline activity for ConfirmDeviceCredential immediately
Make sure to finish ConfirmDeviceCredentialActivity directly, and use
Intent.FLAG_ACTIVITY_FORWARD_RESULT, so we can't even end up in a
state where we have the trampoline activity but not the real activity.
Bug: 23849216
Change-Id: I7a5be5af74ca85c11df1f61a69c3fd5cf558e1fb
/packages/apps/Settings/src/com/android/settings/ConfirmDeviceCredentialActivity.java
|
| 0c6e18f24d846d40c5800bbfede83675321f349a |
|
21-Jul-2015 |
Jim Miller <jaggies@google.com> |
Don't launch ConfirmDeviceCredentials multiple times.
Fixes bug 18724944
Change-Id: Ifd93b1632f120a2d17136b3100e2563fbb45b9a5
/packages/apps/Settings/src/com/android/settings/ConfirmDeviceCredentialActivity.java
|
| 6609b0c22ae89a24d1b07dc3c4143452616d4450 |
|
13-Apr-2015 |
Andres Morales <anmorales@google.com> |
pipe auth token through confirm and set password
ConfirmDeviceCredentialsActivity and ChooseLockGeneric now understand
CLSH.EXTRA_KEY_HAS_CHALLENGE and CLSH.EXTRA_KEY_CHALLENGE in their
launching intents. If present, they return a hw_auth_token_t verifying
the challenge passed in as a field in keyed by
CLSH.EXTRA_KEY_CHALLENGE_TOKEN in their result intents.
Change-Id: I0b4e02b6a798a9e57d02522880a180dffadfcde1
/packages/apps/Settings/src/com/android/settings/ConfirmDeviceCredentialActivity.java
|
| 8a09b619aeb233e2aab1919301f162d8acf1f0f0 |
|
07-Apr-2015 |
Jorim Jaggi <jjaggi@google.com> |
Update confirm device credentials to spec, add fingerprint
- New strings in the screen.
- New layout/style.
- Clean up internal API's around it.
- Add fingerprint support if launched from externally
- Separate theme if launched from externally
- If launched from above Keyguard, use SHOW_WHEN_LOCKED flag
Change-Id: Icdf9bf9e0506841f24e8aab5f0f1d1f4b688951f
/packages/apps/Settings/src/com/android/settings/ConfirmDeviceCredentialActivity.java
|
| 3ea423ae0ff56d249b6844b3a68c67ee5eba243d |
|
16-Oct-2014 |
Svetoslav <svetoslavganov@google.com> |
User to confirm credentials if an accessibility service changes encryption.
When an accessibility service is enabled we are not using the user secure
lock when encrypting the data. If the latter is already used for encryption
we are decreasing the encryption level and therefore shall challenge the
user with their secure lock.
bug:17881324
Change-Id: If8905c05e20bc6bb6a6415e501871e5ad83f3d86
/packages/apps/Settings/src/com/android/settings/ConfirmDeviceCredentialActivity.java
|
| 75fe9e027c2f280664c2aaa0a78457fc37bd0e8b |
|
13-Aug-2014 |
Jim Miller <jaggies@google.com> |
API review - move confirm credential constants from Intent
Moves constants from Intent to KeyguardManager.
Fixes bug 17006280
Change-Id: I8ee1f534816a3fe823ad44479e227ba6d3675389
/packages/apps/Settings/src/com/android/settings/ConfirmDeviceCredentialActivity.java
|
| 09b5228ae56283ebcb69d1c295033c74ea868ae5 |
|
11-Jul-2014 |
Jay Civelli <jcivelli@google.com> |
New activity that asks users to confirm their pattern. DO NOT MERGE
Adds an activity that prompts the user for their PIN/password/pattern.
cherry-pick from master b88e8577b9049392aa50649cb40edc845d43d689
Bug 16242766
Change-Id: I3468215a8ac522a06de6573c93a5f5a6dc72ee2d
/packages/apps/Settings/src/com/android/settings/ConfirmDeviceCredentialActivity.java
|