summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Automatic translation importHEADreplicant-6.0-0004-transitionreplicant-6.0-0004-rc6replicant-6.0-0004-rc5-transitionreplicant-6.0-0004-rc5replicant-6.0-0004-rc4replicant-6.0-0004-rc3replicant-6.0-0004-rc2replicant-6.0-0004cm-13.0Michael Bestas2019-08-1014-635/+229
| | | | Change-Id: I0d81a596b49e41ab62602d48218b4efceeb6bee8
* Automatic translation importreplicant-6.0-0004-rc1Abhisek Devkota2017-12-133-0/+129
| | | | Change-Id: I567508506ab620e65e1d1e41dd48331846f153ab
* Automatic translation importreplicant-6.0-0003Abhisek Devkota2017-09-191-28/+1
| | | | Change-Id: Ic4bf3f77812b93a63354834ec63190164afd3e92
* Automatic translation importreplicant-6.0-0002replicant-6.0-0001Abhisek Devkota2017-04-281-32/+12
| | | | Change-Id: Ia808af8537640e2c5eca1a11958bc8f8aa5dc3ef
* WifiInstaller: add permission for access downloaded filesPeter Qiu2017-03-221-0/+1
| | | | | | | | | | | | | | | | | | | | | The previous fix for the security vulnerability b/33178389 add the code to drop the downloaded installation file but forget to update the manifest for additional permission. This omission was due to that the original fix was merged from mnc-dev, which doesn't have such permission requirement. So add the required permission for deleting downloaded installation file. Bug: 33178389 Test: Verify WifiInstaller works and not crashing due permission denied exception CVE-2017-0490 Change-Id: I987ad73dde0e3cc5b920cd08830dd065c47be402 (cherry picked from commit 9a9e51727a5cdaf3ac10c98e1ea4661bc13a11c7) (cherry picked from commit 1ad3b1e3256a226be362de1a4959f2a642d349b7)
* WifiInstaller: remove the installation filePeter Qiu2017-03-221-0/+17
| | | | | | | | | | | | | | | | | | | | Previously, the installation file deletion was done by the parsing function WifiManager#buildWifiConfig. This results in a security vulnerability with the parsing function since the caller can use that function to delete arbitrary files. The underlying API used by WifiManager#buildWifiConfig is updated to not perform the file deletion. So as the caller of that API, we are responsible for deleting the installation file. Bug: 33178389 Test: Verify passpoint configuration installation works using shamu CVE-2017-0490 Change-Id: I3b88347c86dcb213033b5aa76e7e19a5524bee05 (cherry picked from commit bfd17d2ab2be44f9827bcbb4d57833698813f79b) (cherry picked from commit 1166ca8adba9b49c9185dad11b28b02e72124d95)
* Automatic translation importAbhisek Devkota2017-02-191-0/+43
| | | | Change-Id: Ic8fd4edfdf3223fd15464b075fea3760207c1168
* Automatic translation importpinky@build012016-08-290-0/+0
| | | | | Change-Id: Ia0280d285768cffbef57a5dbc3eef4ed4ce99d1f Ticket: -
* Automatic translation importpinky@build012016-08-273-0/+129
| | | | | Change-Id: I01ed32b4bbb1d581a880f6f000c8e9e74b0780c7 Ticket: -
* Automatic translation importinky@build012016-06-171-0/+22
| | | | Change-Id: I74ca4458dbfe3b4ad4ac8790db21893a3974d7bb
* Partially revert "Merge tag 'android-6.0.1_r22' of ↵Michael Bestas2016-05-0178-81/+924
| | | | | | | | | https://android.googlesource.com/platform/packages/apps/CertInstaller into cm-13.0" This reverts commit eb1a27c140d6f9e570920de76ad39f5ec8ac7876, reversing changes made to 477f738259f77eeef94eaaafbc36df3812624be7. Change-Id: I3fa5b7e7b4ae9e0469b7439c85fa982f3f5c16c2
* Merge tag 'android-6.0.1_r30' into HEADJessica Wagantall2016-04-181-1/+0
|\ | | | | | | | | | | | | Ticket: RM-234 Android 6.0.1 release 30 Change-Id: I8e50e7fe4afc5ef5a8704a40b462b5b6b126d3ce
| * 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
* | Automatic translation importMichael Bestas2016-04-161-0/+43
| | | | | | | | Change-Id: I1663439af2eef2930a01fcc17d67257e114891b4
* | Automatic translation importMichael Bestas2016-04-061-0/+43
| | | | | | | | Change-Id: Ia9ec1e2d60965e9bf5bb28fe6af24b7fd1c0ffa1
* | Merge tag 'android-6.0.1_r24' into HEADJessica Wagantall2016-04-052-1/+9
|\ \ | | | | | | | | | | | | Ticket: CYNGNOS-2213 Android 6.0.1 release 24
| * \ merge in mnc-dr1.5-release history after reset to mnc-dr1.5-devThe Android Automerger2016-03-220-0/+0
| |\ \
| | * \ merge in mnc-dr1.5-release history after reset to mnc-dr1.5-devThe Android Automerger2016-03-170-0/+0
| | |\ \ | | |/ / | |/| |
| * | | Trust CA certificates added for the whole OS onlyRobin Lee2016-03-012-1/+9
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 Merge conflict resolution to ag/871740 with changes in ag/871667 to mnc-dr1.5-release
* | | Automatic translation importMichael Bestas2016-03-282-0/+86
| | | | | | | | | | | | Change-Id: I5337ba91df9540cc1b947e0f77fd315d7ba93639
* | | Merge tag 'android-6.0.1_r22' of ↵staging/cm-13.0+r22Steve Kondik2016-03-1080-927/+96
|\| | | | | | | | | | | | | | | | | https://android.googlesource.com/platform/packages/apps/CertInstaller into cm-13.0 Android 6.0.1 release 22
| * | Merge "Nemo CTS: Call the right class for SSL" into cw-e-devPaul Soulos2015-10-212-3/+15
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | am: b0876d3cb4 * commit 'b0876d3cb4e90c21acc23941a80648d45451e7fd': Nemo CTS: Call the right class for SSL
| | * \ Merge "Nemo CTS: Call the right class for SSL" into cw-e-devPaul Soulos2015-10-212-3/+15
| | |\ \
| | | * | Nemo CTS: Call the right class for SSLVinod Krishnan2015-10-142-3/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 24305493 Change-Id: I9486c96aa531f72ae7dee1282903bc96eb7faf1c
| * | | | Import translations. DO NOT MERGEGeoff Mendal2015-10-210-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 958f46fd59 -s ours * commit '958f46fd5944f3588ab1b77baae2452270f3a045': Import translations. DO NOT MERGE
| | * | | Import translations. DO NOT MERGEGeoff Mendal2015-10-2178-61/+199
| | |/ / | | | | | | | | | | | | | | | | Change-Id: If200864ac5c6070758dd37bf2cf23e3161930484 Auto-generated-cl: translation import
| * | | am 49090f38: (-s ours) am 0a66a571: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2015-09-270-0/+0
| |\| | | | | | | | | | | | | | | | | | * commit '49090f38e7103ce0e5e6b63d1251056d4fe73dfb': Import translations. DO NOT MERGE
| | * | am 0a66a571: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2015-09-270-0/+0
| | |\| | | | | | | | | | | | | | | | | * commit '0a66a571a80538bc765a7bea799cd16f55c513d5': Import translations. DO NOT MERGE
| * | | am 2813ac1a: (-s ours) am bf0cc6c9: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2015-09-190-0/+0
| |\| | | | | | | | | | | | | | | | | | * commit '2813ac1a8b6ab1921cde41eb1e2a0f010dcd98cd': Import translations. DO NOT MERGE
| | * | am bf0cc6c9: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2015-09-190-0/+0
| | |\ \ | | | | | | | | | | | | | | | | | | | | * commit 'bf0cc6c95788d1bd121a1aeb74bf2534e8f12c49': Import translations. DO NOT MERGE
| * | | | am f3c2168d: (-s ours) am cb405ac6: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-08-190-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | * commit 'f3c2168d102fecec3bcfcca1bd26353190e55dbb': Import translations. DO NOT MERGE
| | * | | am cb405ac6: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-08-190-0/+0
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit 'cb405ac620f70de541c243bc687bc579ce9d1a19': Import translations. DO NOT MERGE
| * | | | | am 6727a9bc: (-s ours) am 17aa0495: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-08-080-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6727a9bcf2f854e8b76ea231e8d029ac475a179a': Import translations. DO NOT MERGE
| | * | | | am 17aa0495: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-08-080-0/+0
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '17aa049528e4468b6f0b66e9a305beafb5635a79': Import translations. DO NOT MERGE
| * | | | | | am d2dde28a: (-s ours) am 06237447: (-s ours) am 1a472153: (-s ours) Import ↵Geoff Mendal2015-08-070-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | translations. DO NOT MERGE * commit 'd2dde28a94c79553866708dcfbb68aabb7d56e72': Import translations. DO NOT MERGE
| | * | | | | am 06237447: (-s ours) am 1a472153: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-08-070-0/+0
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '062374474efc97dc45121635767789c8378272b4': Import translations. DO NOT MERGE
| * | | | | | | am b6e3c263: am 78f25fd3: am 909641b2: Offload time consuming task to ↵Sanket Padawe2015-08-062-32/+50
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | background while installing HS profile. * commit 'b6e3c263a2b3784b10fd0961c64d27c68230fad6': Offload time consuming task to background while installing HS profile.
| | * | | | | | am 78f25fd3: am 909641b2: Offload time consuming task to background while ↵Sanket Padawe2015-08-062-32/+50
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | installing HS profile. * commit '78f25fd30ba348daedf520f666d88764bbdf0c91': Offload time consuming task to background while installing HS profile.
| * | | | | | | | am 2da85ade: (-s ours) am 10ae7dbe: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-08-050-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2da85adeb3bfdf0281c015bcd91ee3c490890297': Import translations. DO NOT MERGE
| | * | | | | | | am 10ae7dbe: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-08-050-0/+0
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '10ae7dbe82a193a9ea53e0abdfa0bcf2c9826dca': Import translations. DO NOT MERGE
| * | | | | | | | | am 5a59bdb2: am 1be8a62b: am 09e91a70: Merge "Added "Installing" string." ↵Jan Nordqvist2015-08-041-0/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mnc-dev * commit '5a59bdb21d142ba9750e1f239ecbcc3a3c5505b4': Added "Installing" string.
| | * | | | | | | | am 1be8a62b: am 09e91a70: Merge "Added "Installing" string." into mnc-devJan Nordqvist2015-08-041-0/+1
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1be8a62bfe665cdd9f466c3a39d099d7fd3db57c': Added "Installing" string.
| * | | | | | | | | | am d415d944: am 89a882a2: am fb90c6fc: Added logging in a few error paths ↵Jan Nordqvist2015-08-011-0/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for wifi config installation. * commit 'd415d944f2a65d5e369b00c06bdf07e6abd982d1': Added logging in a few error paths for wifi config installation.
| | * | | | | | | | | am 89a882a2: am fb90c6fc: Added logging in a few error paths for wifi config ↵Jan Nordqvist2015-08-011-0/+2
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | installation. * commit '89a882a2eefc5cd2ff3a293cd4637d119d653e27': Added logging in a few error paths for wifi config installation.
| * | | | | | | | | | | am a7861d47: (-s ours) am 6c53d1e3: (-s ours) Merge "Import translations. DO ↵Geoff Mendal2015-07-150-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE" into mnc-dr-dev * commit 'a7861d47e934d847c8d1bf7d8bf3312a7769fcd9': Import translations. DO NOT MERGE
| | * | | | | | | | | | am 6c53d1e3: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-devGeoff Mendal2015-07-150-0/+0
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6c53d1e3fa0b7398075ee25d2ed9438cd61ddd70': Import translations. DO NOT MERGE
| * | | | | | | | | | | | am 1e9bb52d: (-s ours) am f36ac064: (-s ours) am a583f03e: (-s ours) Import ↵Geoff Mendal2015-07-150-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | translations. DO NOT MERGE * commit '1e9bb52d682efa84cdbcde173fa936efcef36781': Import translations. DO NOT MERGE
| | * | | | | | | | | | | am f36ac064: (-s ours) am a583f03e: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-150-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f36ac0645c333f64d041b221369b7a424d4b5d5d': Import translations. DO NOT MERGE
| * | | | | | | | | | | | | am bd70da0c: am 48d644ff: am 219360da: Merge "Allowing rewrite of Passpoint ↵Vinit Deshpande2015-07-141-0/+44
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | credential." into mnc-dev * commit 'bd70da0c584766810470882007ec9b7554dc55bb': Allowing rewrite of Passpoint credential.
| | * | | | | | | | | | | | am 48d644ff: am 219360da: Merge "Allowing rewrite of Passpoint credential." ↵Vinit Deshpande2015-07-141-0/+44
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mnc-dev * commit '48d644ffb3b8245aeacf596302688b1a1ff94e7a': Allowing rewrite of Passpoint credential.