ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
20,687 Commits 2 Branches 0 Tags 54 MiB
dd3718af90
Commit Graph

20687 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kenny Root
dd3718af90 am bb10986c: am 13ce221e: Merge "libutils: Fix an improper const-cast in RefBase" 
* commit 'bb10986c3d7493eaa3cd16042c8e6dae4769a071':
  libutils: Fix an improper const-cast in RefBase
 2011-04-26 11:41:31 -07:00
Kenny Root
b5e7f05190 am 13ce221e: Merge "libutils: Fix an improper const-cast in RefBase" 
* commit '13ce221e4316f7956ba072e774a7b97646e5d99b':
  libutils: Fix an improper const-cast in RefBase
 2011-04-26 11:32:22 -07:00
Kenny Root
c364113a1b Merge "libutils: Fix an improper const-cast in RefBase" 2011-04-26 11:26:33 -07:00
Jean-Baptiste Queru
84199cac5d am 5fcfce96: am 4b72eec3: Merge "Re-assingning local variable if mStringBlocks was initialized here. NPE is thrown otherwise." 
* commit '5fcfce965f1380ee7e151c1df75b247dd42b349e':
  Re-assingning local variable if mStringBlocks was initialized here. NPE is thrown otherwise.
 2011-04-26 01:20:37 -07:00
Irfan Sheriff
6e218d3f06 am d2127c43: Handle DHCP renewal and wakeup in framework 
* commit 'd2127c438fc858a4f6c8ad75b7a1e4491da69a78':
  Handle DHCP renewal and wakeup in framework
 2011-04-26 01:01:31 -07:00
Jean-Baptiste Queru
a89e25181f am 4b72eec3: Merge "Re-assingning local variable if mStringBlocks was initialized here. NPE is thrown otherwise." 
* commit '4b72eec34c983abb7a3afcbadd74d3bd807c4765':
  Re-assingning local variable if mStringBlocks was initialized here. NPE is thrown otherwise.
 2011-04-26 00:39:44 -07:00
Jean-Baptiste Queru
26603203b6 Merge "Re-assingning local variable if mStringBlocks was initialized here. NPE is thrown otherwise." 2011-04-25 13:33:37 -07:00
Josh Stone
e6b21626a5 libutils: Fix an improper const-cast in RefBase 
Under Fedora 15 Beta, gcc 4.6.0 warns:

  frameworks/base/libs/utils/RefBase.cpp: In member function
    ‘void android::RefBase::weakref_type::trackMe(bool, bool)’:
  frameworks/base/libs/utils/RefBase.cpp:483:67: error: passing
    ‘const android::RefBase::weakref_impl’ as ‘this’ argument of
    ‘void android::RefBase::weakref_impl::trackMe(bool, bool)’
    discards qualifiers [-fpermissive]

trackMe is not a const function, so don't use const in the static_cast
to a weakref_impl pointer.

Change-Id: I3c9ba73eb127985f5f54197ffecf2939c50f632c
 2011-04-22 11:13:35 -07:00
Jaikumar Ganesh
1aaeddba56 am c34c88b9: am ec1a8f7a: Merge "Unable to push files to Windows 7" 
* commit 'c34c88b948cb60c057bd2145df9f1b2091f3c894':
  Unable to push files to Windows 7
 2011-04-19 15:57:24 -07:00
Jaikumar Ganesh
d13def39d3 am ec1a8f7a: Merge "Unable to push files to Windows 7" 
* commit 'ec1a8f7aa7e71e292ef813b1e886a9e26e3635af':
  Unable to push files to Windows 7
 2011-04-19 15:28:26 -07:00
Jaikumar Ganesh
7b55adc715 Merge "Unable to push files to Windows 7" 2011-04-19 14:48:08 -07:00
Andreas Huber
e0f13c86b1 am f0f1ceeb: DO NOT MERGE: Make sure we restart the prefetcher immediately when trying to satisfy a read. 
* commit 'f0f1ceeb517ff226532a407da6d55602f195e5b5':
  DO NOT MERGE: Make sure we restart the prefetcher immediately when trying to satisfy a read.
 2011-04-18 15:39:09 -07:00
Eric Fischer
b7b75cbe6d am 71a556f2: Import revised translations. DO NOT MERGE 
* commit '71a556f24e2b8d489bf81b22fab6fe5e99a9eae0':
  Import revised translations.  DO NOT MERGE
 2011-04-12 13:02:15 -07:00
Kenny Root
8a1a615176 am 08d9d9a4: Merge "Runtime resource overlay, iteration 1." 
* commit '08d9d9a46250c4fad66e9b637e8898a3524c4286':
  Runtime resource overlay, iteration 1.
 2011-04-11 15:33:19 -07:00
Kenny Root
d59b5d0087 Merge "Runtime resource overlay, iteration 1." 2011-04-11 10:07:15 -07:00
Brad Fitzpatrick
99887e9630 am ca7ad44a: Merge "audioflinger: Enable ARMv5TE optimized resampler" 
* commit 'ca7ad44a8b6764b5935143bfe55700cbddb0d990':
  audioflinger: Enable ARMv5TE optimized resampler
 2011-04-07 09:08:58 -07:00
Brad Fitzpatrick
fb3f51702d Merge "audioflinger: Enable ARMv5TE optimized resampler" 2011-04-07 08:57:00 -07:00
Xavier Ducrohet
44ce4d4454 am 59aad78e: LayoutLib: don\'t render when shader\'s local matrix is set to 0 scale. 
* commit '59aad78eae14939c169876b2f632d005f382cf7d':
  LayoutLib: don't render when shader's local matrix is set to 0 scale.
 2011-04-06 19:08:11 -07:00
Xavier Ducrohet
decc72dd51 am 8a18dba4: Merge c5aeac7f from honeycomb. 
* commit '8a18dba48c354fc47056b07ddec8a32fda266b6a':
  Merge c5aeac7f from honeycomb.
 2011-04-06 19:08:02 -07:00
Mike Lockwood
209e3ded76 am 43707a83: UsbManager: minor Javadoc tweak 
* commit '43707a83ec12957fb84a406276a38fbaf4e23fd3':
  UsbManager: minor Javadoc tweak
 2011-04-04 14:43:06 -07:00
Jason parks
80e14b3421 am 78a9766b: Merge "Implement teardown script." into gingerbread 
* commit '78a9766be2a08e1f6a448bdb336f2afeff71a52b':
  Implement teardown script.
 2011-04-04 14:42:54 -07:00
Jeff Hamilton
0ff1460735 am 84d34078: Make the NFC UID forward compatible. 
* commit '84d340781b1e148ead9fb4790755737c9dcc1cde':
  Make the NFC UID forward compatible.
 2011-04-04 14:42:44 -07:00
James Dong
b30a300a9b am ea5d2c58: Merge "When read() from AudioRecord returns 0 or negative value, report an error to application. DO NOT MERGE." into gingerbread 
* commit 'ea5d2c584490424be6bbc27dec58b4f9868d631e':
  When read() from AudioRecord returns 0 or negative value, report an error to application. DO NOT MERGE.
 2011-04-04 14:42:05 -07:00
Eric Laurent
c873feaefc am a482d83c: Merge "Issue 4157048: mic gain for VoIP/SIP calls." into gingerbread 
* commit 'a482d83ccf35ccd6cc29a9e1ace3d77b5f28d013':
  Issue 4157048: mic gain for VoIP/SIP calls.
 2011-04-04 12:25:37 -07:00
Mike Lockwood
32b372393d am a8731e1e: Merge "DO NOT MERGE: UsbService: Make USB disconnect handling for accessory mode more robust" into gingerbread 
* commit 'a8731e1e922512e5c22485e48059f33b61ab93ea':
  DO NOT MERGE: UsbService: Make USB disconnect handling for accessory mode more robust
 2011-04-04 12:25:33 -07:00
Trevor Johns
e3b9c61a05 am cafbe87d: Merge "Fixing line in Market IAB docs that explains how to bind to the MarketService." into gingerbread 
* commit 'cafbe87d5b6108d71e85950796b587f95d00cfac':
  Fixing line in Market IAB docs that explains how to bind to the MarketService.
 2011-04-04 12:25:29 -07:00
Simon Wilson
42a45d036e am ec944728: Merge "DO NOT MERGE Disable WiMAX when "Data Enabled" is off" into gingerbread 
* commit 'ec94472835787b66e1799110411d5077d0ef37cd':
  DO NOT MERGE Disable WiMAX when "Data Enabled" is off
 2011-04-04 12:25:25 -07:00
Eric Fischer
6207a8e760 am 8b312c6c: Merge "Import revised translations. DO NOT MERGE" into gingerbread 
* commit '8b312c6ca1c3f6dc4bec0c7d45bc9509afef4984':
  Import revised translations.  DO NOT MERGE
 2011-04-04 12:20:38 -07:00
Jason parks
5c952fc1d3 am cca2f2f9: Merge "Send out a broadcast that the system is being factory reset." into gingerbread 
* commit 'cca2f2f987ab772a4bae3176df7259f59d6502ce':
  Send out a broadcast that the system is being factory reset.
 2011-04-04 12:20:33 -07:00
Justin Ho
6e8e2655a0 am 87805ca3: Updated CDMA roaming icons 
* commit '87805ca3a477e165891baa18efe5239a70d11bc9':
  Updated CDMA roaming icons
 2011-04-04 12:19:39 -07:00
Jean-Baptiste Queru
6952674762 am bef31431: No-op - reconcile with open-source gingerbread 
* commit 'bef31431cafe100e382a3caf7ea7dce343832d68':
 2011-04-04 12:19:26 -07:00
Robert Greenwalt
8e5a5361d3 am 27725e8c: Only leave one default network up at a time. 
* commit '27725e8cd1e2eb3b88186ae8d43e437f130b1f84':
  Only leave one default network up at a time.
 2011-04-04 12:18:58 -07:00
Robert Greenwalt
eaea127a8b Merge "resolved conflicts for merge of 7544b23e to gingerbread-plus-aosp" into gingerbread-plus-aosp 2011-04-04 11:23:51 -07:00
Robert Greenwalt
544de0b31f resolved conflicts for merge of 7544b23e to gingerbread-plus-aosp 
Change-Id: I28cf91f473eb9e3e758129b2f4d89827e73049dd
 2011-04-04 11:21:23 -07:00
Brad Fitzpatrick
c0c45b0dd0 am 9907d161: Merge "Fix data corruption when writing to Bluetooth socket" 
* commit '9907d161584415c81de1099678f160da172fd1a6':
  Fix data corruption when writing to Bluetooth socket
 2011-04-04 11:03:03 -07:00
Brad Fitzpatrick
5e29d67d7c Merge "Fix data corruption when writing to Bluetooth socket" 2011-04-04 10:49:05 -07:00
Brad Fitzpatrick
e40f8ffe51 am 2ed72048: Merge "Always return a valid index from Rfc822Tokenizer.findTokenEnd()" 
* commit '2ed72048828cf9f617da971e5d2b8a062de08e5b':
  Always return a valid index from Rfc822Tokenizer.findTokenEnd()
 2011-04-04 10:17:43 -07:00
Brad Fitzpatrick
8deedde475 am e558a000: Merge "Avoid crash in system server when mounting container" 
* commit 'e558a0000389a2523b8d3d3a787db6b4579d2bdc':
  Avoid crash in system server when mounting container
 2011-04-04 10:17:35 -07:00
Brad Fitzpatrick
9f3c59adc5 Merge "Always return a valid index from Rfc822Tokenizer.findTokenEnd()" 2011-04-04 09:41:10 -07:00
Brad Fitzpatrick
7ac7f79133 Merge "Avoid crash in system server when mounting container" 2011-04-04 09:38:16 -07:00
Jason parks
bef49808c7 Merge "Implement teardown script." into gingerbread 2011-04-01 13:11:06 -07:00
Mårten Kongstad
5f29c87ef2 Runtime resource overlay, iteration 1. 
Runtime resource overlay allows unmodified applications to appear
as if they had been compiled with additional resources defined. See
libs/utils/README for more information.

This commit is the first iteration of runtime resource overlay. It
provides the actual overlay modifications and loading of trusted overlay
packages (ie residing in /vendor) targeting framework-res.apk.

This commit loads exactly one overlay package. The overlay,
if present, must target framework-res.apk and be located at
/vendor/overlay/framework/framework-res.apk.

Change-Id: If26ee7754813004a96c043dba37fbe99fa3919db
 2011-04-01 14:12:10 +02:00
Russell Brenner
7faee43a9d am c6b22e27: Updated JBQ\'s original SurfaceTexture stubs to make webkit MR1 buildable 
* commit 'c6b22e2727bd3730edd5ad72831a9bb4670d00f3':
  Updated JBQ's original SurfaceTexture stubs to make webkit MR1 buildable
 2011-03-31 18:55:26 -07:00
Russell Brenner
8fa06d3579 am 49b49f8f: Added include/private/hwui/DrawGlInfo.h 
* commit '49b49f8fb6d094768d4e093353b34271f2da1bfc':
  Added include/private/hwui/DrawGlInfo.h
 2011-03-31 18:55:20 -07:00
Russell Brenner
0686717d79 Updated JBQ's original SurfaceTexture stubs to make webkit MR1 buildable 
Change-Id: If1c1610efcc0e0bc6de88c75712baed91624b1a7
 2011-03-31 17:40:08 -07:00
James Dong
2688dddfd2 Merge "When read() from AudioRecord returns 0 or negative value, report an error to application. DO NOT MERGE." into gingerbread 2011-03-31 11:20:40 -07:00
Eric Laurent
ce75529174 Merge "Issue 4157048: mic gain for VoIP/SIP calls." into gingerbread 2011-03-30 14:55:49 -07:00
Mike Lockwood
6de2e32fd3 Merge "DO NOT MERGE: UsbService: Make USB disconnect handling for accessory mode more robust" into gingerbread 2011-03-30 14:15:51 -07:00
Trevor Johns
e4e971ee13 Merge "Fixing line in Market IAB docs that explains how to bind to the MarketService." into gingerbread 2011-03-30 13:50:40 -07:00
Simon Wilson
ae9739aec3 Merge "DO NOT MERGE Disable WiMAX when "Data Enabled" is off" into gingerbread 2011-03-30 13:26:45 -07:00