Jim Miller
73b382f726
am b63da58b: am 1aee37ea: am d255b44c: am dfb8cca0: Merge "Don\'t check the keyguard PIN a second time" into mnc-dr-dev
...
* commit 'b63da58b0eb257e876cc824767ad55c1b22f7ea0':
Don't check the keyguard PIN a second time
2015-08-27 05:17:51 +00:00
Jim Miller
1aee37ea3f
am d255b44c: am dfb8cca0: Merge "Don\'t check the keyguard PIN a second time" into mnc-dr-dev
...
* commit 'd255b44c83fa3dfb460c2ef332761bde2cdc4956':
Don't check the keyguard PIN a second time
2015-08-27 03:37:20 +00:00
Jim Miller
d255b44c83
am dfb8cca0: Merge "Don\'t check the keyguard PIN a second time" into mnc-dr-dev
...
* commit 'dfb8cca04dd64dcdf1df4550f7e808360de0517d':
Don't check the keyguard PIN a second time
2015-08-27 02:52:16 +00:00
Jim Miller
ed7dcc2dc5
Don't check the keyguard PIN a second time
...
If you tap the enter key twice on the keyguard PIN entry
screen, the second tap can sometimes register because keyguard
hasn't been dismissed yet. The fix is to ignore a second attempt
after the PIN has already been verified.
Fixes bug 19216025
Change-Id: I73a004e91e43f3da65ec84f90de6943e717d737f
2015-08-26 18:17:37 -07:00
Adrian Roos
733b663cc2
Prevent Fingerprint when SIM is locked
...
Bug: 23214670
Change-Id: I8192ded696c1908871b2578194e2a226bb51b1e9
2015-08-26 16:38:28 -07:00
Adrian Roos
cb20f55415
am f83da111: am b51e34c3: am fb6f6f24: am 2c632c88: Merge "Invoke strong auth callback and default strong auth expired to true" into mnc-dr-dev
...
* commit 'f83da11131cfa0069fd4d455a74379968a7772ee':
Invoke strong auth callback and default strong auth expired to true
2015-08-22 01:22:25 +00:00
Adrian Roos
e3b07451c3
resolved conflicts for merge of bcc26c02 to master
...
Change-Id: I4260ff0d090cfa9741fd3adcfcadcbbff6839388
2015-08-21 18:08:58 -07:00
Jorim Jaggi
ab03badef9
am ff35aa2e: am 60146356: am 83526e3b: am 86bed406: Fix fingerprint listening state race conditions
...
* commit 'ff35aa2ec14fe17853bd4edacc7dd9171e8b32f3':
Fix fingerprint listening state race conditions
2015-08-22 00:51:35 +00:00
Adrian Roos
b51e34c35f
am fb6f6f24: am 2c632c88: Merge "Invoke strong auth callback and default strong auth expired to true" into mnc-dr-dev
...
* commit 'fb6f6f2490372f113698d9c8d09dae7f4991dec3':
Invoke strong auth callback and default strong auth expired to true
2015-08-22 00:26:58 +00:00
Adrian Roos
69fd61cb9a
am a8bbebd4: am b5e47228: Add StrongAuthTracker
...
* commit 'a8bbebd426b554378cedf3d4e729cabd7e0caff9':
Add StrongAuthTracker
2015-08-22 00:26:39 +00:00
Jorim Jaggi
6014635635
am 83526e3b: am 86bed406: Fix fingerprint listening state race conditions
...
* commit '83526e3bbdff8e8ca3f85616d0678eb5d00ae3b7':
Fix fingerprint listening state race conditions
2015-08-22 00:26:24 +00:00
Adrian Roos
fb6f6f2490
am 2c632c88: Merge "Invoke strong auth callback and default strong auth expired to true" into mnc-dr-dev
...
* commit '2c632c8831349d2c951c9addae05f080958f0604':
Invoke strong auth callback and default strong auth expired to true
2015-08-22 00:17:39 +00:00
Adrian Roos
a8bbebd426
am b5e47228: Add StrongAuthTracker
...
* commit 'b5e4722891e7bbf2fffcd995af02838667a3abab':
Add StrongAuthTracker
2015-08-22 00:16:48 +00:00
Jorim Jaggi
83526e3bbd
am 86bed406: Fix fingerprint listening state race conditions
...
* commit '86bed40605e407459496ee2bfdf6b8af1ae1a581':
Fix fingerprint listening state race conditions
2015-08-22 00:16:29 +00:00
Adrian Roos
1de8bcb1e5
Invoke strong auth callback and default strong auth expired to true
...
Split off from I0af11da1b7cd7c8d837bc5ba3a62ef2ffca74b1b.
The initial value did not matter previously because
a SystemUI crash triggered the boot logic and forced
a manual entry before fingerprint works.
Long term the timeout logic should be moved to StrongAuthTracker
so it can be shared with the trust agent implementation (currently
implemented by the trust agents themeselfes)
Bug: 22846469
Bug: 22115393
Change-Id: I0af11da1b7cd7c8d837bc5ba3a62ef2ffca74b1b
2015-08-21 13:28:01 -07:00
Adrian Roos
b5e4722891
Add StrongAuthTracker
...
Bug: 22846469
Bug: 22115393
Change-Id: I6ef5322d02e540fc043e7f20d3aabf595ce7c224
2015-08-21 13:28:00 -07:00
Jorim Jaggi
86bed40605
Fix fingerprint listening state race conditions
...
When calling cancel() on the cancellation signal, it doesn't happen
immediately. Now, because of a state messup during boot, we go
through the sequence
startListeningForFingerprint
stopListeningForFingerprint
startListeningForFingerprint
However, the cancellation callback from stopListeningForFingeprint
happened AFTER the second startListeningForFingerprint, so we assumed
that fingerprint detection was not running anymore but in reality it
was - leading to weird states and all kinds of small state messups.
Introduce a state machine to track when we we called cancel but
waiting for the confirmation of FingerprintService in order to track
this properly.
Bug: 23380500
Change-Id: I403479fb749cf7c22b73611b69698e8b771777d0
2015-08-21 19:29:05 +00:00
Jorim Jaggi
0eb6586bef
am a0d57270: am e46b5b48: am a2737bee: am 1fa7384a: Merge changes Ie8264c4d,Ic83ac0f1 into mnc-dr-dev
...
* commit 'a0d5727078bdb47f19613b9c73e5d973281609f5':
Fix jank in wake-and-unlock while pulsing
Don't call authenticate immediately after getting valid fingerprint
2015-08-20 02:45:49 +00:00
Jorim Jaggi
e46b5b4823
am a2737bee: am 1fa7384a: Merge changes Ie8264c4d,Ic83ac0f1 into mnc-dr-dev
...
* commit 'a2737beea11455c48b719c6d2f26d5908d4b8cd2':
Fix jank in wake-and-unlock while pulsing
Don't call authenticate immediately after getting valid fingerprint
2015-08-20 02:29:09 +00:00
Jorim Jaggi
a2737beea1
am 1fa7384a: Merge changes Ie8264c4d,Ic83ac0f1 into mnc-dr-dev
...
* commit '1fa7384a101450c4619ed43e176d5a54aa0a54f3':
Fix jank in wake-and-unlock while pulsing
Don't call authenticate immediately after getting valid fingerprint
2015-08-20 02:24:56 +00:00
Jorim Jaggi
1fa7384a10
Merge changes Ie8264c4d,Ic83ac0f1 into mnc-dr-dev
...
* changes:
Fix jank in wake-and-unlock while pulsing
Don't call authenticate immediately after getting valid fingerprint
2015-08-20 02:18:20 +00:00
Jorim Jaggi
71448a7003
Don't call authenticate immediately after getting valid fingerprint
...
After gettin a callback onAuthenticationSucceded we set the
fingerprint listening state to false. However, when waking up, we
immediately started listening again because the state was false.
Protect against that by only calling authenticate only once, except
when the unlock doesn't go through because unlocking with fingerprint
is not allowed.
Also fixes some animation "jank" because of the state messup.
Bug: 23304421
Change-Id: Ic83ac0f1590dd4f8017bb55dca9e19a60cfdf99f
2015-08-19 17:06:29 -07:00
Geoff Mendal
c2e81a0c2d
Import translations. DO NOT MERGE
...
Change-Id: Ifd3cfe65e9a82e21d6a1611368dcbe9d6dfee829
Auto-generated-cl: translation import
2015-08-19 06:53:44 -07:00
Geoff Mendal
3ca63ce0a8
Import translations. DO NOT MERGE
...
Change-Id: Ic7efed73c357ab804e18094702e7f0ca29bcff66
Auto-generated-cl: translation import
2015-08-19 05:32:43 -07:00
Jorim Jaggi
0772bfd206
"resolved conflicts for merge of caacc8ba to master"
...
Change-Id: I7904ac66ded45c3173af14d2940dc8210088e387
2015-08-18 20:04:01 -07:00
Jorim Jaggi
f0c28807a0
am 72964a37: am 1dc1c93b: am caa6cb3a: am 394686ef: Merge "Fix race condition for doze mode and wake-and-unlocking" into mnc-dr-dev
...
* commit '72964a37e090b17d8dabb05cc7f779237a5f3572':
Fix race condition for doze mode and wake-and-unlocking
2015-08-19 02:22:40 +00:00
Jorim Jaggi
e6cfa30631
am 620a31d9: am 40c75831: am b7f482ab: am ee2cfe48: Only call authenticate when we are not listening yet
...
* commit '620a31d948bba714c309c3bb5abba7733eee0fe5':
Only call authenticate when we are not listening yet
2015-08-19 02:22:06 +00:00
Jim Miller
4ea5152bd8
am 849b9e58: am ce6fb7bb: am 7ef77271: am bea9d7b9: Merge "Reset fingerprint lockout timer when strong auth is used." into mnc-dr-dev
...
* commit '849b9e58d6775a393f7d86a6305b658c6af9d16f':
Reset fingerprint lockout timer when strong auth is used.
2015-08-19 02:21:58 +00:00
Jim Miller
10fe83a9b9
am 8978d9ac: am 309fef16: am e11fbc08: am 33a5c807: resolved conflicts for merge of 448216e7 to mnc-dr-dev
...
* commit '8978d9acbaaa89be3c14ed758e7c8a8d06071779':
Revert "Disable fingerprint when remotely reset by DPM"
2015-08-19 02:21:46 +00:00
Jorim Jaggi
f10e475d85
am ebcd9d55: am 0835f33a: Merge "Improve motion for wake-and-unlocking while pulsing" into mnc-dr-dev
...
* commit 'ebcd9d558f1d9e17b5b04d96b816dffb2d8c8d13':
Improve motion for wake-and-unlocking while pulsing
2015-08-19 01:33:52 +00:00
Jorim Jaggi
1dc1c93b93
am caa6cb3a: am 394686ef: Merge "Fix race condition for doze mode and wake-and-unlocking" into mnc-dr-dev
...
* commit 'caa6cb3a2f8118df6e14862b5977d82b32771775':
Fix race condition for doze mode and wake-and-unlocking
2015-08-19 01:33:46 +00:00
Jorim Jaggi
40c7583163
am b7f482ab: am ee2cfe48: Only call authenticate when we are not listening yet
...
* commit 'b7f482ab41f3c50d2765c53db8b4e79f4e1b7903':
Only call authenticate when we are not listening yet
2015-08-19 01:32:40 +00:00
Jim Miller
ce6fb7bba9
am 7ef77271: am bea9d7b9: Merge "Reset fingerprint lockout timer when strong auth is used." into mnc-dr-dev
...
* commit '7ef772713fac5d7b69874f2b972cdec7a60f074b':
Reset fingerprint lockout timer when strong auth is used.
2015-08-19 01:32:24 +00:00
Jim Miller
309fef16e1
am e11fbc08: am 33a5c807: resolved conflicts for merge of 448216e7 to mnc-dr-dev
...
* commit 'e11fbc08a340cb069c8034b7ffd794c32344d4ba':
Revert "Disable fingerprint when remotely reset by DPM"
2015-08-19 01:31:58 +00:00
Jorim Jaggi
ebcd9d558f
am 0835f33a: Merge "Improve motion for wake-and-unlocking while pulsing" into mnc-dr-dev
...
* commit '0835f33a4de14d62c433b36d1b08daff9166e9b3':
Improve motion for wake-and-unlocking while pulsing
2015-08-19 01:13:32 +00:00
Jorim Jaggi
caa6cb3a2f
am 394686ef: Merge "Fix race condition for doze mode and wake-and-unlocking" into mnc-dr-dev
...
* commit '394686efbb51e7c05e230c4ad3695fadc3aa85a0':
Fix race condition for doze mode and wake-and-unlocking
2015-08-19 01:13:28 +00:00
Jorim Jaggi
0835f33a4d
Merge "Improve motion for wake-and-unlocking while pulsing" into mnc-dr-dev
2015-08-19 01:04:58 +00:00
Jorim Jaggi
394686efbb
Merge "Fix race condition for doze mode and wake-and-unlocking" into mnc-dr-dev
2015-08-19 01:04:54 +00:00
Jorim Jaggi
b7f482ab41
am ee2cfe48: Only call authenticate when we are not listening yet
...
* commit 'ee2cfe48d4fb36906c59c2ae545808dba01f90d8':
Only call authenticate when we are not listening yet
2015-08-19 00:59:06 +00:00
Jorim Jaggi
83eb6bb5d8
Improve motion for wake-and-unlocking while pulsing
...
- Move all fingerprint related to logic in on central class in
SystemUI that knows all the state of the UI so there is exactly ONE
place in which we decide what to do when we acquire a fingerprint.
- When pulsing and we get a valid finger, we fade the contents of the
Keyguard out and fade the scrim out almost the same way as we would do
in a normal wake-and-unlock sequence.
- Hide shadows while dozing, so we don't see the artifacts when we fade
the dozed Keyguard out.
Bug: 23225107
Change-Id: I82f78e61f2530cf7d507ade80f6f0a340c082567
2015-08-18 17:57:10 -07:00
Jorim Jaggi
ee2cfe48d4
Only call authenticate when we are not listening yet
...
Bug: 23304421
Change-Id: I5c589ba8992039ca995138d7d74abd123b911a5c
2015-08-19 00:51:23 +00:00
Jim Miller
7ef772713f
am bea9d7b9: Merge "Reset fingerprint lockout timer when strong auth is used." into mnc-dr-dev
...
* commit 'bea9d7b94cfa16da8f257ed705e218b017d459a7':
Reset fingerprint lockout timer when strong auth is used.
2015-08-18 23:18:36 +00:00
Jim Miller
bea9d7b94c
Merge "Reset fingerprint lockout timer when strong auth is used." into mnc-dr-dev
2015-08-18 23:12:18 +00:00
Jim Miller
e11fbc08a3
am 33a5c807: resolved conflicts for merge of 448216e7 to mnc-dr-dev
...
* commit '33a5c80773b7b2913c92fec170787499a453d184':
Revert "Disable fingerprint when remotely reset by DPM"
2015-08-18 20:15:10 +00:00
Jim Miller
33a5c80773
resolved conflicts for merge of 448216e7 to mnc-dr-dev
...
Change-Id: Ic83b34ab6114e2ffe6e08961eaea07110efc5cc5
2015-08-18 13:07:25 -07:00
Jim Miller
e0507bbbf9
Reset fingerprint lockout timer when strong auth is used.
...
Fixes bug 22565462
Change-Id: I4842877839845e7fe103396d8ca8104928568c04
2015-08-18 13:01:31 -07:00
Jorim Jaggi
007f0e8f20
Fix race condition for doze mode and wake-and-unlocking
...
When pulse was about to turn on and at the same time we were starting
a wake-and-unlock sequence, there was jank because the scrim handling
was not correct anymore. Now, abort the pulse when we are wake-and-
unlocking so we don't see flickering with the scrims anymore.
Bug: 23217476
Change-Id: I331f513b68fb1832b4372d3e2e518b31b556a43c
2015-08-17 19:21:42 -07:00
Jim Miller
deb050706c
Revert "Disable fingerprint when remotely reset by DPM"
...
This reverts commit 8ae1be120806d0189f65a492004a7b5416aa6c6f.
Fixes bug 23187090
Change-Id: Idd9798895b08618f7d272b818818a45d3c9dc7d2
2015-08-17 23:33:39 +00:00
Geoff Mendal
ea49b2f6e8
Import translations. DO NOT MERGE
...
Change-Id: Iaffcfead62c6ca52dafd9e5776c65272851076cf
Auto-generated-cl: translation import
2015-08-17 06:52:31 -07:00
Geoff Mendal
f9f462d7ef
Import translations. DO NOT MERGE
...
Change-Id: I5cc8d39d08cbd52c199ffc904348a60d346e6fb7
Auto-generated-cl: translation import
2015-08-17 05:37:50 -07:00