Oscar Montemayor
fa8756149a
Merge "Apps on SD card. Added support for retrieving and generating keys as Hex Strings. Using keys to mount encrypted FS."
2010-01-15 16:20:23 -08:00
Kenny Root
5408f1409b
Merge "Update Time.parse3339() unit tests"
2010-01-15 14:44:58 -08:00
Romain Guy
f450dc86a4
Merge "Added clone to these three classes and added more comments."
2010-01-15 14:40:48 -08:00
Romain Guy
6b0221b52b
Merge "Added non-uniform scaling for spatial sampling."
2010-01-15 14:31:34 -08:00
Colin Cross
1410dff104
Merge "Use correct TLS codepath in graphics libraries"
2010-01-15 14:07:32 -08:00
Oscar Montemayor
d43a216f76
Merge "Apps on SD card. Added support for retrieving and generating keys as Hex Strings."
2010-01-15 13:52:39 -08:00
Eric Fischer
fcebabb49f
Merge "Make the "AM" or "PM" in the status bar clock be in a smaller font size."
2010-01-15 11:23:00 -08:00
Vasu Nori
2ecee422a8
Merge "Change Log.wtf() call to Log.w()"
2010-01-15 10:51:25 -08:00
Niko Catania
db2c8a7b61
Merge "New method to return the last dialed number Bug:2227429"
2010-01-15 10:47:48 -08:00
Robert Greenwalt
bc9cde22d6
resolved conflicts for merge of 90528645 to master
2010-01-15 10:45:11 -08:00
Robert Greenwalt
01389e2945
Merge "Set net.hostname sys property to our unique ID."
2010-01-15 10:20:18 -08:00
Niko Catania
10cdb3417f
Merge "New method to return the last dialed number Bug:2227429"
2010-01-15 09:18:05 -08:00
Tom O'Neill
6f30a0f40e
Merge "Improve ContractsContract.RawContacts documentation"
2010-01-15 08:15:20 -08:00
Romain Guy
ae6d574c61
Merge "Added non-uniform scaling for spatial sampling and converted double to float."
2010-01-14 18:43:51 -08:00
Andreas Huber
39a759eb4d
Merge "Squashed commit of the following:"
2010-01-14 15:12:36 -08:00
Andreas Huber
6d69b6bc19
Merge "Fix a few issues with determining the closest sample to a given time in the MPEG4 sampletable implementation."
2010-01-14 15:12:29 -08:00
Ficus Kirkpatrick
ed82ee7bf2
Merge "Remove some settings we are no longer using."
2010-01-14 15:08:55 -08:00
Andreas Huber
0579c22dd5
Merge "Squashed commit of the following:"
2010-01-14 15:01:22 -08:00
Fred Quintana
b1eb51cebf
Merge "allow + in usernames"
2010-01-14 14:58:39 -08:00
Fred Quintana
ca99444c98
allow + in usernames
2010-01-14 14:57:20 -08:00
Andreas Huber
2a90d6fcd1
Merge "Workaround for some hardware decoders not properly signaling end-of-output-stream properly."
2010-01-14 14:50:11 -08:00
Suchi Amalapurapu
8a6fbfa1d5
Merge "app install on sdcard. provide skeleton implementation to install an app on sdcard, just resources. Add new install path for /asec in installd. ignore . when checking for apk path since the sdcard packages id'ed by package name. Add new -s option to adb shell pm Refactor fwd locked from scanMode to ApplicationInfo. Add new flag for sd install Add new parse flags for fwd locking and installing on sdcard New mock api's in PackageManagerService to invoke MountService api's. These will be refactored again and so have been wrapped internally. Some error codes in PackageManager Changes in PackageManagerService to use mPath and mScanPath during installation and switch to using PackageParser.Package.applicationInfo attributes for source and public resource directories. Some known issues that will be addressed later using system_uid for now. needs some tinkering with uid and packagesetting creation to use the actual app uid error handling from vold not very robust. ignoring lot of things for now sending a delayed destroy to delete packages. will revisit later revisit temp file creation later. just copy for now"
2010-01-14 14:01:56 -08:00
Nicolas Roard
6e307ef968
am 0123101a: am af2af4e5: Add proper support for fixed position elements
...
Merge commit '0123101af0e15221026f97f19dad23488840700a'
* commit '0123101af0e15221026f97f19dad23488840700a':
Add proper support for fixed position elements
2010-01-14 13:18:25 -08:00
Nicolas Roard
d685aabe01
am af2af4e5: Add proper support for fixed position elements
...
Merge commit 'af2af4e53aedb14c781d0351565fd7bec55a141a' into eclair-mr2-plus-aosp
* commit 'af2af4e53aedb14c781d0351565fd7bec55a141a':
Add proper support for fixed position elements
2010-01-14 13:13:26 -08:00
Bjorn Bringert
59b7cdf119
Merge "Expose SearchManager constants for global search"
2010-01-14 13:01:01 -08:00
Niko Catania
ab44be3741
Merge "New method to return the last dialed number Bug:2227429"
2010-01-14 11:51:12 -08:00
Andreas Huber
7335117350
Merge "Support for determining the mime type of media via metadata extraction."
2010-01-14 11:38:24 -08:00
Mark Wagner
d6b746034d
Merge "constants for search"
2010-01-14 11:34:43 -08:00
Mark Wagner
345f8a1fe8
Merge "bugfix endfling case (bug 2300534)"
2010-01-14 08:52:12 -08:00
Bjorn Bringert
2ebad4101c
Merge "Remove Intent.ACTION_GLOBAL_SEARCH"
2010-01-14 02:26:50 -08:00
Bjorn Bringert
2d9e35115e
Merge "Add QSB's GoogleSearch as the preferred web search provider"
2010-01-14 02:25:34 -08:00
Robert Greenwalt
40e8f84f05
am 1193ae4e: Backport l53e91db7 from master.
...
Merge commit '1193ae4e824c66b75083c444ce0f250594e138ee' into eclair-plus-aosp
* commit '1193ae4e824c66b75083c444ce0f250594e138ee':
Backport l53e91db7 from master.
2010-01-13 17:09:40 -08:00
Jason Sams
d9a729bfaf
Merge "Remove excessive logging, fix error in GLSL uniform generation."
2010-01-13 14:54:20 -08:00
Neal Nguyen
9020c70f8a
Merge "Framework Tests Cleanup: Removing CTS duplicate files"
2010-01-13 14:19:11 -08:00
Neal Nguyen
8980c204af
Merge "Framework Tests Cleanup: Removing CTS duplicate files"
2010-01-13 14:18:48 -08:00
Neal Nguyen
6e9ec6112c
Merge "Framework Tests Cleanup: Removing CTS duplicate files"
2010-01-13 14:18:17 -08:00
Neal Nguyen
c0dbaf3371
Merge "Framework Tests Cleanup: Removing CTS duplicate files"
2010-01-13 14:17:56 -08:00
John Wang
f6abaa57e2
Merge "Hangup calls before powering off radio."
2010-01-13 12:12:49 -08:00
Patrick Scott
97a07940a2
am 70c4f6cf: am 021b7b44: Add a static method to obtain the mime type from extension.
...
Merge commit '70c4f6cfb4fd48d5153080d038ac0f5b6dbd98ec'
* commit '70c4f6cfb4fd48d5153080d038ac0f5b6dbd98ec':
Add a static method to obtain the mime type from extension.
2010-01-13 11:51:33 -08:00
Patrick Scott
c220162cfd
am 021b7b44: Add a static method to obtain the mime type from extension.
...
Merge commit '021b7b443fa4bb24ec73d0c09cf019c14eba67bc' into eclair-mr2-plus-aosp
* commit '021b7b443fa4bb24ec73d0c09cf019c14eba67bc':
Add a static method to obtain the mime type from extension.
2010-01-13 11:37:33 -08:00
Andreas Huber
6dafd54f0b
Merge "More metadata support."
2010-01-13 11:28:21 -08:00
Leon Scroggins
6c3067a055
am ace8addc: am 2edd6826: Create a new ImeOption that disables fullscreen in landscape, and use it.
...
Merge commit 'ace8addce47efc03be5038eef48d7fb066b14aae'
* commit 'ace8addce47efc03be5038eef48d7fb066b14aae':
Create a new ImeOption that disables fullscreen in landscape, and use it.
2010-01-13 06:15:38 -08:00
Leon Scroggins
e5cd272577
am 2edd6826: Create a new ImeOption that disables fullscreen in landscape, and use it.
...
Merge commit '2edd68260f26cbd6eddd0df16404bb6bcb22b3b6' into eclair-mr2-plus-aosp
* commit '2edd68260f26cbd6eddd0df16404bb6bcb22b3b6':
Create a new ImeOption that disables fullscreen in landscape, and use it.
2010-01-13 06:11:05 -08:00
Gary King
9166f7bfa7
Use correct TLS codepath in graphics libraries
...
Duplicate ARCH_ARM_HAVE_TLS_REGISTER BoardConfig to proprocessor
HAVE_ARM_TLS_REGISTER define from Bionic's libc Android.mk to ensure that
OpenGL libraries (libEGL, libGLESv1_CM, libGLESv2, libGLES_android) use the
correct codepath in bionic_tls.h for accessing the TLS address
2010-01-12 17:35:35 -08:00
Andreas Huber
a6f5522e64
Merge "Properly respect NALLengthSize in the AVC Configuration header to determine how many bits encode the nal unit size."
2010-01-12 16:42:47 -08:00
Ying Wang
e66f6e966c
am b4f41119: am a1d08886: Merge "Only output proguard keep for nonempty attribute name in the AndroidManifest.xml." into eclair
...
Merge commit 'b4f41119044e5ec7f7b76ed4ac02b5cfbaeb474d'
* commit 'b4f41119044e5ec7f7b76ed4ac02b5cfbaeb474d':
Only output proguard keep for nonempty attribute name in the AndroidManifest.xml.
2010-01-12 16:37:31 -08:00
Ying Wang
4be913e4a8
am a1d08886: Merge "Only output proguard keep for nonempty attribute name in the AndroidManifest.xml." into eclair
...
Merge commit 'a1d08886ec8549878ad16c19754a3239706fb61b' into eclair-plus-aosp
* commit 'a1d08886ec8549878ad16c19754a3239706fb61b':
Only output proguard keep for nonempty attribute name in the AndroidManifest.xml.
2010-01-12 16:34:13 -08:00
Ying Wang
63673439f0
Merge "Only output proguard keep for nonempty attribute name in the AndroidManifest.xml." into eclair
2010-01-12 16:31:14 -08:00
Daisuke Miyakawa
0b23bbb4ec
Merge "Handle null correctly."
2010-01-12 15:47:00 -08:00
Jason Sams
6ea03e7b06
Merge "Implement type generation for user uniforms in vertex shader."
2010-01-12 15:39:57 -08:00