summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Automatic translation importstable/cm-13.0-ZNH0Eclyde@build012016-08-221-0/+43
| | | | | Change-Id: If7b228143d80c9f6dadc094b3253e5563111795b Ticket: RM-214
* Automatic translation importpinky@build012016-08-181-0/+43
| | | | | Change-Id: I354793d583f86527705a0d828e5732755b163e53 Ticket: RM-214
* Automatic translation importclyde@build012016-08-131-0/+43
| | | | | Change-Id: If8f9325e25f024bb70cd7e81f31fd0e4163c7d22 Ticket: RM-214
* Automatic translation importpinky@build012016-06-201-0/+22
| | | | | Change-Id: I6916b173dd522bee94ec7feea0cd55d9466bc7a0 Ticket: RM-214
* Automatic translation importAbhisek Devkota2016-05-1417-0/+659
| | | | | Change-Id: Ia4ee7203ff4b030df1ea6fc7cee95ed8f36fba0f Ticket: RM-214
* Merge tag 'android-6.0.1_r20' into HEADJessica Wagantall2016-04-052-1/+8
|\ | | | | | | | | Ticket: CYNGNOS-2213 Android 6.0.1 release 20
| * 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 Bestas2015-12-254-0/+220
| | | | | | | | Change-Id: Ic658902ada72f3cfef0aaa6b156002a35f1d4250
* | Merge tag 'android-6.0.0_r26' into cm-13.0Ricardo Cerqueira2015-11-056-6/+6
|\| | | | | | | Android 6.0.0 release 26
| * Import translations. DO NOT MERGEBaligh Uddin2015-09-261-1/+1
| | | | | | | | | | Change-Id: I61b565889197a32fbb2af9a1a6fe5ca9d137e352 Auto-generated-cl: translation import
| * Import translations. DO NOT MERGEBaligh Uddin2015-09-181-1/+1
| | | | | | | | | | Change-Id: I97aba4b00dfa5170c2d7d81e70c254fba2ce2d64 Auto-generated-cl: translation import
| * Import translations. DO NOT MERGEGeoff Mendal2015-08-191-1/+1
| | | | | | | | | | Change-Id: I4c62f60aca954d239091ef8ada1aee89f1cb718d Auto-generated-cl: translation import
| * Import translations. DO NOT MERGEGeoff Mendal2015-08-0815-16/+15
| | | | | | | | | | Change-Id: Iaa0da6693419210664580d13081ab943b66f4483 Auto-generated-cl: translation import
| * am 1a472153: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-08-070-0/+0
| |\ | |/ |/| | | | | * commit '1a4721537879353580be60784e95e89ddbf9419c': Import translations. DO NOT MERGE
* | Import translations. DO NOT MERGEGeoff Mendal2015-08-0678-34/+172
| | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 22921398 Change-Id: Ieca23bb01c6f21eab7ea51dd21ef199ebe628cad
| * am 909641b2: Offload time consuming task to background while installing HS ↵Sanket Padawe2015-08-062-32/+50
| |\ | |/ |/| | | | | | | | | profile. * commit '909641b23712b9066b514442b236dfc47c1e3279': Offload time consuming task to background while installing HS profile.
* | Offload time consuming task to background while installing HS profile.Sanket Padawe2015-08-052-32/+50
| | | | | | | | | | | | | | + Avoid Wifi api calls when wifi is disabled. Bug: 22921398 Change-Id: I21b0db5b2926c4bbd5473d84855ec1ef2e83734b
| * Import translations. DO NOT MERGEGeoff Mendal2015-08-0578-34/+173
| | | | | | | | | | Change-Id: I7f3353bb3f40ea6b3202d9e62813343bde6e0510 Auto-generated-cl: translation import
| * am 09e91a70: Merge "Added "Installing" string." into mnc-devJan Nordqvist2015-08-041-0/+1
| |\ | |/ |/| | | | | * commit '09e91a7070452f41c9fdeaa12ff23e7ca876a4fe': Added "Installing" string.
* | Merge "Added "Installing" string." into mnc-devJan Nordqvist2015-08-041-0/+1
|\ \
| * | Added "Installing" string.Jan Nordqvist2015-08-031-0/+1
| | | | | | | | | | | | | | | Bug: 22921398 Change-Id: I47b159fb9ac7d8e5211946f6dd88fd70e9a0c65c
| | * am fb90c6fc: Added logging in a few error paths for wifi config installation.Jan Nordqvist2015-08-011-0/+2
| | |\ | |_|/ |/| | | | | | | | * commit 'fb90c6fc3726b1bcfdbb2bd3db03c731a5316790': Added logging in a few error paths for wifi config installation.
* | | Added logging in a few error paths for wifi config installation.Jan Nordqvist2015-07-311-0/+2
|/ / | | | | | | | | Bug: 22790527 Change-Id: I8f4bb40a572ae4e7f855e4bf4b028f9b889c5af1
| * Merge "Import translations. DO NOT MERGE" into mnc-dr-devGeoff Mendal2015-07-152-2/+2
| |\
| | * Import translations. DO NOT MERGEGeoff Mendal2015-07-152-2/+2
| | | | | | | | | | | | | | | Change-Id: I283d04658eccd1959b8a6fdd8ce5e5215d34ebc7 Auto-generated-cl: translation import
| * | am a583f03e: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-150-0/+0
| |\ \ | |/ / |/| / | |/ | | * commit 'a583f03e488628f29428d6b034d5d7b4b3df98e7': Import translations. DO NOT MERGE
* | Import translations. DO NOT MERGEGeoff Mendal2015-07-152-2/+2
| | | | | | | | | | Change-Id: If7bd7f142e2082ba4ef34731a1efd909fa754246 Auto-generated-cl: translation import
| * am 219360da: Merge "Allowing rewrite of Passpoint credential." into mnc-devVinit Deshpande2015-07-141-0/+44
| |\ | |/ |/| | | | | * commit '219360da8f75362f537a03f128233b7406f0b834': Allowing rewrite of Passpoint credential.
* | Merge "Allowing rewrite of Passpoint credential." into mnc-devVinit Deshpande2015-07-131-0/+44
|\ \
| * | Allowing rewrite of Passpoint credential.Jan Nordqvist2015-07-091-0/+44
| | | | | | | | | | | | | | | Bug: 21779835 Change-Id: I5b551f332f6d487896359147137cb1fc605b109a
| | * am c629ad26: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-130-0/+0
| | |\ | |_|/ |/| | | | | | | | * commit 'c629ad266844a93d60a48fcb7d3b1ef91f577c37': Import translations. DO NOT MERGE
* | | Import translations. DO NOT MERGEGeoff Mendal2015-07-111-8/+8
|/ / | | | | | | | | Change-Id: Id15f99702a8f70becda8fb2ae3bfcf2f8c2c6ae2 Auto-generated-cl: translation import
| * Import translations. DO NOT MERGEGeoff Mendal2015-07-1112-21/+21
| | | | | | | | | | Change-Id: Ic48f8925140daeb642353dd4cc6fc6c609b90b32 Auto-generated-cl: translation import
| * am f8aeaac0: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-080-0/+0
| |\ | |/ |/| | | | | * commit 'f8aeaac0b896d832f1e9319f62cea4d082e60121': Import translations. DO NOT MERGE
* | Import translations. DO NOT MERGEGeoff Mendal2015-07-086-7/+7
| | | | | | | | | | Change-Id: I63f1ed7adb06302e942d9440d243e8d86cc9bbdb Auto-generated-cl: translation import
| * am dc924634: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-060-0/+0
| |\ | |/ |/| | | | | * commit 'dc9246346db8450bc76de0711efe6c95d89475ba': Import translations. DO NOT MERGE
* | Import translations. DO NOT MERGEGeoff Mendal2015-07-065-6/+6
|/ | | | | Change-Id: Ib99bca4410204d1c3b0a1e31f0f0e621c2b379e9 Auto-generated-cl: translation import
* Import translations. DO NOT MERGEGeoff Mendal2015-06-2977-462/+231
| | | | | Change-Id: Idb4a750adf2cf2ac07f24be0358e2413603b447e Auto-generated-cl: translation import
* Merge "Fixed missing white-space." into mnc-devJan Nordqvist2015-06-241-1/+1
|\
| * Fixed missing white-space.Jan Nordqvist2015-06-231-1/+1
| | | | | | | | Change-Id: Ie2a5eb7367b79d6c38a2af7bddd82fbc5bee3a26
* | Merge "String changes for HS 2.0 dialogs." into mnc-devSanket Padawe2015-06-241-2/+2
|\ \
| * | String changes for HS 2.0 dialogs.Sanket Padawe2015-06-231-2/+2
| |/ | | | | | | | | Bug: 22010833 Change-Id: I1bdaac456236bae54f5c6d6a9ecdc718f9a8a198
* / Import translations. DO NOT MERGEGeoff Mendal2015-06-2477-4/+466
|/ | | | | Change-Id: I95eed9782d7a783e3f1d204ac0f5c3e2cd0e5520 Auto-generated-cl: translation import
* Merge "Add dialog when installing HS 2.0 credentials while wifi is off." ↵Sanket Padawe2015-06-234-4/+19
|\ | | | | | | into mnc-dev
| * Add dialog when installing HS 2.0 credentials while wifi is off.Sanket Padawe2015-06-224-4/+19
| | | | | | | | | | Bug: 22010833 Change-Id: Ic59fbf7ec197bc4431508c7d1d495c047c0e20cc
* | Catching runtime exception in WifiInstaller.Jan Nordqvist2015-06-221-3/+10
|/ | | | | Bug: 21958895 Change-Id: Ia483c9307e653e88d7d6050ef70963093f1b5f2b
* Fix RTL layout issueKenny Root2015-06-181-3/+3
| | | | | | | | | | | The wrap_content directive was keeping the text confined to the left side of the screen. Changing it to match_parent will allow it to span the entire dialog. (cherry picked from commit c4178d293ef609a9e3b045fa8e001e9e8179b868) Bug: 21665076 Change-Id: I8506d99ff3e622281187c0bd32b41b4d509b4e24
* Import translations. DO NOT MERGEGeoff Mendal2015-06-103-6/+6
| | | | | Change-Id: I5e89c377db1c6537ce81af707a409e1f1140e83e Auto-generated-cl: translation import
* Import translations. DO NOT MERGEGeoff Mendal2015-06-086-8/+8
| | | | | Change-Id: Id472734f2e8dca913055c92248a49638b0601983 Auto-generated-cl: translation import
* Merge "am 756c09a..655de81 from mirror-m-wireless-internal-release" into mnc-devVinit Deshpande2015-06-031-2/+0
|\