Xiyuan Xia
ee9ca3cde7
Merge "Fix a race condition during async credential check"
2016-01-13 22:32:21 +00:00
Adrian Roos
acc11c0701
Improve bouncer restart prompt message
...
Bug: 26325366
Change-Id: I21ce92b763417f8f9cef571ceab840db71224bb7
2016-01-13 13:06:39 +00:00
Xiyuan Xia
ce64cea383
Fix a race condition during async credential check
...
Do not dismiss keyguard if KeyguardUpdateMonitor.getCurrentUser() is
changed during the async credential check.
Bug:26415736
Change-Id: Id7e04c7100e0920fe86fe006840928a936f62dd8
2016-01-12 16:16:53 -08:00
Geoff Mendal
ee49fb5089
Import translations. DO NOT MERGE
...
Change-Id: Ie9892490fa6ef1d6d531cafc34e8edc816b38a2f
Auto-generated-cl: translation import
2015-12-21 05:39:40 -08:00
Adam Lesinski
906fd73e11
Merge "Fix positional arguments in strings"
2015-12-16 23:02:16 +00:00
Adam Lesinski
cf982aa2e3
Fix positional arguments in strings
...
Change-Id: Id5768adba6b0422b5bb81e800a32be19db2a8626
2015-12-16 14:35:37 -08:00
Geoff Mendal
71dc9e649e
Import translations. DO NOT MERGE
...
Change-Id: Id4a6dcb82bd702595378f563a79fd4088faa6b73
Auto-generated-cl: translation import
2015-12-16 05:45:15 -08:00
Geoff Mendal
14a7c8968f
Import translations. DO NOT MERGE
...
Change-Id: I12a72b6ba0efbce0bf7e89489e277c03463fe6d5
Auto-generated-cl: translation import
2015-12-11 18:46:29 -08:00
Adrian Roos
eaf95c3643
Merge "Charging speed based on voltage" into mnc-dr2-dev am: 0ede75507c
...
am: 82cfaa813b
* commit '82cfaa813b994ff1e5aaedbdfeeb4ced6e5dfcdb':
Charging speed based on voltage
2015-12-02 01:58:50 +00:00
Adrian Roos
0c859ae9c7
Charging speed based on voltage
...
Also takes into account the voltage
at which we charge to make speeds
at different voltages comparable.
Bug: 25229483
Change-Id: I62a192932a013036585cd9fc870808debceac0d3
2015-11-23 17:36:06 -08:00
Geoff Mendal
f905b16c71
Import translations. DO NOT MERGE
...
Change-Id: Ib120f1b756f35c5e144e4b35a2eae6445ccdced3
Auto-generated-cl: translation import
2015-11-16 05:31:02 -08:00
Andrei Stingaceanu
04e245b152
Wire in the device owner info into the KeyguardStatusView
...
Display the device owner information if it has been provisioned by
DPC via DevicePolicyManager, else fallback into displaying the
current user owner information (if set).
Change-Id: Ie915d6669ecac06bfa7b57079b9dcd0fac56df57
2015-11-12 18:08:12 +00:00
Jeff Sharkey
f9fc6d6cc0
More file-based encryption work.
...
Add granular StorageManager APIs for key creation/destruction and
unlocking/locking. Start passing through an opaque token as part
of the unlock command, but leave it empty for now. We now have a
separate "prepare" method that sanity checks that user directories
are correctly setup.
Define a handful of system properties used for marking devices that
should be operating in FBE mode, and if they're emulating FBE. Wire
a command to "sm", but persisting will come later.
Start using new "encryptionAware" flag on apps previously marked with
coreApp flag, which were apps running in the legacy CryptKeeper
model. Small tweaks to handle non-encryptionAware voice interaction
services. Switch PackageManager to consult StorageManager about the
unlocked state of a user.
Bug: 22358539
Change-Id: Ic2865f9b81c10ea39369c441422f7427a3c3c3d6
2015-11-11 10:47:23 -08:00
Geoff Mendal
f3fd6c0e13
Import translations. DO NOT MERGE
...
Change-Id: Ie8815b96b223656f98372f830409837795c45766
Auto-generated-cl: translation import
2015-11-11 05:34:54 -08:00
Geoff Mendal
6b0486a6b5
Import translations. DO NOT MERGE
...
Change-Id: Idace066b891d2ef54c18e1421368bcc5c6fd0fa1
Auto-generated-cl: translation import
2015-11-09 05:39:52 -08:00
Jim Miller
d72d5ac598
Log fingerprint state in KeyguardUpdateMonitor.
...
Attempt to track down bug 24508587
Change-Id: Ifb998e2752ec515c36dd302c2abeb1ab27f3a2f3
2015-11-07 00:48:33 +00:00
Geoff Mendal
23f2301b01
Import translations. DO NOT MERGE
...
Change-Id: I8b90890aff385da901c6a66ac485ddb2560f1cbc
Auto-generated-cl: translation import
2015-11-04 05:40:02 -08:00
Geoff Mendal
10701893a8
Import translations. DO NOT MERGE
...
Change-Id: I8635097aee86e5c12b142769ec91d8788d800c22
Auto-generated-cl: translation import
2015-10-26 05:50:22 -07:00
Toni Barzic
17fdb13a60
Reset lock pattern stealth mode when keygueard pattern view is reset
...
Stealth mode is not guaranteed to remain constant through keyguard pattern
view lifetime (it's user specific, and user context may be switched), so
update it when keyguard pattern is reset.
BUG=25017442
Change-Id: I798fe685cfaadd35462f54ab7e4fa9e6f6276436
2015-10-16 13:38:11 -07:00
Jorim Jaggi
aeaddadb0e
am 8ba8c543: am b278ea0c: am 27f26df6: am 05b11bf3: Merge "Update message in SIM PIN view when configuration changes" into mnc-dr-dev
...
* commit '8ba8c543f77eb8d5abad2653c5a6ebaeccc3a241':
Update message in SIM PIN view when configuration changes
2015-09-24 04:18:01 +00:00
Jorim Jaggi
b278ea0cab
am 27f26df6: am 05b11bf3: Merge "Update message in SIM PIN view when configuration changes" into mnc-dr-dev
...
* commit '27f26df629e7a5c2ea87ad46708dc4678c11d27a':
Update message in SIM PIN view when configuration changes
2015-09-24 02:29:01 +00:00
Jorim Jaggi
27f26df629
am 05b11bf3: Merge "Update message in SIM PIN view when configuration changes" into mnc-dr-dev
...
* commit '05b11bf357be9546a2cbdd3f37c32fc9567f4767':
Update message in SIM PIN view when configuration changes
2015-09-24 02:20:37 +00:00
Jorim Jaggi
05b11bf357
Merge "Update message in SIM PIN view when configuration changes" into mnc-dr-dev
2015-09-24 00:23:47 +00:00
Jorim Jaggi
86f868dc32
am 93d1a17b: am 1af3c6f4: am 1bcb3472: am 6a15d528: Do not go over handler to dispatch keyguard visibility
...
* commit '93d1a17bafd51daaf6ed7fc56c7c3e84c5c119df':
Do not go over handler to dispatch keyguard visibility
2015-09-23 19:53:00 +00:00
Jorim Jaggi
1af3c6f401
am 1bcb3472: am 6a15d528: Do not go over handler to dispatch keyguard visibility
...
* commit '1bcb3472669529edc991a31e6cbf7866a385383e':
Do not go over handler to dispatch keyguard visibility
2015-09-23 19:03:26 +00:00
Jorim Jaggi
1bcb347266
am 6a15d528: Do not go over handler to dispatch keyguard visibility
...
* commit '6a15d528c0a4501389008ef945dec38b5ca6919a':
Do not go over handler to dispatch keyguard visibility
2015-09-23 18:55:38 +00:00
Jorim Jaggi
ad371b2e22
Update message in SIM PIN view when configuration changes
...
Bug: 24273807
Change-Id: I497fcd2ee527ec22d14ff1b6c30be4ef9a878980
2015-09-23 11:52:12 -07:00
Jorim Jaggi
6a15d528c0
Do not go over handler to dispatch keyguard visibility
...
When going over the handler, it could happen with a bad interleaving
we thought that Keyguard was not showing when getting the
onFinishedGoingToSleep message, so we stopped fingerprint
authentication. For some reason our state machine for canceling
/restarting authentication didn't work correctly so the fingerprint
listening state was not correct.
Bug: 24178814
Change-Id: I2a4731f195982395244c12e4d33b2b7d561c5671
2015-09-23 18:44:20 +00:00
Baligh Uddin
05b6999600
Import translations. DO NOT MERGE
...
Change-Id: I31f62d18cace1e7b37b900f94e624e9fc1762f2f
Auto-generated-cl: translation import
2015-09-18 14:02:31 -07:00
Jorim Jaggi
9196534f02
am 2c049cfc: am 3a565669: am 5c2bfa8f: am 58e378b0: Merge "Start fingerprint authentication in onStartedGoingToSleep" into mnc-dr-dev
...
* commit '2c049cfc613f91fbc9a93adf2ee49a3137f7402f':
Start fingerprint authentication in onStartedGoingToSleep
2015-09-18 01:09:32 +00:00
Jorim Jaggi
3a56566914
am 5c2bfa8f: am 58e378b0: Merge "Start fingerprint authentication in onStartedGoingToSleep" into mnc-dr-dev
...
* commit '5c2bfa8ff08331a2a62a1dd7496331eb977c0f13':
Start fingerprint authentication in onStartedGoingToSleep
2015-09-18 00:55:09 +00:00
Jorim Jaggi
5c2bfa8ff0
am 58e378b0: Merge "Start fingerprint authentication in onStartedGoingToSleep" into mnc-dr-dev
...
* commit '58e378b02561d8f606066537b193b0eb62e2404f':
Start fingerprint authentication in onStartedGoingToSleep
2015-09-18 00:48:47 +00:00
Jorim Jaggi
95e4038bb1
Start fingerprint authentication in onStartedGoingToSleep
...
We used to start fingerprint authentication in onFinishedGoingToSleep.
This was a UX issue because then users couldn't place the finger on
the sensor immediately after pressing the power button because
onFinishedGoingToSleep is significantly delayed (around 900ms after
pressing the power button).
Bug: 23570959
Change-Id: I0bf557ebd10e6a8b033ab98a78aa338bf6538dcc
2015-09-18 00:39:13 +00:00
Jorim Jaggi
1988ea2b3a
am 6a188487: am d5411598: am a58bff50: am 3cf7eef1: Listen for fingerprint when on bouncer
...
* commit '6a188487c4eaec361c812197d99a5c24ad4c65d4':
Listen for fingerprint when on bouncer
2015-09-11 03:50:41 +00:00
Jorim Jaggi
d541159868
am a58bff50: am 3cf7eef1: Listen for fingerprint when on bouncer
...
* commit 'a58bff50418933ee5b729deccdf8172132b560f5':
Listen for fingerprint when on bouncer
2015-09-11 02:06:40 +00:00
Jorim Jaggi
a58bff5041
am 3cf7eef1: Listen for fingerprint when on bouncer
...
* commit '3cf7eef1b1890131902447465a343484e23e2115':
Listen for fingerprint when on bouncer
2015-09-11 02:00:42 +00:00
Jorim Jaggi
3cf7eef1b1
Listen for fingerprint when on bouncer
...
To make unlocking work if keyguard is in occluded state and user
taps on a notification.
Bug: 22855718
Change-Id: Ide632f524a635e3e37741abaa77e258394c9a6e2
2015-09-11 01:54:10 +00:00
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