summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-09-19Import translations. DO NOT MERGEBaligh Uddin
Change-Id: I2e32f7356506af3e0495c92f999ddb9c01eb099e Auto-generated-cl: translation import
2012-09-18Import translations. DO NOT MERGEBaligh Uddin
Change-Id: I632952dfefca68ae629f2d28170afa6e02914af1 Auto-generated-cl: translation import
2012-09-18Import translations. DO NOT MERGEBaligh Uddin
Change-Id: I649cf708c26632fe60e5fdd54a5defbd92a182a1 Auto-generated-cl: translation import
2012-09-17am 1116baa5: (-s ours) Import translations. DO NOT MERGEBaligh Uddin
* commit '1116baa54bd069521592d0fa755d4cfd428517c6': Import translations. DO NOT MERGE
2012-09-17am fba4bf92: Do not allow non-primary user to install certsKenny Root
* commit 'fba4bf924c4655024d6175523f3112fc09e7affc': Do not allow non-primary user to install certs
2012-09-17am 1116baa5: (-s ours) Import translations. DO NOT MERGEBaligh Uddin
* commit '1116baa54bd069521592d0fa755d4cfd428517c6': Import translations. DO NOT MERGE
2012-09-17Import translations. DO NOT MERGEBaligh Uddin
Change-Id: Ia5f44282173b0ddeab902cb95fcf16e192109c07 Auto-generated-cl: translation import
2012-09-16Do not allow non-primary user to install certsKenny Root
Change-Id: If0896215a4fe1fc0d982a74bd6fee8551e4671fd
2012-09-13Import translations. DO NOT MERGEBaligh Uddin
Change-Id: I4eed49bdfed9e97d7944490a5a16ec729fd8cfd9 Auto-generated-cl: translation import
2012-09-05Tracking upgrade to bouncycastle 1.47Brian Carlstrom
Change-Id: Ic6744ae517ab1d3b49de45edd05979dd164bfade
2012-07-16Import translations. DO NOT MERGEYing Wang
Change-Id: I95b1814f5c02241b6a527cc2162be4f9d69ab9e3 Auto-generated-cl: translation import
2012-07-13Import translations. DO NOT MERGEYing Wang
Change-Id: Ife2d738b9905b982fbc6b8242a29612886ef06cb Auto-generated-cl: translation import
2012-07-12Import translations. DO NOT MERGEYing Wang
Change-Id: I7b1b65e78617a5631c35f6166e193d2dbf9ba80d Auto-generated-cl: translation import
2012-06-18Import translations. DO NOT MERGEYing Wang
Change-Id: I7c0903f9dcb872d5db38287875394f1540473661
2012-05-25Import translations. DO NOT MERGEEric Fischer
Change-Id: If72a89d5cb7ae3ed416d56a5f6d036f4086d771e
2012-04-15Allow empty passwords when installing from a PKCS#12 fileandroid-cts-4.1_r4android-cts-4.1_r2android-cts-4.1_r1android-4.1.2_r2.1android-4.1.2_r2android-4.1.2_r1android-4.1.1_r6.1android-4.1.1_r6android-4.1.1_r5android-4.1.1_r4android-4.1.1_r3android-4.1.1_r2android-4.1.1_r1.1android-4.1.1_r1tools_r21jb-releasejb-mr0-releasejb-devBrian Carlstrom
Bug: http://code.google.com/p/android/issues/detail?id=28189 Change-Id: I6ce96eba0e7e583e49a17179d3f3c66df5f13a29
2012-04-13Import translations. DO NOT MERGEEric Fischer
Change-Id: I119a8393d292a065f723cbadcc57d45be7b97d29
2012-04-03Merge remote-tracking branch 'goog/ics-aah'Mike Lockwood
2012-03-30Broader support for KeyChain.EXTRA_NAMEBrian Carlstrom
Previously EXTRA_NAME only supplied the default name when used with KeyChain.EXTRA_CERTIFICATE. It now also provides the default name with KeyChain.EXTRA_PKCS12, overriding the value found within the PKCS#12 file. In addition, will be used as the default alias name when credentials are installed from external storage as opposed to via an extra. Bug: 6129421 Change-Id: I63c06a866fc62bfa56636011b766d3dcae7764bd
2012-03-19Convert to new KeyStore formatKenny Root
The keystore no longer stores private keys in the clear, so it shouldn't have its private key material in PEM. It will just be an opaque handle for a private key. Change-Id: I939169338d0f7dc39743c9904166454f2cad49cc
2012-03-07Import translations. DO NOT MERGEEric Fischer
Change-Id: I828d313dcad89ad34f5c39cf258547b47a9e0937
2012-02-13am 9d9df27c: am 4fad005f: am 5e794499: Merge "Remove PKCS12_PASSWORD_DIALOG ↵Jean-Baptiste Queru
and NAME_CREDENTIAL_DIALOG in order to correctly recreate it on onCreateDialog" * commit '9d9df27c20ea169b4e90a17f1a1c1a244906c96b': Remove PKCS12_PASSWORD_DIALOG and NAME_CREDENTIAL_DIALOG in order to correctly recreate it on onCreateDialog
2012-02-13am 4fad005f: am 5e794499: Merge "Remove PKCS12_PASSWORD_DIALOG and ↵Jean-Baptiste Queru
NAME_CREDENTIAL_DIALOG in order to correctly recreate it on onCreateDialog" * commit '4fad005fbc84825278d341ffb8a9a5c5c9f95a32': Remove PKCS12_PASSWORD_DIALOG and NAME_CREDENTIAL_DIALOG in order to correctly recreate it on onCreateDialog
2012-02-13am 5e794499: Merge "Remove PKCS12_PASSWORD_DIALOG and NAME_CREDENTIAL_DIALOG ↵android-sdk-adt_r20tools_r20ics-plus-aospJean-Baptiste Queru
in order to correctly recreate it on onCreateDialog" * commit '5e794499725296c2d436ccbe54e5517037938172': Remove PKCS12_PASSWORD_DIALOG and NAME_CREDENTIAL_DIALOG in order to correctly recreate it on onCreateDialog
2012-02-13Merge "Remove PKCS12_PASSWORD_DIALOG and NAME_CREDENTIAL_DIALOG in order to ↵Jean-Baptiste Queru
correctly recreate it on onCreateDialog"
2012-02-10am d9195b1a: (-s ours) am 8292ec01: (-s ours) Import translations. DO NOT MERGEEric Fischer
* commit 'd9195b1a522d14c130592cb770b8a4051db47229': Import translations. DO NOT MERGE
2012-02-10am 8292ec01: (-s ours) Import translations. DO NOT MERGEEric Fischer
* commit '8292ec0171aa61d9372d8ea24d7d5c0e6bb915fa': Import translations. DO NOT MERGE
2012-02-10am 8292ec01: Import translations. DO NOT MERGEEric Fischer
* commit '8292ec0171aa61d9372d8ea24d7d5c0e6bb915fa': Import translations. DO NOT MERGE
2012-02-08Import translations. DO NOT MERGEandroid-4.0.4_r2.1android-4.0.4_r2android-4.0.4_r1.2android-4.0.4_r1.1android-4.0.4_r1ics-mr1-releaseics-mr1Eric Fischer
Change-Id: I3f9408037dd1ad87c8c326badd044f8412ee7c35
2012-02-08Remove PKCS12_PASSWORD_DIALOG and NAME_CREDENTIAL_DIALOG in order to ↵Shuhrat Dehkanov
correctly recreate it on onCreateDialog If an empty password or name is supplied for certificate password or certificate name dialogs, respectively, showDialog is called without removing them. As a result onCreateDialog is not called leaving the dialog without visible UI to the user. Steps to reproduce: 1. Put password protected certificate to the SD card. 2. Navigate to Settings > Security and initiate certificate installation. 3. Provide an empty password and press OK. 3.1. Provide an empty name for NAME_CREDENTIAL_DIALOG related issue. Change-Id: I83ffd680313eb9c69214113d3091a70910a80ae2 Signed-off-by: Shuhrat Dehkanov <uzbmaster@gmail.com>
2012-01-26Import translations. DO NOT MERGEEric Fischer
Change-Id: I308c2b9bb5b199c558cdc8c93b972a3f320d22ff
2011-12-29Import revised translations.Eric Fischer
Change-Id: Ib86c34a82a0d665725933083cb3696adf5d4bd5b
2011-11-21am 72a70411: (-s ours) Import revised translations. DO NOT MERGEEric Fischer
* commit '72a7041136b14e4ee98d3e53837c7dff6d54402b': Import revised translations. DO NOT MERGE
2011-11-21am 72a70411: Import revised translations. DO NOT MERGEEric Fischer
* commit '72a7041136b14e4ee98d3e53837c7dff6d54402b': Import revised translations. DO NOT MERGE
2011-11-21Import revised translations. DO NOT MERGEandroid-sdk-4.0.3_r1android-sdk-4.0.3-tools_r1android-cts-verifier-4.0_r1android-cts-verifier-4.0.3_r1android-cts-4.0.3_r2android-cts-4.0.3_r1android-4.0.3_r1.1android-4.0.3_r1Eric Fischer
Change-Id: I834bc89a2b6669da2f91706c564b5ecf4b3d66e0
2011-11-17am a70922ff: (-s ours) Import revised translations. DO NOT MERGEEric Fischer
* commit 'a70922fff3821eb8de52e071105c02371c0cbd58': Import revised translations. DO NOT MERGE
2011-11-16am a70922ff: Import revised translations. DO NOT MERGEEric Fischer
* commit 'a70922fff3821eb8de52e071105c02371c0cbd58': Import revised translations. DO NOT MERGE
2011-11-16Import revised translations. DO NOT MERGEEric Fischer
Change-Id: I0a22bb72e18483dd1f27cd8c2b502168ae678058
2011-11-10Merge "Import revised translations."Eric Fischer
2011-11-10Import revised translations.Eric Fischer
Change-Id: I3e3373a8ab47562aca8ec624181aaac1e3884d1f
2011-11-10am 2546ac02: (-s ours) am 86b2f598: (-s ours) Import revised translations. ↵Eric Fischer
DO NOT MERGE * commit '2546ac02e62bb29c8a99529de605062bb1137114': Import revised translations. DO NOT MERGE
2011-11-09am 2546ac02: am 86b2f598: (-s ours) Import revised translations. DO NOT MERGEEric Fischer
* commit '2546ac02e62bb29c8a99529de605062bb1137114': Import revised translations. DO NOT MERGE
2011-11-09am 86b2f598: (-s ours) Import revised translations. DO NOT MERGEEric Fischer
* commit '86b2f598353c8f93512df3deeb07fd5f0ff1f558': Import revised translations. DO NOT MERGE
2011-11-08Import revised translations. DO NOT MERGEandroid-sdk-adt_r16.0.1android-cts-4.0_r1android-4.0.2_r1ics-mr0-releaseics-mr0Eric Fischer
Change-Id: Icabfe1bf8548b2c03b6c4244381f92c71dbe9193
2011-11-02String edits to use standard UI text terminologyClaudia de Veaux
and punctuation. For ex, We use contractions now and don't say "please" anymore. Bugs: 5165745, 5163232, 5162668, 5162667, 5162328 Change-Id: I10f6903d60cb3df736521c20d2bdd8bff400decf Typo fixed after self-review.
2011-11-02Merge "Import revised translations."Eric Fischer
2011-11-02am 8d57f6e9: Import revised translations.Eric Fischer
* commit '8d57f6e9b165b58e2347b616b05985b4a6717f77': Import revised translations.
2011-11-02Import revised translations.Eric Fischer
Change-Id: I3af847e83c9cc172190d2a3e3d5a93fc825a10cd
2011-11-01am 8d57f6e9: Import revised translations.Eric Fischer
* commit '8d57f6e9b165b58e2347b616b05985b4a6717f77': Import revised translations.
2011-11-01Import revised translations.Eric Fischer
Change-Id: Ie921e64107c39f019f0e2fc2a0296aa30ee6c45f
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-25 08:22:58 +0000