ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
18,932 Commits 2 Branches 0 Tags 54 MiB
8c16a393c9
Commit Graph

18932 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kenny Root
8c16a393c9 am aec3e36f: am 2d817f75: Free scanBuf in ZipFileRO 
Merge commit 'aec3e36fd4f8cdcc53110bbcd7f0afa20bf315d4'

* commit 'aec3e36fd4f8cdcc53110bbcd7f0afa20bf315d4':
  Free scanBuf in ZipFileRO
 2010-08-05 12:07:48 -07:00
Chet Haase
a697b7e845 Merge "Add new API to Animator to allow seeking of animations" 2010-08-05 11:53:34 -07:00
Marco Nelissen
3eb650f060 am 533dc786: am 7d146197: Merge "Fix divide by zero." into gingerbread 
Merge commit '533dc7866c19327e31ec6a13e36b997bcc74a650'

* commit '533dc7866c19327e31ec6a13e36b997bcc74a650':
  Fix divide by zero.
 2010-08-05 11:46:39 -07:00
Kenny Root
45b0c84438 am d6dc45c3: am 125816a2: Merge "Failure to move .dex in eng builds is not fatal" into gingerbread 
Merge commit 'd6dc45c30c1704fca9ec33f51c7c4ec1bee515ea'

* commit 'd6dc45c30c1704fca9ec33f51c7c4ec1bee515ea':
  Failure to move .dex in eng builds is not fatal
 2010-08-05 11:46:32 -07:00
jsh
b0c41be4ee am 0b4e3ad3: am 82cadee3: Merge "Add support for PSC of serving cell." into gingerbread 
Merge commit '0b4e3ad356c6e4f2f4152d02de7a4dc395825bba'

* commit '0b4e3ad356c6e4f2f4152d02de7a4dc395825bba':
  Add support for PSC of serving cell.
 2010-08-05 11:46:25 -07:00
Andreas Huber
89f71031f6 am ac8e7060: am 86d2c088: Merge "Don\'t return a decoder error if the encoded stream does not start with SPS/PPS." into gingerbread 
Merge commit 'ac8e7060e09cc8eecc3f959691185bf156939404'

* commit 'ac8e7060e09cc8eecc3f959691185bf156939404':
  Don't return a decoder error if the encoded stream does not start with SPS/PPS.
 2010-08-05 11:46:12 -07:00
Andreas Huber
7e10ba6fa9 am 1f513d88: am c17f35dd: Merge "Support for Gtalk video, includes AMR/H.263 assembler and packetization support, extensions to MediaRecorder to stream via RTP over a pair of UDP sockets as well as various fixes to the RTP implementation." into gingerbread 
Merge commit '1f513d8821670a33d6361ea521b6756163a3f9bf'

* commit '1f513d8821670a33d6361ea521b6756163a3f9bf':
  Support for Gtalk video, includes AMR/H.263 assembler and packetization support, extensions to MediaRecorder to stream via RTP over a pair of UDP sockets as well as various fixes to the RTP implementation.
 2010-08-05 11:46:04 -07:00
Kenny Root
381160e257 am 1cd6340a: am 50871525: Add more debugging to installd 
Merge commit '1cd6340a72d81c81630d6374ed46211497520897'

* commit '1cd6340a72d81c81630d6374ed46211497520897':
  Add more debugging to installd
 2010-08-05 11:45:54 -07:00
Jaikumar Ganesh
ca6425cd6f am c4ed734b: am 737998f5: Merge "Add Blocked Device property." into gingerbread 
Merge commit 'c4ed734bd87c61f60ae5e23afb8d5eb2cde12b2c'

* commit 'c4ed734bd87c61f60ae5e23afb8d5eb2cde12b2c':
  Add Blocked Device property.
 2010-08-05 11:45:44 -07:00
Eric Fischer
977ab02695 am c1b387ae: (-s ours) am d89443d8: Merge "Import revised translations. DO NOT MERGE" into gingerbread 
Merge commit 'c1b387aed8a10031b4fde6d82ab9353d975486b3'

* commit 'c1b387aed8a10031b4fde6d82ab9353d975486b3':
  Import revised translations.  DO NOT MERGE
 2010-08-05 11:44:01 -07:00
Eric Laurent
b42085e004 am eec3fca6: am 7629e8dd: Merge "Fix issue 2876124." into gingerbread 
Merge commit 'eec3fca6277296f354ee2b1af0f4b3dceddb3067'

* commit 'eec3fca6277296f354ee2b1af0f4b3dceddb3067':
  Fix issue 2876124.
 2010-08-05 11:43:45 -07:00
Alex Sakhartchouk
51d82a9c48 Merge "Fixing fonts to use constant color instead of variable." 2010-08-05 11:27:11 -07:00
Marco Nelissen
e33624bfae Resolve conflicts for commit '3ce65633' 
Change-Id: I7ad67f68ce30a9fc4492f8291eded28d19aa65dd
 2010-08-05 11:23:14 -07:00
Kenny Root
b06eb6f97e am c5183aca: am c68bcc32: Merge "Only allow one movePackage operation in-flight" into gingerbread 
Merge commit 'c5183acae55e08f4bfcb58aa122a200863748a63'

* commit 'c5183acae55e08f4bfcb58aa122a200863748a63':
  Only allow one movePackage operation in-flight
 2010-08-05 10:47:15 -07:00
Robert Greenwalt
b7bc4534e7 Merge "Fix runtime reset (missing case break)." 2010-08-05 08:17:09 -07:00
Eric Laurent
80fa322466 resolved conflicts for merge of acc4e683 to master 
Change-Id: Iabfdbdd1f048bd1a3f5cf90bfba8a33f5a0d27f8
 2010-08-05 02:53:22 -07:00
Oscar Montemayor
97a5141844 Merge "Fix for SDK breakage with hidden field." 2010-08-04 18:28:43 -07:00
Oscar Montemayor
9e6d286b3a Merge "Fix for bug 2890320 Browser crashes, after adding bookmark. Fixed Proxy class locking and dealing with empty exclusion lists." 2010-08-04 17:15:25 -07:00
Kenny Root
ddf215280d am 2d817f75: Free scanBuf in ZipFileRO 
Merge commit '2d817f75969cf3942ae3bcb9d194b9c095288dc7' into gingerbread-plus-aosp

* commit '2d817f75969cf3942ae3bcb9d194b9c095288dc7':
  Free scanBuf in ZipFileRO
 2010-08-04 17:04:29 -07:00
Kenny Root
8f20e5e540 Free scanBuf in ZipFileRO 
In the success case, the 65kB scanBuf was not freed!

Also, get rid of annoying complaints about ssize_t from printf in error
cases.

Change-Id: If154ac19bf47637f898b4ec8c8e27c9a073a7b81
 2010-08-04 16:53:56 -07:00
Manuel Roman
7fabc542a8 Merge "add shutdown() to ContentProvider & call in ProviderTestCase*.tearDown" 2010-08-04 16:42:55 -07:00
Oscar Montemayor
eea50e63cd Merge "Device Policy Manager changes to enable Global Proxy." 2010-08-04 16:25:01 -07:00
Irfan Sheriff
66ac78451c Merge "Avoid hostname lookup in NetworkProperties" 2010-08-04 16:07:13 -07:00
Marco Nelissen
9c3d163b67 am 7d146197: Merge "Fix divide by zero." into gingerbread 
Merge commit '7d146197873e9bd5c1618a4ae10bcd13c821e1ce' into gingerbread-plus-aosp

* commit '7d146197873e9bd5c1618a4ae10bcd13c821e1ce':
  Fix divide by zero.
 2010-08-04 15:39:55 -07:00
Marco Nelissen
996ad778a2 Merge "Fix divide by zero." into gingerbread 2010-08-04 15:37:37 -07:00
Romain Guy
49e04e9b9f Merge "Fix native crash in SkiaShader." 2010-08-04 15:35:10 -07:00
Kenny Root
ef0f8760ef am 125816a2: Merge "Failure to move .dex in eng builds is not fatal" into gingerbread 
Merge commit '125816a2a89343efdcccc5a74c2dd8a2608c54a0' into gingerbread-plus-aosp

* commit '125816a2a89343efdcccc5a74c2dd8a2608c54a0':
  Failure to move .dex in eng builds is not fatal
 2010-08-04 15:03:56 -07:00
Kenny Root
c10d3b9496 Merge "Failure to move .dex in eng builds is not fatal" into gingerbread 2010-08-04 15:01:56 -07:00
Alex Sakhartchouk
658935faac Merge "Added ability to set font color. Propagating the name of meshes and allocations from native a3d to java" 2010-08-04 14:48:26 -07:00
jsh
5050148024 am 82cadee3: Merge "Add support for PSC of serving cell." into gingerbread 
Merge commit '82cadee3ca830315c617dfdbf3a8eef207c58436' into gingerbread-plus-aosp

* commit '82cadee3ca830315c617dfdbf3a8eef207c58436':
  Add support for PSC of serving cell.
 2010-08-04 14:35:44 -07:00
jsh
bc16ba64ab Merge "Add support for PSC of serving cell." into gingerbread 2010-08-04 14:32:19 -07:00
Nipun Kwatra
7960397e90 Merge "Adding parseSizesList, getSupportedPreviewSizes to CameraParameters." 2010-08-04 14:23:54 -07:00
Andreas Huber
a28e1e8d78 am 86d2c088: Merge "Don\'t return a decoder error if the encoded stream does not start with SPS/PPS." into gingerbread 
Merge commit '86d2c088f15e0df33d5f81bece1c2f088632cc2c' into gingerbread-plus-aosp

* commit '86d2c088f15e0df33d5f81bece1c2f088632cc2c':
  Don't return a decoder error if the encoded stream does not start with SPS/PPS.
 2010-08-04 14:18:58 -07:00
Andreas Huber
890a89a6d8 Merge "Don't return a decoder error if the encoded stream does not start with SPS/PPS." into gingerbread 2010-08-04 14:16:20 -07:00
Andreas Huber
18822aa0c1 am c17f35dd: Merge "Support for Gtalk video, includes AMR/H.263 assembler and packetization support, extensions to MediaRecorder to stream via RTP over a pair of UDP sockets as well as various fixes to the RTP implementation." into gingerbread 
Merge commit 'c17f35dd927570c5c8d0c00b25a5bfaa1d4f1444' into gingerbread-plus-aosp

* commit 'c17f35dd927570c5c8d0c00b25a5bfaa1d4f1444':
  Support for Gtalk video, includes AMR/H.263 assembler and packetization support, extensions to MediaRecorder to stream via RTP over a pair of UDP sockets as well as various fixes to the RTP implementation.
 2010-08-04 14:15:23 -07:00
Kenny Root
ba1b3fa456 am 50871525: Add more debugging to installd 
Merge commit '508715259c332613240b2399c77d35ea7214f91a' into gingerbread-plus-aosp

* commit '508715259c332613240b2399c77d35ea7214f91a':
  Add more debugging to installd
 2010-08-04 14:12:52 -07:00
Brad Fitzpatrick
d33a03e95d am 9ee17b7d: am 866362fc: Merge "Usage Stats: don\'t block writing stats to disk." into gingerbread 
Merge commit '9ee17b7dec7c76830b5add29f3b97039e178629a'

* commit '9ee17b7dec7c76830b5add29f3b97039e178629a':
  Usage Stats: don't block writing stats to disk.
 2010-08-04 14:07:55 -07:00
Andreas Huber
71f8931bdd Merge "Support for Gtalk video, includes AMR/H.263 assembler and packetization support, extensions to MediaRecorder to stream via RTP over a pair of UDP sockets as well as various fixes to the RTP implementation." into gingerbread 2010-08-04 14:06:12 -07:00
Chet Haase
f3ffcdd63e Merge "Fix NPE in onAnimationEnd when using Sequencer.after(long)" 2010-08-04 13:58:52 -07:00
Jeff Hamilton
35a325618b Merge "Improve the documentation for the browser provider, and a few small cleanups." 2010-08-04 13:44:17 -07:00
Scott Main
1bed8fd45a Merge "add droiddoc flag for honeycomb apis (for reference filtering)" 2010-08-04 13:35:39 -07:00
Daniel Sandler
4ef5e27672 Merge "Cleaning up the notification data structures." 2010-08-04 13:12:15 -07:00
Mike Lockwood
02fd59d3d7 Merge changes I085cb3cf,Ied1cddc6 
* changes:
  MTP: Add support for syncing MTP playlists
  MTP: Fix some thread safety issues in MTP server start/stop sequence.
 2010-08-04 13:02:06 -07:00
Brett Chabot
260246446a Merge "resolved conflicts for merge of 10928c37 to master" 2010-08-04 12:04:54 -07:00
Brett Chabot
3b89f9bffc resolved conflicts for merge of 10928c37 to master 
Change-Id: Idbe91a2fe90cab0a03fdef096dc6741dc5937351
 2010-08-04 12:03:46 -07:00
Jaikumar Ganesh
fbf99d0cb9 am 737998f5: Merge "Add Blocked Device property." into gingerbread 
Merge commit '737998f5955aa14f1b21967f6f559bca60cb1844' into gingerbread-plus-aosp

* commit '737998f5955aa14f1b21967f6f559bca60cb1844':
  Add Blocked Device property.
 2010-08-04 11:36:03 -07:00
Jaikumar Ganesh
78f1ec9186 Merge "Add Blocked Device property." into gingerbread 2010-08-04 11:28:55 -07:00
James Dong
703f6aef51 am d152c1c7: am d194f3d6: Merge "Replace CHECK with a failure return value when mCamera->setParameters() fails if the camera is locked by someone else." into gingerbread 
Merge commit 'd152c1c7534a80b84f6b389efa8a410ea359b3eb'

* commit 'd152c1c7534a80b84f6b389efa8a410ea359b3eb':
  Replace CHECK with a failure return value when mCamera->setParameters() fails
 2010-08-04 11:12:40 -07:00
Chris Tate
5e9ccb8f3b am 9f6b16a2: am 5d46ce24: Merge "Enhanced VelocityTracker for > 5 pointers and fixed bugs." into gingerbread 
Merge commit '9f6b16a29b62f29496bc652cfec7d6fe9f08c7f4'

* commit '9f6b16a29b62f29496bc652cfec7d6fe9f08c7f4':
  Enhanced VelocityTracker for > 5 pointers and fixed bugs.
 2010-08-04 11:12:32 -07:00
Mathias Agopian
ff1448b53f am d12a98e2: am 9abce39a: Merge "fix [2421247] implement eglGetProcAddress(), needed in the ndk" into gingerbread 
Merge commit 'd12a98e2b1eb3a2ae20eace8a7d4b5fa13bbedfb'

* commit 'd12a98e2b1eb3a2ae20eace8a7d4b5fa13bbedfb':
  fix [2421247] implement eglGetProcAddress(), needed in the ndk
 2010-08-04 11:12:25 -07:00