summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Support for 64-bit integer type.Stephen Hines2010-10-012-1/+9
| | | | | | b/3050131 exported renderscript structures don't appear to support int64_t Change-Id: I9aea676425b694a3a6457e63e38b00e591847e20
* Finish plumbing for double RS elements.Stephen Hines2010-09-303-2/+10
| | | | Change-Id: Ic708dcaeda4966bb2121ecb6834f56cfa68ad58e
* resolved conflicts for merge of 53b07027 to masterMike Lockwood2010-09-303-14/+56
|\ | | | | | | Change-Id: Ia5ce86d84454a4be76e71aeb77942ba8d88d2700
| * am 727d67d4: Merge "location: rebind to network location and geocoder ↵Mike Lockwood2010-09-303-13/+53
| |\ | | | | | | | | | | | | | | | | | | | | | | | | services after package update" into gingerbread Merge commit '727d67d4fb8721b0291312e4cca33927dfba0e31' into gingerbread-plus-aosp * commit '727d67d4fb8721b0291312e4cca33927dfba0e31': location: rebind to network location and geocoder services after package update
| | * Merge "location: rebind to network location and geocoder services after ↵Mike Lockwood2010-09-303-13/+53
| | |\ | | | | | | | | | | | | package update" into gingerbread
| | | * location: rebind to network location and geocoder services after package updateMike Lockwood2010-09-303-13/+53
| | | | | | | | | | | | | | | | | | | | Change-Id: I2d7db3512b9edd7e0ba27d97442967fc2278e3b9 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | Merge "Updated current.xml as autogenerated"Steve Howard2010-09-301-28/+28
|\ \ \ \
| * | | | Updated current.xml as autogeneratedSteve Howard2010-09-301-28/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | My previous change included a manually-edited version of current.xml to get the build fixed. This change includes an equivalent file as generated by update-api, so that the next person won't see a bunch of unexpected diffs. Change-Id: Ia244d90248ec54ddfa3b7344c09720c56ff201e3
* | | | | am c3bc8b7b: am 1bfbf19b: Merge "Fix night/notnight resource folder ↵Dianne Hackborn2010-09-301-2/+2
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | handling." into gingerbread Merge commit 'c3bc8b7b08611c8d86919f4695430990bc6b475d' * commit 'c3bc8b7b08611c8d86919f4695430990bc6b475d': Fix night/notnight resource folder handling.
| * | | | am 1bfbf19b: Merge "Fix night/notnight resource folder handling." into ↵Dianne Hackborn2010-09-301-2/+2
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit '1bfbf19bd93567d75d1f62c0ee3a81dddc7cc895' into gingerbread-plus-aosp * commit '1bfbf19bd93567d75d1f62c0ee3a81dddc7cc895': Fix night/notnight resource folder handling.
| | * | | Merge "Fix night/notnight resource folder handling." into gingerbreadDianne Hackborn2010-09-301-2/+2
| | |\ \ \
| | | * | | Fix night/notnight resource folder handling.Tobias Haamel2010-09-301-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The values for NIGHT_NO / NIGHT_YES are shifted later on in the ResourceTypes header file to match with the ones specified in the Configuration class file. This is basically the same as it's done for the SCREEN_LONG_NO / SCREEN_LONG_YES constants. Since the values are also masked later on by 0x30 (MASK_UI_MODE_NIGHT) the system currently recognizes resources specified in night/notnight folders as if they were resources which can be used for any of both modes. This results in an error saying that the resources are already specified somewhere else. Should fix: http://b/issue?id=3022577 Change-Id: I554b37231ea4c69a8625e519150473fddce7d8ed
* | | | | | am 5dcaf7b0: am fcf1948a: Moved Rfc822 validator testPaul Westbrook2010-09-301-34/+0
|\ \ \ \ \ \ | |/ / / / / | | | | / / | |_|_|/ / |/| | | | | | | | | | | | | | Merge commit '5dcaf7b0b92ad6867ed50801923fb29157edddaa' * commit '5dcaf7b0b92ad6867ed50801923fb29157edddaa': Moved Rfc822 validator test
| * | | | am fcf1948a: Moved Rfc822 validator testPaul Westbrook2010-09-301-34/+0
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'fcf1948aeb0b548d1f89890d58baefd008880cb7' into gingerbread-plus-aosp * commit 'fcf1948aeb0b548d1f89890d58baefd008880cb7': Moved Rfc822 validator test
| | * | | Moved Rfc822 validator testPaul Westbrook2010-09-301-34/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved rfc822 validator test to framework/ex, as this is where the code lives Change-Id: Ia12e67364df9c8f9351dea423d769454a5d4e58d
* | | | | Merge "resolved conflicts for merge of 538c3fa3 to master"Steve Howard2010-09-305-71/+155
|\ \ \ \ \
| * \ \ \ \ resolved conflicts for merge of 538c3fa3 to masterSteve Howard2010-09-305-71/+155
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | Change-Id: I9190ca078ffd8b51515e3d53ac5753c05110c014
| | * | | | am cdcc0a65: Merge "Have download manager give more details when downloads ↵Steve Howard2010-09-305-100/+184
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | are paused" into gingerbread Merge commit 'cdcc0a65fae7e649f0f07e396dbe0dd59ceffada' into gingerbread-plus-aosp * commit 'cdcc0a65fae7e649f0f07e396dbe0dd59ceffada': Have download manager give more details when downloads are paused
| | | * | | Merge "Have download manager give more details when downloads are paused" ↵Steve Howard2010-09-305-100/+184
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | into gingerbread
| | | | * | | Have download manager give more details when downloads are pausedSteve Howard2010-09-295-100/+184
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change introduces more detailed reporting of why downloads are paused in the download manager. First, it adds new, more detailed status constants in android.provider.Downloads for when a download is paused, in place of the old catch-all STATUS_RUNNING_PAUSED. I've eliminated some dead code there as well to ease the change. Second, in the public API, it changes COLUMN_ERROR_CODE to COLUMN_REASON, which now reports useful info for STATUS_PAUSED in addition to STATUS_FAILED. It adds some new PAUSED_* constants for reason values when a download is paused, and adds code to generate these values appropriately. Change-Id: Ie617d1c2c59357375e19466086923ace5e2fb122
* | | | | | | Merge "Add new rezzing-in effect of Carousel to Recents."Jim Miller2010-09-301-0/+1
|\ \ \ \ \ \ \
| * | | | | | | Add new rezzing-in effect of Carousel to Recents.Jim Miller2010-09-301-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ibfbc53af8bce3e43903bac1b3937731f2c903323
* | | | | | | | Merge "Adding anisotropic filtering and related samples."Alex Sakhartchouk2010-09-3014-19/+164
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Adding anisotropic filtering and related samples.Alex Sakhartchouk2010-09-3014-19/+164
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Idb173274417feb5e25bfd64c5e9fa2492a23a17e
* | | | | | | | am 6bbc2f15: am 2fb818ca: Fix the javadoc of Parameters.setRotation.Wu-cheng Li2010-09-301-15/+39
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '6bbc2f1562ddc1be65aafcce63896f5899596c2a' * commit '6bbc2f1562ddc1be65aafcce63896f5899596c2a': Fix the javadoc of Parameters.setRotation.
| * | | | | | | am 2fb818ca: Fix the javadoc of Parameters.setRotation.Wu-cheng Li2010-09-301-15/+39
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '2fb818ca7dd53d00646854a2473f1a69be43067c' into gingerbread-plus-aosp * commit '2fb818ca7dd53d00646854a2473f1a69be43067c': Fix the javadoc of Parameters.setRotation.
| | * | | | | | Fix the javadoc of Parameters.setRotation.Wu-cheng Li2010-09-301-15/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | setRotation needs to consider the orientation of cameras. Change-Id: I3ef23dc088647dacdddbb83e3f303c16b9251185
* | | | | | | | am ab6327bc: am 20cb2310: Merge "KeyStore: Initialize IV correctly." into ↵Chia-chi Yeh2010-09-301-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit 'ab6327bc9ab70f3b4c1f509d038474982772207e' * commit 'ab6327bc9ab70f3b4c1f509d038474982772207e': KeyStore: Initialize IV correctly.
| * | | | | | | am 20cb2310: Merge "KeyStore: Initialize IV correctly." into gingerbreadChia-chi Yeh2010-09-301-1/+1
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '20cb2310cffb787c54016d50b9b5fe320fc5b025' into gingerbread-plus-aosp * commit '20cb2310cffb787c54016d50b9b5fe320fc5b025': KeyStore: Initialize IV correctly.
| | * | | | | | Merge "KeyStore: Initialize IV correctly." into gingerbreadChia-chi Yeh2010-09-301-1/+1
| | |\ \ \ \ \ \
| | | * | | | | | KeyStore: Initialize IV correctly.Chia-chi Yeh2010-09-301-1/+1
| | | | |_|_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | Change-Id: Idbf207dfcc11b92e606cbf4fd3732ed7a8aa3416
* | | | | | | | am 2b133fc0: am 21ae1ad6: RTP: Minor fixes with polishing.Chia-chi Yeh2010-09-303-19/+20
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '2b133fc07533a853f7de23da4f60a766f4233bed' * commit '2b133fc07533a853f7de23da4f60a766f4233bed': RTP: Minor fixes with polishing.
| * | | | | | | am 21ae1ad6: RTP: Minor fixes with polishing.Chia-chi Yeh2010-09-303-19/+20
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '21ae1ad6a695d6f1f253797fcf2a77b975b82cd3' into gingerbread-plus-aosp * commit '21ae1ad6a695d6f1f253797fcf2a77b975b82cd3': RTP: Minor fixes with polishing.
| | * | | | | | RTP: Minor fixes with polishing.Chia-chi Yeh2010-09-303-19/+20
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | Change-Id: I50641373989e512fb489b5017edbcfd7848fe8b9
* | | | | | | am 92cb1a02: am 2cbb56f9: Merge "KeyStore: Fix the return value when send() ↵Chia-chi Yeh2010-09-301-1/+4
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | or recv() has an error." into gingerbread Merge commit '92cb1a026a2d6c594a63c18d8906271147eed85b' * commit '92cb1a026a2d6c594a63c18d8906271147eed85b': KeyStore: Fix the return value when send() or recv() has an error.
| * | | | | | am 2cbb56f9: Merge "KeyStore: Fix the return value when send() or recv() has ↵Chia-chi Yeh2010-09-301-1/+4
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | an error." into gingerbread Merge commit '2cbb56f961e4893a3bf7ded560d4bdbf45eabd01' into gingerbread-plus-aosp * commit '2cbb56f961e4893a3bf7ded560d4bdbf45eabd01': KeyStore: Fix the return value when send() or recv() has an error.
| | * | | | | Merge "KeyStore: Fix the return value when send() or recv() has an error." ↵Chia-chi Yeh2010-09-301-1/+4
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into gingerbread
| | | * | | | | KeyStore: Fix the return value when send() or recv() has an error.Chia-chi Yeh2010-09-301-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I20a63c76bd29b1a9f8959a6c4fe5a5b8a9a971b4
* | | | | | | | am c79e74ec: am d29e0754: Merge "Add uri field to SipManager.ListenerRelay" ↵Hung-ying Tyan2010-09-301-10/+12
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into gingerbread Merge commit 'c79e74ec1d30f95de89568ee645a9b1577ae73b3' * commit 'c79e74ec1d30f95de89568ee645a9b1577ae73b3': Add uri field to SipManager.ListenerRelay
| * | | | | | | am d29e0754: Merge "Add uri field to SipManager.ListenerRelay" into gingerbreadHung-ying Tyan2010-09-301-10/+12
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'd29e0754183e4b3945eb7cabae91cd3df47ae4d6' into gingerbread-plus-aosp * commit 'd29e0754183e4b3945eb7cabae91cd3df47ae4d6': Add uri field to SipManager.ListenerRelay
| | * | | | | | Merge "Add uri field to SipManager.ListenerRelay" into gingerbreadHung-ying Tyan2010-09-301-10/+12
| | |\ \ \ \ \ \
| | | * | | | | | Add uri field to SipManager.ListenerRelayHung-ying Tyan2010-09-301-10/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in case mSession is not available. Change-Id: Ifee2c129e48aa1177f648f176413ab6aa5606770
* | | | | | | | | am f6381ec1: am dfd1484e: Merge "RTP: Adjust the jitter buffer to 512ms." ↵Chia-chi Yeh2010-09-301-23/+35
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into gingerbread Merge commit 'f6381ec1da1166e3350d897faae654afb2c21a5a' * commit 'f6381ec1da1166e3350d897faae654afb2c21a5a': RTP: Adjust the jitter buffer to 512ms.
| * | | | | | | | am dfd1484e: Merge "RTP: Adjust the jitter buffer to 512ms." into gingerbreadChia-chi Yeh2010-09-301-23/+35
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'dfd1484e3ba9c305730ccb39859919ca0e97d720' into gingerbread-plus-aosp * commit 'dfd1484e3ba9c305730ccb39859919ca0e97d720': RTP: Adjust the jitter buffer to 512ms.
| | * | | | | | | Merge "RTP: Adjust the jitter buffer to 512ms." into gingerbreadChia-chi Yeh2010-09-291-23/+35
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | | * | | | | | RTP: Adjust the jitter buffer to 512ms.Chia-chi Yeh2010-09-301-23/+35
| | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia91c1aa1a03b65dbd329ea98383f370844e2b0c0
* | | | | | | | am 34552149: am 6a53489a: SipService: add UID check.Hung-ying Tyan2010-09-301-15/+65
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '34552149e4b997d4ed3383fc153faff2bb189066' * commit '34552149e4b997d4ed3383fc153faff2bb189066': SipService: add UID check.
| * | | | | | | am 6a53489a: SipService: add UID check.Hung-ying Tyan2010-09-301-15/+65
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '6a53489ae594d7cc373a00687d6ea2f23d0634df' into gingerbread-plus-aosp * commit '6a53489ae594d7cc373a00687d6ea2f23d0634df': SipService: add UID check.
| | * | | | | | SipService: add UID check.Hung-ying Tyan2010-09-301-15/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only allow creator or radio user to access profiles. Change-Id: I548938f117926bcc878419142d1b5d818a4e70df
* | | | | | | | Merge "resolved conflicts for merge of 6e9a021e to master"Adam Powell2010-09-302-16/+74
|\ \ \ \ \ \ \ \