summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Skip non KeyEntry from PKCS12 file during extraction.staging/cm-14.0cm-14.0Rubin Xu2016-06-161-7/+14
| | | | | Change-Id: I76880fc3a39c092cfc007450f59c477a2bdaf48e Fix: 29315994
* Import translations. DO NOT MERGEBaligh Uddin2016-06-074-4/+4
| | | | | | | Auto-generated-cl: translation import Bug: 29169863 Change-Id: Id451071d48faec8169bff7a858563b4a8cf876ae
* Import translations. DO NOT MERGEBill Yi2016-06-0311-15/+15
| | | | | Change-Id: Id3867cfe24d042af1d0c1b5ea1b5d03ef094ffc1 Auto-generated-cl: translation import
* Import translations. DO NOT MERGEBaligh Uddin2016-05-2112-27/+27
| | | | | | | Auto-generated-cl: translation import Bug: 28857042 Change-Id: Ibc3e786c697f659ceb3e888f4aa4cce75fee18a8
* Import translations. DO NOT MERGEBaligh Uddin2016-05-041-1/+1
| | | | | | | Auto-generated-cl: translation import Bug: 28463229 Change-Id: Id360b25e346da5eee258ace928f653cebc747fed
* Approve CA certs automatically in CertInstallerVictor Chang2016-04-145-17/+59
| | | | | | | | | | | | | | - Since the cert is installed by real user, the cert is approved by the user - It avoids cert pending approval notification posted by DPM - Also, show screenlock only it has ca certs Test: - if no screenlock, it doesn't ask user to unlock. User will be asked to set a screenlock after naming the cert - work chanllenge is shown if the cert is installed from work profile Bug: 28161447 Change-Id: I3eea305fc6d8023f7a30a1644b7b0c2a873a3b75
* When installing client cert, do not add CA certs to trusted credentialsRubin Xu2016-03-292-6/+28
| | | | | Bug: 18239590 Change-Id: I10b056c3bb86fdc371e92f0b2313425f9d1e125f
* Add back DocumentsContract.EXTRA_SHOW_ADVANCED flag, because it wasAga Wronska2016-03-221-0/+1
| | | | | | | | | | | brought back to DocuemtnsUI Revert "Fix build break from removal of DocumentsContract.EXTRA_SHOW_ADVANCED" This reverts commit d31bf9e911fd006736ce74b870d0cad4896ff5f9. Bug: 27683276 Change-Id: I92c631461f0201552d2df39e3347af9b2b6b3d71
* Import translations. DO NOT MERGEGeoff Mendal2016-03-191-0/+77
| | | | | Change-Id: Ied04892b84f91d2799c6af80e1b248d3bcf1d992 Auto-generated-cl: translation import
* Fix build break from removal of DocumentsContract.EXTRA_SHOW_ADVANCEDGeorge Mount2016-03-021-1/+0
| | | | Change-Id: Ibd4b5e5f01042c3b126499f98020606327faa10d
* Import translations. DO NOT MERGEGeoff Mendal2016-02-293-10/+87
| | | | | Change-Id: I77363edadc1b9c4646b65d38d99e165c034c975c Auto-generated-cl: translation import
* Merge "Remove unused string: storage_error" into nyc-devRobin Lee2016-02-2580-80/+0
|\
| * Remove unused string: storage_errorRobin Lee2016-02-2380-80/+0
| | | | | | | | | | Bug: 27045170 Change-Id: I7a653106d09669399ddf944aba854f7f373a98e3
* | resolve merge conflicts of ef177fb06e to cw-e-dev am: 7e2d30d880Robin Lee2016-02-230-0/+0
|\ \ | |/ |/| | | | | | | | | am: 366e5932c9 -s ours * commit '366e5932c97aea65a147d55370eb94776be1fa56': Trust CA certificates added for the whole OS only
| * resolve merge conflicts of ef177fb06e to cw-e-devRobin Lee2016-02-232-1/+9
| |\ | | | | | | | | | | | | | | | | | | am: 7e2d30d880 * commit '7e2d30d880bdc751ee84a7782745f82911089374': Trust CA certificates added for the whole OS only
| | * resolve merge conflicts of ef177fb06e to cw-e-devRobin Lee2016-02-232-1/+9
| | |\ | | | | | | | | | | | | Change-Id: I936db87e2373aa40a0e7dd61fb8bce8448a0f25e
| | | * Trust CA certificates added for the whole OS only am: 4f135c9bd7 am: ↵Robin Lee2016-02-232-1/+8
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 63176f4144 am: fb82066502 am: 92b51d2e67 am: 1e39462d6f am: 3048960121 am: 021a55abd2 am: 00efcbac54 am: b8ed5ed218 * commit 'b8ed5ed218a54afade3d2431e73899a1a6bd2215': Trust CA certificates added for the whole OS only
| | | | * Trust CA certificates added for the whole OS only am: 4f135c9bd7 am: ↵Robin Lee2016-02-232-1/+8
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 63176f4144 am: fb82066502 am: 92b51d2e67 am: 1e39462d6f am: 3048960121 am: 021a55abd2 am: 00efcbac54 * commit '00efcbac543be111c1cf756c2d62bc4b88f654b0': Trust CA certificates added for the whole OS only
| | | | | * Trust CA certificates added for the whole OS only am: 4f135c9bd7 am: ↵Robin Lee2016-02-232-1/+8
| | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 63176f4144 am: fb82066502 am: 92b51d2e67 am: 1e39462d6f am: 3048960121 am: 021a55abd2 * commit '021a55abd2f3e6e7c3d24e13027fb6638192cd92': Trust CA certificates added for the whole OS only
| | | | | | * Trust CA certificates added for the whole OS only am: 4f135c9bd7 am: ↵Robin Lee2016-02-232-1/+8
| | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 63176f4144 am: fb82066502 am: 92b51d2e67 am: 1e39462d6f am: 3048960121 * commit '30489601214d02e43641ab35a955c114a703dee4': Trust CA certificates added for the whole OS only
| | | | | | | * Trust CA certificates added for the whole OS only am: 4f135c9bd7 am: ↵Robin Lee2016-02-232-1/+8
| | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 63176f4144 am: fb82066502 am: 92b51d2e67 am: 1e39462d6f * commit '1e39462d6f9dccd57aff18040ae9e5f31e7aa081': Trust CA certificates added for the whole OS only
| | | | | | | | * Trust CA certificates added for the whole OS only am: 4f135c9bd7 am: ↵Robin Lee2016-02-232-1/+8
| | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 63176f4144 am: fb82066502 am: 92b51d2e67 * commit '92b51d2e67aaa8ea1f8074d53da15d2a90b02179': Trust CA certificates added for the whole OS only
| | | | | | | | | * Trust CA certificates added for the whole OS only am: 4f135c9bd7 am: 63176f4144Robin Lee2016-02-232-1/+8
| | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: fb82066502 * commit 'fb820665021336ccf570cbdcdcda7df2a7cc7824': Trust CA certificates added for the whole OS only
| | | | | | | | | | * Trust CA certificates added for the whole OS only am: 4f135c9bd7Robin Lee2016-02-232-1/+8
| | | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 63176f4144 * commit '63176f4144a3199f4794162c75acdc1322cd948e': Trust CA certificates added for the whole OS only
| | | | | | | | | | | * Trust CA certificates added for the whole OS onlyRobin Lee2016-02-232-1/+8
| | | | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 4f135c9bd7 * commit '4f135c9bd77a54781d25c866657f0af9ecdd94e1': Trust CA certificates added for the whole OS only
| | | | | | | | | | | | * Trust CA certificates added for the whole OS onlyRobin Lee2016-02-222-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
* | | | | | | | | | | | | Merge "Skip password dialog if PKCS#12 has no password" into nyc-devRobin Lee2016-02-222-8/+28
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Skip password dialog if PKCS#12 has no passwordRobin Lee2016-02-122-8/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Just an extra unnecessary step for the user, eg. in the case of a file generated locally just as an interchange format. Bug: 27155157 Change-Id: Iafb948172e6a8d33b1742a06e5d0c69dc0658d78
* | | | | | | | | | | | | | Trust CA certificates added for the whole OS onlyRobin Lee2016-02-222-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
* | | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2016-02-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I062f563b693aec4123b1d3961cc2ad552246ac4a Auto-generated-cl: translation import
* | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev am: 3e4266b322 ↵Geoff Mendal2016-02-030-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -s ours am: e397cec8e6 -s ours * commit 'e397cec8e6e0557f9ddbf5ad871db8f56f91c5fb': Import translations. DO NOT MERGE
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge "Import translations. DO NOT MERGE" into mnc-dr2-devGeoff Mendal2016-02-030-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 3e4266b322 -s ours * commit '3e4266b322ee5673ce740e19f3a82166983173a6': Import translations. DO NOT MERGE
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge "Import translations. DO NOT MERGE" into mnc-dr2-devGeoff Mendal2016-02-0378-95/+938
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2016-02-0378-95/+938
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I348a9628761e73018e337dd877beeb7f18d4041c Auto-generated-cl: translation import
* | | | | | | | | | | | | | | | Import translations. DO NOT MERGE am: 5bc3dabe05 -s ours am: 0bfd90d509 -s ↵Geoff Mendal2016-02-030-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: 9edbc73c12 -s ours * commit '9edbc73c12bd54b15ec44c5966fa841f4473b97c': Import translations. DO NOT MERGE
| * | | | | | | | | | | | | | | Import translations. DO NOT MERGE am: 5bc3dabe05 -s oursGeoff Mendal2016-02-030-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 0bfd90d509 -s ours * commit '0bfd90d50987b35e8a37f49c0af362912667235f': Import translations. DO NOT MERGE
| | * | | | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2016-02-020-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / | | |/| / / / / / / / / / / / / | | | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 5bc3dabe05 -s ours * commit '5bc3dabe05b3cc4c36cea7c68773cb8ba04fbdd7': Import translations. DO NOT MERGE
| | | * | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2016-02-0278-95/+938
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I039514b1d0e994b71ef58360d1dd70f037dbf65a Auto-generated-cl: translation import
* | | | | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2016-01-181-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iab6346f28ccfa6a1dd0f07618912ebca177cb845 Auto-generated-cl: translation import
* | | | | | | | | | | | | | | Drop checks for locked WiFi key store when installing keys/certs.Jan Nordqvist2016-01-121-10/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The security provided by the PIN lock is not considered to provide any added value over disk encryption for the protection of the WiFi key store. In addition the PIN lock is major hurdle for onboarding 802.1X users who do need a trust cert installed. BUG=25887356 Change-Id: Ifb8004679ab6b1f155751ff18e29be27e4dce65f
* | | | | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-12-211-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I25dcbbf11442c18395692b1a31f7977f1fb7c3c7 Auto-generated-cl: translation import
* | | | | | | | | | | | | | | Import translations. DO NOT MERGE am: 2c5449ee83 -s ours am: f209c8c7f9 -s ↵Geoff Mendal2015-12-160-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: 98dba3ffcb -s ours am: 4a735d6571 -s ours * commit '4a735d6571bb803e12fa4b910ce9abe322eb5124': Import translations. DO NOT MERGE
| * | | | | | | | | | | | | | Import translations. DO NOT MERGE am: 2c5449ee83 -s ours am: f209c8c7f9 -s ↵Geoff Mendal2015-12-160-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: 98dba3ffcb -s ours * commit '98dba3ffcbae0ce3f295e77a881366dfa21fb4f9': Import translations. DO NOT MERGE
| | * | | | | | | | | | | | | Import translations. DO NOT MERGE am: 2c5449ee83 -s oursGeoff Mendal2015-12-160-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: f209c8c7f9 -s ours * commit 'f209c8c7f919ea1c06b7b8461b872085e8a0a268': Import translations. DO NOT MERGE
| | | * | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-12-160-0/+0
| | |/| | | | | | | | | | | | | | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 2c5449ee83 -s ours * commit '2c5449ee83cb5cebc4f4a53a6c1ee50c6ec8eb03': Import translations. DO NOT MERGE
| | | * | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-12-154-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic8bd5381238a14bc17f4ef54a61f4325a79160cf Auto-generated-cl: translation import
* | | | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-12-161-0/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I35aa3fd87bfeea7c9993c02462251bcd01683b6d Auto-generated-cl: translation import
* | | | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-11-303-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I05c3645e79f625265d78f0eeca9ae54928cf7245 Auto-generated-cl: translation import
* | | | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-11-091-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie4831d8e52f181b858aed342352fededc6e5b890 Auto-generated-cl: translation import
* | | | | | | | | | | | | | Import translations. DO NOT MERGE am: 5d360f869a -s oursBaligh Uddin2015-11-050-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 518d473454 -s ours * commit '518d47345431ee9c8deab1f3dd550e0a7f65d761': Import translations. DO NOT MERGE
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-26 15:14:51 +0000