Commit Graph

21602 Commits

Author SHA1 Message Date
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
Jason Sams
66e60ba16a Merge "Better debugging for scripts." 2010-09-22 15:59:06 -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
dbb9affde3 am 2de0a50a: 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 '2de0a50a9ab05db07b4ae5c1401b1dbd26ce28e1'

* commit '2de0a50a9ab05db07b4ae5c1401b1dbd26ce28e1':
  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:44:23 -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
Brad Fitzpatrick
c1a1452f4c am 9317801a: am c87a8adc: Merge "Flesh out StrictMode docs." into gingerbread
Merge commit '9317801a3c9be6d1a1dbde558ca7d2106982e96f'

* commit '9317801a3c9be6d1a1dbde558ca7d2106982e96f':
  Flesh out StrictMode docs.
2010-09-22 15:36:11 -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
Jason Sams
eae2aeb37d Merge "Remove excessive logging." 2010-09-22 14:52:01 -07:00
Romain Guy
9d3be978f2 Merge "Fix texture corruption issue, faster re-upload of textures." 2010-09-22 14:45:04 -07:00
Mathias Agopian
cd2c51cf45 am d01ce192: am 9d5fac51: Merge "fix small bug in EGL error management" into gingerbread
Merge commit 'd01ce1924a51539c4d47ef1f55913bdf1a018124'

* commit 'd01ce1924a51539c4d47ef1f55913bdf1a018124':
  fix small bug in EGL error management
2010-09-22 14:41:45 -07:00
Jason Sams
0f28d61da1 Merge "Fix two minor RS bugs. 1: index set size was populated with bad value in java, 2: bad error check in uploadToBufferObject." 2010-09-22 14:27:50 -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
Mathias Agopian
f3c24f8703 Merge "fix typo EGL_NO_IMAGE_KHR -> EGL_NO_SYNC_KHR" 2010-09-22 14:15:15 -07:00
Andreas Huber
99e8526911 am cc6b941c: 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 'cc6b941cf01994c04b5e1f92b0860be8e2abc50e'

* commit 'cc6b941cf01994c04b5e1f92b0860be8e2abc50e':
  Make sure we drain the avc software decoder's output queue once we run out of input data.
2010-09-22 13:54:20 -07:00
Vasu Nori
1b2ecd96f1 am c55a6a42: (-s ours) am 2359d49b: Merge "DO NOT MERGE - redo Ib5e519fb40d3191ecac06c03a844872df19f3963" into gingerbread
Merge commit 'c55a6a42afd328fd78e8cc307194e2ca33b81a04'

* commit 'c55a6a42afd328fd78e8cc307194e2ca33b81a04':
  DO NOT MERGE - redo  Ib5e519fb40d3191ecac06c03a844872df19f3963
2010-09-22 13:54:08 -07:00
Jesse Wilson
2597586048 am f78fdacc: am eaa2cabf: Merge "Fix problem where Base64InputStream single-byte reads were unsigned." into gingerbread
Merge commit 'f78fdaccde379d1c101be137416808ea62a2f292'

* commit 'f78fdaccde379d1c101be137416808ea62a2f292':
  Fix problem where Base64InputStream single-byte reads were unsigned.
2010-09-22 13:53:33 -07:00
Mike Lockwood
583d8577b3 Merge "MTP host: Use Java longs for storage and object IDs" 2010-09-22 12:33:35 -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
Jack Palevich
d7a4f91401 Add simple interactive end-to-end latency test.
Change-Id: I4c2f2acf797a3a753f8a6061db3d2bcdc7d642f0
2010-09-22 12:13:02 -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
Shimeng (Simon) Wang
e128587482 Merge "Add a fixed viewport margin since website content width changes." 2010-09-22 11:17:50 -07:00
Amith Yamasani
be8b12a0fe Merge "Add an AUTO_TIME_ZONE setting so that we can switch timezones while keeping correct time." 2010-09-22 11:09:37 -07:00
Andreas Huber
a305abcc9c am ada0deb4: am f5a8f2f4: 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 'ada0deb4c295f18add04a474c2b396c87b0bee09'

* commit 'ada0deb4c295f18add04a474c2b396c87b0bee09':
  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 10:26:39 -07:00
Andreas Huber
f122d46f10 am 1a29d836: am 31e323e6: Merge "Make sure we drain the avc software decoder\'s output queue once we run out of input data." into gingerbread
Merge commit '1a29d8361a03597115a998cc15860791f8ddd503'

* commit '1a29d8361a03597115a998cc15860791f8ddd503':
  Make sure we drain the avc software decoder's output queue once we run out of input data.
2010-09-22 10:22:19 -07:00
Andreas Huber
fd65e1d523 am f5a8f2f4: 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 'f5a8f2f4634e4fffbb20c66fa37980d0599a27f1' into gingerbread-plus-aosp

* commit 'f5a8f2f4634e4fffbb20c66fa37980d0599a27f1':
  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 10:22:18 -07:00
Vasu Nori
11d05de2d8 am 18f196a1: (-s ours) am 9e1266da: Merge "(do not merge)hide videochat changes in gingerbread. bug:3001483" into gingerbread
Merge commit '18f196a19eb93c8b309c8a3e2093ce4400708348'

* commit '18f196a19eb93c8b309c8a3e2093ce4400708348':
  (do not merge)hide videochat changes in gingerbread. bug:3001483
2010-09-22 10:18:39 -07:00
Andreas Huber
bab8b6403b am 31e323e6: Merge "Make sure we drain the avc software decoder\'s output queue once we run out of input data." into gingerbread
Merge commit '31e323e6c874e6f306e7f35a22350750b23b06de' into gingerbread-plus-aosp

* commit '31e323e6c874e6f306e7f35a22350750b23b06de':
  Make sure we drain the avc software decoder's output queue once we run out of input data.
2010-09-22 10:18:29 -07:00
Andreas Huber
3141fd5690 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 10:15:57 -07:00
Vasu Nori
e031d557f2 am 9e1266da: Merge "(do not merge)hide videochat changes in gingerbread. bug:3001483" into gingerbread
Merge commit '9e1266da66a39c0a4994c7224236d103aa6536eb' into gingerbread-plus-aosp

* commit '9e1266da66a39c0a4994c7224236d103aa6536eb': (1565 commits)
  (do not merge)hide videochat changes in gingerbread. bug:3001483
  Fix a bug in DumpRenderTree2's run_apache2.py script
  Fix DumpRenderTree2 to make AbstractResult serializable
  Fix DumpRenderTree2 to handle SSL errors
  Work on fragments in layouts.
  Text selection anchors changed to use windows
  Add support for circular gradients to the GL renderer.
  cherry pick "Fix build" a227db53f0cd30214c393b400436d1e0863396ef into master
  Test use of "f" suffix on float initializers.
  Detect and throw exception for using
  bring database code in master for 'adb bugreport' in sync with ginger
  Make the reading level scale at least 0.5f apart from overview level.
  Make the breadcrumbs touchable for navigation.
  Added the behavior paramter to transition constructors
  recovery just takes a filename as an argument now
  Updated RSTest to test primitive type assignments.
  STOPSHIP follow up to Change-Id: I392875b62ed270741633f5bffa519932e4a9f985
  add new param to device config properties: db connection pool size
  fix [3018216] UI shrinks / stretches while using apps with IME
  Modifying PendingIntent APIs for collection widgets
  ...
2010-09-22 10:13:34 -07:00
Andreas Huber
c2dbd01de4 Merge "Make sure we drain the avc software decoder's output queue once we run out of input data." into gingerbread 2010-09-22 10:11:51 -07:00
Vasu Nori
a962f6d127 Merge "(do not merge)hide videochat changes in gingerbread. bug:3001483" into gingerbread 2010-09-22 10:10:31 -07:00
Mike Lockwood
aa0186f7ef am 6cec0dc0: am 32371695: Merge "GpsLocationProvider: Fix race condition while bringing up APN for SUPL." into gingerbread
Merge commit '6cec0dc0e47459553a3a6572abd28a8e49ce5875'

* commit '6cec0dc0e47459553a3a6572abd28a8e49ce5875':
  GpsLocationProvider: Fix race condition while bringing up APN for SUPL.
2010-09-22 10:01:48 -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
15ea66dbca am 8f05b5c8: am ca54cdaf: Merge "SipService: fix thread/socket leak" into gingerbread
Merge commit '8f05b5c8d3c310bc70a3eff04911ea9cf4eba87a'

* commit '8f05b5c8d3c310bc70a3eff04911ea9cf4eba87a':
  SipService: fix thread/socket leak
2010-09-22 09:45:41 -07:00
Eric Laurent
1ad38018bd am b35f36f0: am 4f294558: Merge "Fix broken insert reverb auto tests." into gingerbread
Merge commit 'b35f36f08ddc59fb0e264aff9de4d465321b26ca'

* commit 'b35f36f08ddc59fb0e264aff9de4d465321b26ca':
  Fix broken insert reverb auto tests.
2010-09-22 09:42:59 -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