summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Automatic translation importstable/cm-12.1-YOG7DAbhisek Devkota2016-05-2317-0/+642
| | | | | Change-Id: I44f0aae32a4040fc6055d7ecd8079846743bb1cd Ticket: RM-170
* Merge tag 'android-5.1.1_r37' into HEADJessica Wagantall2016-04-042-1/+8
|\ | | | | | | | | Ticket: CYNGNOS-2213 Android 5.1.1 release 37
| * Trust CA certificates added for the whole OS onlyRobin Lee2016-02-262-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | Excludes any CA certificates installed for wifi-only from being used for anything else. Does not take effect retroactively against certs which were already installed. The CAs will continue to be saved to a part of the keystore accessible by services running under WIFI_UID. Bug: 26324357 Bug: 25780055 Change-Id: Ifeb9daf24c9f9a22b2b2daf247d5622c707c9885
* | Catch corrupt cert errorEd Falk2015-09-081-11/+15
| | | | | | | | | | | | | | | | Wraps cert-reading code in try..catch to deal with corrupted certs. If a cert is corrupted, prints info message and proceeds as if cert had been null. Change-Id: I765f39f0e1022d21a39115ecd6b9d3420889327c
* | Merge tag 'android-5.1.0_r1' of ↵staging/cm-12.1stable/cm-12.1-YOG3CSteve Kondik2015-03-155-12/+12
|\| | | | | | | | | | | https://android.googlesource.com/platform/packages/apps/CertInstaller into cm-12.1 Android 5.1.0 release 1
| * am cf188a52: (-s ours) am d48b66cd: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-10-190-0/+0
| |\ | | | | | | | | | | | | * commit 'cf188a522bbe43c5af0f7a3878b02eb37d1e8df8': Import translations. DO NOT MERGE
| | * am d48b66cd: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-10-190-0/+0
| | |\ | | | | | | | | | | | | | | | | * commit 'd48b66cdec04ed54463dd7017af784e82aab7b4a': Import translations. DO NOT MERGE
| * | | am a13a813b: (-s ours) am 4b7effff: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-09-300-0/+0
| |\| | | | | | | | | | | | | | | | | | * commit 'a13a813bd04d626221a17e96bd9d213eaca3afa9': Import translations. DO NOT MERGE
| | * | am 4b7effff: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-09-300-0/+0
| | |\ \ | | | | | | | | | | | | | | | | | | | | * commit '4b7effff047f63a00ae94fbb02e21056b2b0ea62': Import translations. DO NOT MERGE
| * | | | am 56611958: (-s ours) am fb3b6190: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-09-160-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | * commit '566119583656568b2914570d822c6477db7c739c': Import translations. DO NOT MERGE
| | * | | am fb3b6190: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-09-160-0/+0
| |/| | | | | | | | | | | | | | | | | | | | | | | * commit 'fb3b619032f4d1d1a84b54fa8b155100b6727828': Import translations. DO NOT MERGE
* | | | | Automatic translation importstable/cm-12.0-YNG4Nstable/cm-12.0-YNG3Cstable/cm-12.0-YNG1TAstable/cm-12.0-YNG1Tstable/cm-12.0-YNG1Icm-12.0Michael Bestas2015-02-104-0/+220
| |_|_|/ |/| | | | | | | | | | | Change-Id: Idb5b17a9abc27c35bfcc5a0b7c86a146b16e3461
* | | | Import translations. DO NOT MERGEstaging/cm-12.0-cafBaligh Uddin2014-10-191-2/+2
| |_|/ |/| | | | | | | | | | | Change-Id: Idc9c1b825391e533184cefc9442a118fff6da4b3 Auto-generated-cl: translation import
* | | Import translations. DO NOT MERGEBaligh Uddin2014-09-283-5/+5
| |/ |/| | | | | | | Change-Id: Ic16fc3fb5c74141bf55d316ec354c4ecb98f8268 Auto-generated-cl: translation import
* | Import translations. DO NOT MERGEBaligh Uddin2014-09-142-5/+5
|/ | | | | Change-Id: I794a6a0e15803c24dab90f8d73399dfd656f2476 Auto-generated-cl: translation import
* Fix buildSungsoo Lim2014-09-111-2/+0
| | | | Change-Id: Idf9385e3f4f844fabd795fc634740f929497a19b
* am b3f3f024: am 9fa804c6: am 26e6becc: am 69506291: resolved conflicts for ↵Kenny Root2014-09-111-0/+2
|\ | | | | | | | | | | | | merge of 48d20b70 to klp-dev * commit 'b3f3f024fc092114421e70b5b0f40c49d586fd48': Check component class instead of action
| * am 9fa804c6: am 26e6becc: am 69506291: resolved conflicts for merge of ↵Kenny Root2014-09-111-1/+5
| |\ | | | | | | | | | | | | | | | | | | 48d20b70 to klp-dev * commit '9fa804c60ad9e91ea2296e1acf326f46189f362b': Check component class instead of action
| | * am 26e6becc: am 69506291: resolved conflicts for merge of 48d20b70 to klp-devKenny Root2014-09-111-1/+5
| | |\ | | | | | | | | | | | | | | | | * commit '26e6beccf2cc3619e6108bbe25b01692b4dc9c8c': Check component class instead of action
| | | * am 69506291: resolved conflicts for merge of 48d20b70 to klp-devKenny Root2014-09-111-1/+5
| | | |\ | | | | | | | | | | | | | | | | | | | | * commit '695062916d4fdc01efbf7e4e925ff1fea636f8c3': Check component class instead of action
| | | | * resolved conflicts for merge of 48d20b70 to klp-devKenny Root2014-09-101-1/+5
| | | | |\ | | | | | | | | | | | | | | | | | | Change-Id: Ie07b8ef90a2447f26cdef5b30169793416bfbc0c
| | | | | * am 5aac5317: Check component class instead of actionKenny Root2014-09-101-1/+5
| | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5aac53173509f394e67acd75b98c4d0731c86f76': Check component class instead of action
| | | | | | * Check component class instead of actionKenny Root2014-06-121-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure the called intent was filtered for permission by ActivityManagerService by checking the ComponentName instead of the action. (cherry picked from commit 38a956408f45c9a7cbb48b79c67257b9207fda30) Bug: 14441285 Change-Id: I3a848ef2375ddfa7c9b35389524419993a6b3693
* | | | | | | Import translations. DO NOT MERGEBaligh Uddin2014-08-241-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0f3119b8296987bb93630901d447fe69e9af43f3 Auto-generated-cl: translation import
* | | | | | | Merge "Import translations. DO NOT MERGE" into lmp-devBaligh Uddin2014-08-163-14/+14
|\ \ \ \ \ \ \
| * | | | | | | Import translations. DO NOT MERGEBaligh Uddin2014-08-153-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4c524b6ec330d1f76c1d15a376a8e5acf87d8377 Auto-generated-cl: translation import
* | | | | | | | am 66f69041: (-s ours) am f9894e70: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-08-160-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| / / / / / / | |/ / / / / / | | | | | | | * commit '66f69041c76a4ab445afdd60c9481ba177fe4160': Import translations. DO NOT MERGE
| * | | | | | am f9894e70: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-08-150-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f9894e7063701007a3611664a917f9144205abb8': Import translations. DO NOT MERGE
| | * | | | | Import translations. DO NOT MERGEBaligh Uddin2014-08-152-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I744b9d79dabbaa3a38cc3a2f16e611b5ff8be745 Auto-generated-cl: translation import
* | | | | | | Merge "Remove deprecated locales - DO NOT MERGE" into lmp-devBaligh Uddin2014-07-1712-690/+0
|\ \ \ \ \ \ \
| * | | | | | | Remove deprecated locales - DO NOT MERGEBaligh Uddin2014-07-1912-690/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9183c60ca6936791fd146a90347fa3fe1c75820f
* | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2014-07-171-1/+1
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9820e752c85147939f9d4cc6192473672dd9474c Auto-generated-cl: translation import
* | | | | | | am c05e175e: (-s ours) am 9a7dc69c: (-s ours) am 0b4c1a08: (-s ours) am ↵Baligh Uddin2014-07-060-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 779301f3: (-s ours) Import translations. DO NOT MERGE * commit 'c05e175e08b1aeed752e341e867dafff1f880a44': Import translations. DO NOT MERGE
| * | | | | | am 9a7dc69c: (-s ours) am 0b4c1a08: (-s ours) am 779301f3: (-s ours) Import ↵Baligh Uddin2014-07-060-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | translations. DO NOT MERGE * commit '9a7dc69c8f372edb3946d512a2401b17b83a9c45': Import translations. DO NOT MERGE
| | * | | | | am 0b4c1a08: (-s ours) am 779301f3: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-07-060-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0b4c1a083b632d1c2ffa7f70046d78b4b0baec11': Import translations. DO NOT MERGE
| | | * | | | am 779301f3: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-07-060-0/+0
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '779301f35bdc0688119942b4297817831f57656e': Import translations. DO NOT MERGE
| | | | * | | Import translations. DO NOT MERGEBaligh Uddin2014-07-052-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0e756a613224aaa420189afae311f03b7ecc645c Auto-generated-cl: translation import
* | | | | | | am fd95f033: (-s ours) am e5e9552d: (-s ours) am dbed01b4: (-s ours) Import ↵Baligh Uddin2014-07-060-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | translations. DO NOT MERGE * commit 'fd95f033ad4ed9099b112bcbd4da9b4a2ffcc483': Import translations. DO NOT MERGE
| * | | | | | am e5e9552d: (-s ours) am dbed01b4: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-07-060-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e5e9552d02a55a9c40740ab82680cddba986c599': Import translations. DO NOT MERGE
| | * | | | | am dbed01b4: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-07-060-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'dbed01b46b042f46f6bc0892ec1b706a4f1d916e': Import translations. DO NOT MERGE
| | | * | | | Import translations. DO NOT MERGEBaligh Uddin2014-07-056-28/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie00bf8a6786d7b2a61d1f6615ffc687a7a86bfe5 Auto-generated-cl: translation import
* | | | | | | Import translations. DO NOT MERGEBaligh Uddin2014-07-058-0/+448
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I74ba2cf37cc2b7f524cd8f757bd5706f0041263a Auto-generated-cl: translation import
* | | | | | | Import translations. DO NOT MERGEBaligh Uddin2014-06-2916-1/+858
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic9e8c7683338d8b3c25b589438f833e10b31951a Auto-generated-cl: translation import
* | | | | | | Merge "Block certificate installation if user restriction enabled."Julia Reynolds2014-06-171-0/+8
|\ \ \ \ \ \ \
| * | | | | | | Block certificate installation if user restriction enabled.Julia Reynolds2014-06-121-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 14081992 Change-Id: Ic7f04cc3555144512ca100b31d77ddec15e28546
* | | | | | | | Check component class instead of actionKenny Root2014-05-301-1/+5
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure the called intent was filtered for permission by ActivityManagerService by checking the ComponentName instead of the action. Bug: 14441285 Change-Id: I3a848ef2375ddfa7c9b35389524419993a6b3693
* | | | | | | Import translations. DO NOT MERGEBaligh Uddin2014-04-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If02bc8b68bd3d377b62548924dfabfe20bab3f1f Auto-generated-cl: translation import
* | | | | | | am e78671c5: (-s ours) am af8d8bb2: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-04-230-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e78671c5d43da4984673a17b02614d79854c4551': Import translations. DO NOT MERGE
| * | | | | | am af8d8bb2: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-04-230-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'af8d8bb272307158fab272e78fc7088ae2d5f813': Import translations. DO NOT MERGE
| | * | | | | Import translations. DO NOT MERGEBaligh Uddin2014-04-2216-28/+590
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8bab1b65b1964b9d0b8dc522b2d6ebab1ab668c5 Auto-generated-cl: translation import
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-18 09:16:53 +0000