drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
31,047 Commits 1 Branch 0 Tags
Commit Graph

31047 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xavier Ducrohet
3082449508 am 1e24ccbd: Merge "Add generation of dependency file for .ap_ package" 
* commit '1e24ccbdd56a45c8bb5f2eba94af5aecd2d02554':
  Add generation of dependency file for .ap_ package
 2011-07-20 15:23:55 -07:00
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
Robert Greenwalt
1efe4d5cfd First pass tying into per-interface DNS cache 
Change-Id: Iacce225d392786e37fa2dbf9647045fca0b70e64
 2011-07-20 14:47:41 -07:00
Raphael Moll
caed59d90d Layoutlib_create flag -p: don't change all accesses to public. 
Change-Id: Icb1709ed0cb275a5a51ca34030695a5e94091499
 2011-07-19 22:36:13 -07:00
Xavier Ducrohet
ba6c98db8f am 82943ecf: am d40c93f6: Merge "Add dependency generation to Aapt for R.java" 
* commit '82943ecfe2c4266cf3db50326240825fefcaa38f':
  Add dependency generation to Aapt for R.java
 2011-07-19 10:15:11 -07:00
Xavier Ducrohet
d5431ed550 am 2e659ae5: am 42755155: Merge "Copy once-created R.java into library projects" 
* commit '2e659ae59c17a0c0584d35b8c400a294c9d49e12':
  Copy once-created R.java into library projects
 2011-07-19 10:15:09 -07:00
Xavier Ducrohet
82943ecfe2 am d40c93f6: Merge "Add dependency generation to Aapt for R.java" 
* commit 'd40c93f61ca5b3f2351b8db716f67b58f1625e85':
  Add dependency generation to Aapt for R.java
 2011-07-19 10:10:17 -07:00
Xavier Ducrohet
2e659ae59c am 42755155: Merge "Copy once-created R.java into library projects" 
* commit '42755155d6e8ddc3201b08def2bf262a64fa25f2':
  Copy once-created R.java into library projects
 2011-07-19 10:10:15 -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
a4aef41a74 am a74774fd: am 4d8f6a38: Merge "stagefright aacenc: Mark codeWord as UWord16" 
* commit 'a74774fd9146aa22801487d3652dc18e9e328b8e':
  stagefright aacenc: Mark codeWord as UWord16
 2011-07-18 16:53:41 -07:00
Conley Owens
a74774fd91 am 4d8f6a38: Merge "stagefright aacenc: Mark codeWord as UWord16" 
* commit '4d8f6a38e7268e29e189cb4173f42c7aa5b320a3':
  stagefright aacenc: Mark codeWord as UWord16
 2011-07-18 16:52:26 -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
2acddc54e1 am 89bac182: am 88409911: Merge "stagefright: Include stdlib.h for malloc/free" 
* commit '89bac1820f3788d655ae293ec9a65c18226e09ee':
  stagefright: Include stdlib.h for malloc/free
 2011-07-18 15:41:31 -07:00
Deckard Autoverifier
3114059886 am 16db83c2: am eb07c531: Merge "stagefright amrwbenc: Remove a duplicate, unused file" 
* commit '16db83c26442f5e25b6aad77a37b612fa0be9862':
  stagefright amrwbenc: Remove a duplicate, unused file
 2011-07-18 15:41:29 -07:00
Deckard Autoverifier
29fd8cdbe5 am 80ef1745: am c06c3603: Merge "stagefright aacenc: Make the mem_malloc function 64-bit safe" 
* commit '80ef1745d00c235b117e389e56e58210cf88e5c8':
  stagefright aacenc: Make the mem_malloc function 64-bit safe
 2011-07-18 15:41:26 -07:00
Deckard Autoverifier
691257b181 am 68e37dac: am 55f115a3: Merge "stagefright: Only use __int64 on MSVC, not on all win32 compilers" 
* commit '68e37dacc065eebb971d443722b7a8413ff403d6':
  stagefright: Only use __int64 on MSVC, not on all win32 compilers
 2011-07-18 15:41:24 -07:00
Deckard Autoverifier
89bac1820f am 88409911: Merge "stagefright: Include stdlib.h for malloc/free" 
* commit '88409911aebed6c3663e51d51fca67f527c0c2fb':
  stagefright: Include stdlib.h for malloc/free
 2011-07-18 15:38:30 -07:00
Deckard Autoverifier
16db83c264 am eb07c531: Merge "stagefright amrwbenc: Remove a duplicate, unused file" 
* commit 'eb07c531498f4dc881ad2b4d1a32cacab25950ff':
  stagefright amrwbenc: Remove a duplicate, unused file
 2011-07-18 15:38:27 -07:00
Deckard Autoverifier
80ef1745d0 am c06c3603: Merge "stagefright aacenc: Make the mem_malloc function 64-bit safe" 
* commit 'c06c3603e09a85136eb97d1d8ba1a49fcebae93b':
  stagefright aacenc: Make the mem_malloc function 64-bit safe
 2011-07-18 15:38:25 -07:00
Deckard Autoverifier
68e37dacc0 am 55f115a3: Merge "stagefright: Only use __int64 on MSVC, not on all win32 compilers" 
* commit '55f115a3214343c826acf27fcbc4bf2927049083':
  stagefright: Only use __int64 on MSVC, not on all win32 compilers
 2011-07-18 15:38:22 -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
45ddd42544 am 3edba93f: am 98fcc404: Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace" 
* commit '3edba93fd9bff8e2b22486271e6e816e3b233ae9':
  stagefright aacenc/amrwbenc: Remove trailing whitespace
 2011-07-18 12:44:57 -07:00
Conley Owens
3edba93fd9 am 98fcc404: Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace" 
* commit '98fcc4041d35831c7a65a6e2f0e61021e0fb37e2':
  stagefright aacenc/amrwbenc: Remove trailing whitespace
 2011-07-18 12:42:42 -07:00
Conley Owens
98fcc4041d Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace" 2011-07-18 12:37:16 -07:00
Nick Pelly
1bce9e25b6 am 01588aca: Merge "Preserve invariant that sService is not null (although NfcAdapter.get() can return null)" into gingerbread 
* commit '01588acaf87cfe9916239b7b26cc6810e0097138':
  Preserve invariant that sService is not null (although NfcAdapter.get() can return null)
 2011-07-13 22:38:44 -07:00
Jaikumar Ganesh
ab3ec17608 am 9ff89495: am 53cf7858: Merge "Bluetooth: correcting return value from cancelDiscovery" 
* commit '9ff89495a4890191a0bc5dfddf28f23f79f23698':
  Bluetooth: correcting return value from cancelDiscovery
 2011-07-13 10:25:27 -07:00
Jaikumar Ganesh
9ff89495a4 am 53cf7858: Merge "Bluetooth: correcting return value from cancelDiscovery" 
* commit '53cf7858c3fd36082302efdc4d848925bcc0001e':
  Bluetooth: correcting return value from cancelDiscovery
 2011-07-13 10:22:40 -07:00
Jaikumar Ganesh
53cf7858c3 Merge "Bluetooth: correcting return value from cancelDiscovery" 2011-07-13 10:04:19 -07:00
David 'Digit' Turner
db4c5f352d resolved conflicts for merge of 7816eded to gingerbread-plus-aosp 
Change-Id: I1f7d1f488f6a86774962d427aca472a8a444e0aa
 2011-07-12 00:57:09 +02:00
Nick Pelly
01588acaf8 Merge "Preserve invariant that sService is not null (although NfcAdapter.get() can return null)" into gingerbread 2011-07-11 11:07:22 -07:00
Robert Tsai
15bc894aae Preserve invariant that sService is not null (although NfcAdapter.get() can return null) 
Change-Id: I85fcbc5e79549835dac255ce614bd5d65d39fc25
 2011-07-09 23:57:22 -07:00
David 'Digit' Turner
7816eded41 merge intel x86 patches into gingerbread branch 2011-07-08 18:19:01 +02:00
David 'Digit' Turner
2435a927f3 NativeDaemonConnector: Fix SDCard mounting bug in the emulator. 
This patch fixes a really annoying bug that prevented the emulator
from properly mounting the SD Card.

The issue was that mOutputStream was not initialized when the onDaemonConnected
callbacks are called, just after the daemon's socket connection is established.

In one specific case (MountService a.k.a. VoldConnector), the corresponding
callback function immediately tried to perform a doCommandList() call on the
connector object. The request failed because mOutputStream was still defined
as null when it happened.

By moving the initialization of the variable just before the callback is
invoked, we ensure that things work properly.

Change-Id: I46726a50ef69eaafe70081ff4eda1244b744beba
 2011-07-07 03:46:00 +02:00
Bruce Beare
0a9b16d158 Fix missing NL 
Orig-Change-Id: I323f0c01d2e9ad4c9f07cad24bf6b63edc28ad62
Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>
 2011-07-07 03:45:59 +02:00
Robert Greenwalt
7022db4cd2 am 2b62c4fb: am 38bb0123: Merge "Added methods to support dns cache per interface" 
* commit '2b62c4fbfeb7df0988bf216c50cd4a24f05add9f':
  Added methods to support dns cache per interface
 2011-07-06 07:42:19 -07:00
Robert Greenwalt
2b62c4fbfe am 38bb0123: Merge "Added methods to support dns cache per interface" 
* commit '38bb0123b8b9857c3119fd359739daf872f619d6':
  Added methods to support dns cache per interface
 2011-07-06 07:35:02 -07:00
Robert Greenwalt
38bb0123b8 Merge "Added methods to support dns cache per interface" 2011-07-01 09:26:50 -07:00
Conley Owens
98395483e4 am 9f2cbf14: am e06749e1: Merge "Add FLAG_AUTO_CANCEL flag for multiple supl notifications." 
* commit '9f2cbf14f8d79e6ed48ff9d76f6aaede45185418':
  Add FLAG_AUTO_CANCEL flag for multiple supl notifications.
 2011-06-30 08:22:10 -07:00
Conley Owens
9f2cbf14f8 am e06749e1: Merge "Add FLAG_AUTO_CANCEL flag for multiple supl notifications." 
* commit 'e06749e14c1fb2d78540cba9548ee3b4b7b3b1d9':
  Add FLAG_AUTO_CANCEL flag for multiple supl notifications.
 2011-06-30 08:19:00 -07:00
Conley Owens
e06749e14c Merge "Add FLAG_AUTO_CANCEL flag for multiple supl notifications." 2011-06-30 08:11:25 -07:00
Eric Fischer
fb94fd3e11 Import revised translations. DO NOT MERGE 
Change-Id: I7d20fc3f79a16adf99cf8dc8465b79adcd8b38d7
 2011-06-29 12:36:17 -07:00
Xavier Ducrohet
842725fc64 am 4d825e1f: Merge "Bring in more layout lib changes from hc-mr1." into gingerbread 
* commit '4d825e1f3bb6b52ecbea6f0c4aa2081b7f1edc89':
  Bring in more layout lib changes from hc-mr1.
 2011-06-28 18:55:46 -07:00
Xavier Ducrohet
9bce27a9ce am 4753498d: Merge "CherryPick 06942bc4 from hc-mr1. do not merge." into gingerbread 
* commit '4753498d5c1ac3cf93b0730e77946a95b6913a82':
  CherryPick 06942bc4 from hc-mr1. do not merge.
 2011-06-28 18:55:42 -07:00
Xavier Ducrohet
155cf6c1e1 am 9918ffb0: Merge "CherryPick 988eeeb5 from hc-mr1. do not merge." into gingerbread 
* commit '9918ffb07f47430e22f6e53576d59b599f5a3534':
  CherryPick 988eeeb5 from hc-mr1. do not merge.
 2011-06-28 18:53:54 -07:00