summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Check component class instead of actioncm-11.0-XNPH05Q-tomato-9828f8e9cccm-11.0-XNPH05Q-bacon-5229c4ef56stable/cm-11.0-XNF9Xstable/cm-11.0-XNF8Ystable/cm-11.0shipping/cm-11.0Kenny Root2014-11-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
* Automatic translation importMichael Bestas2014-10-152-4/+61
| | | | Change-Id: I2140b5309d7a41c4137dfec89729555df7650282
* Automatic translation importMichael Bestas2014-09-131-0/+1
| | | | Change-Id: Ic6f48357a13ac6a3e8223a3e3c0948af4960b455
* Automatic translation importcm-11.0-XNPH44S-bacon-5fa8c79c0bMichael Bestas2014-08-235-5/+5
| | | | Change-Id: Ibe6f0e09cae96e2b907559b254fe153d464ffcd5
* Automatic translation importMichael Bestas2014-08-091-0/+1
| | | | Change-Id: I187e42655fe046ae01fd5f227befcebbc9d31a47
* Automatic translation importMichael Bestas2014-07-242-1/+41
| | | | Change-Id: Ibe9cbebf453ca70af881f95064057b7a2bf9ed78
* Automatic translation importcm-11.0-XNPH33R-bacon-3628510d76cm-11.0-XNPH30O-bacon-4f280f505aMichael Bestas2014-06-222-0/+44
| | | | Change-Id: I25e4bf19291c95e2f23999a89a216e873d745097
* Automatic translation importcm-11.0-XNPH25R-bacon-d22b777afacm-11.0-XNPH22R-bacon-03d77315eaMichael Bestas2014-05-213-80/+70
| | | | Change-Id: Ibddc65c27f80897b476494fec2f0478a496d9489
* Prevent CertInstallerMain from being recreated upon screenSize changehanpengx2014-04-261-1/+1
| | | | | | | | | | | | | | | | | | | | | Steps to Reproduce on Nexus 10: 1.Enter Settings app->Wi-Fi. 2.Tap options menu and select "Advanced" item. 3.Tap "Install certificates" item. 4.Rotate the device. 5.Two instances of DocumentsActivity will be created. In step 3, Settings app will start CertInstallerMain Activity(invisible) when user want to install certificates, then CertInstallerMain will start DocumentsActivity with action Intent.ACTION_OPEN_DOCUMENT to open document in its onCreate() method. When user rotate the screen, the configuration screenSize will change, then the CertInstallerMain will be destroyed and recreated, the DocumentsActivity will be created again in onCreate() method of CertInstallerMain. Change-Id: I0d31b9936aa158afbea6f426b5216fad50e6b237 Signed-off-by: hanpengx <pengfeix.han@intel.com> Signed-off-by: Guobin Zhang <guobin.zhang@intel.com>
* CertInstaller: AST translationsmalditoastur2014-01-281-0/+55
| | | | Change-Id: Ia0e9df384f9329d73c1aa457c7a09ea18cac7768
* Merge tag 'android-4.4.1_r1' into HEADRicardo Cerqueira2013-12-068-523/+104
|\ | | | | | | Android 4.4.1 Release 1
| * Import translations. DO NOT MERGEBaligh Uddin2013-11-044-26/+26
| | | | | | | | | | Change-Id: Ife9390482e6ead6f379e45fafc732e49234d7277 Auto-generated-cl: translation import
| * Pick certificates using OPEN_DOC intent.Jeff Sharkey2013-10-254-497/+78
| | | | | | | | | | | | | | | | | | | | Instead of blindly scanning just primary internal storage, use the new DocumentsUI intents to let the user select certificates from any storage backend. This includes both primary and secondary external storage devices. Bug: 11354402 Change-Id: Ia0b4bf1b30c83eb1a64b070cd2f99ad5e6498786
* | Merge tag 'android-4.4_r1' into cm-11.0Ricardo Cerqueira2013-11-0114-4/+566
|\| | | | | | | Android 4.4 Release 1.0
| * Import translations. DO NOT MERGEBaligh Uddin2013-09-251-1/+1
| | | | | | | | | | Change-Id: Ie7eb81367672af757b52893a8258aea004b26249 Auto-generated-cl: translation import
| * Import translations. DO NOT MERGEBaligh Uddin2013-09-1411-1/+563
| | | | | | | | | | Change-Id: I3ad037b03518ee5ae9dc1969f79c3353aaacc1fe Auto-generated-cl: translation import
| * Import translations. DO NOT MERGEBaligh Uddin2013-06-031-1/+1
| | | | | | | | | | Change-Id: Ia8993ff516fcd3e102128ee6d3025576388bc691 Auto-generated-cl: translation import
| * Import translations. DO NOT MERGEBaligh Uddin2013-05-171-1/+1
| | | | | | | | | | Change-Id: I2cceffe87164f79feb299c60ea78643965b746d7 Auto-generated-cl: translation import
| * am 69f0e1b2: (-s ours) am b256d693: Import translations. DO NOT MERGEBaligh Uddin2013-05-080-0/+0
| |\ | | | | | | | | | | | | * commit '69f0e1b2636a7118dc5bbb8e98393d9c91c85df0': Import translations. DO NOT MERGE
| | * am b256d693: Import translations. DO NOT MERGEBaligh Uddin2013-05-082-3/+3
| | |\ | | | | | | | | | | | | | | | | * commit 'b256d69334d9141aefb3473d0839c31c9f396741': Import translations. DO NOT MERGE
| * | | Import translations. DO NOT MERGEBaligh Uddin2013-05-082-3/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: Iad328a4792e01801e478f0014218a4c91c51747e Auto-generated-cl: translation import
| * | | am fed7ca4a: (-s ours) am d933ae29: Import translations. DO NOT MERGEBaligh Uddin2013-05-060-0/+0
| |\| | | | | | | | | | | | | | | | | | * commit 'fed7ca4a4195f77514a10950ef56e35c1e6c4fd4': Import translations. DO NOT MERGE
| | * | am d933ae29: Import translations. DO NOT MERGEBaligh Uddin2013-05-062-2/+2
| | |\ \ | | | | | | | | | | | | | | | | | | | | * commit 'd933ae29003ab80e0a162daa2cd1f01d4d392c9f': Import translations. DO NOT MERGE
| * | | | Import translations. DO NOT MERGEBaligh Uddin2013-05-032-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2f13b2153df780d94482a9b12eeecfd2a9e04f29 Auto-generated-cl: translation import
| * | | | am 97e65d3e: (-s ours) am 2564e3a4: Import translations. DO NOT MERGEBaligh Uddin2013-05-010-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | * commit '97e65d3e39543a30f3bcf9d888c9010e21fd29b6': Import translations. DO NOT MERGE
| | * | | am 2564e3a4: Import translations. DO NOT MERGEBaligh Uddin2013-05-011-1/+1
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit '2564e3a4e96fe567299ca47c9f7e288e3f28df0b': Import translations. DO NOT MERGE
| * | | | | Import translations. DO NOT MERGEBaligh Uddin2013-05-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib66ba18bc2e27c983c2ec23f019d038bc4edf493 Auto-generated-cl: translation import
| * | | | | am 0e0af3c9: am 5bed3637: Import translations. DO NOT MERGEBaligh Uddin2013-04-240-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0e0af3c9f28a73a4499102ad7e11294cd81f307e': Import translations. DO NOT MERGE
| | * | | | am 5bed3637: Import translations. DO NOT MERGEBaligh Uddin2013-04-245-17/+21
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5bed3637b0cc6002baf240d78741a634c0b0b66e': Import translations. DO NOT MERGE
| * | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-04-245-17/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I087f02a3e788911cae44c41996637bc107677d95 Auto-generated-cl: translation import
| * | | | | | am 80feba62: am d2439b3f: Import translations. DO NOT MERGEBaligh Uddin2013-04-230-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '80feba6272b753a8938effb427bd5ac392299f21': Import translations. DO NOT MERGE
| | * | | | | am d2439b3f: Import translations. DO NOT MERGEBaligh Uddin2013-04-2349-0/+240
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd2439b3f2f105e4800ff3c257b43498ba849f4c4': Import translations. DO NOT MERGE
| * | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-04-2249-0/+240
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia45924c46b7a7fd33ee287b69e7e074b140ba466 Auto-generated-cl: translation import
| * | | | | | am 7de56669: Add spinner to select Wi-FiKenny Root2013-04-174-7/+86
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7de56669876ed330f0ab4e603619273de1f51048': Add spinner to select Wi-Fi
| * \ \ \ \ \ \ am c3d5df93: keystore: remove old APIsKenny Root2013-04-151-1/+1
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c3d5df9307977f27ca4048055f003282a7095ee8': keystore: remove old APIs
| * \ \ \ \ \ \ \ am 048bb6c3: Merge "Allow multiuser use of keystore"Kenny Root2013-04-080-0/+0
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '048bb6c386ff614e9ad1294dc8e135b9f5922227': Allow multiuser use of keystore
| | * \ \ \ \ \ \ \ Merge "Allow multiuser use of keystore"Kenny Root2013-04-081-7/+0
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Allow multiuser use of keystoreKenny Root2013-04-081-7/+0
| | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since keystore has been refactored to let muliple users use it simultaneously, we can remove all the restrictions put into place to prevent it. Bug: 7249554 Change-Id: Ia4a9f8cdd2f86b458805505e01ba9767330287d8
* | | | | | | | | | CertInstaller: UG translation, added Uyghur translation.cm-10.2.1cm-10.2.0cm-10.2-M1stable/cm-10.2sahranbay2013-10-131-0/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I80a1292c6e93da63c492cb08459748614beeef1b
* | | | | | | | | | Merge tag 'android-4.3_r2.1' into cm-10.2Ricardo Cerqueira2013-07-2557-38/+389
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | Android 4.3 release 2.1
| * | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-05-082-3/+3
| | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I17eba3b67c379eaa0631c87b9255567609e6c911 Auto-generated-cl: translation import
| * | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-05-032-2/+2
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4432d066e3bb6c9bad80144de526424d75b59295 Auto-generated-cl: translation import
| * | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-05-011-1/+1
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ide77789f28653293b5c70cfe3b8c22b02bce852c Auto-generated-cl: translation import
| * | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-04-245-17/+21
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | Change-Id: Ida8a71e481d3c05539b81866248bfc5e6a3d8206 Auto-generated-cl: translation import
| * | | | | Import translations. DO NOT MERGEBaligh Uddin2013-04-2249-0/+240
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | Change-Id: I58abd73a1d50628ccd8d91390ad831ebda3d78ae Auto-generated-cl: translation import
| * | | | Add spinner to select Wi-FiKenny Root2013-04-164-7/+86
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For the regular installation path, we now need to show a spinner so we don't regress from previous behavior where we can install certs for wifi from the main installation screen. You can also get to this from the Wi-Fi AP list, so only show it when the intended use is ambiguous. Bug: 8600545 Change-Id: I8e9c905ff84142ed7c1f50bf77eb3fb5574f8df1
| * | | keystore: remove old APIsKenny Root2013-04-121-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | Remove the call sites that don't have the flags specified. This is to ensure that callers know what flags they're setting. Bug: 8122243 Change-Id: I4b7a8b9327cde5cbfe30c28870f8c31376a5b690
| * | Allow multiuser use of keystoreKenny Root2013-04-081-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since keystore has been refactored to let muliple users use it simultaneously, we can remove all the restrictions put into place to prevent it. (cherry picked from commit 89f8f9ab58947ba67f95c5784dc4288bf78a2fdf) Bug: 7249554 Change-Id: I05e8804e35d762ad473d1649fdba34e4182a2c68
| * | am a1008d4b: Merge "Add ability to install credentials as other UID"Kenny Root2013-03-285-7/+48
| |\| | | | | | | | | | | | | * commit 'a1008d4bfa1c934419013da0d2186f0fe6ce9327': Add ability to install credentials as other UID
| | * Merge "Add ability to install credentials as other UID"Kenny Root2013-03-285-7/+48
| | |\