31468 Commits

Author SHA1 Message Date
Gil Dobjanschi
11dd325466 Merge "I splitted the start and end transtions into separate classes." 2010-09-17 16:43:25 -07:00
Gil Dobjanschi
7c1df82880 I splitted the start and end transtions into separate classes.
Change-Id: Ia8fbf5b34ee4b96fa4339d6dda78ec03c8a08615
2010-09-17 16:35:31 -07:00
Robert Greenwalt
1e58e4021c Merge "Enhance http proxy support" 2010-09-17 16:22:34 -07:00
Robert Greenwalt
d192dad69e Enhance http proxy support
Make it read proxys the correct way from CS so it works for all network types.
Add utility class for apache http client support.

bug:2700664
Change-Id: If81917b19b5f0636247a6519a1ec78bd8dbf3596
2010-09-17 16:14:10 -07:00
Jeff Brown
f1ec1ddd50 am bc9599d4: am 838e93ed: Merge "Looper: Drop default parameters in favor of a safer overload." into gingerbread
Merge commit 'bc9599d48c79c18d306a13f51af9ef2aac92cdca'

* commit 'bc9599d48c79c18d306a13f51af9ef2aac92cdca':
  Looper: Drop default parameters in favor of a safer overload.
2010-09-17 16:10:01 -07:00
Chet Haase
aca11c0cf4 am 6dcffb43: (-s ours) am 4a2b3ef1: Merge "new assets" into gingerbread
Merge commit '6dcffb434fff42b956b604e24a5b5728e721b686'

* commit '6dcffb434fff42b956b604e24a5b5728e721b686':
  new assets
2010-09-17 15:55:11 -07:00
Romain Guy
5e87e0d07d Merge "Fix positioning of 1 pixel wide lines (esp. non AA lines.)" 2010-09-17 15:49:56 -07:00
Romain Guy
be3512735c Merge changes Id5200e94,I08fcbfa7
* changes:
  Add support for non AA lines.
  Correctly free memory.
2010-09-17 15:49:30 -07:00
Andreas Huber
0a5dd105f7 am 7bc600cb: am f98197a7: Make sure the message dispatcher stays around until after OMX_FreeHandle is finished in case it posts some more messages during shutdown. Clear the source as soon as possible in OMXCodec\'s destructor.
Merge commit '7bc600cb08394e60eef984843976d4f79e5d94e8'

* commit '7bc600cb08394e60eef984843976d4f79e5d94e8':
  Make sure the message dispatcher stays around until after OMX_FreeHandle is finished in case it posts some more messages during shutdown. Clear the source as soon as possible in OMXCodec's destructor.
2010-09-17 15:46:15 -07:00
Romain Guy
b5ab4173e0 Fix positioning of 1 pixel wide lines (esp. non AA lines.)
Change-Id: Ic155cac72f351edae35dffdfbb236954f57ba7de
2010-09-17 15:36:56 -07:00
Andreas Huber
f6bd4369fd resolved conflicts for merge of 1fc97385 to master
Change-Id: I9b1fb673844eb822313067d3be16b6c1ce1f2ccb
2010-09-17 15:35:59 -07:00
Romain Guy
c95c8d6bf8 Add support for non AA lines.
Change-Id: Id5200e94815404d62760437d0d2dbb0a9276c700
2010-09-17 15:31:32 -07:00
Jamie Gennis
9db8abcd1e Merge "Fix a SurfaceFlinger bug." 2010-09-17 14:07:13 -07:00
Stephen Hines
580807a20a Merge "Handle RS reflection name changes." 2010-09-17 13:55:39 -07:00
Nipun Kwatra
8726305905 Merge "Adding default profiles for specific levels." 2010-09-17 13:54:55 -07:00
Stephen Hines
2c6f34480c Merge "Minor app updates for RS. force RSTest to portrait." 2010-09-17 13:50:21 -07:00
Jason Sams
d74a72fd0a Merge "Fix function name match for refcounting funcs." 2010-09-17 13:42:27 -07:00
Jeff Brown
bc9599d48c am 838e93ed: Merge "Looper: Drop default parameters in favor of a safer overload." into gingerbread
Merge commit '838e93ed19879ce3d88b5be51630137d6a6999c6' into gingerbread-plus-aosp

* commit '838e93ed19879ce3d88b5be51630137d6a6999c6':
  Looper: Drop default parameters in favor of a safer overload.
2010-09-17 13:30:20 -07:00
Jeff Brown
838e93ed19 Merge "Looper: Drop default parameters in favor of a safer overload." into gingerbread 2010-09-17 13:25:55 -07:00
Nipun Kwatra
d48a15c3fe Adding default profiles for specific levels.
The low and high profiles should each match one of the
specific profiles. So we need to add the specific profiles
corresponding to the low/high profiles. This makes the
default profile compliant to documentation + cts.

Also fixed javadoc to account time lapse profiles.

Change-Id: I34e7307d00ce261c69dc10ead2900025c7f6d428
2010-09-17 13:19:13 -07:00
Jason Sams
4fd8bb4b56 Fix function name match for refcounting funcs.
Change-Id: I3fa8211200023e0df494cd9aab698e215b3c2164
2010-09-17 13:17:17 -07:00
Chet Haase
6dcffb434f am 4a2b3ef1: Merge "new assets" into gingerbread
Merge commit '4a2b3ef1810135bea25a827d7c52767f50c528b6' into gingerbread-plus-aosp

* commit '4a2b3ef1810135bea25a827d7c52767f50c528b6':
  new assets
2010-09-17 13:14:58 -07:00
Chet Haase
4a2b3ef181 Merge "new assets" into gingerbread 2010-09-17 13:10:54 -07:00
Chet Haase
657028c293 new assets
Change-Id: I077fd2162e0901b6f31b815459873586f813a753
2010-09-17 12:55:03 -07:00
Andreas Huber
7bc600cb08 am f98197a7: Make sure the message dispatcher stays around until after OMX_FreeHandle is finished in case it posts some more messages during shutdown. Clear the source as soon as possible in OMXCodec\'s destructor.
Merge commit 'f98197a7274c2d7da647f52b3d8b0c74492139af' into gingerbread-plus-aosp

* commit 'f98197a7274c2d7da647f52b3d8b0c74492139af':
  Make sure the message dispatcher stays around until after OMX_FreeHandle is finished in case it posts some more messages during shutdown. Clear the source as soon as possible in OMXCodec's destructor.
2010-09-17 12:50:45 -07:00
Andreas Huber
1fc97385d8 am 524e6f62: Register the new OMX components.
Merge commit '524e6f62c93e9947f3f9de386c6f6be7a3085d3c' into gingerbread-plus-aosp

* commit '524e6f62c93e9947f3f9de386c6f6be7a3085d3c':
  Register the new OMX components.
2010-09-17 12:50:35 -07:00
Joe Malin
0b7a3bc3de Merge "Doc Change: add screenshots to Testing in Eclipse topic" 2010-09-17 12:43:06 -07:00
Jamie Gennis
40d272c132 Fix a SurfaceFlinger bug.
The bug caused SurfaceFlinger to constantly trigger reallocation of buffers
that requested a fixed size.

Change-Id: Ic993a60e6474e36a344c8b48d541a0d08b8c4faf
2010-09-17 12:19:07 -07:00
Andreas Huber
f98197a727 Make sure the message dispatcher stays around until after OMX_FreeHandle is finished in case it posts some more messages during shutdown. Clear the source as soon as possible in OMXCodec's destructor.
Change-Id: I9c896cf07dea0c3201b6f074dbaf27e6d85cd784
2010-09-17 11:49:39 -07:00
Shimeng (Simon) Wang
3fed1bd49a Merge "Use website preferred width as the fixed viewport." 2010-09-17 11:31:45 -07:00
Shimeng (Simon) Wang
14bcc0e7fe Use website preferred width as the fixed viewport.
This preferred width will be set between the default viewport width and
the max fixed viewport width.  The default viewport width serves as the
minimum fixed viewport width, so it's lowered to 980.

This change will make the shirt.woot.com/blog site works better, since it's using
1080 as the preferred width, so user needs not to scroll in overview mode.

issue: 3003933
Change-Id: Ie3eed44a54d277f5bc5f63cd394d463012a80d80
2010-09-17 10:54:48 -07:00
Romain Guy
31529ff791 Correctly free memory.
Change-Id: I08fcbfa7d27ae413e0a8e8ca6ea305c8530a72c1
2010-09-17 10:26:31 -07:00
Jeff Hamilton
bfb619a12a Merge "Convert Numbers to Booleans when calling getAsBoolean()." 2010-09-17 10:21:55 -07:00
Vasu Nori
4e874edf69 don't compile statement for certain SQL statements
SQL statements such as Create table, Pragma, Begin, Commit, Rollback
etc don't need a compiled statement.

Change-Id: I55f5e4e6cbb41cbe83e592e25ba852fe23e2b39f
2010-09-17 10:15:40 -07:00
Stephen Hines
93a958f095 Handle RS reflection name changes.
Change-Id: I0f3f9805a0f0bf44ce9e9944a3eaa5a80dd0cdde
2010-09-17 10:03:00 -07:00
Nipun Kwatra
7553cf74e6 Implemented frequent read returns for quick stop in time lapse.
If the frame capture interval is large, read will block for a long time.
Due to the way the mediaRecorder framework works, a stop() call from
mediaRecorder waits until the read returns, causing a long wait for
stop() to return. To avoid this, we return a copy of the last read
frame with the same time stamp if a frame is not available quickly.
This keeps the read() call from blocking too long. This method is
triggered when startQuickReadReturns() is called on
CameraSourceTimeLapse.

In the still camera case, also using waitRelative on Condition
instaed of sleeping, so that we can wake it up.
Also for the idle check instead of sleeping, we now wait on a
condition variable, which is woken up when the last takePicture
callback gets called.

Change-Id: Ia74386e175536aee0f44ae2f8b114c353d3d72f5
2010-09-17 09:50:27 -07:00
Andreas Huber
524e6f62c9 Register the new OMX components.
Change-Id: I795287c63073ca86ad0f97d6afcfc85c401dc984
2010-09-17 09:33:47 -07:00
Maksymilian Osowski
67a58a0f7c Merge "Updated Summarizer to use SQLite DB." 2010-09-17 09:19:21 -07:00
Shimeng (Simon) Wang
71579f97f8 Merge "Use website specified viewport." 2010-09-17 09:00:40 -07:00
Maksymilian Osowski
394e0fb849 Updated Summarizer to use SQLite DB.
It avoids OOM issues by dumping the memory to the DB every
few hundred tests and then reading them in chunks when
generating summaries, etc.

Change-Id: I5f63d960d456f17e9f2189230a7ae0ca5607ce51
2010-09-17 16:35:46 +01:00
Maksymilian Osowski
fadb0de33d Changed Summarizer to dump generated html code to file every few hundred tests to avoid OOM errors.
Change-Id: Id0917d45ffab2e47d67d17d629f342add5292d4e
2010-09-17 16:14:39 +01:00
Steve Block
76c97ee414 Fix DumpRenderTree2 to serve HTTP tests on http://127.0.0.1:8000
Currently DumpRenderTree2 serves HTTP tests on http://localhost:8080.
Some of the tests hardcode 'http://127.0.0.1:8000' for resources, so
we must use this scheme and port for the requests to be same-origin.

This fixes LayoutTest http/tests/appcache/credential-url.html

Change-Id: I2a9c402fc7b0e0b62eb4a278d67ac0e63ef96e8b
2010-09-17 16:12:21 +01:00
Maksymilian Osowski
062c0c9846 Merge "Updated ManagerService to call Summarizer.summarize() in a separate thread." 2010-09-17 07:29:14 -07:00
Maksymilian Osowski
517ebf14d4 Merge "Changed the behaviour of run_apache2.py restart." 2010-09-17 07:28:58 -07:00
Maksymilian Osowski
4af7705631 Changed the behaviour of run_apache2.py restart.
Now it explicitly stops and starts the server and not just invokes apache2 -k restart

Change-Id: I74cfa9c3388552fcc56b62c5ab614262ca540d0b
2010-09-17 15:27:34 +01:00
Maksymilian Osowski
9893d96d12 Updated ManagerService to call Summarizer.summarize() in a separate thread.
This could potentially take a long time and result in ANR.

Change-Id: Ib8b246e627e841217b68c955d92c97801e93d923
2010-09-17 15:11:15 +01:00
Steve Block
b6a2364eba Merge "Update DumpRenderTree2 to handle failing tests where no meaningful diff is available" 2010-09-17 06:40:24 -07:00
Jeff Hamilton
d208c3a68b Convert Numbers to Booleans when calling getAsBoolean().
Change-Id: I31ad0bccd422f8e76cf37d500a93744cc23d4859
2010-09-17 08:12:19 -05:00
Steve Block
8a6def0247 Update DumpRenderTree2 to handle failing tests where no meaningful diff is available
Currently, DumpRenderTree2 asigns the following result codes
{PASS, FAIL_RESULT_DIFFERS, FAIL_NO_EXPECTED_RESULT, FAIL_TIMED_OUT,
FAIL_CRASHED}

This is not strictly correct, as a test may fail for any of three
reasons - crashing, timing out, or the the result not being as
expected. Therefore, it's possible for a test to fail even if the
result is as expected.

This patch updates AbstractResult to handle each of the three reasons
for failure separately. We then test all three to determine if the
test has passed.

This allows us to correctly report whether or not the result differs
from expected for a failing test.

Change-Id: I7adcfe72c4dd0bd3de2e1b868d9807be6eb5bddf
2010-09-17 13:21:22 +01:00
Maksymilian Osowski
44ce3242a9 Merge "Changed run_layout_tests.py and run_apache2.py to accept alternative tests root dir." 2010-09-17 05:04:19 -07:00