30800 Commits

Author SHA1 Message Date
Josiah Gaskin
8a39da80b3 Added Caching for PreProcessed PNGs
Added a cache management system for pre-processed PNG files
along with unit tests. The cache system will be used if
the --no-crunch flag is passed to AAPT during the package
phase. The cache can be updated by a call to 'aapt crunch'
(see usage statement). Also put in benchmarking code.

Change-Id: I58271fb2ee2f5f9075fd74d4ff6f15e7afabd05c
2011-07-20 15:20:26 -07:00
Xavier Ducrohet
1e24ccbdd5 Merge "Add generation of dependency file for .ap_ package" 2011-07-20 15:08:23 -07:00
Xavier Ducrohet
d40c93f61c Merge "Add dependency generation to Aapt for R.java" 2011-07-19 10:03:16 -07:00
Xavier Ducrohet
42755155d6 Merge "Copy once-created R.java into library projects" 2011-07-19 10:03:05 -07:00
Conley Owens
4d8f6a38e7 Merge "stagefright aacenc: Mark codeWord as UWord16" 2011-07-18 16:49:43 -07:00
Josiah Gaskin
03589cc653 Add generation of dependency file for .ap_ package
Make Aapt generate a dependency file in the same directory as the
output ap_ file if the --generate-dependencies flag is set.
This dependency file can then be read by the ant exec loop task
to see whether to repackage resources.

Change-Id: I763679414daf76369700aa599c26dcf78d4de099
2011-07-18 16:37:55 -07:00
Deckard Autoverifier
88409911ae Merge "stagefright: Include stdlib.h for malloc/free" 2011-07-18 15:23:41 -07:00
Deckard Autoverifier
eb07c53149 Merge "stagefright amrwbenc: Remove a duplicate, unused file" 2011-07-18 15:23:31 -07:00
Deckard Autoverifier
c06c3603e0 Merge "stagefright aacenc: Make the mem_malloc function 64-bit safe" 2011-07-18 15:23:20 -07:00
Deckard Autoverifier
55f115a321 Merge "stagefright: Only use __int64 on MSVC, not on all win32 compilers" 2011-07-18 15:23:09 -07:00
Conley Owens
98fcc4041d Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace" 2011-07-18 12:37:16 -07:00
Jaikumar Ganesh
53cf7858c3 Merge "Bluetooth: correcting return value from cancelDiscovery" 2011-07-13 10:04:19 -07:00
Robert Greenwalt
38bb0123b8 Merge "Added methods to support dns cache per interface" 2011-07-01 09:26:50 -07:00
Conley Owens
e06749e14c Merge "Add FLAG_AUTO_CANCEL flag for multiple supl notifications." 2011-06-30 08:11:25 -07:00
Josiah Gaskin
9bf34ca6f8 Add dependency generation to Aapt for R.java
Make Aapt generate a dependency file in the location specified
by RClassDir for R.java if the --generate-dependencies flag is set.
This dependency file is then read by the ant exec loop task
to see whether to recreate R.java.

Change-Id: I7152dac86b6ea0e448ef65e3a95694afe233c789
2011-06-27 16:44:57 -07:00
Josiah Gaskin
ce89f1531e Copy once-created R.java into library projects
This change adds functionality in Aapt to allow specification of
library projects to copy the generated R.java file into rather
than regenerating the file for each library project.

Change-Id: I05939d1dc875bd875be9298ca47cb639235070c6
2011-06-27 16:29:38 -07:00
Jean-Baptiste Queru
4fea5373d3 Merge "Add WEBP to the list of Image formats that support Compression." 2011-06-24 11:13:42 -07:00
Jean-Baptiste Queru
f458d5fdb8 Merge "Tweak for forward-compatibility" 2011-06-24 11:08:36 -07:00
Jean-Baptiste Queru
0fe0e7a4cb Tweak for forward-compatibility
Change-Id: Ic5e4d949c1c80a2ebdc2ec802c35b5d3d7f9661d
2011-06-24 10:49:18 -07:00
Martin Storsjo
21fc9ad28e stagefright amrwbenc: Remove a duplicate, unused file
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
2011-06-23 12:20:12 +03:00
Vikas Arora
2305ac9e4a Add WEBP to the list of Image formats that support Compression.
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
2011-06-23 13:11:13 +05:30
Raphael Moll
e2b41b0d5c Merge "Laoutlib_creator: keep original of delegate methods." 2011-06-22 17:11:27 -07:00
Martin Storsjo
842679beea stagefright: Only use __int64 on MSVC, not on all win32 compilers
Change-Id: I9eef7e1cb762753b792ab602333dc5a2fd8a173c
2011-06-22 21:55:13 +03:00
Martin Storsjo
a9de2b598d stagefright aacenc: Make the mem_malloc function 64-bit safe
Change-Id: I720109133bf5e13388b26a3bdbd66ff1f5320b70
2011-06-22 21:54:25 +03:00
Martin Storsjo
5c8247f730 stagefright: Include stdlib.h for malloc/free
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
2011-06-22 21:54:06 +03:00
Conley Owens
bf5adfa5e5 Merge "Check if we are in daylight time when calculating timezone" 2011-06-20 11:01:41 -07:00
Jean-Baptiste Queru
e3b05d0916 Merge "Tweaks for forward-compatibility" 2011-06-18 09:45:53 -07:00
Jean-Baptiste Queru
84d0ccf16c Tweaks for forward-compatibility
Change-Id: Iec525edc186e78d5d865f82dd5b1f56263c22e86
2011-06-18 09:42:04 -07:00
Raphael Moll
865c3bef54 Laoutlib_creator: keep original of delegate methods.
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
2011-06-17 19:07:13 -07:00
Anshuman Pandey
fad5445c66 Add FLAG_AUTO_CANCEL flag for multiple supl notifications.
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>
2011-06-15 14:49:53 +02:00
Conley Owens
d8b027b18f Merge "stagefright aacenc/amrwbenc: Convert line breaks to Unix style" 2011-06-09 11:12:04 -07:00
Jean-Baptiste Queru
f3894a04ac Merge "Tweak setViewport stuff for fwd-compat" 2011-06-08 13:10:58 -07:00
Jean-Baptiste Queru
de26719153 Tweak setViewport stuff for fwd-compat
Change-Id: I532336eced54544115dfd47d5557cc77bafdfc87
2011-06-08 13:00:58 -07:00
Romain Guy
258f32e2e3 Merge "Disable plugins if setPluginsEnabled(false) called." 2011-06-06 16:23:25 -07:00
Tero Saarni
29086e46be Disable plugins if setPluginsEnabled(false) called.
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>
2011-06-02 23:06:58 +03:00
Jaikumar Ganesh
94062517ae Merge "Require bonding and encryption for PBAP server" 2011-05-25 09:27:32 -07:00
Jean-Baptiste Queru
038e8f9984 Merge "Adding support for parsing of SMS-CB pdus in UMTS format." 2011-05-25 08:06:17 -07:00
Conley Owens
4cf0eee755 Merge "Fixing concurrency issue on IccPhoneBookInterfaceManager." 2011-05-24 14:05:05 -07:00
David Sobreira Marques
d778462836 Fixing concurrency issue on IccPhoneBookInterfaceManager.
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>
2011-05-20 20:14:56 -03:00
Jaikumar Ganesh
4b41df613d Merge "Use proper type for oob variable in register_agent. Without this change the BluetoothEventLoop crashes on my armv5 arch board." 2011-05-20 13:37:00 -07:00
Jaikumar Ganesh
198ed3e46a Merge "BT: Wrong publishing result of bonding error code." 2011-05-20 13:35:20 -07:00
Jaikumar Ganesh
848a1e3d85 Merge "OBEX: Fix PrivateOutputStream small write problem" 2011-05-20 09:40:32 -07:00
Erik Ljungberg
a9c4c594ef OBEX: Fix PrivateOutputStream small write problem
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
2011-05-20 12:39:18 +02:00
Jean-Baptiste Queru
6c427617be Merge "support humidity sensor type" 2011-05-18 15:00:11 -07:00
Jean-Baptiste Queru
7ae7d31c2f Merge "MOTOYA changed two kinds of Japanese font files." 2011-05-18 09:24:40 -07:00
Mathias Jeppsson
e3b9dc107e Require bonding and encryption for PBAP server
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
2011-05-17 07:52:15 +02:00
Jean-Baptiste Queru
f247e545b5 Merge "Adapt to latest skia" 2011-05-12 15:09:51 -07:00
Derek Sollenberger
0ceb9501b2 Adapt to latest skia
Change-Id: I39247db04ca8b7993b0f5a16fb0324828d04cc3a
2011-05-12 15:05:44 -07:00
Jean-Baptiste Queru
6714e67740 Merge "Ninepatch tweaks for better interop" 2011-05-12 14:24:09 -07:00
Jean-Baptiste Queru
9faa34e603 Ninepatch tweaks for better interop
Change-Id: I96781e2b27fcd6dd05d9726829e8e79ff365cbdc
2011-05-12 14:22:43 -07:00