31443 Commits

Author SHA1 Message Date
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
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
Joe Malin
0b7a3bc3de Merge "Doc Change: add screenshots to Testing in Eclipse topic" 2010-09-17 12:43:06 -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
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
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
Steve Block
c0847c55ea Remove superfluous CSS from DumpRenderTree2's Summarizer
Change-Id: Ifc3764ec3cf7bd5ee412abaf45112eed22083456
2010-09-17 12:30:21 +01:00
Steve Block
2c38de8436 Implement WebViewClient.onReceivedHttpAuthRequest() in DumpRenderTree2
This fixes LayoutTest http/tests/appcache/auth.html.

Change-Id: Idd9ead9c35341cc6a787d409ae2fe1bebef01d60
2010-09-17 12:30:21 +01:00
Maksymilian Osowski
78fbc54c18 Changed run_layout_tests.py and run_apache2.py to accept alternative tests root dir.
Change-Id: I6d0537b6712ca6f68ec004e5e8bf95b97b9017fc
2010-09-17 12:18:56 +01:00
Hung-ying Tyan
9e2f4096cd Merge "Fix build." 2010-09-17 03:24:53 -07:00
Hung-ying Tyan
e30fc66305 Fix build.
Change-Id: Icb6faa2ed6428d9db7f880a1855ce01d8cd22495
2010-09-17 18:23:26 +08:00
Hung-ying Tyan
6aec9f4766 Merge "Fix build" 2010-09-17 02:43:51 -07:00
Hung-ying Tyan
93f39477c1 Fix build
Change-Id: If2fdfcb6da3a1cf5f0d62ddfc0f2c98be55b32a7
2010-09-17 17:42:19 +08:00
Hung-ying Tyan
0a56f342f9 am 960d409c: am 1d158357: SipPhone: do not append SIP domain to PSTN number
Merge commit '960d409c79aad3a9f78d930cdebedcc0fb34c30e'

* commit '960d409c79aad3a9f78d930cdebedcc0fb34c30e':
  SipPhone: do not append SIP domain to PSTN number
2010-09-17 02:06:19 -07:00
Hung-ying Tyan
960d409c79 am 1d158357: SipPhone: do not append SIP domain to PSTN number
Merge commit '1d1583573d2099756bbbeef48d97c280edc393e0' into gingerbread-plus-aosp

* commit '1d1583573d2099756bbbeef48d97c280edc393e0':
  SipPhone: do not append SIP domain to PSTN number
2010-09-17 02:03:39 -07:00
Hung-ying Tyan
6c62609e8f resolved conflicts for merge of 394d1e4b to master
Change-Id: I2c3a0ff646e3024d422d809ce964bd188fc70bb7
2010-09-17 16:56:05 +08:00
Hung-ying Tyan
394d1e4bed am afa583e6: SipAudioCall: expose startAudio()
Merge commit 'afa583e6557557577188c3e40146ac8d6f2aa7c7' into gingerbread-plus-aosp

* commit 'afa583e6557557577188c3e40146ac8d6f2aa7c7':
  SipAudioCall: expose startAudio()
2010-09-17 01:01:07 -07:00
Hung-ying Tyan
1d1583573d SipPhone: do not append SIP domain to PSTN number
in the CallerInfo so that only PSTN number is shown in the call log.

http://b/issue?id=2982632

Change-Id: I414f01d16ce64ecb8da7c6943ea7f080bcfd2794
2010-09-17 16:00:31 +08:00
Hung-ying Tyan
afa583e655 SipAudioCall: expose startAudio()
so that apps can start audio when time is right.

Change-Id: I7ae96689d3a8006b34097533bc2434bc3814b82a
2010-09-17 15:58:18 +08:00
Tadashi G. Takaoka
2c7ab0854e am a79433cb: am ecd43cca: Merge "Initialize Keyboard.Key attributes from parent Keyboard.Row" into gingerbread
Merge commit 'a79433cb66c83b3a27e94e42aef95cbae752bcc5'

* commit 'a79433cb66c83b3a27e94e42aef95cbae752bcc5':
  Initialize Keyboard.Key attributes from parent Keyboard.Row
2010-09-17 00:05:52 -07:00
Tadashi G. Takaoka
a79433cb66 am ecd43cca: Merge "Initialize Keyboard.Key attributes from parent Keyboard.Row" into gingerbread
Merge commit 'ecd43cca4205a3c32a5e2ee4000bdc31d28e22be' into gingerbread-plus-aosp

* commit 'ecd43cca4205a3c32a5e2ee4000bdc31d28e22be':
  Initialize Keyboard.Key attributes from parent Keyboard.Row
2010-09-17 00:03:32 -07:00
Tadashi G. Takaoka
ecd43cca42 Merge "Initialize Keyboard.Key attributes from parent Keyboard.Row" into gingerbread 2010-09-17 00:01:19 -07:00
Brian Carlstrom
f81174b281 am f3f822ed: am 987ba541: Merge "Fix sim-eng build on Hardy" into gingerbread
Merge commit 'f3f822edc7d9f08edc91a2e1826de127a19c235d'

* commit 'f3f822edc7d9f08edc91a2e1826de127a19c235d':
  Fix sim-eng build on Hardy
2010-09-16 23:54:39 -07:00
Brian Carlstrom
f3f822edc7 am 987ba541: Merge "Fix sim-eng build on Hardy" into gingerbread
Merge commit '987ba54127caaaa87056965b3d98b7e1a5b110b7' into gingerbread-plus-aosp

* commit '987ba54127caaaa87056965b3d98b7e1a5b110b7':
  Fix sim-eng build on Hardy
2010-09-16 23:51:31 -07:00
Brian Carlstrom
987ba54127 Merge "Fix sim-eng build on Hardy" into gingerbread 2010-09-16 23:48:53 -07:00
Hung-ying Tyan
6308514cbf am 156edcc9: am 9404e633: Merge "Add timer to SIP session creation process." into gingerbread
Merge commit '156edcc9f64e010d6b6de97e9a77adfccee353eb'

* commit '156edcc9f64e010d6b6de97e9a77adfccee353eb':
  Add timer to SIP session creation process.
2010-09-16 23:44:42 -07:00
Tadashi G. Takaoka
b65b7cb580 Initialize Keyboard.Key attributes from parent Keyboard.Row
Bug: 3009940
Change-Id: I22ef3e507c31e46b7581e20bcdd6b5ebc750adfe
2010-09-17 15:40:35 +09:00
Hung-ying Tyan
156edcc9f6 am 9404e633: Merge "Add timer to SIP session creation process." into gingerbread
Merge commit '9404e633a55cd325b57732cdd776053b3886b611' into gingerbread-plus-aosp

* commit '9404e633a55cd325b57732cdd776053b3886b611':
  Add timer to SIP session creation process.
2010-09-16 23:40:28 -07:00
Hung-ying Tyan
9404e633a5 Merge "Add timer to SIP session creation process." into gingerbread 2010-09-16 23:30:49 -07:00
Mathias Agopian
00030e9e70 am 876e0e56: am 36f429d3: Fix typo which causes sensors to fail miserably
Merge commit '876e0e5646f3f062b5f81ead9ff42bfc1da5ffe1'

* commit '876e0e5646f3f062b5f81ead9ff42bfc1da5ffe1':
  Fix typo which causes sensors to fail miserably
2010-09-16 23:26:16 -07:00