ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
17,258 Commits 2 Branches 0 Tags 54 MiB
53bcc7833b
Commit Graph

17258 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brian Carlstrom
f62a2a12fb Merge "Tracking merge of dalvik-dev to gingerbread" into gingerbread 2010-08-05 10:35:53 -07:00
Andreas Huber
6471436a59 am 2c37f3d3: Merge "Better support for fake timestamps in RTP, H.263 video now also requests FIR." into gingerbread 
Merge commit '2c37f3d3a09188f3dc66e177547709e4828918be' into gingerbread-plus-aosp

* commit '2c37f3d3a09188f3dc66e177547709e4828918be':
  Better support for fake timestamps in RTP, H.263 video now also requests FIR.
 2010-08-05 10:13:30 -07:00
Andreas Huber
d2975a1e05 am 407ec58c: Merge "A better fix for the OggExtractor referring to the sample rate while it hasn\'t been initialized yet." into gingerbread 
Merge commit '407ec58c6604da3255b04aa99577515deba3a26f' into gingerbread-plus-aosp

* commit '407ec58c6604da3255b04aa99577515deba3a26f':
  A better fix for the OggExtractor referring to the sample rate while it hasn't been initialized yet.
 2010-08-05 10:13:26 -07:00
Andreas Huber
0f77bbece9 Merge "Better support for fake timestamps in RTP, H.263 video now also requests FIR." into gingerbread 2010-08-05 10:11:28 -07:00
Andreas Huber
1c9711eb67 Merge "A better fix for the OggExtractor referring to the sample rate while it hasn't been initialized yet." into gingerbread 2010-08-05 10:11:18 -07:00
Kenny Root
69e0d086f2 am dec43a10: Merge "Fix up PackageManager tests" into gingerbread 
Merge commit 'dec43a102226de55307de20d5779e20a435be8b1' into gingerbread-plus-aosp

* commit 'dec43a102226de55307de20d5779e20a435be8b1':
  Fix up PackageManager tests
 2010-08-05 10:04:59 -07:00
Kenny Root
b536767ab1 Merge "Fix up PackageManager tests" into gingerbread 2010-08-05 10:02:30 -07:00
Andreas Huber
1c16338fd9 am fb861523: Merge "Specification of codec specific data as part of the session description is now optional." into gingerbread 
Merge commit 'fb861523318710b95c08110b9b2de28f7da74a40' into gingerbread-plus-aosp

* commit 'fb861523318710b95c08110b9b2de28f7da74a40':
  Specification of codec specific data as part of the session description is now optional.
 2010-08-05 09:25:25 -07:00
Andreas Huber
3ca9110ff1 Merge "Specification of codec specific data as part of the session description is now optional." into gingerbread 2010-08-05 09:18:38 -07:00
Chung-yih Wang
074f16ec45 am cde66df4: Revert "Move SIP telephony related codes to framework." 
Merge commit 'cde66df44240cfe5a7bec12ac52464c3bf26c14f' into gingerbread-plus-aosp

* commit 'cde66df44240cfe5a7bec12ac52464c3bf26c14f':
  Revert "Move SIP telephony related codes to framework."
 2010-08-04 22:33:08 -07:00
Chung-yih Wang
60879b9526 am 468e35ef: Merge "Move SIP telephony related codes to framework." into gingerbread 
Merge commit '468e35efc595114354eff7ee2685ea79ed098c7f' into gingerbread-plus-aosp

* commit '468e35efc595114354eff7ee2685ea79ed098c7f':
  Move SIP telephony related codes to framework.
 2010-08-04 21:18:57 -07:00
Chung-yih Wang
ddb37ad00e Merge "Move SIP telephony related codes to framework." into gingerbread 2010-08-04 21:16:48 -07:00
Daniel Sandler
26158c247d am 9b87770f: Merge "Fix crash when startForeground posts a broken Notification." into gingerbread 
Merge commit '9b87770f53c55a313a7fdc6f553265aabbde3446' into gingerbread-plus-aosp

* commit '9b87770f53c55a313a7fdc6f553265aabbde3446':
  Fix crash when startForeground posts a broken Notification.
 2010-08-04 20:36:09 -07:00
Daniel Sandler
d925cc553e Merge "Fix crash when startForeground posts a broken Notification." into gingerbread 2010-08-04 20:33:32 -07:00
Chung-yih Wang
8410a45841 am 8c503569: Merge "Move the sip related codes to framework." into gingerbread 
Merge commit '8c5035696b0aaf30ae49594b845f663fe633ac88' into gingerbread-plus-aosp

* commit '8c5035696b0aaf30ae49594b845f663fe633ac88':
  Move the sip related codes to framework.
 2010-08-04 19:30:37 -07:00
Chung-yih Wang
5072094ab5 Merge "Move the sip related codes to framework." into gingerbread 2010-08-04 19:28:23 -07:00
John Wang
3221724f96 am 62f066a1: Merge "Add register methods in CallManager "do not merge"" into gingerbread 
Merge commit '62f066a14afb2774569a54c150a9d0a2601dd77a' into gingerbread-plus-aosp

* commit '62f066a14afb2774569a54c150a9d0a2601dd77a':
  Add register methods in CallManager "do not merge"
 2010-08-04 18:56:37 -07:00
John Wang
9785da69cb Merge "Add register methods in CallManager "do not merge"" into gingerbread 2010-08-04 18:54:55 -07:00
Scott Main
73a4e67f09 am 97c2d840: am 8dd87ad9: fix some doc errors in the resources; add link to resource docs for ColorStateList class 
Merge commit '97c2d840a10813164d82571775a3566637d6c5de' into gingerbread-plus-aosp

* commit '97c2d840a10813164d82571775a3566637d6c5de':
  fix some doc errors in the resources;
 2010-08-04 18:05:26 -07:00
Scott Main
4151093a2e am 769f9b89: am 5b86de94: fix doc bugs 
Merge commit '769f9b8980a774e3493cbd9beac565c6b5d62161' into gingerbread-plus-aosp

* commit '769f9b8980a774e3493cbd9beac565c6b5d62161':
  fix doc bugs
 2010-08-04 18:05:22 -07:00
Scott Main
9b45f9f372 am 8dd87ad9: fix some doc errors in the resources; add link to resource docs for ColorStateList class 
Merge commit '8dd87ad9440bc63bc312b06f292adcd2642b1c41' into gingerbread

* commit '8dd87ad9440bc63bc312b06f292adcd2642b1c41':
  fix some doc errors in the resources;
 2010-08-04 18:02:25 -07:00
Scott Main
3e703d7eb7 am 5b86de94: fix doc bugs 
Merge commit '5b86de94a163ce4c52ab08a9820f9d78414e1767' into gingerbread

* commit '5b86de94a163ce4c52ab08a9820f9d78414e1767':
  fix doc bugs
 2010-08-04 18:02:18 -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
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
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
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
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
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
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
Eric Fischer
b59489aa34 am d89443d8: Merge "Import revised translations. DO NOT MERGE" into gingerbread 
Merge commit 'd89443d86603dbc9e02e1db32b9071780b4702bc' into gingerbread-plus-aosp

* commit 'd89443d86603dbc9e02e1db32b9071780b4702bc':
  Import revised translations.  DO NOT MERGE
 2010-08-04 10:43:27 -07:00
Eric Fischer
597824ef3a Merge "Import revised translations. DO NOT MERGE" into gingerbread 2010-08-04 10:40:36 -07:00
Eric Laurent
fd75a3e4d3 am 7629e8dd: Merge "Fix issue 2876124." into gingerbread 
Merge commit '7629e8dd1426a8a8e38a82e13eb51d1c6af24f36' into gingerbread-plus-aosp

* commit '7629e8dd1426a8a8e38a82e13eb51d1c6af24f36':
  Fix issue 2876124.
 2010-08-04 10:07:24 -07:00
Eric Laurent
1f45355466 Merge "Fix issue 2876124." into gingerbread 2010-08-04 10:03:36 -07:00
Marco Nelissen
e1ae94c4a7 am c6ecccb2: Merge "Fix the build." into gingerbread 
Merge commit 'c6ecccb284401b6312108f927ffcfc303872f380' into gingerbread-plus-aosp

* commit 'c6ecccb284401b6312108f927ffcfc303872f380':
  Fix the build.
 2010-08-04 09:24:52 -07:00
Marco Nelissen
cfccfc26ff Merge "Fix the build." into gingerbread 2010-08-04 09:22:31 -07:00
Kenny Root
f15845211b am c68bcc32: Merge "Only allow one movePackage operation in-flight" into gingerbread 
Merge commit 'c68bcc320522abf856211e9aa00bba71ccaddacb' into gingerbread-plus-aosp

* commit 'c68bcc320522abf856211e9aa00bba71ccaddacb':
  Only allow one movePackage operation in-flight
 2010-08-04 09:18:27 -07:00
Kenny Root
804cf1088b Merge "Only allow one movePackage operation in-flight" into gingerbread 2010-08-04 09:15:48 -07:00
Eric Laurent
87507f512d am 1340ee8a: Merge "NEW_API: Unhide audio effect APIs." into gingerbread 
Merge commit '1340ee8a273a9b25a779f3b18d6f832ce496c68e' into gingerbread-plus-aosp

* commit '1340ee8a273a9b25a779f3b18d6f832ce496c68e':
  NEW_API: Unhide audio effect APIs.
 2010-08-04 08:52:27 -07:00
Eric Laurent
d915ec99f4 Merge "NEW_API: Unhide audio effect APIs." into gingerbread 2010-08-04 08:42:37 -07:00
Brad Fitzpatrick
313311391c am 866362fc: Merge "Usage Stats: don\'t block writing stats to disk." into gingerbread 
Merge commit '866362fcb4db93584143c21934ea355cbf9e0757' into gingerbread-plus-aosp

* commit '866362fcb4db93584143c21934ea355cbf9e0757':
  Usage Stats: don't block writing stats to disk.
 2010-08-03 17:00:20 -07:00
Brad Fitzpatrick
e924f17c24 Merge "Usage Stats: don't block writing stats to disk." into gingerbread 2010-08-03 16:57:47 -07:00
Brett Chabot
f36edbf46b am c458b2ca: Merge "Frameworks core tests size cleanup." into gingerbread 
Merge commit 'c458b2cab3a67e84f768af2247ba5235003a4ce4' into gingerbread-plus-aosp

* commit 'c458b2cab3a67e84f768af2247ba5235003a4ce4':
  Frameworks core tests size cleanup.
 2010-08-03 16:04:03 -07:00