summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge tag 'android-6.0.1_r22' of ↵staging/cm-13.0+r22Steve Kondik2016-03-1014-104/+22
|\ | | | | | | | | | | https://android.googlesource.com/platform/packages/apps/KeyChain into cm-13.0 Android 6.0.1 release 22
| * 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
| * | | 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
| * | | | am 10a0dc21: (-s ours) am 4d9ee901: (-s ours) am a5698f20: (-s ours) Import ↵Geoff Mendal2015-07-150-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | translations. DO NOT MERGE * commit '10a0dc21bbf73a9bfe01de47007d25c78a0d214e': Import translations. DO NOT MERGE
| | * | | am 4d9ee901: (-s ours) am a5698f20: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-150-0/+0
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit '4d9ee90111837f47a524e479eb161ff52990986d': Import translations. DO NOT MERGE
| * | | | | am 6553dd6e: (-s ours) am b9e4739a: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-130-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6553dd6e7cf2a95b2c3cb7f6e1c322a14bdcd86e': Import translations. DO NOT MERGE
| | * | | | am b9e4739a: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-130-0/+0
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b9e4739ac20adfc9f5adb6de46ea4055b88229da': Import translations. DO NOT MERGE
| * | | | | | am 6c34480e: Merge "KeyChain does not use cleartext network traffic." into ↵Alex Klyubin2015-06-091-1/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mnc-dev * commit '6c34480ef4f14a0f2afa70f310dec0a728ece7ed': KeyChain does not use cleartext network traffic.
| * | | | | | am 44c777b6: Switch from KeyStore.delKey/saw to KeyStore.delete/list.Alex Klyubin2015-06-082-2/+2
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '44c777b623d27a75b14dd20f7f1bd102d063c651': Switch from KeyStore.delKey/saw to KeyStore.delete/list.
| * \ \ \ \ \ \ am 67c838de: Merge "Replace String host:port/url args with Uri arg" into mnc-devRobin Lee2015-05-141-14/+6
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '67c838de37d8c3658391a46aba83dca522ab26f8': Replace String host:port/url args with Uri arg
| * \ \ \ \ \ \ \ am 5c26ba7d: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-05-140-0/+0
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5c26ba7dd266f488e5699bc1d7f2c32382666746': Import translations. DO NOT MERGE
* | | | | | | | | | Automatic translation importMichael Bestas2016-03-0513-0/+266
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic1dc9210216dbc9ff1746bdf7b67e4b90591be98
* | | | | | | | | | Automatic translation importMichael Bestas2015-12-254-0/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I83883788b7f37e90b857448380da45ebb0945af1
* | | | | | | | | | Merge tag 'android-6.0.0_r26' into cm-13.0Ricardo Cerqueira2015-11-054-5/+33
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | Android 6.0.0 release 26
| * | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2015-09-241-2/+2
| | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I87aa2f399acadcd3a904022c3dc5cdb40d52711e Auto-generated-cl: translation import
| * | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2015-09-184-6/+32
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I41d7cd44a85db234ff95643253f24ac0c3c23d70 Auto-generated-cl: translation import
| * | | | | | | am a5698f20: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-150-0/+0
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | / | | |_|_|_|_|/ | |/| | | | | * commit 'a5698f209dc9d79382233db011810f8e8f88c2c2': Import translations. DO NOT MERGE
* | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-07-1510-20/+18
| |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4ca5b6484619026f25227ba89a8b3fdc3bcf3e45 Auto-generated-cl: translation import
| * | | | | Import translations. DO NOT MERGEGeoff Mendal2015-07-119-17/+17
|/ / / / / | | | | | | | | | | | | | | | | | | | | Change-Id: I24bfadf3b3926fe50152cb88f4919fc03c1a9b62 Auto-generated-cl: translation import
* | | | | Merge "KeyChain does not use cleartext network traffic." into mnc-devAlex Klyubin2015-06-091-1/+2
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | KeyChain does not use cleartext network traffic.Alex Klyubin2015-05-201-1/+2
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This declares to the platform and tools that this app does not use cleartext network traffic. The platform and tools will be blocking (on best effort basis) attempts to use such traffic by this app. For example, attempts to use HTTP (rather than HTTPS) will be blocked. Bug: 19215516 Change-Id: I4c6215af47112f75c577fa1174d85ca2165aeea3
* / | | Switch from KeyStore.delKey/saw to KeyStore.delete/list.Alex Klyubin2015-06-082-2/+2
|/ / / | | | | | | | | | | | | | | | | | | | | | KeyStore.delKey was replaced by KeyStore.delete, and KeyStore.saw was replaced by KeyStore.list. Bug: 18088752 Change-Id: I45eae9d252dc304f9d8d6fa8bfd1a9729ef090b3
* | | Merge "Replace String host:port/url args with Uri arg" into mnc-devRobin Lee2015-05-141-14/+6
|\ \ \ | |_|/ |/| |
| * | Replace String host:port/url args with Uri argRobin Lee2015-05-111-14/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | Uri provides a stronger guarantee of well-formedness and lets apps do nice extra things like specifying scheme etc. without twisting any expectations. Bug: 20820034 Change-Id: Ia6bbedb74765444920b667d643fb7e1eb6a7292b
* | | Import translations. DO NOT MERGEGeoff Mendal2015-05-132-0/+56
| |/ |/| | | | | | | Change-Id: If5dfed0f846c2686efb664afd6791c721864507b Auto-generated-cl: translation import
* | Track keystore password method changesChad Brubaker2015-05-073-5/+5
|/ | | | Change-Id: I324914c00195d762cbaa8c63084e41fa796b7df8
* Import translations. DO NOT MERGEGeoff Mendal2015-04-251-0/+28
| | | | | Change-Id: Ibbeb4881952f7f4095c2e718f77154748b9f5517 Auto-generated-cl: translation import
* Import translations. DO NOT MERGEGeoff Mendal2015-03-211-0/+28
| | | | | Change-Id: Id8741a060aa1bf83a380fe8e0d47869050b63547 Auto-generated-cl: translation import
* Import translations. DO NOT MERGEGeoff Mendal2015-03-161-2/+2
| | | | | Change-Id: Ifef1ebd3b4b2c70ebcaac08adcaad25e5ee73afb Auto-generated-cl: translation import
* am 3e2ffa63: (-s ours) am 0ed51eff: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-02-260-0/+0
|\ | | | | | | | | * commit '3e2ffa63ebf6827fbe261ec6e9357cc40ec6fe1f': Import translations. DO NOT MERGE
| * am 0ed51eff: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-02-260-0/+0
| |\ | | | | | | | | | | | | * commit '0ed51eff351d940b8aa2ce92f28c805e307bfb9f': Import translations. DO NOT MERGE
| | * Import translations. DO NOT MERGEGeoff Mendal2015-02-266-7/+7
| |/ | | | | | | | | Change-Id: Idd39dd9905d8772e846b31cfbd071034aa1d3ba6 Auto-generated-cl: translation import
* | Import translations. DO NOT MERGEGeoff Mendal2015-02-251-1/+1
| | | | | | | | | | Change-Id: I463c17186cba380ba46a9437c52dab9df58d5ad1 Auto-generated-cl: translation import
* | Make UID parameter an intRobin Lee2015-02-171-3/+4
| | | | | | | | | | | | | | The caller's uid is also acquired at an earlier stage to make mistakes a little less likely. Change-Id: Icbf6e2e97cb6301b968b3eb8b3f9a46331f7983e
* | Merge "Use device policy suggestions when choosing alias"Robin Lee2015-02-161-7/+61
|\ \
| * | Use device policy suggestions when choosing aliasRobin Lee2015-02-041-7/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Query device policy for a suggested certificate before showing any kind of selection UI. The RPC call is made at the same time as retrieving and listing certificates so performance impact should be relatively small. Bug: 15065444 Change-Id: I0729b435c218b7991e6cb5faedefb7900577afcc
* | | am c5674708: (-s ours) am a3f9bea0: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-02-120-0/+0
|\ \ \ | |/ / |/| / | |/ | | * commit 'c567470803e76646c8b356f062dca79e7661c5c6': Import translations. DO NOT MERGE
| * am a3f9bea0: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-02-120-0/+0
| |\ | | | | | | | | | | | | * commit 'a3f9bea0a7fc8ead2d78a99c8c78d453cdef985f': Import translations. DO NOT MERGE
| | * Import translations. DO NOT MERGEGeoff Mendal2015-02-125-6/+6
| | | | | | | | | | | | | | | Change-Id: I851c8d01a4fca61a9af8edad51f407e7e6495e6b Auto-generated-cl: translation import
* | | Import translations. DO NOT MERGEGeoff Mendal2015-02-021-1/+1
| | | | | | | | | | | | | | | Change-Id: I395fe445f47b977d59af90302dd7b81fb6c8d329 Auto-generated-cl: translation import
* | | Import translations. DO NOT MERGEGeoff Mendal2015-01-201-1/+1
| | | | | | | | | | | | | | | Change-Id: I41a7c9df7b0a3da52fdb8b695bfca993ed1242a2 Auto-generated-cl: translation import
* | | Import translations. DO NOT MERGEGeoff Mendal2015-01-051-1/+1
| | | | | | | | | | | | | | | Change-Id: I4563542ca41c5554d1b2b7f0139da1cecda20f0b Auto-generated-cl: translation import
* | | Import translations. DO NOT MERGEBaligh Uddin2014-12-221-1/+1
| | | | | | | | | | | | | | | Change-Id: I98c36a745527a5e4c4324cb262ba9e4a5256528e Auto-generated-cl: translation import
* | | Import translations. DO NOT MERGEGeoff Mendal2014-12-171-1/+1
| | | | | | | | | | | | | | | Change-Id: Ic9b16027a186675d65ac015c60b7275940d468d5 Auto-generated-cl: translation import
* | | Import translations. DO NOT MERGEGeoff Mendal2014-12-081-1/+1
| | | | | | | | | | | | | | | Change-Id: I8990050edbae501d86a49ac0c7a47b236c8b7f99 Auto-generated-cl: translation import
* | | Import translations. DO NOT MERGEGeoff Mendal2014-11-241-1/+1
| | | | | | | | | | | | | | | Change-Id: I538e5b37fed489349271f44e556ebce9cfbd2fa6 Auto-generated-cl: translation import
* | | Import translations. DO NOT MERGEGeoff Mendal2014-11-171-1/+1
| | | | | | | | | | | | | | | Change-Id: I94b37c178962291af02dcd8e3f72fd56e92bbfdb Auto-generated-cl: translation import
* | | am 2d1fc8a1: am 1493cd63: am 137cd8d8: Call local finish(String) on cancelKenny Root2014-11-150-0/+0
|\| | | | | | | | | | | | | | * commit '2d1fc8a1a39d4f384bddf141b9d18b9876dc4e94': Call local finish(String) on cancel
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-13 07:21:11 +0000