summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "stagefright aacenc: Mark codeWord as UWord16"Conley Owens2011-07-181-1/+1
|\
| * stagefright aacenc: Mark codeWord as UWord16Martin Storsjo2011-04-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | Without this, the codeword 0xffff will be expanded to 0xffffffff when passed as a Word32 parameter. All code words set into this variable are UWord16 initially. When it was expanded to 0xffffffff, it could accidentally overwrite earlier cached bits in the bitstream writer. Change-Id: Id91a2b8a4e934876d9cb39eaeeee323202ec8e40
* | Merge "stagefright: Include stdlib.h for malloc/free"Deckard Autoverifier2011-07-181-3/+1
|\ \
| * | stagefright: Include stdlib.h for malloc/freeMartin Storsjo2011-06-221-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to ANSI C, malloc/free are provided by stdlib.h. Also, string.h is always available according to ANSI C, and provides the memset function, so there's no need to include it conditionally for linux only. This makes the code buildable on OS X, too. Change-Id: Ie5d1da02158797e7e45dea257cbe3e4996dde4db
* | | Merge "stagefright amrwbenc: Remove a duplicate, unused file"Deckard Autoverifier2011-07-181-73/+0
|\ \ \
| * | | stagefright amrwbenc: Remove a duplicate, unused fileMartin Storsjo2011-06-231-73/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This file is identical to common/cmnMemory.c, and that's the file that is used by all the makefiles, not this one. Change-Id: I6a601c24a983285e55e5356bd5569853a1e2d7fe
* | | | Merge "stagefright aacenc: Make the mem_malloc function 64-bit safe"Deckard Autoverifier2011-07-181-2/+7
|\ \ \ \
| * | | | stagefright aacenc: Make the mem_malloc function 64-bit safeMartin Storsjo2011-06-221-2/+7
| | |/ / | |/| | | | | | | | | | Change-Id: I720109133bf5e13388b26a3bdbd66ff1f5320b70
* | | | Merge "stagefright: Only use __int64 on MSVC, not on all win32 compilers"Deckard Autoverifier2011-07-181-1/+1
|\ \ \ \
| * | | | stagefright: Only use __int64 on MSVC, not on all win32 compilersMartin Storsjo2011-06-221-1/+1
| |/ / / | | | | | | | | | | | | Change-Id: I9eef7e1cb762753b792ab602333dc5a2fd8a173c
* | | | Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace"Conley Owens2011-07-18150-5154/+5154
|\ \ \ \ | | |_|/ | |/| |
| * | | stagefright aacenc/amrwbenc: Remove trailing whitespaceMans Rullgard2011-04-23150-5154/+5154
| | | | | | | | | | | | | | | | Change-Id: I3c85d8ba4cfb164455d137cdbf3b5ecc941dc6b8
* | | | Merge "Bluetooth: correcting return value from cancelDiscovery"Jaikumar Ganesh2011-07-133-5/+9
|\ \ \ \
| * | | | Bluetooth: correcting return value from cancelDiscoveryAlbert Mojir2011-03-213-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BluetoothAdapter.cancelDiscovery was previously always returning false. Change-Id: Ic1fd134d4b710438d95c5b8ca009104529dd1bf5
* | | | | Merge "Added methods to support dns cache per interface"Robert Greenwalt2011-07-012-0/+80
|\ \ \ \ \
| * | | | | Added methods to support dns cache per interfaceMattias Falk2011-04-192-0/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added some methods to NetworkManagementService as part of the work to implement a dns cache per interface. Change-Id: I5c7369075dee6b6a4ff67b27f1df7cc124f54c14
* | | | | | Merge "Add FLAG_AUTO_CANCEL flag for multiple supl notifications."Conley Owens2011-06-301-1/+1
|\ \ \ \ \ \
| * | | | | | Add FLAG_AUTO_CANCEL flag for multiple supl notifications.Anshuman Pandey2011-06-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added FLAG_AUTO_CANCEL to notification flags in GpsNetInitiatedHandler.java. This is done to clear consecutive notifications in UI Change-Id: I84be36af0b556f43ffd7d51ac04ff12300090ca5 Signed-off-by: Anshuman Pandey <anshuman.pandey@stericsson.com> Signed-off-by: Christian Bejram <christian.bejram@stericsson.com>
* | | | | | | Merge "Add WEBP to the list of Image formats that support Compression."Jean-Baptiste Queru2011-06-242-3/+7
|\ \ \ \ \ \ \
| * | | | | | | Add WEBP to the list of Image formats that support Compression.Vikas Arora2011-06-232-3/+7
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note: The integrator of this change to Android internal code-repo will have to run one extra step 'make update-api' to update 'api/current.txt' file corresponding to approved API. The AOSP branch didn't have this file, hence I could not add the same to this change. The updated file 'api/current.txt' has to be submitted along with this change. Change-Id: I29909e907a2e82d801e16654322190a808c5bda9
* | | | | | | Merge "Tweak for forward-compatibility"Jean-Baptiste Queru2011-06-241-0/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Tweak for forward-compatibilityJean-Baptiste Queru2011-06-241-0/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | Change-Id: Ic5e4d949c1c80a2ebdc2ec802c35b5d3d7f9661d
* | | | | | Merge "Laoutlib_creator: keep original of delegate methods."Raphael Moll2011-06-228-117/+319
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Laoutlib_creator: keep original of delegate methods.Raphael Moll2011-06-178-117/+319
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For specific methods, Layoublib_create can rewrite the implementation of a method to invoke a delegate instead of the original code. This allows layoutlib to implement native code or override existing behavior. This patch also 'saves' the original implementation of a rewritten method so that the delegate can access the original implementation as needed. Obviously this is only done for non-native methods. Given a non-native SomeClass.MethodName, we generate 2 methods: - A copy of the original method named "SomeClass.MethodName_original". The content is the original method as-is from the reader. - A brand new implementation of SomeClass.MethodName which calls to a non-existing method named "SomeClass_delegate.MethodName". The implementation of this 'delegate' method is done in layoutlib_brigde. Change-Id: I5ca2cd3ac55991a8e8a51c417e75ee447bf9e9e6
* | | | | Merge "Check if we are in daylight time when calculating timezone"Conley Owens2011-06-201-7/+3
|\ \ \ \ \
| * | | | | Check if we are in daylight time when calculating timezoneLavettacn Xiao2011-04-191-7/+3
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code that calculates the Kernel TimeZone does not check if we are actually in daylite time prior updating the kernel time zone. Use TimeZone.getOffset which checks for daylight savings. Also updated setTimeZone for consistency. Change-Id: I44565bc8df48e81370ea3bfbb099a6a5675e343d
* | | | | Merge "Tweaks for forward-compatibility"Jean-Baptiste Queru2011-06-184-0/+17
|\ \ \ \ \
| * | | | | Tweaks for forward-compatibilityJean-Baptiste Queru2011-06-184-0/+17
|/ / / / / | | | | | | | | | | | | | | | Change-Id: Iec525edc186e78d5d865f82dd5b1f56263c22e86
* | | | | Merge "stagefright aacenc/amrwbenc: Convert line breaks to Unix style"Conley Owens2011-06-09185-30089/+30089
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | stagefright aacenc/amrwbenc: Convert line breaks to Unix styleMans Rullgard2011-04-23185-30089/+30089
| | | | | | | | | | | | | | | | | | | | Change-Id: I6219725a9fbd72432bad71a176c14f26fabdbd5f
* | | | | Merge "Tweak setViewport stuff for fwd-compat"Jean-Baptiste Queru2011-06-082-18/+3
|\ \ \ \ \
| * | | | | Tweak setViewport stuff for fwd-compatJean-Baptiste Queru2011-06-082-18/+3
|/ / / / / | | | | | | | | | | | | | | | Change-Id: I532336eced54544115dfd47d5557cc77bafdfc87
* | | | | Merge "Disable plugins if setPluginsEnabled(false) called."Romain Guy2011-06-061-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Disable plugins if setPluginsEnabled(false) called.Tero Saarni2011-06-021-1/+1
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Old deprecated method for enabling/disabling plugins was ignoring flag parameter and causing plugins always to be loaded. Fixes issue 17242. Change-Id: I1da10a3ee7f3041e59b43641169c3935a05aa347 Signed-off-by: Tero Saarni <tero.saarni@gmail.com>
* | | | Merge "Require bonding and encryption for PBAP server"Jaikumar Ganesh2011-05-251-3/+63
|\ \ \ \
| * | | | Require bonding and encryption for PBAP serverMathias Jeppsson2011-05-171-3/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Phonebook Access Profile specification requires bonding and encryption. For devices not supporting SSP (Secure Simple Pairing), InsecureRfcomm will require neither. Adding EncryptedRfcomm to force bonding and encryption but not requiring authenticated link key. Change-Id: If47cca9c5ffd89358bcd61d64f7785d17e0ca7cc
* | | | | Merge "Adding support for parsing of SMS-CB pdus in UMTS format."Jean-Baptiste Queru2011-05-253-28/+512
|\ \ \ \ \
| * | | | | Adding support for parsing of SMS-CB pdus in UMTS format.Henrik Hall2011-01-113-28/+512
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This enables RIL to dispatch pdus in both GSM or UMTS format. The RAT that was used will be transparent to clients. Change-Id: I57c53ec79496d274e18b3fee196551af97c0857d
* | | | | | Merge "Fixing concurrency issue on IccPhoneBookInterfaceManager."Conley Owens2011-05-243-34/+43
|\ \ \ \ \ \
| * | | | | | Fixing concurrency issue on IccPhoneBookInterfaceManager.David Sobreira Marques2011-05-203-34/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All the reads/updates methods are synchronous calls that rely on an unique lock object in order to wait for the asynchronous simcard operations to complete and return appropriate results Concurent calls to these methods will cause errors when one completed operation will unlock all waiting calls generating inconsistent results on some of the method calls. Change-Id: I8b87004ac039bcb971b8369f7640281f1bf9eb35 Signed-off-by: David Sobreira Marques <dpsmarques@gmail.com>
* | | | | | | Merge "Use proper type for oob variable in register_agent. Without this ↵Jaikumar Ganesh2011-05-201-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | change the BluetoothEventLoop crashes on my armv5 arch board."
| * | | | | | | Use proper type for oob variable in register_agent.Nicu Pavel2011-05-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without this change the BluetoothEventLoop crashes on my armv5 arch board. Change-Id: Ia10382f0aea4736be268512ccf9d5c5cde052851
* | | | | | | | Merge "BT: Wrong publishing result of bonding error code."Jaikumar Ganesh2011-05-201-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | BT: Wrong publishing result of bonding error code.Arek Lichwa2011-05-051-1/+1
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | During bonding bluez stack publish the error code over dbus. JNI gets the error, in this ER case: org.bluez.Error.AuthenticationFailed (Authentication Failed), and then wrong call to overloaded setBondState() is made on callstack using default result code parameter as 0 (BOND_SUCCESS). Change-Id: I6f743cedc76e63d0c2a35e89d3aa48267b89c06e Signed-off-by: Christian Bejram <christian.bejram@stericsson.com>
* | | | | | | | Merge "OBEX: Fix PrivateOutputStream small write problem"Jaikumar Ganesh2011-05-201-12/+9
|\ \ \ \ \ \ \ \
| * | | | | | | | OBEX: Fix PrivateOutputStream small write problemErik Ljungberg2011-05-201-12/+9
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When data less than max packet size in length is sent into the write method the data will only be added to the internal buffer. If several calls to write is performed by the application continueOperation will not be called at all. The solution to the problem is to always check the internal buffer size and to call continueOperation every time maxPacketSize bytes is in the internal buffer. Change-Id: I5ebfa3c26db2c1aefe1a115d7782d8ceaa760937
* | | | | | | | Merge "support humidity sensor type"Jean-Baptiste Queru2011-05-183-1/+77
|\ \ \ \ \ \ \ \
| * | | | | | | | support humidity sensor typeUrs Fleisch2011-04-133-1/+77
| | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | Change-Id: I4156842677e91de0f922284d196147ff61e71a70
* | | | | | | | Merge "MOTOYA changed two kinds of Japanese font files."Jean-Baptiste Queru2011-05-182-0/+0
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | MOTOYA changed two kinds of Japanese font files.yoshinaka2011-04-062-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | <The design image was changed to the full size> From "U+FF10 fullwidth zero" to "U+FF19 fullwidth nine" <Following characters were added> "U+203C double exclamation poin","U+2047 double question mark","U+2048 question exclamation point" "U+2049 exclamation question mark","U+261A Black left pointing index","U+261B Black right pointing index" "U+261C White left pointing index","U+261D White up pointing index","U+261E White right pointing index" "U+261F White down pointing index" Change-Id: I1641926c13ce8e11fde794f5584119ad44607374
generated by cgit v1.1 at 2025-08-03 16:30:49 +0000