summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Revert "Can not mark the same content of browser page after copy""John Reck2013-04-302-9/+2
|\
| * Revert "Can not mark the same content of browser page after copy"John Reck2013-04-302-9/+2
| | | | | | | | | | | | | | | | This reverts commit 2b3cef0dd74cb9470e5387b015ee7a13af1fff7b Causes crashes in Email, reverting for now Change-Id: Ia0286763d0ab1f90c2b6082d44a6ca804769f49c
* | Don't use X509CertImpl directlyKenny Root2013-04-292-10/+20
| | | | | | | | Change-Id: Ibabee35c90c2636c6f362e4d778d6795a0cef6c2
* | Merge "Use the newer ZoneInfoDB API."Elliott Hughes2013-04-261-1/+1
|\ \
| * | Use the newer ZoneInfoDB API.Elliott Hughes2013-04-261-1/+1
| | | | | | | | | | | | Change-Id: I846c720ae6c262afb4fd7f8a749008c837e76cc4
* | | Merge "Can not mark the same content of browser page after copy"Victoria Lease2013-04-262-2/+9
|\ \ \ | |/ / |/| / | |/
| * Can not mark the same content of browser page after copyPeter Nilsson2013-04-102-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | Marking a text on the web page and then press copy works, but trying to mark the same text again does not work. The reason for this is that the selection never gets cleared in webkit. The fix, calling cleaSelection in the onDestroyActionMode. Also added clearSelection when getting an onConfigurationChange. Change-Id: I59b384cb5441b6a3a05007ea7e77f9699889a87c
* | Merge "Human-readable POSIX capabilities for SystemServer."Alex Klyubin2013-04-241-1/+29
|\ \
| * | Human-readable POSIX capabilities for SystemServer.Alex Klyubin2013-04-221-1/+29
| | | | | | | | | | | | Change-Id: I8fecdc55b2cf0041ceed643eb48df53d22ecd600
* | | Merge "Adding matching @deprecated."Ian Rogers2013-04-231-0/+1
|\ \ \
| * | | Adding matching @deprecated.Ian Rogers2013-04-191-0/+1
| |/ / | | | | | | | | | | | | Bug: 8657266 Change-Id: Idbd22dc647f11441d15da12eb23723539768cf4c
* | | Merge "KeyEvent: update comment"Michael Wright2013-04-211-2/+2
|\ \ \ | |/ / |/| |
| * | KeyEvent: update commentChirayu Desai2013-04-151-2/+2
| |/ | | | | | | Change-Id: I1ea491e7e23670bf0ea83392710010b557803178
* | Merge "Fixed the problem ime invisible status despite being the icon that ↵Satoshi Kataoka2013-04-181-1/+1
|\ \ | | | | | | | | | appears in the statusbar."
| * | Fixed the problem ime invisible status despite being the icon that appears ↵jungheang.lee2013-02-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in the statusbar. [Reproduce the Path] Precondition : Set "Auto-rotate screen" option to ENABLE Calendar App lunch -> Rotate device to "Landscape" -> Touch "+" button(Add new Schedule) -> Check the ime icons of the Status bar Ime invisible status despite being the icon that appears in the statusbar. Displays an icon in the status bar when the ime was actually visible state is modified to check. Change-Id: If103ab909c5bfa6391eb51a696fb8b8f0b18808c
* | | keystore: Add flag for blobs to be unencryptedKenny Root2013-04-151-6/+10
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | In order to let apps use keystore more productively, make the blob encryption optional. As more hardware-assisted keystores (i.e., hardware that has a Keymaster HAL) come around, encrypting blobs start to make less sense since the thing it's encrypting is usually a token and not any raw key material. (cherry picked from commit a3788b00bb221e20abdd42f747d2af419e0a088c) Bug: 8122243 Change-Id: Ifc1c64743651b23a4eace208ade0176af47ea989
* | Adjust the HttpResponseCache for OkHttp.jwilson2013-04-031-7/+8
| | | | | | | | Change-Id: I2a80f3c3f30a3d15673d797fa3d1211286f75030
* | Remove keystore entries when package removedKenny Root2013-04-021-0/+21
| | | | | | | | | | | | | | | | | | Add a hook into PackageManagerService so that when app IDs are completely removed, we erase all entries from keystore for those UIDs that have gone away. Bug: 3020069 Change-Id: Id4b1d51a5fa4c418865055635a84bebcf5b65ec8
* | Merge "Clarify the documentation of SparseArray.indexOfValue."Elliott Hughes2013-03-291-8/+10
|\ \
| * | Clarify the documentation of SparseArray.indexOfValue.Elliott Hughes2013-03-261-8/+10
| | | | | | | | | | | | | | | Bug: https://code.google.com/p/android/issues/detail?id=53297 Change-Id: I28725a2d03d4c11948bfe4fb90d730c86bf41481
* | | KeyStore: add API to query storage typeKenny Root2013-03-291-0/+20
| | | | | | | | | | | | | | | | | | | | | Add an API to keystore daemon to query what kind of storage is currently in use. Change-Id: I5a83ae92250ca63b691dcf1beb8b3e1703797745
* | | Merge "Correct executable bit for source files [Take 2]"Elliott Hughes2013-03-2811-0/+0
|\ \ \
| * | | Correct executable bit for source files [Take 2]Chirayu Desai2013-03-2711-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change Ieb51bafb46c895a21d2e83696f5a901ba752b2c5 left out some files, this fixes them. Change-Id: Ia949a8581668836ea0251602e048f09c852f5169
* | | | Two REMOVE_PROVIDER messages caused by race condition.Guobin Zhang2013-03-271-0/+7
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a bug in unstable ContentProvider. IllegalStateException: ref counts can't go to zero here: stable=0 unstable=0 IllegalStateException: unstable count < 0: -1 There is a race between main thread and background database thread. Main thread is responsible for handling the REMOVE_PROVIDER message. Database thread starts insert or query request again and again. acquireProvider in db thread will often snatch provider from the jaws of death, sometime it fails to remove REMOVE_PROVIDER which is already fired out from MessageQueue. But completeRemoveProvider in main thread gets suspended when trying to execute the critical section. If db thread released the provider before main thread resumes the execution, then two REMOVE_PROVIDER messages will be executed. Change-Id: I8588aa1d1a8bc444dcd2adf6f8bc3f055cebbdc4 Signed-off-by: Guobin Zhang <guobin.zhang@intel.com>
* | | Remove dead DateUtils code that was never in an API level.Elliott Hughes2013-03-262-116/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | Also rewrite @deprecated comments to use an initial capital so they look right in the generated documentation. Also improve formatIpAddress documentation. Change-Id: I317ebe411ef76e16a4535318ce73e00b63af38da
* | | Remove the fixed-length buffer in DdmHandleNativeHeap.getLeakInfo.Elliott Hughes2013-03-261-85/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | It was possible to overrun this buffer, and even if you did fill the buffer in a single read and exit the loop, the "string" still wouldn't be terminated. Bug: 8468088 Change-Id: Ia19f4d26dfd79e7b63807a7ec9540b932163d246
* | | Merge "BackupManagerService files need new security labeling."Geremy Condra2013-03-261-0/+5
|\ \ \
| * | | BackupManagerService files need new security labeling.rpcraig2012-12-041-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use restorecon to label files and directories specific to BMS. * /data/backup : provide default type labeling for all files/dirs used by BMS. * /data/secure/backup : provide default type labeling used by BMS when encrypted file system is enabled. * /cache/<package name>.{data|restore} : specifically target files opened and passed by BMS to apps that have backup capabilities. * /cache/backup : default labeling for the directory used by the LocalTransport that stores backup files for local testing. Change-Id: Id4d46e82cd13abc2e395e0c30c515f0a33df93e7 Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
* | | | Add seinfo parsing to PackageManagerService.Robert Craig2013-03-251-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch set allows the PMS to parse the mac_permissions.xml file which contains the seinfo values. Each package that is installed on the device will be assigned an seinfo value based on policy. This seinfo value will help label the app process and data directory. Modifications include adjustments to ApplicationInfo.java to store the seinfo tag per package as well as adjustments to installd to communicate the seinfo tag to libselinux. Change-Id: I61ad1ea12fb6a9a6d0b108ec163bc4bf4c954b58 Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
* | | | KeyStore: change migrate to duplicateKenny Root2013-03-211-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | After discussion, it was determined that duplicate would be less disruptive and it still fit in the current HAL model. Change-Id: I2f9cae48d38ec7146511e876450fa39fc92cda55
* | | | Update SELinux JNI to use helpersKenny Root2013-03-201-352/+331
| | | | | | | | | | | | | | | | Change-Id: Ifc707eafd1ecbba64c93fa2250c4334d0ce40005
* | | | KeyStore: add "migrate" commandKenny Root2013-03-201-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To support the WiFi service, we need to support migration from the system UID to the wifi UID. This adds a command to achieve the migration. Bug: 8122243 Change-Id: I65f7a91504c1d2a2aac22b9c3051adffd28d66c1
* | | | KeyStore: add API to uid versionsKenny Root2013-03-201-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In previous commits, we added the ability to specify which UID we want to target on certain operations. This commit adds the ability to reach those binder calls from the KeyStore class. Also fix a problem where saw() was not reading all the values returned via the Binder call. This changes the semantics to return a null instead of failing silently when it's not possible to search. Change-Id: I32098dc0eb42e09ace89f6b7455766842a72e9f4
* | | | Remove dead code from DateUtils.Elliott Hughes2013-03-191-82/+0
| | | | | | | | | | | | | | | | | | | | | | | | This stuff is @hide, @deprecated, unused, and was never in any API level. Change-Id: I87d132d77d7296a2de8527e05c2def362cab1c37
* | | | Fix times in debugging output to use H rather than k.Elliott Hughes2013-03-181-1/+1
| | | | | | | | | | | | | | | | | | | | Bug: 8359981 Change-Id: I4fccf3ed7e469b77f6e755dacbcd025005390505
* | | | Clean up (some of) our many clocks to use H instead of k.Elliott Hughes2013-03-184-67/+76
| | | | | | | | | | | | | | | | | | | | Bug: 8359981 Change-Id: I3c0c38c2bf5adc4b5bdc11c3d10cf41dd8fb6462
* | | | Deliberately break DateFormat.format's formatting of 'k' for compatibility.Elliott Hughes2013-03-181-7/+20
| |/ / |/| | | | | | | | | | | Bug: 8359981 Change-Id: I44ed816c644f94783c77952d544c5444b966868b
* | | Merge "update APN version for MVNO"Robert Greenwalt2013-03-161-1/+1
|\ \ \
| * | | update APN version for MVNOSungmin Choi2013-02-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As adding MVNO feature, update APN version from 7 to 8. To recognize MVNO, use new elements, spn, imsi, gid, mvno_type. Bug: 8143480 Change-Id: Ib8e7370ebc99c1518e6d9337621e64966c128a0b
* | | | Merge "Fix NPE when pasting non-text from Clipboard"John Reck2013-03-121-1/+1
|\ \ \ \
| * | | | Fix NPE when pasting non-text from ClipboardNils Holmström2013-03-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When copying a link from a bookmark and then pasting it into a textfield a NullPointerException will occur. A ClipData.Item is not guaranteed to always contain a text string and therefore getText() can be set to null. Using method coerceToText() instead of getText() makes sure that a text string is always returned. Change-Id: I81343c0371835a3a7a52045dcd1760e69e59a967
* | | | | Merge "Switch TLS Channel ID API from ECPrivateKey to PrivateKey."Kenny Root2013-03-121-4/+4
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Switch TLS Channel ID API from ECPrivateKey to PrivateKey.Alex Klyubin2013-03-121-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is to accept both the "transparent" and "opaque" ECC private keys. "Transparent" keys provide structured access to their key material -- these are instances of ECPrivateKey. "Opaque" private keys are not required to provide structured (or even any) access to their key material -- these are instances of PrivateKey. Change-Id: Ib22e18b45b638b429f994ed965416c753226c4ee
* | | | | Fix DateFormat k and h, and implement K and H for the first time.Elliott Hughes2013-03-111-7/+19
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8359981 Change-Id: I52ef937a77e9e28f2719c2ee6f59e4b74514f0b2
* | | | | use Calendar in DateUtils format methodSungmin Choi2013-03-111-10/+28
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The DatePickerDialog is using DateUtils to format the dialog's title and the DateUtils class does not work with dates outside to the specified range. For example, if user selects 2038-03-07, DatePickerDialog shows 1902-01-30 on Title. The reason for the DateUtils class not being able to format dates outside the range of 1902 and 2036 is because internally it is using the Time class which does not support such dates. To fix it, use Calendar class in DataUilts format method. Steps to reproduce: 1. Settings -> Date & time 2. uncheck Automatic date & time 3. Set Date 4. choose any date before 1902 or after 2037 5. update wrong date on Title Bug: https://code.google.com/p/android/issues/detail?id=13050 Change-Id: I003266765751b5c340426af84daef271f39f771e
* | | | Improve DateFormat.format.Elliott Hughes2013-03-082-247/+114
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for the 'c' format character, required in many non-English locales. Reimplement 'c' and 'E', and 'L' and 'M', so they correctly interpret 5-count pattern characters. Replace the old incorrect class documentation with a pointer to the well-maintained libcore equivalent and the Unicode UTS to which these two implementations are supposed to conform. Deprecate the useless constants for pattern characters. No one sane is going to write MONTH + MONTH + MONTH + MONTH instead of "MMMM". Correct the documentation for getLongDateFormat and getMediumDateFormat. Also fix DateUtils.getStandaloneMonthString for LENGTH_SHORTEST. Tests are in https://android-review.googlesource.com/53291. Change-Id: I4dda8b18070f05ccdc11c1f0a9381a9d233db4e8
* | | | Improve the Resource.getQuantityString/getQuantityText documentation.Elliott Hughes2013-03-081-18/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Natural languages differ so much and in such odd ways that you can't use getQuantityString as an "if" statement. It's really just for grammaticality. This is explained well in http://developer.android.com/guide/topics/resources/string-resource.html#Plurals but we need to make more of an effort to motivate people to read that, and to at least get the most important point across if they don't read it. Change-Id: I549b9f3563462c45f2dea34c558185e0714127cd
* | | | Use getRelativeDayString in getRelativeTimeSpanString.Elliott Hughes2013-03-071-40/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The bug we're fixing here is that languages that don't distinguish the "one" case grammatically (such as Japanese) would say the equivalent of "In 1 day" rather than "Tomorrow" because of the misuse of getQuantityString. This has the side-effect of switching us over to the CLDR strings for relative day names, which have consistent capitalization; the Android donottranslate-cldr.xml strings varied even within a language, so although this is a change, it seems like a step in the right direction. In a future change, we should actually push all relative day formatting down into icu4c. Bug: 7098707 Change-Id: Ia2f9af3d18c441d6093dd5da7956a3d0130e5b06
* | | | Explain why the frameworks/base DateUtilsTest isn't merged with CTS' ↵Elliott Hughes2013-03-071-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | DateUtilsTest. Change-Id: Icbdb4e9133a9ae1c1b37f822367e1ac86e9e36cb
* | | | Merge "FIX Null Pointer Exception on dialog cancel"Victoria Lease2013-03-051-0/+2
|\ \ \ \