drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
229,725 Commits 1 Branch 0 Tags
Commit Graph

1474 Commits

Author SHA1 Message Date
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
Jorim Jaggi
559b8c5f4e Merge commit '80581f7a' into master 
Change-Id: Ifd8f9c7a854901e0a48bc8a611cfb002fa37298c
 2015-08-12 20:09:52 -07:00
Jorim Jaggi
deb6a3acbd am 73d9e1ce: am 69082a29: Merge "Require strong authentication after a timeout" into mnc-dr-dev 
* commit '73d9e1ce0bc8e4478b165fd5f550c99830fbcb57':
  Require strong authentication after a timeout
 2015-08-13 01:09:21 +00:00
Jorim Jaggi
73d9e1ce0b am 69082a29: Merge "Require strong authentication after a timeout" into mnc-dr-dev 
* commit '69082a298f50680128ada89a8bef777f0fadf829':
  Require strong authentication after a timeout
 2015-08-13 01:02:31 +00:00
Jorim Jaggi
25b4d4b280 Require strong authentication after a timeout 
Bug: 21594472
Change-Id: Iab169d4fa2e4ad134f8c8579654b28e96b5b1385
 2015-08-12 16:39:56 -07:00
Selim Cinek
1ca500cfc2 am 7f07068d: am 8d97651d: am 13c9828f: am c40d6799: Merge "Indicating fingerprint error messages on the bouncer now" into mnc-dr-dev 
* commit '7f07068df990e88e993e44d58d5c5d4acfbc7171':
  Indicating fingerprint error messages on the bouncer now
 2015-08-12 01:28:09 +00:00
Selim Cinek
8d97651d15 am 13c9828f: am c40d6799: Merge "Indicating fingerprint error messages on the bouncer now" into mnc-dr-dev 
* commit '13c9828fab18571121ec3fecca99f709d606925b':
  Indicating fingerprint error messages on the bouncer now
 2015-08-12 01:12:59 +00:00
Selim Cinek
13c9828fab am c40d6799: Merge "Indicating fingerprint error messages on the bouncer now" into mnc-dr-dev 
* commit 'c40d6799df6b3dc1c61aa05d2e356096521b7099':
  Indicating fingerprint error messages on the bouncer now
 2015-08-12 01:06:16 +00:00
Selim Cinek
cfafe4ea6f Indicating fingerprint error messages on the bouncer now 
Also ensure that error messages are surfaced when the screen
comes on such that the user knows why his fingerprint is not
working.

Bug: 22035466
Bug: 22524101
Change-Id: I00b0e833cdb8a3475545ba75b8cb7bf7a419dfd4
 2015-08-11 16:37:54 -07:00
Jorim Jaggi
56c6df333a am 839e85c8: am 61c70aad: am f306cef4: am 959431bc: Wake device when Keyguard invisible and getting fingerprint 
* commit '839e85c89054fb10c01fc6dbc04d2eabb112e0d3':
  Wake device when Keyguard invisible and getting fingerprint
 2015-08-11 23:33:43 +00:00
Jorim Jaggi
61c70aad96 am f306cef4: am 959431bc: Wake device when Keyguard invisible and getting fingerprint 
* commit 'f306cef4c215c77049024d28617af29a7b03b96f':
  Wake device when Keyguard invisible and getting fingerprint
 2015-08-11 23:20:41 +00:00
Jorim Jaggi
f306cef4c2 am 959431bc: Wake device when Keyguard invisible and getting fingerprint 
* commit '959431bcca9fc7b3491b1501957b1f4b45efee65':
  Wake device when Keyguard invisible and getting fingerprint
 2015-08-11 22:46:41 +00:00
Jorim Jaggi
959431bcca Wake device when Keyguard invisible and getting fingerprint 
Also fixes a bug where we didn't listen for fingerprint after
rebooting the device.

Bug: 22644634
Bug: 23046263
Change-Id: Ide85a01d9d4cfcc880fbc29ca4f3cc6eef47da2d
 2015-08-11 22:35:50 +00:00
Geoff Mendal
2393f7e282 Import translations. DO NOT MERGE 
Change-Id: I8efa511283a9b372c6386dd3a3396abee1d10780
Auto-generated-cl: translation import
 2015-08-08 07:13:01 -07:00
Geoff Mendal
4fe623763f Import translations. DO NOT MERGE 
Change-Id: I4a54f0256d1f4f9f57e8fdfde634ecf477740370
Auto-generated-cl: translation import
 2015-08-08 06:00:57 -07:00
Jim Miller
4f50d59580 am 40fa4070: am 4a66bbf7: am 5f96eb0c: am 6fdb85d3: am 120fc2c7: Merge "Disable fingerprint when remotely reset by DPM" into mnc-dev 
* commit '40fa4070c70d9ddde681b2fb28627b8a4889080e':
  Disable fingerprint when remotely reset by DPM
 2015-08-06 03:03:27 +00:00
Jim Miller
4a66bbf7fd am 5f96eb0c: am 6fdb85d3: am 120fc2c7: Merge "Disable fingerprint when remotely reset by DPM" into mnc-dev 
* commit '5f96eb0caf6db51751b2af6404c98037067ce29d':
  Disable fingerprint when remotely reset by DPM
 2015-08-06 02:40:00 +00:00
Jim Miller
5f96eb0caf am 6fdb85d3: am 120fc2c7: Merge "Disable fingerprint when remotely reset by DPM" into mnc-dev 
* commit '6fdb85d383007e7d68895195d6347840276abeab':
  Disable fingerprint when remotely reset by DPM
 2015-08-06 01:57:54 +00:00
Jim Miller
6fdb85d383 am 120fc2c7: Merge "Disable fingerprint when remotely reset by DPM" into mnc-dev 
* commit '120fc2c74eb290e06cddf1b52d363338f940c612':
  Disable fingerprint when remotely reset by DPM
 2015-08-06 01:43:13 +00:00
Jim Miller
8ae1be1208 Disable fingerprint when remotely reset by DPM 
When the device is lost or stolen, it's safer to
fall back to strong authentication (pin, pattern or
password).  This disables fingerprint like we do with
trust agents.

Fixes bug 21620081

Change-Id: I7bbe54be3721b2f160b783daeb3acbe434705046
 2015-08-05 20:06:37 +00:00
Jim Miller
b617438232 am 6a659183: am 59128d81: am d14fa9b4: am 3f9b9f2b: am 45fcaa54: Merge "Don\'t wipe device because of short PIN, patterns or passwords" into mnc-dev 
* commit '6a65918307be42f0c70d13e7eb35b6b9dd4b6c99':
  Don't wipe device because of short PIN, patterns or passwords
 2015-08-03 21:06:00 +00:00
Jim Miller
59128d812e am d14fa9b4: am 3f9b9f2b: am 45fcaa54: Merge "Don\'t wipe device because of short PIN, patterns or passwords" into mnc-dev 
* commit 'd14fa9b4158979afb4a43e2ea572a216ca5dc8d4':
  Don't wipe device because of short PIN, patterns or passwords
 2015-08-03 20:50:52 +00:00
Jim Miller
d14fa9b415 am 3f9b9f2b: am 45fcaa54: Merge "Don\'t wipe device because of short PIN, patterns or passwords" into mnc-dev 
* commit '3f9b9f2bbe81e25cfc2754e19a129895f8ad1011':
  Don't wipe device because of short PIN, patterns or passwords
 2015-08-03 20:41:52 +00:00
Jim Miller
3f9b9f2bbe am 45fcaa54: Merge "Don\'t wipe device because of short PIN, patterns or passwords" into mnc-dev 
* commit '45fcaa547dc5b9eb2c20879b290415daa1446004':
  Don't wipe device because of short PIN, patterns or passwords
 2015-08-03 20:33:00 +00:00
Jim Miller
51e3a672e0 Don't wipe device because of short PIN, patterns or passwords 
This fixes a bug where we were counting short PIN, patterns and
passwords as attempts. For devices with a device policy admin,
this would cause devices to get wiped after a short amount of
interaction with the UI.

Fixes bug 22844609

Change-Id: I7616b38d954f89d4a2cee23f9aec1b898041b1f2
 2015-08-03 19:36:24 +00:00
Jorim Jaggi
4d3bfb6943 am 647569d4: am 0a7844db: am 703dc46e: am f1518da4: Fix fingerprint icon screen on animation 
* commit '647569d440ba9fca90cf61f588d5a1e89d8a736e':
  Fix fingerprint icon screen on animation
 2015-08-01 17:52:58 +00:00
Jorim Jaggi
0a7844db40 am 703dc46e: am f1518da4: Fix fingerprint icon screen on animation 
* commit '703dc46ebf38bc1211524a4afb67ffdfbba7c6ec':
  Fix fingerprint icon screen on animation
 2015-08-01 16:52:08 +00:00
Jorim Jaggi
703dc46ebf am f1518da4: Fix fingerprint icon screen on animation 
* commit 'f1518da4512dcf350fd808a5288634f534bca1bb':
  Fix fingerprint icon screen on animation
 2015-08-01 16:34:09 +00:00
Geoff Mendal
2f8e387b01 Import translations. DO NOT MERGE 
Change-Id: I067b513b8b2344bd2f8ee9960ddcc5000e7173c3
Auto-generated-cl: translation import
 2015-07-31 20:34:13 -07:00
Geoff Mendal
d40ed6ca36 Import translations. DO NOT MERGE 
Change-Id: I8f9ae7ce04314f6865dec5a54988a4f3a742a304
Auto-generated-cl: translation import
 2015-07-31 19:20:05 -07:00
Jorim Jaggi
f1518da451 Fix fingerprint icon screen on animation 
Bug: 22807015
Change-Id: I4685085007d87f1b1e1db380d0f899efc4e56240
 2015-07-31 19:31:16 +00:00
Jim Miller
23e8619a10 am 5745eead: am ea5de59e: am e9338ac3: am be869b66: am 30c5da9c: Don\'t call cancel() when fingerprint auth fails 
* commit '5745eead22ecd70fd9d418f1a6ac23d837dbdbe8':
  Don't call cancel() when fingerprint auth fails
 2015-07-30 05:35:45 +00:00
Jim Miller
ea5de59e43 am e9338ac3: am be869b66: am 30c5da9c: Don\'t call cancel() when fingerprint auth fails 
* commit 'e9338ac35aad34a2b882d73a0f9ca40558057f34':
  Don't call cancel() when fingerprint auth fails
 2015-07-30 05:08:13 +00:00
Jim Miller
e9338ac35a am be869b66: am 30c5da9c: Don\'t call cancel() when fingerprint auth fails 
* commit 'be869b667142d3dc8723f19951b4d6ba2c055b24':
  Don't call cancel() when fingerprint auth fails
 2015-07-30 04:55:59 +00:00
Jim Miller
be869b6671 am 30c5da9c: Don\'t call cancel() when fingerprint auth fails 
* commit '30c5da9cc20cc4b9ce820963c6f58d7826f46eaa':
  Don't call cancel() when fingerprint auth fails
 2015-07-30 04:44:20 +00:00
Jim Miller
30c5da9cc2 Don't call cancel() when fingerprint auth fails 
KeyguardUpdateMonitor should not call cancel() when fingerprint
auth fails. The life cycle will continue until an actual error
occurs or the maximum number of retries is reached.

Fixes bug 22562277

Change-Id: I36291d025de9c049cc7f7924f692c8c21349bb7b
 2015-07-30 04:31:37 +00:00
Adrian Roos
0d7c7c5f85 am 38ea7978: am bb8326d0: am f03ad443: am f65209d8: am e2cd8419: Merge "Fix pattern lock for accessibility" into mnc-dev 
* commit '38ea797860960477bce5d3e73b7d351f436d7090':
  Fix pattern lock for accessibility
 2015-07-29 22:33:57 +00:00
Adrian Roos
bb8326d0cc am f03ad443: am f65209d8: am e2cd8419: Merge "Fix pattern lock for accessibility" into mnc-dev 
* commit 'f03ad4438323b866fc465e3f2a425c266cdacdf3':
  Fix pattern lock for accessibility
 2015-07-29 22:04:00 +00:00
Adrian Roos
f03ad44383 am f65209d8: am e2cd8419: Merge "Fix pattern lock for accessibility" into mnc-dev 
* commit 'f65209d8082ca1251996021ddf0b227f0c08f56f':
  Fix pattern lock for accessibility
 2015-07-29 21:52:08 +00:00
Adrian Roos
f65209d808 am e2cd8419: Merge "Fix pattern lock for accessibility" into mnc-dev 
* commit 'e2cd84196e1266200f906b5d721640217fc2e6f9':
  Fix pattern lock for accessibility
 2015-07-29 21:37:08 +00:00
Adrian Roos
e2cd84196e Merge "Fix pattern lock for accessibility" into mnc-dev 2015-07-29 21:23:25 +00:00