Adrian Roos
a52a37b0fe
am 1b0b38cf: am 5d3c8c89: am 90630f6a: am 09235d10: am 82b3e62a: am 4692a48c: am c4bfea20: am 3f38173f: am 3a7690b1: am 8184ea52: Add lockout after trying to enter PIN / Password too often
...
* commit '1b0b38cfeb54638899ddab48ff9198590f951a55':
Add lockout after trying to enter PIN / Password too often
2014-04-03 14:38:30 +00:00
Adrian Roos
1b0b38cfeb
am 5d3c8c89: am 90630f6a: am 09235d10: am 82b3e62a: am 4692a48c: am c4bfea20: am 3f38173f: am 3a7690b1: am 8184ea52: Add lockout after trying to enter PIN / Password too often
...
* commit '5d3c8c89fca09ee190fe8df37e76ff05cc3833b1':
Add lockout after trying to enter PIN / Password too often
2014-04-03 14:35:13 +00:00
Adrian Roos
5d3c8c89fc
am 90630f6a: am 09235d10: am 82b3e62a: am 4692a48c: am c4bfea20: am 3f38173f: am 3a7690b1: am 8184ea52: Add lockout after trying to enter PIN / Password too often
...
* commit '90630f6a6d19e169befb8ad8117d53200eb562c4':
Add lockout after trying to enter PIN / Password too often
2014-04-03 14:29:57 +00:00
Adrian Roos
90630f6a6d
am 09235d10: am 82b3e62a: am 4692a48c: am c4bfea20: am 3f38173f: am 3a7690b1: am 8184ea52: Add lockout after trying to enter PIN / Password too often
...
* commit '09235d1065b501aa8a42e0767d72c15e7b846bae':
Add lockout after trying to enter PIN / Password too often
2014-04-03 14:23:57 +00:00
Adrian Roos
09235d1065
am 82b3e62a: am 4692a48c: am c4bfea20: am 3f38173f: am 3a7690b1: am 8184ea52: Add lockout after trying to enter PIN / Password too often
...
* commit '82b3e62a4f8c8a229f700bbf122b8f8854162146':
Add lockout after trying to enter PIN / Password too often
2014-04-03 14:17:11 +00:00
Adrian Roos
82b3e62a4f
am 4692a48c: am c4bfea20: am 3f38173f: am 3a7690b1: am 8184ea52: Add lockout after trying to enter PIN / Password too often
...
* commit '4692a48c28d7002221fec28d5ac324636f81c8f2':
Add lockout after trying to enter PIN / Password too often
2014-04-03 14:11:02 +00:00
Adrian Roos
4692a48c28
am c4bfea20: am 3f38173f: am 3a7690b1: am 8184ea52: Add lockout after trying to enter PIN / Password too often
...
* commit 'c4bfea207acf62c9e70949d3225d082d95d4d193':
Add lockout after trying to enter PIN / Password too often
2014-04-03 14:05:07 +00:00
Adrian Roos
c4bfea207a
am 3f38173f: am 3a7690b1: am 8184ea52: Add lockout after trying to enter PIN / Password too often
...
* commit '3f38173fadc1423d4c36b265a2ab5fdc09d88271':
Add lockout after trying to enter PIN / Password too often
2014-04-03 13:58:57 +00:00
Adrian Roos
3f38173fad
am 3a7690b1: am 8184ea52: Add lockout after trying to enter PIN / Password too often
...
* commit '3a7690b157c100f3a36b6fdc2578a12845875e06':
Add lockout after trying to enter PIN / Password too often
2014-04-03 13:55:28 +00:00
Adrian Roos
3a7690b157
am 8184ea52: Add lockout after trying to enter PIN / Password too often
...
* commit '8184ea524519a67b1284266844e6e186f3a74cab':
Add lockout after trying to enter PIN / Password too often
2014-04-03 13:49:53 +00:00
Adrian Roos
8184ea5245
Add lockout after trying to enter PIN / Password too often
...
Enforce the same lockout that is already enforced when entering the pattern.
Bug: 13647935
Change-Id: Ia60a2235ad526c293b7a8d5600f406f187004df7
2014-04-02 16:28:10 +02:00
Xia Wang
836eff87a9
Merge "Add legacy VPN test framework and test cases" into klp-dev
2014-04-02 03:36:50 +00:00
Xia Wang
340bda7154
Add legacy VPN test framework and test cases
...
- VpnProfileParser can parse VPN profiles from an xml file
- CertInstallerHelper installs keys and certificates to keystore
- VpnTests includes all test cases
Change-Id: Ib5ce33e770ee4f82bea153f9b5c5cf3802f95b0c
2014-04-01 17:45:58 -07:00
Baligh Uddin
112916b596
Import translations. DO NOT MERGE
...
Change-Id: I0208bc3b072d49bb77ea2f07e365b1982bb5e324
Auto-generated-cl: translation import
2014-03-31 14:40:25 -07:00
Baligh Uddin
3a9b49f975
Import translations. DO NOT MERGE
...
Change-Id: I81d83e8408295dcc6e24b92459170e9d81d2ec0f
Auto-generated-cl: translation import
2014-03-26 14:08:55 -07:00
Baligh Uddin
da4a6a53d4
Import translations. DO NOT MERGE
...
Change-Id: Ifc3cdc5dd618ef6c452303597b5abc791e0bf5af
Auto-generated-cl: translation import
2014-03-24 12:59:14 -07:00
Baligh Uddin
947e899585
Import translations. DO NOT MERGE
...
Change-Id: I4fe915d0452b637fc646265dca39732877a12444
Auto-generated-cl: translation import
2014-03-19 13:10:41 -07:00
Geoff Mendal
e8de72e53a
Import translations. DO NOT MERGE
...
Change-Id: I85a8b58b4ced6be66f751e4315f5b039e0378355
Auto-generated-cl: translation import
2014-03-17 12:42:54 -07:00
David Braun
edcb923df6
Add string parameter order to default SMS dialog text
...
Bug: 13433191 cs - Android - Other: Swapped placeholders in Hangouts confirmation message, reverse m
Change-Id: I8d00c58e5000b3851304d48c4681f9ebe2eebec8
2014-03-13 11:20:48 -07:00
Baligh Uddin
7c35c10ebc
Import translations. DO NOT MERGE
...
Change-Id: Ide5d8c50abddb80d6e820777804ed8f0a2a93327
Auto-generated-cl: translation import
2014-03-12 12:02:29 -07:00
Baligh Uddin
14b82fd73f
Merge "Import translations. DO NOT MERGE" into klp-dev
2014-03-11 17:37:53 +00:00
Alan Viverette
8840aa4c40
Merge "DO NOT MERGE Add preference for caption text opacity" into klp-dev
2014-03-11 02:11:52 +00:00
Alan Viverette
d43d5becb3
Merge "DO NOT MERGE Remove extra fragment in captioning preferences" into klp-dev
2014-03-11 02:11:41 +00:00
Baligh Uddin
f1b94b2f67
Import translations. DO NOT MERGE
...
Change-Id: I7cdee6a82eff27c06e0b0039a695d28de2339011
Auto-generated-cl: translation import
2014-03-10 15:28:38 -07:00
Wei Wang
104eea0b97
Merge "DO NOT MERGE Change bluetooth off display message." into klp-dev
2014-03-08 02:00:37 +00:00
Alan Viverette
00f221dc9e
DO NOT MERGE Add preference for caption text opacity
...
BUG: 11990225
Change-Id: Ib7dd92fd3e44931a1a4a2603effb02550b4fbc59
2014-03-07 14:06:29 -08:00
Alan Viverette
af28facb6f
DO NOT MERGE Remove extra fragment in captioning preferences
...
BUG: 11813771
Change-Id: Ied0b268aca93d7081cdcee1ea9db6347a762e3ac
2014-03-07 14:06:07 -08:00
Rob Fletcher
549a39b495
DO NOT MERGE HTML injection fix for bluetooth pairing, issue 65946
...
During bluetooth pairing, HTML injection is possible via the device name displayed to the user. This escapes the device name, before creating HTML from it, so it will preserve things like < and > but will not affect rendering of HTML
Bug: 12976386
Change-Id: I8a02d3be8c1a779dc9ed1c9ef8083a1159ab3f2b
2014-03-06 11:51:15 -08:00
Wei Wang
1a188f4075
DO NOT MERGE Change bluetooth off display message.
...
Cherry picking ble advertising changes from master to KLP MR2.
b/13137996
Change-Id: I71ef30fbb005c60efe1497a33d1758be07c7f1a8
2014-03-06 18:45:35 +00:00
Baligh Uddin
d83484dba0
Import translations. DO NOT MERGE
...
Change-Id: I96d7cdea504fe320dc1768f1e0dbae23d5901fbd
Auto-generated-cl: translation import
2014-02-20 07:23:08 -08:00
Amith Yamasani
3c4603ef1c
am 8f948217: am c68a6bde: am 0ad77445: am 7c0ada65: am 3f722079: am 1ba09366: am 0fce6123: am 7a2d8bd4: am 49d502a4: am c7843db0: Remove unused DebugIntentSender
...
* commit '8f9482170835059c11cffa9c554191306db49fbd':
Remove unused DebugIntentSender
2014-02-05 20:35:24 +00:00
Amith Yamasani
8f94821708
am c68a6bde: am 0ad77445: am 7c0ada65: am 3f722079: am 1ba09366: am 0fce6123: am 7a2d8bd4: am 49d502a4: am c7843db0: Remove unused DebugIntentSender
...
* commit 'c68a6bde44203cae70c50f6194cce22c9be5c48e':
Remove unused DebugIntentSender
2014-02-05 12:33:48 -08:00
Amith Yamasani
c68a6bde44
am 0ad77445: am 7c0ada65: am 3f722079: am 1ba09366: am 0fce6123: am 7a2d8bd4: am 49d502a4: am c7843db0: Remove unused DebugIntentSender
...
* commit '0ad774458a627cc4608c717a7efdadf2404d973c':
Remove unused DebugIntentSender
2014-02-05 12:30:42 -08:00
Amith Yamasani
0ad774458a
am 7c0ada65: am 3f722079: am 1ba09366: am 0fce6123: am 7a2d8bd4: am 49d502a4: am c7843db0: Remove unused DebugIntentSender
...
* commit '7c0ada65542f2c9b3899337b085aace13fcc7142':
Remove unused DebugIntentSender
2014-02-05 11:52:23 -08:00
Amith Yamasani
7c0ada6554
am 3f722079: am 1ba09366: am 0fce6123: am 7a2d8bd4: am 49d502a4: am c7843db0: Remove unused DebugIntentSender
...
* commit '3f72207985a5a636d14800d0b8094c28220a8e00':
Remove unused DebugIntentSender
2014-02-05 11:27:30 -08:00
Amith Yamasani
3f72207985
am 1ba09366: am 0fce6123: am 7a2d8bd4: am 49d502a4: am c7843db0: Remove unused DebugIntentSender
...
* commit '1ba09366ccc174d71572ddbe0b80814982d2ae9b':
Remove unused DebugIntentSender
2014-02-05 11:22:46 -08:00
Amith Yamasani
1ba09366cc
am 0fce6123: am 7a2d8bd4: am 49d502a4: am c7843db0: Remove unused DebugIntentSender
...
* commit '0fce6123bddf505d1dab3d7a7daff05a0832c007':
Remove unused DebugIntentSender
2014-02-05 11:19:03 -08:00
Amith Yamasani
0fce6123bd
am 7a2d8bd4: am 49d502a4: am c7843db0: Remove unused DebugIntentSender
...
* commit '7a2d8bd4b008efabd57e258f782e8bb59b5a09df':
Remove unused DebugIntentSender
2014-02-05 11:15:01 -08:00
Amith Yamasani
7a2d8bd4b0
am 49d502a4: am c7843db0: Remove unused DebugIntentSender
...
* commit '49d502a45d9b7536d38210590c99d8c99a43e4d9':
Remove unused DebugIntentSender
2014-02-05 11:09:40 -08:00
Amith Yamasani
49d502a45d
am c7843db0: Remove unused DebugIntentSender
...
* commit 'c7843db06c736ed8b8635f2b5d52fdd891fbf69b':
Remove unused DebugIntentSender
2014-02-05 11:04:25 -08:00
Amith Yamasani
c7843db06c
Remove unused DebugIntentSender
...
Bug: 12722251
Change-Id: Idb5f7e2fcf4da6826c9fcb2499af9cf9c189dfeb
(cherry picked from commit 26430486e4
2014-02-04 23:48:05 +00:00
Baligh Uddin
6b8a7116a2
Import translations. DO NOT MERGE
...
Change-Id: I06e9ef8b9e6bdabcb6daf0ba0761a367bd798918
Auto-generated-cl: translation import
2014-01-06 18:46:29 -08:00
Baligh Uddin
0ae418b207
Import translations. DO NOT MERGE
...
Change-Id: I36c9a623cd5f1eb08fae29edf50d82e9a8cd5846
Auto-generated-cl: translation import
2013-12-30 15:09:59 -08:00
Baligh Uddin
0f952752e3
Import translations. DO NOT MERGE
...
Change-Id: I4f4f30cdf374729ad15bd018d7ae6d926f8d6f1d
Auto-generated-cl: translation import
2013-12-26 16:26:39 -08:00
Baligh Uddin
7ba7272113
Import translations. DO NOT MERGE
...
Change-Id: Ib169fe13c8487481f13d4a17b9f09bd04883f93e
Auto-generated-cl: translation import
2013-12-18 22:12:01 -08:00
Baligh Uddin
1177cdec4e
Import translations. DO NOT MERGE
...
Change-Id: I41e0c190e9f01cfccff03435cebbf732b603751f
Auto-generated-cl: translation import
2013-12-16 12:44:01 -08:00
Baligh Uddin
879cc42fb3
Import translations. DO NOT MERGE
...
Change-Id: I653a48c8fe5951d7987fc807befc343913ae11f3
Auto-generated-cl: translation import
2013-12-11 20:01:51 -08:00
Baligh Uddin
233d666aee
Import translations. DO NOT MERGE
...
Change-Id: I6e55230f7b85d2e90578617e879802d6d40eb6d2
Auto-generated-cl: translation import
2013-12-09 11:47:45 -08:00
Lance Jin-woong Chang
5d65a47c39
Merge "Revert "Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change Bug: 11923434 Change-Id: I34a353137338b0f8d55e2309f037c34922141181"" into klp-dev
2013-12-05 01:27:46 +00:00
Lance Jin-woong Chang
0637c1f909
Revert "Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change Bug: 11923434 Change-Id: I34a353137338b0f8d55e2309f037c34922141181"
...
This reverts commit 5796dad9a4
2013-12-05 00:59:51 +00:00
