summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Automatic translation importstaging/cm-14.1-cafrebaseinky@build012016-12-3018-0/+505
| | | | | Change-Id: Ie97fdae55e61b02ebcb943617e5e0e6c1eae7387 Ticket: -
* Merge d9530a5dd830ba16ad838267d9991df56a662702 on remote branchLinux Build Service Account2016-12-152-11/+1
|\ | | | | | | Change-Id: I8c4f379cc0dc6220e926d9c87d3f3cb22c2db82f
| * Merge N-MR1 to remote branch.Lalit Kansara2016-12-082-11/+1
|/| | | | | | | Change-Id: I003bc00596eab7ff4493b43c1a2270c6aef17e86
| * Import translations. DO NOT MERGEBill Yi2016-07-202-5/+5
| | | | | | | | | | Change-Id: Ic2f479d4b4ca3a321bc828f8c43f3f243bf7d10e Auto-generated-cl: translation import
| * Revert "Apply user restriction to KeyChainService."Robin Lee2016-06-231-10/+0
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 3fb7449c95754dedca4220948561b5f8617b8b2c. All UI components listen to this restriction now. It should not be checked in the service any more as this prevents silent installation of certificates through policy. Change-Id: Ib113e944355629de99392a3a31eaac5c3d2607ef Fix: 28967587 (cherry picked from commit 2e03cc10247bcd370c742d34c26c1f5eaacf71a3)
| * Refresh checked state when choosing certificates.Rubin Xu2016-06-171-0/+2
| |\ | |/ |/| | | | | | | am: 01b70dc543 Change-Id: Ia50d653069e4f3c9d8b74912c6f3c5e45e1d97ae
* | Refresh checked state when choosing certificates.staging/cm-14.0cm-14.0Rubin Xu2016-06-151-0/+2
| | | | | | | | | | Change-Id: Icba8e75deaec1ffed7f11378cd2fe77bac40797b Fix: 27913435
| * Import translations. DO NOT MERGEBill Yi2016-06-030-0/+0
| |\ | |/ |/| | | | | | | | | | | | | am: 74e2df03d5 -s ours * commit '74e2df03d53a4feb2b4548e6c974cf2458009560': Import translations. DO NOT MERGE Change-Id: I67856b457a92e9359d4e2440ec7d01e2c97c7e96
* | Import translations. DO NOT MERGEBill Yi2016-06-038-10/+10
| | | | | | | | | | Change-Id: Icbd5309296aa3ce7a16b53f85a836dc8a3c603d2 Auto-generated-cl: translation import
| * Import translations. DO NOT MERGEBill Yi2016-06-0317-24/+24
| | | | | | | | | | Change-Id: I38444a289be2d90750482bfc2df09087f0fdb011 Auto-generated-cl: translation import
| * Import translations. DO NOT MERGEBaligh Uddin2016-05-220-0/+0
| |\ | |/ |/| | | | | | | | | | | | | am: c001658521 -s ours * commit 'c001658521bf2c9b12bfb320c0206c3ca42b1aa9': Import translations. DO NOT MERGE Change-Id: I936161eb0e3741f44a7357947adbf035d8b478bb
* | Import translations. DO NOT MERGEBaligh Uddin2016-05-2113-20/+20
|/ | | | | | | Auto-generated-cl: translation import Bug: 28857042 Change-Id: I2ee0f5546c76c1a0ff0090d27e1d7ba0b6a222e6
* Install client cert chain as CA_CERTIFICATE in keystoreRubin Xu2016-03-241-1/+26
| | | | | | | CA_CERTIFICATE should store the cert chain minus the leaf cert. Bug: 18239590 Change-Id: Ie05715ea07ba71bcf206050af461bc478a9ce643
* Import translations. DO NOT MERGEGeoff Mendal2016-03-193-4/+60
| | | | | Change-Id: I3595a8db4b3fe4feacc6275f2385f4924f45727c Auto-generated-cl: translation import
* keychain: Remove unnecessary core-tests dependencyBrian Carlstrom2016-03-081-1/+1
| | | | | Bug: 27555885 Change-Id: I7618377ff6928695ec5f0f9a4627c227223cd5f1
* Delete grants when keypair is removedRobin Lee2016-03-021-1/+16
| | | | | | | | Otherwise the grant will linger even if another keypair is installed with the same alias. It's better if that doesn't happen. Bug: 27335182 Change-Id: I72491201c807e3e70f0085e6f1b364d692de8d0a
* Removing GET_ACCOUNTS permission.Carlos Valdivia2016-02-161-7/+6
| | | | | | | | It doesn't appear that GET_ACCOUNTS was ever needed in KeyChain and it is going to be non-functional in targetSdkVersion >= 24. Bug: 21901286 Change-Id: Id393d884e1dc5f67863bb0146c589aee3abd9091
* Import translations. DO NOT MERGEGeoff Mendal2016-02-031-1/+1
| | | | | Change-Id: I9c79214f0754437352e5af3f5f10b0d4b280a547 Auto-generated-cl: translation import
* Import translations. DO NOT MERGE am: fe4ab758a3 -s ours am: 43fd759659 -s ↵Geoff Mendal2016-02-020-0/+0
|\ | | | | | | | | | | | | | | | | ours am: 3a247e9b34 -s ours * commit '3a247e9b343590bdf8d50c1adea3f31e95e0fbbd': Import translations. DO NOT MERGE
| * Import translations. DO NOT MERGE am: fe4ab758a3 -s oursGeoff Mendal2016-02-020-0/+0
| |\ | | | | | | | | | | | | | | | | | | am: 43fd759659 -s ours * commit '43fd7596598e1ba67609bf764b6dd10059341a99': Import translations. DO NOT MERGE
| | * Import translations. DO NOT MERGEGeoff Mendal2016-02-020-0/+0
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | am: fe4ab758a3 -s ours * commit 'fe4ab758a3f9da6aa9be3876d097e52232ba88cb': Import translations. DO NOT MERGE
| | | * Import translations. DO NOT MERGEGeoff Mendal2016-02-0215-27/+109
| | | | | | | | | | | | | | | | | | | | Change-Id: I5789e52cf7d9ec04fcf8fb3f14888c300912dedd Auto-generated-cl: translation import
* | | | Import translations. DO NOT MERGE am: b81e580dba -s oursGeoff Mendal2016-02-020-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | am: a698f323c2 -s ours * commit 'a698f323c203b276a0b18e72aa3807c66b443e04': Import translations. DO NOT MERGE
| * | | Import translations. DO NOT MERGEGeoff Mendal2016-02-020-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | am: b81e580dba -s ours * commit 'b81e580dbaa5eac7a94d477237c4b549c0a79d7d': Import translations. DO NOT MERGE
| | * | Import translations. DO NOT MERGEGeoff Mendal2016-02-0215-27/+109
| | |/ | | | | | | | | | | | | Change-Id: I1960ecabf0aec537fa0454d89108ccacfe3731ea Auto-generated-cl: translation import
* | | Import translations. DO NOT MERGEGeoff Mendal2016-01-271-1/+1
| | | | | | | | | | | | | | | Change-Id: I349db2c34f2251bb248eb96b2f614db4a930d79e Auto-generated-cl: translation import
* | | Import translations. DO NOT MERGEGeoff Mendal2016-01-181-2/+2
| | | | | | | | | | | | | | | Change-Id: Iab08110342a3426ef542d37b8e16682faf66ecf0 Auto-generated-cl: translation import
* | | Import translations. DO NOT MERGEGeoff Mendal2015-12-161-0/+28
| | | | | | | | | | | | | | | Change-Id: If38005adecc232a91a241a670d0ab07c45f6a559 Auto-generated-cl: translation import
* | | Implement removeKeyPairRobin Lee2015-12-081-0/+5
| | | | | | | | | | | | | | | Bug: 22541933 Change-Id: I37317e7c22e89816156e6e9a7abf4c5a59e8440a
* | | Import translations. DO NOT MERGEGeoff Mendal2015-11-091-2/+2
| | | | | | | | | | | | | | | Change-Id: I4de97a7f2de8b0dfc9e56cd6528cd48940aec50b Auto-generated-cl: translation import
* | | Import translations. DO NOT MERGE am: 2beb2d2d6d -s oursBaligh Uddin2015-11-050-0/+0
|\| | | | | | | | | | | | | | | | | | | | am: a26ccf3abf -s ours * commit 'a26ccf3abf7781499ee2a7bffb5a7c2e2f12fc62': Import translations. DO NOT MERGE
| * | Import translations. DO NOT MERGEBaligh Uddin2015-11-050-0/+0
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | am: 2beb2d2d6d -s ours * commit '2beb2d2d6d2a12df8e4555b536473c8f34f6e0d6': Import translations. DO NOT MERGE
| | * | Import translations. DO NOT MERGEBaligh Uddin2015-11-0412-22/+48
| |/ / | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 25433205 Change-Id: Ibffd2522a3e1c9739435dd0e8dd0b1216a0c7492
* | | Import translations. DO NOT MERGEGeoff Mendal2015-10-121-1/+1
| | | | | | | | | | | | | | | Change-Id: I913cf0dc5ed15ad8be195bee85cac7f6a8387381 Auto-generated-cl: translation import
* | | am a7ec6c4a: (-s ours) am 00f9406a: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2015-09-290-0/+0
|\| | | | | | | | | | | | | | * commit 'a7ec6c4a1e6d331417f5e94c1d455878e92b4d0c': Import translations. DO NOT MERGE
| * | am 00f9406a: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2015-09-290-0/+0
| |\ \ | | | | | | | | | | | | | | | | * commit '00f9406acbd7d956e8cd7d1a1a5e0b2015f03cca': Import translations. DO NOT MERGE
| | * | Import translations. DO NOT MERGEBaligh Uddin2015-09-2912-22/+48
| | | | | | | | | | | | | | | | | | | | Change-Id: Ia61872df6f89de2d3d8f5f893977903818b12a5e Auto-generated-cl: translation import
* | | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2015-09-271-2/+2
|\ \ \ \
| * | | | Import translations. DO NOT MERGEBaligh Uddin2015-09-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic069cef8932bbcad7f7be8e044663b49d568adf0 Auto-generated-cl: translation import
* | | | | am 32916adb: (-s ours) am bbdf253c: (-s ours) am 4e3ae4c3: (-s ours) am ↵Baligh Uddin2015-09-250-0/+0
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | | | | | | | | | | | | 4eaca148: (-s ours) Import translations. DO NOT MERGE * commit '32916adb62fbbb8a15c20296a8e6b71bb4478266': Import translations. DO NOT MERGE
| * | | am bbdf253c: (-s ours) am 4e3ae4c3: (-s ours) am 4eaca148: (-s ours) Import ↵Baligh Uddin2015-09-250-0/+0
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | translations. DO NOT MERGE * commit 'bbdf253cf21c31940e3fda795ddfc63bd8edc104': Import translations. DO NOT MERGE
| | * | am 4e3ae4c3: (-s ours) am 4eaca148: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2015-09-250-0/+0
| | |\ \ | | | | | | | | | | | | | | | | | | | | * commit '4e3ae4c3ac0a7ee79e342bbb0e51e6fa6d431009': Import translations. DO NOT MERGE
| | | * \ am 4eaca148: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2015-09-250-0/+0
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit '4eaca1480bb1313200a32a1e6c3cfad5cb1bf415': Import translations. DO NOT MERGE
| | | | * | Import translations. DO NOT MERGEBaligh Uddin2015-09-241-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I87aa2f399acadcd3a904022c3dc5cdb40d52711e Auto-generated-cl: translation import
* | | | | | am 836e2302: (-s ours) am ba9f859f: (-s ours) am 008f8f0d: (-s ours) am ↵Baligh Uddin2015-09-190-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e924107c: (-s ours) Import translations. DO NOT MERGE * commit '836e23020e0ff44a3821592595dee89e37398a3b': Import translations. DO NOT MERGE
| * | | | | am ba9f859f: (-s ours) am 008f8f0d: (-s ours) am e924107c: (-s ours) Import ↵Baligh Uddin2015-09-190-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | translations. DO NOT MERGE * commit 'ba9f859ff76b506e1a5d8c84fad6e576b1aa09ff': Import translations. DO NOT MERGE
| | * | | | am 008f8f0d: (-s ours) am e924107c: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2015-09-190-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '008f8f0da55a59268bfc4dbe1ef2dbe49c2db3d4': Import translations. DO NOT MERGE
| | | * | | am e924107c: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2015-09-190-0/+0
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e924107c222469383de4f1ce0d7356d8da4de3da': Import translations. DO NOT MERGE
| | | | * | Import translations. DO NOT MERGEBaligh Uddin2015-09-184-6/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I41d7cd44a85db234ff95643253f24ac0c3c23d70 Auto-generated-cl: translation import
* | | | | | Import translations. DO NOT MERGEBaligh Uddin2015-09-101-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I80ce9f0b01b8a572be974819cd0060090bb9144e Auto-generated-cl: translation import