Baligh Uddin
8edf2cd5fa
Import translations. DO NOT MERGE
...
Change-Id: Id824c528d4575f735a16eb4c12d8fff0209c1ac6
Auto-generated-cl: translation import
2015-09-10 12:30:42 -07:00
Geoff Mendal
9f3e169c3a
Import translations. DO NOT MERGE
...
Change-Id: Ifcce22af4c5736023ed78b34be3a420ec6c6738d
Auto-generated-cl: translation import
2015-09-07 08:31:05 -07:00
Geoff Mendal
d74340e086
Import translations. DO NOT MERGE
...
Change-Id: I88401ff7470317261302a5bae660a7cccbe3fd33
Auto-generated-cl: translation import
2015-09-07 07:05:11 -07:00
Adrian Roos
0e22872666
resolved conflicts for merge of 123fb19d to master
...
Change-Id: Ie029b8d72eaf968a5224cd0b90d97b112d51ba35
2015-09-03 15:02:49 -07:00
Adrian Roos
95179ad4be
am 54ceea19: am 95200e6f: Merge "Poke fingerprint timeout when vold password is correct" into mnc-dr-dev
...
* commit '54ceea195bdecfcc9e4e11088aa1bb0b9bb5a481':
Poke fingerprint timeout when vold password is correct
2015-09-03 19:57:58 +00:00
Adrian Roos
54ceea195b
am 95200e6f: Merge "Poke fingerprint timeout when vold password is correct" into mnc-dr-dev
...
* commit '95200e6f4eb34818ac0b652167cffacfcfb4fdff':
Poke fingerprint timeout when vold password is correct
2015-09-03 19:46:41 +00:00
Adrian Roos
95200e6f4e
Merge "Poke fingerprint timeout when vold password is correct" into mnc-dr-dev
2015-09-03 19:41:22 +00:00
Adrian Roos
f6d51acec6
Poke fingerprint timeout when vold password is correct
...
Bug: 23718313
Change-Id: I6c88fbba9ae460594b8e2f1a77c6545b305e5813
2015-09-03 12:34:11 -07:00
Jim Miller
8376cd717a
am 9946c255: am 444f8d2d: am d050cc87: am e45761ff: Merge "Fix broken enter key after failed PIN attempts." into mnc-dr-dev
...
* commit '9946c255e2f1b51a3cdaf7c42193c8dc9e9d63fb':
Fix broken enter key after failed PIN attempts.
2015-09-03 04:35:36 +00:00
Jim Miller
444f8d2d37
am d050cc87: am e45761ff: Merge "Fix broken enter key after failed PIN attempts." into mnc-dr-dev
...
* commit 'd050cc87c865d0ea382132d5669668e7b806ac89':
Fix broken enter key after failed PIN attempts.
2015-09-01 23:32:43 +00:00
Jim Miller
d050cc87c8
am e45761ff: Merge "Fix broken enter key after failed PIN attempts." into mnc-dr-dev
...
* commit 'e45761ff901342a538607a3539997b106e867821':
Fix broken enter key after failed PIN attempts.
2015-09-01 23:08:06 +00:00
Jim Miller
c467bd641f
Fix broken enter key after failed PIN attempts.
...
Fixes bug 23699953
Change-Id: Id099443b830f5608c0bf955075c3407b401f3d53
2015-09-01 15:21:55 -07:00
Jorim Jaggi
6a89feae87
am 53c5dadb: am d302508d: am 4a306fd7: am 3a464785: Add a private API to get notified about lockout resets
...
* commit '53c5dadbb8ddf0898e91e129aee4a19f1028175a':
Add a private API to get notified about lockout resets
2015-09-01 16:10:10 +00:00
Jorim Jaggi
d302508d28
am 4a306fd7: am 3a464785: Add a private API to get notified about lockout resets
...
* commit '4a306fd744bc2f6f434cb7032580b063b704a9c5':
Add a private API to get notified about lockout resets
2015-09-01 00:58:31 +00:00
Jorim Jaggi
4a306fd744
am 3a464785: Add a private API to get notified about lockout resets
...
* commit '3a464785088e7fd206666f640912729533948ce8':
Add a private API to get notified about lockout resets
2015-09-01 00:47:00 +00:00
Jorim Jaggi
3a46478508
Add a private API to get notified about lockout resets
...
SystemUI uses it to start authentication again after lockout reset
expired.
Bug: 22846755
Change-Id: I90a987c6aa4ac52cc7e7aff1bce262d1db3f12ee
2015-09-01 00:37:54 +00:00
Geoff Mendal
469fa94613
Import translations. DO NOT MERGE
...
Change-Id: I770ccd06cea0e57fa92434a33e4e183d79010921
Auto-generated-cl: translation import
2015-08-29 08:37:22 -07:00
Geoff Mendal
72285bcccf
Import translations. DO NOT MERGE
...
Change-Id: I2446db9d1ecc2efedeb811dc2d72b994241f0acf
Auto-generated-cl: translation import
2015-08-29 07:14:27 -07:00
Adrian Roos
0b48efaf32
am f094bde1: am c63a12b7: am 6fe373b1: am 16d7245b: Merge "Prevent Fingerprint when SIM is locked" into mnc-dr-dev
...
* commit 'f094bde15dbbe305d594e11dff5fa22737b93c2c':
Prevent Fingerprint when SIM is locked
2015-08-27 22:06:49 +00:00
Adrian Roos
c63a12b78c
am 6fe373b1: am 16d7245b: Merge "Prevent Fingerprint when SIM is locked" into mnc-dr-dev
...
* commit '6fe373b10ef2a2e56745ee2c67588e96f5b8dcad':
Prevent Fingerprint when SIM is locked
2015-08-27 18:24:03 +00:00
Adrian Roos
6fe373b10e
am 16d7245b: Merge "Prevent Fingerprint when SIM is locked" into mnc-dr-dev
...
* commit '16d7245b64062f4c65d55433642388d1dc9bdf70':
Prevent Fingerprint when SIM is locked
2015-08-27 18:15:21 +00:00
Adrian Roos
16d7245b64
Merge "Prevent Fingerprint when SIM is locked" into mnc-dr-dev
2015-08-27 18:06:44 +00:00
Xiaohui Chen
cc791bc47c
More cleanup USER_OWNER
...
Bug: 19913735
Change-Id: I7fe1bb2a66231b7d1ae0670dff5e2ec736b2e541
2015-08-27 18:05:21 +00:00
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