Commit Graph

18507 Commits

Author SHA1 Message Date
James Dong
535b68553e am 697bd76e: Merge "Use the advertised profile and level from M4V and H263 video encoders" into gingerbread
Merge commit '697bd76e427f00584a0e026ceca2f4d39215cd0d' into gingerbread-plus-aosp

* commit '697bd76e427f00584a0e026ceca2f4d39215cd0d':
  Use the advertised profile and level from M4V and H263 video encoders
2010-09-23 10:17:30 -07:00
James Dong
b3cc6a47f2 Merge "Use the advertised profile and level from M4V and H263 video encoders" into gingerbread 2010-09-23 10:11:04 -07:00
Robert Greenwalt
36e39984cb am e87ebb08: Merge "Cleanup Netd to prevent getting hung." into gingerbread
Merge commit 'e87ebb08fba88628a65eae88fc5bc7911cfa7d97' into gingerbread-plus-aosp

* commit 'e87ebb08fba88628a65eae88fc5bc7911cfa7d97':
  Cleanup Netd to prevent getting hung.
2010-09-23 08:48:14 -07:00
Robert Greenwalt
63d0074b5a Merge "Cleanup Netd to prevent getting hung." into gingerbread 2010-09-23 08:41:21 -07:00
repo sync
8af2cf4ee0 am 0b7d6de1: Fix the build.
Merge commit '0b7d6de1559a4a78af76ab501e0a15afc396c2b9' into gingerbread-plus-aosp

* commit '0b7d6de1559a4a78af76ab501e0a15afc396c2b9':
  Fix the build.
2010-09-22 23:56:42 -07:00
repo sync
cefce2967e am 75c3853e: Merge changes I7efff4f2,I1631ee20,I14d9886a,Ic2858920,Iff588130,I37ba9d83 into gingerbread
Merge commit '75c3853ec5e4bb306fa4a614e5005df1a4e75b92' into gingerbread-plus-aosp

* commit '75c3853ec5e4bb306fa4a614e5005df1a4e75b92':
  SIP: Make SipAudioCallImpl use SimpleSessionDescription instead of javax.sdp.
  SDP: Add a simple class to help manipulate session descriptions.
  RTP: Add log throttle for "no data".
  RTP: Update native part to reflect the API change.
  RTP: Add two getters to retrieve the current configuration from AudioStream.
  RTP: Extend codec capability and update the APIs.
2010-09-22 23:17:24 -07:00
repo sync
938db5b127 Merge changes I7efff4f2,I1631ee20,I14d9886a,Ic2858920,Iff588130,I37ba9d83 into gingerbread
* changes:
  SIP: Make SipAudioCallImpl use SimpleSessionDescription instead of javax.sdp.
  SDP: Add a simple class to help manipulate session descriptions.
  RTP: Add log throttle for "no data".
  RTP: Update native part to reflect the API change.
  RTP: Add two getters to retrieve the current configuration from AudioStream.
  RTP: Extend codec capability and update the APIs.
2010-09-22 23:14:15 -07:00
Wei-Ta Chen
e73d757d26 am 6b849e21: Unhide BitmapRegionDecoder.
Merge commit '6b849e2123be98eb2a1a25b8abf0b13a279ce952' into gingerbread-plus-aosp

* commit '6b849e2123be98eb2a1a25b8abf0b13a279ce952':
  Unhide BitmapRegionDecoder.
2010-09-22 23:03:30 -07:00
Adam Powell
73a41636a2 am e8189420: Merge "DO NOT MERGE Apply new styles to the status bar/notification shade" into gingerbread
Merge commit 'e81894201979513de87269a21a1802da72d2b954' into gingerbread-plus-aosp

* commit 'e81894201979513de87269a21a1802da72d2b954':
  DO NOT MERGE Apply new styles to the status bar/notification shade
2010-09-22 21:10:41 -07:00
Adam Powell
4a220ba58d Merge "DO NOT MERGE Apply new styles to the status bar/notification shade" into gingerbread 2010-09-22 21:08:10 -07:00
Brad Fitzpatrick
9f170b33c5 am 89647b11: Don\'t do single byte writes in DropBoxManagerService
Merge commit '89647b1172cdf40a3681922150122b0bd2ea83f1' into gingerbread-plus-aosp

* commit '89647b1172cdf40a3681922150122b0bd2ea83f1':
  Don't do single byte writes in DropBoxManagerService
2010-09-22 18:33:46 -07:00
Joe Onorato
1120296d6c am 8310b42f: Add javadoc saying that wake locks are ref counted by default.
Merge commit '8310b42fbc086b0f05fc8ef45ac34c7e099c485e' into gingerbread-plus-aosp

* commit '8310b42fbc086b0f05fc8ef45ac34c7e099c485e':
  Add javadoc saying that wake locks are ref counted by default.
2010-09-22 17:29:49 -07:00
Amith Yamasani
bdef848c22 am 95f600b5: Merge "Fix NPE in PowerManagerService on boot, if some settings are corrupted." into gingerbread
Merge commit '95f600b55f617fcc94985fee07927aff48160362' into gingerbread-plus-aosp

* commit '95f600b55f617fcc94985fee07927aff48160362':
  Fix NPE in PowerManagerService on boot, if some settings are corrupted.
2010-09-22 16:35:11 -07:00
Amith Yamasani
44db6e1fa4 Merge "Fix NPE in PowerManagerService on boot, if some settings are corrupted." into gingerbread 2010-09-22 16:29:49 -07:00
Eric Laurent
35980c6c74 am 08959c63: Merge "Request permission for global audio effects." into gingerbread
Merge commit '08959c6396b8a52194554f961ae8fd874c994e4e' into gingerbread-plus-aosp

* commit '08959c6396b8a52194554f961ae8fd874c994e4e':
  Request permission for global audio effects.
2010-09-22 16:05:37 -07:00
Steve Howard
9bf4362ae3 am 127146ee: Merge "Decrease sensitivity of orientation changes a bit." into gingerbread
Merge commit '127146ee1c716d785fd70207045625c0c1f1d1ef' into gingerbread-plus-aosp

* commit '127146ee1c716d785fd70207045625c0c1f1d1ef':
  Decrease sensitivity of orientation changes a bit.
2010-09-22 16:05:03 -07:00
Eric Laurent
7a31199704 Merge "Request permission for global audio effects." into gingerbread 2010-09-22 16:00:59 -07:00
Eric Laurent
ea1a2e5d1d am 3efbc555: Merge "Fix more audio effects auto tests" into gingerbread
Merge commit '3efbc55545673f3988cb1b2934b903d78f8873cd' into gingerbread-plus-aosp

* commit '3efbc55545673f3988cb1b2934b903d78f8873cd':
  Fix more audio effects auto tests
2010-09-22 15:59:28 -07:00
Steve Howard
e05595c170 Merge "Decrease sensitivity of orientation changes a bit." into gingerbread 2010-09-22 15:57:12 -07:00
Eric Laurent
3f9dab6a7d Merge "Fix more audio effects auto tests" into gingerbread 2010-09-22 15:53:49 -07:00
Andreas Huber
863f93db94 am a72bb404: Merge "Raise the amount of memory set aside for omx buffer allocations in the test harness to accomodate the new requirements of some codecs." into gingerbread
Merge commit 'a72bb404ceb11ac551825226eb75d2a280deb1b2' into gingerbread-plus-aosp

* commit 'a72bb404ceb11ac551825226eb75d2a280deb1b2':
  Raise the amount of memory set aside for omx buffer allocations in the test harness to accomodate the new requirements of some codecs.
2010-09-22 15:38:43 -07:00
Andreas Huber
250522c661 Merge "Raise the amount of memory set aside for omx buffer allocations in the test harness to accomodate the new requirements of some codecs." into gingerbread 2010-09-22 15:34:00 -07:00
Brad Fitzpatrick
4b1a236d00 am c87a8adc: Merge "Flesh out StrictMode docs." into gingerbread
Merge commit 'c87a8adc0e143e0c7efc62a1094ee6ac666e46d9' into gingerbread-plus-aosp

* commit 'c87a8adc0e143e0c7efc62a1094ee6ac666e46d9':
  Flesh out StrictMode docs.
2010-09-22 15:30:05 -07:00
Brad Fitzpatrick
060b5f6757 Merge "Flesh out StrictMode docs." into gingerbread 2010-09-22 15:25:26 -07:00
Mathias Agopian
d7a0841a19 am 9d5fac51: Merge "fix small bug in EGL error management" into gingerbread
Merge commit '9d5fac517463526450268bf6353e32c13a8cdd0c' into gingerbread-plus-aosp

* commit '9d5fac517463526450268bf6353e32c13a8cdd0c':
  fix small bug in EGL error management
2010-09-22 14:21:01 -07:00
Mathias Agopian
1c3654864d Merge "fix small bug in EGL error management" into gingerbread 2010-09-22 14:15:23 -07:00
Andreas Huber
40f102433a am 4374b23d: Merge "Make sure we drain the avc software decoder\'s output queue once we run out of input data." into gingerbread
Merge commit '4374b23d6be406710b91be746229e6c548613410' into gingerbread-plus-aosp

* commit '4374b23d6be406710b91be746229e6c548613410':
  Make sure we drain the avc software decoder's output queue once we run out of input data.
2010-09-22 12:25:13 -07:00
Andreas Huber
4a198dc08f Merge "Make sure we drain the avc software decoder's output queue once we run out of input data." into gingerbread 2010-09-22 12:20:54 -07:00
Vasu Nori
6ff7a2474f am 2359d49b: Merge "DO NOT MERGE - redo Ib5e519fb40d3191ecac06c03a844872df19f3963" into gingerbread
Merge commit '2359d49b80df13c1724c7c6da5648f17a33d881a' into gingerbread-plus-aosp

* commit '2359d49b80df13c1724c7c6da5648f17a33d881a':
  DO NOT MERGE - redo  Ib5e519fb40d3191ecac06c03a844872df19f3963
2010-09-22 12:19:54 -07:00
Vasu Nori
d9c52a7c96 Merge "DO NOT MERGE - redo Ib5e519fb40d3191ecac06c03a844872df19f3963" into gingerbread 2010-09-22 12:10:37 -07:00
Jesse Wilson
86c49d5639 am eaa2cabf: Merge "Fix problem where Base64InputStream single-byte reads were unsigned." into gingerbread
Merge commit 'eaa2cabf342e973925fb223104f9971deae27b17' into gingerbread-plus-aosp

* commit 'eaa2cabf342e973925fb223104f9971deae27b17':
  Fix problem where Base64InputStream single-byte reads were unsigned.
2010-09-22 11:51:11 -07:00
Jesse Wilson
edc1238264 Merge "Fix problem where Base64InputStream single-byte reads were unsigned." into gingerbread 2010-09-22 11:38:43 -07:00
Mike Lockwood
d56d66a081 am 32371695: Merge "GpsLocationProvider: Fix race condition while bringing up APN for SUPL." into gingerbread
Merge commit '32371695daf917701f78a86224b58bfda0381e27' into gingerbread-plus-aosp

* commit '32371695daf917701f78a86224b58bfda0381e27':
  GpsLocationProvider: Fix race condition while bringing up APN for SUPL.
2010-09-22 09:57:50 -07:00
Mike Lockwood
ab7a8ac2cf Merge "GpsLocationProvider: Fix race condition while bringing up APN for SUPL." into gingerbread 2010-09-22 09:54:53 -07:00
Hung-ying Tyan
204f06d989 am ca54cdaf: Merge "SipService: fix thread/socket leak" into gingerbread
Merge commit 'ca54cdaf66449cd4f81d8887ec603392b8f3779c' into gingerbread-plus-aosp

* commit 'ca54cdaf66449cd4f81d8887ec603392b8f3779c':
  SipService: fix thread/socket leak
2010-09-22 09:41:17 -07:00
Eric Laurent
5a7555951d am 4f294558: Merge "Fix broken insert reverb auto tests." into gingerbread
Merge commit '4f294558aa23bc155988838ef153dca731efe707' into gingerbread-plus-aosp

* commit '4f294558aa23bc155988838ef153dca731efe707':
  Fix broken insert reverb auto tests.
2010-09-22 09:38:46 -07:00
Hung-ying Tyan
a5a1eb7cb8 Merge "SipService: fix thread/socket leak" into gingerbread 2010-09-22 09:35:35 -07:00
Eric Laurent
be9efe04c7 Merge "Fix broken insert reverb auto tests." into gingerbread 2010-09-22 09:34:00 -07:00
Cary Clark
7bc0a21acc am dd8f13fa: Merge "Do not merge: clear text selection on rotate" into gingerbread
Merge commit 'dd8f13faf1cb8ad7a5f2573f09fe8436ec8a4ac2' into gingerbread-plus-aosp

* commit 'dd8f13faf1cb8ad7a5f2573f09fe8436ec8a4ac2':
  Do not merge: clear text selection on rotate
2010-09-22 08:35:58 -07:00
Cary Clark
f945f81265 Merge "Do not merge: clear text selection on rotate" into gingerbread 2010-09-22 08:29:12 -07:00
Patrick Scott
0b75398771 am b2044da3: Do not merge: cherry-pick a fix for a npe.
Merge commit 'b2044da3f9f9ad74f0dffd5ae024e558f8a9a89a' into gingerbread-plus-aosp

* commit 'b2044da3f9f9ad74f0dffd5ae024e558f8a9a89a':
  Do not merge: cherry-pick a fix for a npe.
2010-09-22 07:03:12 -07:00
Shin-ichiro Fukuda
90ffd1462d am dd62a056: DO NOT MERGE. MOTOYA Japanese fonts
Merge commit 'dd62a056b8d746c620218a68bb476382f02d8174' into gingerbread-plus-aosp

* commit 'dd62a056b8d746c620218a68bb476382f02d8174':
  DO NOT MERGE. MOTOYA Japanese fonts
2010-09-21 19:35:35 -07:00
Raphael Moll
487fbba5e9 am f2960b8d: Refresh the layoutlib_create doc.
Merge commit 'f2960b8d66d7a20f590716f5e51160e77d0d1b24' into gingerbread-plus-aosp

* commit 'f2960b8d66d7a20f590716f5e51160e77d0d1b24':
  Refresh the layoutlib_create doc.
2010-09-21 18:58:14 -07:00
Jeff Brown
810ba3f321 am 98bcb41d: Merge "Fix race reading input configuration during system startup." into gingerbread
Merge commit '98bcb41d9b434bbe486b33681d9d091d6072d1f1' into gingerbread-plus-aosp

* commit '98bcb41d9b434bbe486b33681d9d091d6072d1f1':
  Fix race reading input configuration during system startup.
2010-09-21 18:39:39 -07:00
Jeff Brown
452598cc1e Merge "Fix race reading input configuration during system startup." into gingerbread 2010-09-21 18:33:12 -07:00
Adam Powell
dbdd60b9d7 am 9aed3002: Text selection anchors changed to use windows
Merge commit '9aed300279db6953356aed5ef24a42291f5829cb' into gingerbread-plus-aosp

* commit '9aed300279db6953356aed5ef24a42291f5829cb':
  Text selection anchors changed to use windows
2010-09-21 17:20:40 -07:00
Dan Morrill
212b858725 am 62018429: Merge "Adding new feature definitions for new sensors (barometer and gyroscope.)" into gingerbread
Merge commit '62018429c2639b8a0f27e9b18b9b186df80bca4d' into gingerbread-plus-aosp

* commit '62018429c2639b8a0f27e9b18b9b186df80bca4d':
  Adding new feature definitions for new sensors (barometer and gyroscope.)
2010-09-21 17:03:42 -07:00
Dan Morrill
01d038ae02 Merge "Adding new feature definitions for new sensors (barometer and gyroscope.)" into gingerbread 2010-09-21 16:59:29 -07:00
Brett Chabot
a656cb17c2 Merge "Fix build" into gingerbread-plus-aosp 2010-09-21 16:06:58 -07:00
Eric Laurent
3d64b57049 am a6dc4699: Merge "Fix issue 2913071." into gingerbread
Merge commit 'a6dc4699222a484222d1c54d5319f302a02e406b' into gingerbread-plus-aosp

* commit 'a6dc4699222a484222d1c54d5319f302a02e406b':
  Fix issue 2913071.
2010-09-21 15:59:23 -07:00