Jim Miller
d205d407b4
am f2b934b4: am 3ea68240: Merge "Stop keyguard from spamming the log" into lmp-mr1-dev
...
* commit 'f2b934b42be772d457b3f6e16c95aad1056c502e':
Stop keyguard from spamming the log
2014-12-04 21:17:55 +00:00
xinhe
c377c360e9
am 9a4472bf: am 8f61e754: Merge "Unable to unlock SIM with a PIN/PUK" into lmp-mr1-dev
...
* commit '9a4472bf45044082f4fa6d906530f3640761676a':
Unable to unlock SIM with a PIN/PUK
2014-12-04 21:17:50 +00:00
Jim Miller
f2b934b42b
am 3ea68240: Merge "Stop keyguard from spamming the log" into lmp-mr1-dev
...
* commit '3ea6824034ea8fbcd418af8e07606f60fd844e45':
Stop keyguard from spamming the log
2014-12-04 15:15:16 +00:00
xinhe
9a4472bf45
am 8f61e754: Merge "Unable to unlock SIM with a PIN/PUK" into lmp-mr1-dev
...
* commit '8f61e7549ebb7ccb6bc2d41c30a9f2da2fb9bd7c':
Unable to unlock SIM with a PIN/PUK
2014-12-04 15:14:59 +00:00
Geoff Mendal
72a2041995
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
2014-12-04 04:33:28 +00:00
Jim Miller
3ea6824034
Merge "Stop keyguard from spamming the log" into lmp-mr1-dev
2014-12-03 23:44:32 +00:00
xinhe
8f61e7549e
Merge "Unable to unlock SIM with a PIN/PUK" into lmp-mr1-dev
2014-12-03 23:39:32 +00:00
xinhe
18b9c3cb50
Unable to unlock SIM with a PIN/PUK
...
call TelephonyManager.getSimState instead of accessing systemProperty
Bug:18489776
Change-Id: I45d2315a588f706c4815750963dcfec9f8409c5d
2014-12-03 23:36:16 +00:00
Jim Miller
8b6bd4d3f4
Stop keyguard from spamming the log
...
Fixes bug 18147652
Change-Id: I9f6d3a6f1b8e3d6443c112ecf8a61ea2dc4e3434
2014-12-03 15:33:13 -08:00
Geoff Mendal
3a7436effb
Import translations. DO NOT MERGE
...
Change-Id: Ia32fade2318979587cf9eabe1aad8ca6a912c52d
Auto-generated-cl: translation import
2014-12-03 06:36:10 -08:00
Geoff Mendal
7494e13705
Import translations. DO NOT MERGE
...
Change-Id: I05d1072828d3d0256c04101d22fab4a55c6530f2
Auto-generated-cl: translation import
2014-12-03 06:31:39 -08:00
Geoff Mendal
97df114581
Import translations. DO NOT MERGE
...
Change-Id: Iea99b1400da98c7af76027d54e0f9315c2726a5b
Auto-generated-cl: translation import
2014-12-03 06:27:45 -08:00
Baligh Uddin
c46c0d9d82
Import translations. DO NOT MERGE
...
Change-Id: I6acd5c2437f73dcbeca9cf6746c0a7c23c98eebc
Auto-generated-cl: translation import
2014-12-02 14:14:05 -08:00
Geoff Mendal
fceb7d652f
Import translations. DO NOT MERGE
...
Change-Id: I99666ee10f2ad6d4489d9ad554606ee22566b15a
Auto-generated-cl: translation import
2014-12-01 06:44:53 -08:00
Geoff Mendal
a990faec87
Import translations. DO NOT MERGE
...
Change-Id: I372891f089f72f814e92a63ac7f78a25cee9ebbf
Auto-generated-cl: translation import
2014-12-01 06:40:31 -08:00
Geoff Mendal
9cde3e1d82
Import translations. DO NOT MERGE
...
Change-Id: I2cb5a0bf876f8553710f0ed3882f7ef56da24557
Auto-generated-cl: translation import
2014-12-01 06:36:32 -08:00
Jorim Jaggi
ca389b259f
am 199d621c: am f1b05619: am 95e89cae: Fix jank when pin/pattern is shown
...
* commit '199d621c5fc994e323fa6b73c34729d48fc46c11':
Fix jank when pin/pattern is shown
2014-11-26 19:42:24 +00:00
Jorim Jaggi
7d754e0ccb
am f1e6d231: am c5c2e537: Merge "resolved conflicts for merge of 803a6dc0 to lmp-mr1-ub-dev" into lmp-mr1-ub-dev
...
* commit 'f1e6d2315eea6e9f289b8c1bafc04a4cbc6f05e1':
Make IKeyguardService interface asynchronous
2014-11-26 19:42:19 +00:00
Alan Viverette
a033bb9c73
am ed79856d: am 30c0d5b5: am 8a45126a: Merge "Load SPEAK_PASSWORD from currently active user rather than self" into lmp-mr1-dev
...
* commit 'ed79856db292044a15fe7d3c3227fb9ec808f070':
Load SPEAK_PASSWORD from currently active user rather than self
2014-11-26 19:41:43 +00:00
Jorim Jaggi
199d621c5f
am f1b05619: am 95e89cae: Fix jank when pin/pattern is shown
...
* commit 'f1b05619cc44b039721110955695fa261f1746da':
Fix jank when pin/pattern is shown
2014-11-26 18:43:52 +00:00
Jorim Jaggi
f1e6d2315e
am c5c2e537: Merge "resolved conflicts for merge of 803a6dc0 to lmp-mr1-ub-dev" into lmp-mr1-ub-dev
...
* commit 'c5c2e53779c2c2b6d889bdad5d11d47da9e72789':
Make IKeyguardService interface asynchronous
2014-11-26 18:43:47 +00:00
Alan Viverette
ed79856db2
am 30c0d5b5: am 8a45126a: Merge "Load SPEAK_PASSWORD from currently active user rather than self" into lmp-mr1-dev
...
* commit '30c0d5b5eadecf5ba3c9ee536f153adc4c8c8723':
Load SPEAK_PASSWORD from currently active user rather than self
2014-11-26 18:41:35 +00:00
Jorim Jaggi
f1b05619cc
am 95e89cae: Fix jank when pin/pattern is shown
...
* commit '95e89caeb252a54807c76d60c7440766829e418c':
Fix jank when pin/pattern is shown
2014-11-26 14:49:56 +00:00
Jorim Jaggi
c5c2e53779
Merge "resolved conflicts for merge of 803a6dc0 to lmp-mr1-ub-dev" into lmp-mr1-ub-dev
2014-11-26 14:48:47 +00:00
Geoff Mendal
19475c24a9
Import translations. DO NOT MERGE
...
Change-Id: Ie84614988b6307176d8da43db0038c12420065e8
Auto-generated-cl: translation import
2014-11-26 06:39:40 -08:00
Geoff Mendal
57086523d5
Import translations. DO NOT MERGE
...
Change-Id: Ic378d28436a78faca2428b60431714db6dc7a0f2
Auto-generated-cl: translation import
2014-11-26 06:35:08 -08:00
Geoff Mendal
441d4f04d1
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
2014-11-26 14:32:45 +00:00
Geoff Mendal
92ed2ec015
Import translations. DO NOT MERGE
...
Change-Id: Idfd2434481ce912e23afaaa7fb6bbef3dcad35f8
Auto-generated-cl: translation import
2014-11-26 06:31:37 -08:00
Jorim Jaggi
95e89caeb2
Fix jank when pin/pattern is shown
...
- Only update layout params of status bar window when needed
- Do not update security method all the time, only when needed (only
when reset gets called)
- Check for actual used security method when updating states for
bouncer
Bug: 18505838
Change-Id: Ib3d0021c0cc364fa5598e06e0a2bae059ae79cbe
2014-11-26 14:07:49 +00:00
Jorim Jaggi
803a6dc080
Merge "Make IKeyguardService interface asynchronous" into lmp-mr1-dev
2014-11-26 14:07:21 +00:00
Alan Viverette
b6e0cb97b7
Load SPEAK_PASSWORD from currently active user rather than self
...
Also fixes a typo in UserHandle's docs.
BUG: 18295054
Change-Id: I1f5384f84062b9ea7dcbebe1e5f64af331028d41
2014-11-25 16:08:03 -08:00
Jim Miller
ab954546dc
Make IKeyguardService interface asynchronous
...
Add a state callback so lockscreen reports back whenever its state
relevant for PhoneWindowManager changed, instead of synchronously
calling into SysUI which can lead to deadlocks. Directly use
LockPatternUtils for isSecure, and optimize the number of calls to
this method to optimize layout performance.
Bug: 17677097
Change-Id: I5d491fc8884d4f84d9562626b9ea0d5eaa5166fc
2014-11-25 23:22:52 +01:00
Jorim Jaggi
b1c6fa5436
am 649c0ca2: am fc4d8043: am f510a8a6: Merge "Tint SIM images in PIN/PUK screen" into lmp-mr1-dev
...
* commit '649c0ca2a418fed4eff92b93e5e825c5814b4870':
Tint SIM images in PIN/PUK screen
2014-11-25 15:15:51 +00:00
Jorim Jaggi
649c0ca2a4
am fc4d8043: am f510a8a6: Merge "Tint SIM images in PIN/PUK screen" into lmp-mr1-dev
...
* commit 'fc4d8043ded6f8ef5dcf6ffdcb9f2f40c1c369f5':
Tint SIM images in PIN/PUK screen
2014-11-25 15:09:46 +00:00
Jorim Jaggi
cb17416a8d
am 0da89b76: resolved conflicts for merge of f0fc23a1 to lmp-mr1-dev-plus-aosp
...
* commit '0da89b76402816dade084166a97b1d352ae1f78b':
Fixed several time related states for secondary users
2014-11-25 15:04:28 +00:00
Jorim Jaggi
0da89b7640
resolved conflicts for merge of f0fc23a1 to lmp-mr1-dev-plus-aosp
...
Change-Id: I8f1dbae2ecd14ae4e51a9e86eb6d36dd56a48be1
2014-11-25 15:34:56 +01:00
Wink Saville
5c11e41b1a
am b4c54109: am 4f1cce63: am 12c2136e: Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev
...
* commit 'b4c5410987a6657b71fb0b86e1ef8337628241dc':
Additional changes to SubscriptionManager API as per API council.
2014-11-24 18:13:01 +00:00
Wink Saville
b4c5410987
am 4f1cce63: am 12c2136e: Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev
...
* commit '4f1cce63061976490e2e2cfc4085e1634d3a02de':
Additional changes to SubscriptionManager API as per API council.
2014-11-24 18:06:09 +00:00
Jorim Jaggi
f510a8a688
Merge "Tint SIM images in PIN/PUK screen" into lmp-mr1-dev
2014-11-24 16:26:03 +00:00
Geoff Mendal
b80417303f
Import translations. DO NOT MERGE
...
Change-Id: I99aa8bb6f0cd916b4ea4e4621a175cad9d43c3af
Auto-generated-cl: translation import
2014-11-24 06:29:27 -08:00
Geoff Mendal
905e20855b
Import translations. DO NOT MERGE
...
Change-Id: Ib51df7dd1177be11dbe75dc983866a9cfdf74511
Auto-generated-cl: translation import
2014-11-24 06:21:48 -08:00
Selim Cinek
962b06f9a0
Merge "Fixed several time related states for secondary users" into lmp-mr1-dev
2014-11-24 11:52:40 +00:00
Wink Saville
d09c4cad65
Additional changes to SubscriptionManager API as per API council.
...
bug: 17575308
Change-Id: Idd98aa46c15a9219ccf28091c62602ac8bf16c62
2014-11-22 10:08:16 -08:00
Amith Yamasani
9d4e6a8355
am 1f26bf6b: am 108bdbc9: am efb2df69: Merge "Different messages when wiping user and not device" into lmp-mr1-dev
...
* commit '1f26bf6bfd683b840f688b41d285fd9c942e6ed5':
Different messages when wiping user and not device
2014-11-22 00:00:01 +00:00
Amith Yamasani
1f26bf6bfd
am 108bdbc9: am efb2df69: Merge "Different messages when wiping user and not device" into lmp-mr1-dev
...
* commit '108bdbc934d1e5fb77406d0267ab67f8736dfc57':
Different messages when wiping user and not device
2014-11-21 23:07:03 +00:00
Jim Miller
7cc0a1f1bb
am 879a4ee8: Merge "Add multi-sim support to keyguard" into lmp-mr1-dev automerge: 0284e5e automerge: eab3240
...
* commit '879a4ee8b09e879de890dbbbc34629cd297572eb':
Add multi-sim support to keyguard
2014-11-21 22:32:40 +00:00
Amith Yamasani
efb2df698a
Merge "Different messages when wiping user and not device" into lmp-mr1-dev
2014-11-21 22:27:17 +00:00
Amith Yamasani
3a3d212a51
Different messages when wiping user and not device
...
There are 3 types of users
1. Primary - device will be wiped
2. Managed profile - profile will be removed
3. Secondary user - user will be removed
Show different messages for almost wipe and wipe in each
of these 3 cases.
Bug: 16843155
Change-Id: Icecfe520622773da9e45465bf2217e8ed38b266e
2014-11-21 13:57:48 -08:00
Jim Miller
879a4ee8b0
Merge "Add multi-sim support to keyguard" into lmp-mr1-dev automerge: 0284e5e
...
automerge: eab3240
* commit 'eab3240c78423e791a7f36864f55f94c25a5aba5':
Add multi-sim support to keyguard
2014-11-21 18:55:36 +00:00
Jim Miller
0284e5e498
Merge "Add multi-sim support to keyguard" into lmp-mr1-dev
2014-11-21 18:38:03 +00:00