commit 266440ef9b7aee437d971afb688a91b6a48e8cca Merge: be92a5c 770358e Author: Brett Chabot Date: Tue Nov 1 14:42:34 2011 -0700 Merge "Support merging device info metrics." into ics-mr0 commit be92a5c09f66660b78a109a650d1494df3939e12 Author: Brian Muramatsu Date: Tue Nov 1 13:31:56 2011 -0700 Updated ICS MR0 Expectations Change-Id: I7a1bfcd825e654bc999e8ef84f38f2e16821be60 commit 770358ebdbafa73653cced292f5f77cdccfbe2aa Author: Brett Chabot Date: Fri Oct 28 17:27:35 2011 -0700 Support merging device info metrics. Add support to read in previous device metrics from XML, and add logic to combine values. ie when running on multiple devices, we want the report to show: serial1,serial2 etc Also cleanup a few constants for consistency. Bug 5171702 Change-Id: I53a1d82b78fde7795f72015c289baa28c7b8472e commit b8d3f20481a799c704e204e560abefb0d363d49e Merge: 3f5e458 df2fccc Author: Brian Muramatsu Date: Mon Oct 31 14:05:36 2011 -0700 Merge "Updated ICS MR0 Expectations" into ics-mr0 commit df2fcccf37f7e3a23d1c36dd9d5b39b8f60d1e4d Author: Brian Muramatsu Date: Mon Oct 31 13:57:33 2011 -0700 Updated ICS MR0 Expectations Change-Id: I66054608723bb6bc8930bf9da429d39ae8b5212c commit 3f5e45884a66f9a3b218ba11ea793164b5e3e18b Merge: 5163f53 74c8db9 Author: Eric Laurent Date: Mon Oct 31 13:50:01 2011 -0700 Merge "Adapt AudioManager volume test to new behavior" into ics-mr0 commit 74c8db916ac8add2d345a102494c523bf3e40e3f Author: Eric Laurent Date: Mon Oct 31 12:42:00 2011 -0700 Adapt AudioManager volume test to new behavior The control of silent/vibrate mode by volume keys changed again... Removed the test of silent/vibrate mode changes induced by volume key presses as this is defined by the UI spec and not the CDD and is cause for constant mismatch between CTS and framework behavior. Change-Id: I62354483357b60848718ca7c73964e2e70f1c2a5 commit 5163f53730f5f49fc5c8007d1653eecb9720be82 Merge: 0558876 a275ecc Author: Brian Muramatsu Date: Mon Oct 31 11:07:23 2011 -0700 Merge "Set CTS Version to 4.0_r1" into ics-mr0 commit a275ecc2b87c73acbb5a68a6c15585005f136a3b Author: Brian Muramatsu Date: Mon Oct 31 11:01:31 2011 -0700 Set CTS Version to 4.0_r1 Bug 5533369 This time the version is set in Tradefed rather than the old host. Change-Id: I8f5a24bde32fa3208b5be1ba3a5f1c6874051aa3 commit 0558876f5ad7f422b7261027dd3174dd64bf6b97 Merge: c01946a 84f0df4 Author: Dave Burke Date: Fri Oct 28 18:48:04 2011 -0700 Merge "Fix flaky test #5534184" into ics-mr0 commit 84f0df4a98e8e05635189856cd3c363020396bcf Author: Dave Burke Date: Fri Oct 28 18:40:18 2011 -0700 Fix flaky test #5534184 Change-Id: I92da240528805d36bd77308b3c005c34da84d572 commit c01946a6266e845b97e7d1ca6ba49b142993e930 Merge: 9e1bcac b9995b4 Author: Brian Muramatsu Date: Fri Oct 28 17:32:09 2011 -0700 Merge "Updated ICS MR0 Expectations" into ics-mr0 commit b9995b435359de16fad9e26693df9f58bcba70e4 Author: Brian Muramatsu Date: Fri Oct 28 17:22:53 2011 -0700 Updated ICS MR0 Expectations Change-Id: Iab5deec3390f94d419198b79ab529c7c2eb02077 commit 9e1bcac67091f018a9a40b0a8aceb2b8ec0de952 Author: Brett Chabot Date: Fri Oct 28 14:03:53 2011 -0700 Assert that apk installs successfully. Change-Id: I82240b136c869367aa45f276ce9b1f1a4117d5e0 commit 291adc99f2f6ed18f814048adad46f2d358a3c0f Merge: ffd849e f8b02e4 Author: Brett Chabot Date: Fri Oct 28 14:00:39 2011 -0700 Merge "Add --bugreport option." into ics-mr0 commit ffd849eadd5c985639165bb867382b0628d21e13 Merge: 4c4e1b6 bd2cce0 Author: Brian Muramatsu Date: Fri Oct 28 13:48:49 2011 -0700 Merge "More TestEnvironment Stuff" into ics-mr0 commit f8b02e43adf39c4bcd0d237701302585834fde86 Author: Brett Chabot Date: Fri Oct 28 12:48:43 2011 -0700 Add --bugreport option. Add ability to generate a bugreport after each failed test. Also compress each generated log file. Change-Id: I1e960b0caa69511fdc163057250d537add6579ae commit bd2cce00f9440d64ce278aaa7a603edde9eb0a7d Author: Brian Muramatsu Date: Fri Oct 28 11:53:09 2011 -0700 More TestEnvironment Stuff Bug 5498103 Setting the CookieHandler.setDefault to null should fix the OldCookieHandlerTest. Added more stuff from the Vogar TestEnvironment class... Change-Id: I5c5c347625d8f3f47eb668e7ab214fb438beadf0 commit 4c4e1b6390fc4d1f30380b8d2a4f9324f828086f Merge: a0a70a4 98e9f2c Author: Brian Muramatsu Date: Fri Oct 28 11:25:28 2011 -0700 Merge "Show Path to Generated Report" into ics-mr0 commit 98e9f2ce6c8d34b99242c237cdeb3cdb42b3f924 Author: Brian Muramatsu Date: Fri Oct 28 11:11:45 2011 -0700 Show Path to Generated Report This makes it easier to view the report after a CTS run. Added "file://" so it is clickable in my terminal.. Change-Id: I752713faae0873dfc77dc74871957f5626bf14cc commit a0a70a40bee347eee48e37dfdd24ec278de149b8 Author: Brian Muramatsu Date: Fri Oct 28 11:01:31 2011 -0700 Add Not Executed Count to Test Summary Useful to see when things go awry... Change-Id: I2f7b4b9df536dae151c5d984546f415f026918a6 commit c50a91eb91c465bc7cd92b16e47b3d2a9f8308c0 Merge: d7ca3d4 c953928 Author: Brian Muramatsu Date: Thu Oct 27 18:26:27 2011 -0700 Merge "Save and Restore user.home Property" into ics-mr0 commit c9539286083dff7fb23db9b644342a0e7e1b3205 Author: Brian Muramatsu Date: Thu Oct 27 18:21:58 2011 -0700 Save and Restore user.home Property Bug 5498103 Change-Id: Iaaa84f8b1c9da8471729e74e25061394f7944232 commit d7ca3d460e3b3a224cf35f64dfa2acf16677ddf4 Merge: 03396da 4822bb7 Author: Brian Muramatsu Date: Thu Oct 27 17:11:07 2011 -0700 Merge "Save and Restore java.io.tmpDir Property" into ics-mr0 commit 4822bb721fdfdb37c160247143a645f927ade624 Author: Brian Muramatsu Date: Thu Oct 27 16:49:01 2011 -0700 Save and Restore java.io.tmpDir Property Bug 5498103 OldFileTest seemed to change this property causing a bunch of failures in OldFormatterTest. Change-Id: Ib569d8545046cf1924f25630637341ec262e3c99 commit 03396dad98f31d445b20abe421669cc7516b15c7 Author: Brett Chabot Date: Thu Oct 27 13:28:10 2011 -0700 Add device info consistency check. Bug 5171702 Change-Id: Icbdeec5ac910c705d7da9db5bb964067fb423775 commit 64ecf7ba932349a84db6c6b25f906e1840904faa Merge: ed2b866 fb0ca56 Author: Brett Chabot Date: Thu Oct 27 14:21:27 2011 -0700 Merge "Add custom cts-tradefed help text and prompt." into ics-mr0 commit ed2b8669ca6adfc16c971daea8e7d1d6207e071f Merge: ce1dc91 50d4fe3 Author: Brian Muramatsu Date: Thu Oct 27 14:17:24 2011 -0700 Merge "Save and Restore Default Locale in Test Runner" into ics-mr0 commit 50d4fe3d31952ba91588bd71cc113726916748df Author: Brian Muramatsu Date: Thu Oct 27 13:52:44 2011 -0700 Save and Restore Default Locale in Test Runner Bug 5498103 Change-Id: I49e4563c96a71fa05b77bb23e52dee83b1b677e2 commit fb0ca56e51070fdc727ad00f1053f6ec809f8730 Author: Brett Chabot Date: Tue Oct 25 20:13:44 2011 -0700 Add custom cts-tradefed help text and prompt. Bug 5377370 Change-Id: I197efce3c5e41e3edb4e1c7abe093841834aec1d commit ce1dc91d00501e1b445da263eb2aa8f7a215be06 Merge: 4789cbd 799ff6a Author: Brian Muramatsu Date: Wed Oct 26 18:25:24 2011 -0700 Merge "Update ICS MR0 Expectations" into ics-mr0 commit 799ff6a0b07160e8da59ee9f7795f9126257a619 Author: Brian Muramatsu Date: Thu Oct 20 13:57:29 2011 -0700 Update ICS MR0 Expectations Change-Id: I103595e0f441e469b92eaa8b8359999d7f7b778f commit 4789cbd14b8b527ba0592b47fcbfaf75fe2eddea Author: Brett Chabot Date: Wed Oct 26 16:49:16 2011 -0700 Make accessibility tests unlock the keyguard. Include the InstrumentationCtsTestRunner in the accessibilitytest package, which will unlock the keyguard before running tests. Bug 5521447 Change-Id: I39dc4907ac7d1ce6a3452c4a16e29478ec91d3fd commit 86e9cbb39f8e25041acb32a0254071302f96969c Merge: 24e1467 82dcdfe Author: Brett Chabot Date: Wed Oct 26 13:48:06 2011 -0700 Merge "Handle DeviceNotAvailableException in JarHostTest." into ics-mr0 commit 24e1467b6da33addf4a5c03927c0ed1495fbf299 Author: Brian Muramatsu Date: Tue Oct 25 18:36:55 2011 -0700 Fix Build Change-Id: I4a9f771e14f0d6b93ee1fa34ad73faeb856e5230 commit 44650b16f2f6e14f179b3c9e2feb4e79e9e27573 Author: Brett Chabot Date: Tue Oct 25 18:09:39 2011 -0700 Fix vm-tests attempt 2 Pass in ANDROID_DATA env variable, so dalvikvm will use the dalvik-cache folder in /data/local/tmp/dalvik-cache. Also remove all files when test completes. Bug 5493719 Change-Id: Ifa63f25f4c5b374a7a44fce79075401a51de2987 commit 6bb6bc20d99dd79400f12ff60dccd2b59a91c383 Merge: cb8b1d9 bd3e510 Author: Brett Chabot Date: Tue Oct 25 17:23:03 2011 -0700 Merge "Change --no-collect-device-info to --skip-device-info/-d." into ics-mr0 commit bd3e510061d0d361dcbc3ced99bd6ce0cab63851 Author: Brett Chabot Date: Tue Oct 25 17:19:22 2011 -0700 Change --no-collect-device-info to --skip-device-info/-d. Change-Id: Ie2406d972e634fa028538d4804f1747060926e1b commit cb8b1d9566e122812b7da9346254bb97eb06bc40 Merge: c390565 358dc56 Author: Brett Chabot Date: Tue Oct 25 16:48:04 2011 -0700 Merge "Only install necessary prequisite apks." into ics-mr0 commit 358dc567fdf3b1d623659980f83c8085b702dc13 Author: Brett Chabot Date: Tue Oct 25 15:46:48 2011 -0700 Only install necessary prequisite apks. Bug 5513483 Change-Id: Ic93592799108300d71677d7a317dd6e926502159 commit c390565f0592fdbabdb60d632a382e61be1a3002 Merge: d082177 784f1d9 Author: Brian Muramatsu Date: Tue Oct 25 13:52:06 2011 -0700 Merge "Update CTS Verifier Feature Summary" into ics-mr0 commit d0821774a85c3bdf86f574c7d4cafae1174026af Merge: 697bc37 93e9c3d Author: Brett Chabot Date: Tue Oct 25 13:47:13 2011 -0700 Merge "Execute remaining tests in order." into ics-mr0 commit 93e9c3d2399cfa60a6f0ec2f91ea85c438da85e0 Author: Brett Chabot Date: Tue Oct 25 13:37:12 2011 -0700 Execute remaining tests in order. Bug 5513628 Change-Id: I36b85c3ecb5cfaeebdc7538db0bbf917053b4957 commit 697bc37f3635d1dfb458ae31287f9b387ec59ff6 Merge: 8e49560 65cc34f Author: Brian Muramatsu Date: Tue Oct 25 11:46:43 2011 -0700 Merge "Fix a mismatch problem because of hidden public API in CamcorderProfile.java" into ics-mr0 commit 8e495607ba58394578f2113577156ca0db0c0188 Merge: 1281c50 0fae572 Author: Brian Muramatsu Date: Tue Oct 25 11:31:12 2011 -0700 Merge "fix IPv6 loopback pattern" into ics-mr0 commit 0fae5723eaab8fdc22c8e822390a8f5d47f34c8b Author: Nick Kralevich Date: Tue Oct 25 10:16:06 2011 -0700 fix IPv6 loopback pattern In /proc/net/udp6 and /proc/net/tcp6, the addresses stored in that file are in network byte order. As a result, the IPv6 loopback address, ::1, is stored as 00000000000000000000000001000000 NOT 00000000000000000000000000000001 Bug: 5473686 Change-Id: I73098d52c981c48d82423c8ce99b6b20d11a5568 commit 1281c50e10c813db70fbc97386d72897a3238ca8 Merge: 1b20cf3 37d4f0e Author: Brian Muramatsu Date: Tue Oct 25 11:26:32 2011 -0700 Merge "DO NOT MERGE Adjust test start date" into ics-mr0 commit 37d4f0e1ba8d37e58a0b617b195c9bfa3a36331d Author: Andy McFadden Date: Mon Oct 24 16:50:23 2011 -0700 DO NOT MERGE Adjust test start date We were examining instances of a recurrent event that straddled a DST time change. This caused the test to fail when the device was configured for GMT. Bug 5498105 Change-Id: I32a0ee9e2aad95670b76b2d1803b2538f3ba7dd7 commit 1b20cf32c6715a64fcdb2d749ac96c033a23d36e Author: Ying Wang Date: Tue Oct 25 10:40:44 2011 -0700 Retain META-INF in core-tests. Bug: 5497388 Before this change ctscore.mk calls function unzip-jar-files, which removes META-INF deliberately. Change-Id: I6880efdbc107a570eaac6db957402713606b6578 commit 65cc34f5b4eb28efa87a597744d7fd586f4ccd9f Author: James Dong Date: Mon Oct 24 20:35:52 2011 -0700 Fix a mismatch problem because of hidden public API in CamcorderProfile.java Change-Id: I53f6e3a41049af4a605744552a16501bde0375b8 related-to-bug: 5381276 commit 82dcdfe2e55e8f4115de3484d35a785ff10f95dc Author: Brett Chabot Date: Mon Oct 24 20:35:42 2011 -0700 Handle DeviceNotAvailableException in JarHostTest. Bug 5497983 Change-Id: I998ddcd23368225275bac6b98a55aad09a1058cf commit 64011e7a0c6eb6945db3730652db792978ebfda0 Merge: 58a9998 1555ab5 Author: Brett Chabot Date: Mon Oct 24 14:31:38 2011 -0700 Merge "Make vm-tests-tf use ITestDevice.pushDir" into ics-mr0 commit 58a9998004f882fe33789222e9cd8dc0665151b4 Merge: e2e960e 27a8456 Author: Svetoslav Ganov Date: Mon Oct 24 12:23:28 2011 -0700 Merge "Adding CTS tests for the new accessibility APIs in ICS." into ics-mr0 commit e2e960e0fd049ce982f9279c7a2c5dd5135d9229 Merge: ef0e640 b59bad6 Author: Brian Muramatsu Date: Mon Oct 24 12:21:05 2011 -0700 Merge "Fix PackageSignatureTest#testPackageSignatures" into ics-mr0 commit 27a84563508815d6d2652a0dfe17a118daccb2bd Author: Svetoslav Ganov Date: Sat Oct 22 20:54:18 2011 -0700 Adding CTS tests for the new accessibility APIs in ICS. 1. Added tests for the new APIs introduced in ICS. 2. Fixed a failing CTS test. NOTE: This change does *not* affect the system image, rather CTS. Change-Id: I15eabeb1f60404707f99ac2048455463fce4c0c8 commit b59bad6ec2b77595dff3d280ef08a2ea0303e586 Author: Brian Muramatsu Date: Mon Oct 24 12:13:02 2011 -0700 Fix PackageSignatureTest#testPackageSignatures Add android.core.tests.runner to the whitelist exception list. This is just a package used while running CTS is not of concern. Change-Id: I5212cb1336a029c228187731c08012a3a8940d72 commit ef0e640564414d621e8208433635a677244a5969 Merge: ed593d7 1569c20 Author: Brett Chabot Date: Mon Oct 24 11:59:20 2011 -0700 Merge "Complete 'continue-session' support" into ics-mr0 commit 1569c2021bb6328de6a21bacfad3941789c49deb Author: Brett Chabot Date: Thu Oct 20 16:28:09 2011 -0700 Complete 'continue-session' support Change the CTS xml generator to read in results from a previous XML file. The XML generator has also been changed to store results in its own data structure, rather than reusing CollectingTestListener. Bug 5171576 Change-Id: Ie4d2aaca47bfb01a7203e9227d4506e2f9a2abd2 commit 1555ab52e50c233b664b2f8ec545877acebaa0d6 Author: Brett Chabot Date: Fri Oct 21 15:13:03 2011 -0700 Make vm-tests-tf use ITestDevice.pushDir Bug 5493719 Change-Id: I5a396f2871c2369cd41ba6d007f83c95348b8643 commit ed593d793155215768c9dc3fdc21451a08e15bbf Author: Brian Muramatsu Date: Fri Oct 21 15:22:05 2011 -0700 Fix FileObserverTest#testFileObserver Bug 4368017 Update to match new default permissions. Change-Id: I52b546a024a50203515ceef2cd3c0da83f3e26c2 commit 784f1d959bdfb31c9ca9bd9c23c59bc710801c84 Author: Brian Muramatsu Date: Fri Oct 21 14:12:50 2011 -0700 Update CTS Verifier Feature Summary Add WiFi Direct as not required. Change-Id: I65e568378f84fe583a0703dbc1e57fcd0d765f8c commit 7774f933a036b44c918c297aab2ff2199511e2f2 Merge: f64e7bd 1f1d0c7 Author: Brian Muramatsu Date: Fri Oct 21 11:04:40 2011 -0700 Merge " modified: MediaPlayerStreamingTest.java" into ics-mr0 commit f64e7bde8bace8ed518f950c9b55c86c3e85612f Merge: 1e45ca3 f6334c2 Author: Steve Block Date: Fri Oct 21 03:20:12 2011 -0700 Merge "Fix some WebView SSL tests" into ics-mr0 commit 1e45ca3661e236c86368c9c69ef19f67441c6aa2 Author: Tyler Luu Date: Thu Oct 20 15:45:36 2011 -0500 Supported params don't have to change for testSceneMode After scene mode selection, certain parameters can be overwritten, but the supported values for that parameter doesn't necessarily have to change as long as that new parameter is in the list of supported values. Applications can still change that parameter even after setting scene mode. bug:5474359 Change-Id: Ib6c671752db497ae73eeceed54eaf7dfaa0fbf58 Signed-off-by: Tyler Luu commit 1f1d0c74c48490e57e35c5b5bf5f787aba2c638e Author: Guru Nagarajan Date: Thu Oct 20 14:36:42 2011 -0700 modified: MediaPlayerStreamingTest.java Change-Id: Ieb1f955c3ac0d03d55d75cff47dcb0e74406b450 commit f6334c26fa9e8749666b6e953a45d2afd26f22cf Author: Steve Block Date: Thu Oct 20 23:00:31 2011 +0100 Fix some WebView SSL tests We need to clear SSL preferences in any test where we depend upon WebViewClient.onReceivedSslError() being called. Also cleans up use of assertEquals(). Bug: 5484235 Change-Id: I8bf27826fa99691c83ae6e52f99b95ecb278e57b commit dc612d65bdd40b8f206b78cfe758b8496391d674 Merge: 817c153 7db0ce8 Author: Brett Chabot Date: Thu Oct 20 14:53:44 2011 -0700 Merge "Handle missing device serial in CtsXmlResultReporter." into ics-mr0 commit 7db0ce8be1dee3038f8f0f1dc722da9f4bc8f055 Author: Brett Chabot Date: Thu Oct 20 14:44:37 2011 -0700 Handle missing device serial in CtsXmlResultReporter. Change-Id: Ie45a538d25717e822ac9612bbba7528e48277e1a commit 817c153b0f1b3d313e25ad80942c7a1cbf7e33de Author: Brett Chabot Date: Thu Oct 20 14:40:43 2011 -0700 Add a --continue-session option. Bug 5171576 Change-Id: Ic3b3509c38921ad952b8f87c990f2250ac73983d commit 22e35bc2390591549aca4286b018b36aab4b2851 Author: Brett Chabot Date: Thu Oct 20 11:55:32 2011 -0700 Fix xml generation. Change-Id: I5bd63fbba838c3459111119001cef5cf7fe8fd3b commit 04e211dd38156143a6bbde249de3324c01aea820 Merge: 676ec5e 303242d Author: Brett Chabot Date: Thu Oct 20 10:50:31 2011 -0700 Merge "Add 'add derivedplan' console command." into ics-mr0 commit 676ec5e743b8d169db97ad6df599c12459549313 Merge: e11234d c51a350 Author: Brett Chabot Date: Thu Oct 20 10:50:25 2011 -0700 Merge "Test summary cleanup." into ics-mr0 commit e11234d4efba05cadbd5f332e64cf0fec8ab6cdc Merge: ad39448 b791837 Author: Brett Chabot Date: Thu Oct 20 10:50:18 2011 -0700 Merge "testtype cleanup." into ics-mr0 commit ad3944853e69ff0ea60d1dab87541ad4cea9052c Merge: dd757f8 00921c0 Author: Brett Chabot Date: Thu Oct 20 10:50:00 2011 -0700 Merge "Add ability to retrieve test results with given status." into ics-mr0 commit dd757f836d97e4dbb7aae92649195b861a61cb95 Merge: d680458 e78d022 Author: Brett Chabot Date: Thu Oct 20 10:42:09 2011 -0700 Merge "turn off adb root for cts." into ics-mr0 commit 00921c0892b32f5d80cc692d3a75d868715f6c7e Author: Brett Chabot Date: Wed Oct 19 18:53:49 2011 -0700 Add ability to retrieve test results with given status. Bug 5171576 Change-Id: Id38a03d9208e442cfeae2f458248f0914b2691dd commit 303242dd6675eb7e4f82c0309576faffb48ba921 Author: Brett Chabot Date: Wed Oct 19 19:20:35 2011 -0700 Add 'add derivedplan' console command. Also add display of plan name to 'list results' Bug 5171576 Change-Id: I4092dbd4177e8fea99e307e1c205255bea9075e1 commit c51a350bf01d6880e70b4381eaa82fec3c72975e Author: Brett Chabot Date: Wed Oct 19 19:11:15 2011 -0700 Test summary cleanup. Add support for parsing plan name for test summaries. Store cts build id in the buildinfo. Bug 5171576 Change-Id: I315d0f551676a2ba2f471826635e3fd2a95bc83e commit b7918376fd81f6e4a2e948e2a4929593183bdd17 Author: Brett Chabot Date: Wed Oct 19 19:03:44 2011 -0700 testtype cleanup. Rename TestCaseRepo to TestPackageRepo, and add a ITestPan.getName method Bug 5171576 Change-Id: Ib4725f36179794fc0883c97a7830f7cc2c1a7e6b commit e78d022f0cac5abbe602cc68f9c118aa027c2854 Author: Brett Chabot Date: Wed Oct 19 18:52:09 2011 -0700 turn off adb root for cts. Change-Id: I16148308abde2ecdebe4bd80465edaf40140d44e commit d680458c9a761ffa4d763d9d905dd44b11a903eb Author: Brian Muramatsu Date: Wed Oct 19 14:59:25 2011 -0700 Don't Call pass() Twice in SearchManagerTest Bug 5444914 In one of the tests, pass() was being called by the handler's doStep method and then again after checknig the doStep's return value. The first pass caused the activity to terminate and clean up its references. Then the handler's pass call would get a NPE when it finally executed. I also cleaned up a lot of junk in the corresponding test. Change-Id: I65611bdda03e3243a646cd0a51b11e6986f4b019 commit 99d96c4d0dfd06422f4f9a15494fb460e72fe074 Author: Chih-Chung Chang Date: Wed Oct 19 20:12:27 2011 +0800 Fix 5333610: Increase fps tolerance from 3% to 5%. Change-Id: If2ac09f9b7f169bf7a7356bdf52f34412f1457ae commit f6a4b2dad744f23b3f0cb8e0cab8a2997581c1ca Author: Brett Chabot Date: Tue Oct 18 16:43:24 2011 -0700 Display app package name in cts report for consistency. Change-Id: I6dcbddbabf94c381c3a6f1e64c9d091e89f111c7 commit 7c56cca55df9f8033a237c57c8fbd8ab7ea5860e Merge: e7fc9ee da6997c Author: Brett Chabot Date: Tue Oct 18 16:29:22 2011 -0700 Merge "Use CTS-TF instead of CTS plan." into ics-mr0 commit e7fc9eef5c176703a8e5f03f43a3bbd43a752b2f Merge: 6674951 857fdce Author: Brett Chabot Date: Tue Oct 18 16:26:41 2011 -0700 Merge "Add more logs when generating CTS results." into ics-mr0 commit da6997cf7e3d4f84b2560a6adc3c09bc28b5add3 Author: Brett Chabot Date: Tue Oct 18 14:34:41 2011 -0700 Use CTS-TF instead of CTS plan. Bug 5473472 Change-Id: Id3bdf20744ffcae5f2eff0501dabe34d82fb4322 commit 857fdce96c39d6eb360f5c307b373d8fa7bb06e4 Author: Brett Chabot Date: Tue Oct 18 16:19:26 2011 -0700 Add more logs when generating CTS results. Bug 5376438 Change-Id: Iccaecbf2cdb34c20957d6d07edf0a9fda1a2bd75 commit 6674951515a7915c05aa8e3bc88a0ac011d57c09 Merge: 7d89369 65cd6ef Author: Brett Chabot Date: Tue Oct 18 13:57:48 2011 -0700 Merge "Add ability to parse test package results from xml." into ics-mr0 commit 7d893697000f2634ff5bb9a5d73f7a4d41014053 Merge: 3c64686 e9d1096 Author: Eric Laurent Date: Mon Oct 17 19:48:37 2011 -0700 Merge "Align AudioManager test with new volume policy." into ics-mr0 commit 65cd6eff9303eebf0a57c68b42e8a9e44b8771ae Author: Brett Chabot Date: Mon Oct 17 18:23:21 2011 -0700 Add ability to parse test package results from xml. Also fix xml generation for stack traces. Bug 5171576 Change-Id: I3cbcdb69c6887bace2b1bd0610aeba7f1f8b8884 commit 3c64686bc8fe2d681500c432ae1a6b4602c83f77 Author: Brett Chabot Date: Mon Oct 17 16:25:14 2011 -0700 Refactor CTS xml creation. Break out creation of package and test elements into separate classes. Bug 5171576 Change-Id: I57a26075294393169b0902339295c49597be781f commit d55865381528ec3040696d76e1532f09840c133c Merge: 0ce1a8a fad0a7c Author: Brett Chabot Date: Mon Oct 17 16:04:16 2011 -0700 Merge "Serialization support for test plans." into ics-mr0 commit fad0a7c7d74d90e9612e925ba167587881eb1984 Author: Brett Chabot Date: Mon Oct 17 15:30:28 2011 -0700 Serialization support for test plans. Bug 5171576 Change-Id: I589129f40a1b1b8b7732d6583a87df320a2d8764 commit 0ce1a8a10a81f0fbb15eaaa269c4aedfcc165868 Merge: dea0d8b ab0f6f6 Author: Brian Muramatsu Date: Mon Oct 17 13:25:59 2011 -0700 Merge "Update Eclipse CTS Classpath" into ics-mr0 commit ab0f6f6ca1fb5bf7dfdde0899d04c1e8f9ef6a15 Author: Brian Muramatsu Date: Mon Oct 17 13:23:53 2011 -0700 Update Eclipse CTS Classpath Change-Id: Ie872ef39d52ceca37d6db1e66892c96675eb0934 commit dea0d8bbbf151b4d0ccd33f3d28cb6c25c86d5a1 Merge: 6d4fd61 bb47ea0 Author: Jamie Gennis Date: Mon Oct 17 12:46:22 2011 -0700 Merge changes I34dbae75,I582afae6 into ics-mr0 * changes: Augment CTS test for MediaPlayer.setSurface DO NOT MERGE: Add CTS test for MediaPlayer.setSurface() For bug 5088394. commit bb47ea0cfe6b354a63b815cddd057966df7ff1fa Author: Jamie Gennis Date: Fri Oct 14 19:58:03 2011 -0700 Augment CTS test for MediaPlayer.setSurface This change makes the test cover the case where a Surface that has already been released is passed to MediaPlayer.setSurface. Bug: 5396571 Change-Id: I34dbae755b4aa17664c20f2e6a34c0603e061adf commit 6d4fd610d7b419c2c6cf4fe7a8d76d26c373c4e5 Merge: 156b3c7 bd135ae Author: Svetoslav Ganov Date: Mon Oct 17 11:54:28 2011 -0700 Merge "Fixing the AccessibilityEvent test." into ics-mr0 commit bd135ae1f1e110d97cf1233e744bf43b7551e1f3 Author: Svetoslav Ganov Date: Mon Oct 17 11:49:29 2011 -0700 Fixing the AccessibilityEvent test. Since a couple of new properties were added to the event class AccessibilityEventTest#testMarshalling was failing. bug:4367707 Change-Id: I73a86ff07eb9d5fac84610d1b68a90b67856475a commit 156b3c75c4be7be45b1a221ce38f0710c900515c Merge: 13638ab 62b0d44 Author: Brian Muramatsu Date: Mon Oct 17 11:23:10 2011 -0700 Merge "Log Test Class + Name + Result" into ics-mr0 commit 6414866794c720163ae485792fb7ef292b8d3e51 Author: Gloria Wang Date: Mon Oct 3 15:56:30 2011 -0700 DO NOT MERGE: Add CTS test for MediaPlayer.setSurface() For bug 5088394. Change-Id: I582afae674a7dc8c919613009a048f2715fe090c commit e9d1096a1d39bc8cb62f13c30cb8a0cbbb6b4f31 Author: Eric Laurent Date: Fri Oct 14 18:00:57 2011 -0700 Align AudioManager test with new volume policy. New silent mode policy specifies that ring and notification stream volume should never reach 0 unless in silent mode. Change-Id: Ia138cfa0dad905d571c1d2cdc53bee33bb9cba3c commit 13638abcc3bea5bdd4ef04491311a6a7b3c43eef Author: Brett Chabot Date: Sun Oct 16 13:59:03 2011 -0700 cts-tradefed: cleanup signature test and option reporting. Bug 5264339 Change-Id: I3fee64b7f5e6855e7457389522dac4e68a230143 commit 62b0d44828b1e54394f4e461466961dd90bb7e66 Author: Brian Muramatsu Date: Fri Oct 14 18:30:36 2011 -0700 Log Test Class + Name + Result Bug 5411733 Change-Id: I7305ac01d00aba4f9088ba552237ab48de4f1435 commit 584c94429c75d2691e67997120076979161d548f Merge: 493bb84 0a4a658 Author: Brian Muramatsu Date: Fri Oct 14 11:47:15 2011 -0700 Merge "Add Screen Layout Size and Long Tests" into ics-mr0 commit 493bb84678ec0709ee841c9dff7bfe198e304501 Merge: 21539b4 31c6490 Author: Brian Muramatsu Date: Fri Oct 14 11:37:50 2011 -0700 Merge "Fix NPE in ServiceTest" into ics-mr0 commit 21539b471b5a95e3ebbbe89cd9f3f51a1fe58967 Merge: bfbaa22 1de3bd8 Author: Jeff Brown Date: Thu Oct 13 18:08:48 2011 -0700 Merge "Fix CTS test broken due to default value of closeOnTouchOutside. (DO NOT MERGE)" into ics-mr0 commit bfbaa225b2970eadac00fba1a04f2ebc359f8864 Merge: 4b433d9 c498a12 Author: Jeff Brown Date: Thu Oct 13 18:08:37 2011 -0700 Merge "Fix a broken CTS test for sendPointerSync. (DO NOT MERGE)" into ics-mr0 commit 1de3bd86b3feaf4a5c0a5b3df54634820427ea33 Author: Jeff Brown Date: Thu Oct 13 17:57:22 2011 -0700 Fix CTS test broken due to default value of closeOnTouchOutside. (DO NOT MERGE) The default value of closeOnTouchOutside depends on the size of the screen using the resource system. The testTouchEvents test assumes it defaults to true but it might not. Bug: 5195897 Change-Id: I68b8aa1a775acea46831e36a4eff355679bcdfd2 commit c498a12bc91160f16da38f810a87143f049b2f89 Author: Jeff Brown Date: Thu Oct 13 17:28:45 2011 -0700 Fix a broken CTS test for sendPointerSync. (DO NOT MERGE) Bug: 4355412 Change-Id: I0f036bb0ed132c696c2981eeb9ba02fe65b830cc commit 4b433d9ff4c123f0a10ea06fe566a1b2d8b4cf56 Merge: 3b8fc20 84d766e Author: Kenny Root Date: Thu Oct 13 17:10:13 2011 -0700 Merge "Add GET_SIGNATURES to getPackageArchiveInfo test" into ics-mr0 commit 84d766e7539233b946b1713013281f5b08aa44ba Author: Kenny Root Date: Fri Aug 12 11:08:01 2011 -0700 Add GET_SIGNATURES to getPackageArchiveInfo test Check to see that GET_SIGNATURES works when used with the PackageManager#getPackageArchiveInfo API. Change-Id: I01f12ef7b3102846b52603926b2708f277c50707 commit 31c6490a7cff878d4e780eca638dd56a9ec306b1 Author: Brian Muramatsu Date: Thu Oct 13 16:40:22 2011 -0700 Fix NPE in ServiceTest Bug 5444914 I can't seem to reproduce this anymore, but I noticed this weird code that was starting a new Handler on every onResume. This can't be right, so I'm moving it to onCreate... Change-Id: I1b5b7c233f577a0adcf236075d3258d5993ad015 commit 0a4a658e2dcfb91e52f82f06121b9ced2f7463fc Author: Brian Muramatsu Date: Mon Oct 10 14:37:34 2011 -0700 Add Screen Layout Size and Long Tests Bug 5278778 Assert that the screen layout size and long value is reported just like WindowManagerService does. Change-Id: Id009e329ece44f7ba24bcecc14db626e07747b91 commit 3b8fc206ef48349adc1dfbac13dc66de64c06ef7 Merge: 3f38460 3df223e Author: Wu-cheng Li Date: Wed Oct 12 20:57:29 2011 -0700 Merge "Add CTS for camera continuous autofocus modes." into ics-mr0 commit 3f3846090838e52fb2b8cb6d4a9be5ea7e935895 Merge: 5fdd416 15cedb7 Author: Wu-cheng Li Date: Wed Oct 12 20:57:10 2011 -0700 Merge "Add video snapshot CTS." into ics-mr0 commit 5fdd416f34e9a6e9ea4119281f831357f2b0215c Merge: 9523d7b 8acbab0 Author: Wu-cheng Li Date: Wed Oct 12 20:57:02 2011 -0700 Merge "Add camera face detection CTS." into ics-mr0 commit 3df223e5c79955b7594cd27343a58b6b0684a88f Author: Wu-cheng Li Date: Wed Oct 12 20:25:23 2011 +0800 Add CTS for camera continuous autofocus modes. - Also make sure focus position does not change after stopPreview or takePicture. bug:5169599 Change-Id: I81577447e8943b1e136ac92e04564171635a352f commit 9523d7b7332531fdee138ff8191042fd1095bbf9 Merge: 4f8482c 2d73ba0 Author: Andy McFadden Date: Wed Oct 12 12:20:13 2011 -0700 Merge "Additional tests for Reminders and hasAlarm" into ics-mr0 commit 15cedb72822f5d4c3f74e650c33dc55b8f182b28 Author: Wu-cheng Li Date: Wed Oct 12 18:06:00 2011 +0800 Add video snapshot CTS. bug:5169599 Change-Id: I46f4b3de3c9fd67aff0fe037e3171ce8a673b0ba commit 8acbab03ea26d67c0fec65b9e6760c671fbba39c Author: Wu-cheng Li Date: Wed Oct 12 15:20:14 2011 +0800 Add camera face detection CTS. bug:5169599 Change-Id: I86eb53920d86c277dde34c253bae935520e4ac95 commit 2d73ba06837c5aa3be3f25ea8f9ff240f6dce494 Author: Andy McFadden Date: Fri Oct 7 16:24:27 2011 -0700 Additional tests for Reminders and hasAlarm Verify that Events.hasAlarm properly tracks additions and deletions in the Reminders table. Added some additional tests on deletion of Reminders and Attendees. Bug 5424486 Change-Id: Ife5aac69e6e3a5ce478ea3e10868e84fd7d468dc commit 4f8482cb67f9216fea1fae54155911db57b34b06 Author: Jeff Brown Date: Mon Oct 10 18:12:37 2011 -0700 Update CTS tests as part of CursorWindow ashmem changes. Bug: 5332296 Change-Id: I6f857817ef57cc6de4dd228857b334961e451ae3 commit 8369f1dd52e7f686efa039cb464eeb2e0e7ff474 Merge: 645a365 7bb7287 Author: Wu-cheng Li Date: Tue Oct 11 03:45:32 2011 -0700 Merge "CTS: Fix for #testMultiCameraRelease" commit 7bb728794084449caa161762fcf1b400e7d84bd3 Author: Sundar Raman Date: Tue Sep 20 10:37:04 2011 -0700 CTS: Fix for #testMultiCameraRelease - When switching between different cameras one should release the preview surface first before re-using it again. bug:5360297 Change-Id: I3c336ba6c2f6cdd11c4250fcc79feb1d4bd86ad1 Signed-off-by: Emilian Peev Signed-off-by: Sundar Raman commit 645a365f6a47a17d2a4806602c69211eac886664 Merge: a88d60a 47beef5 Author: Jean-Michel Trivi Date: Mon Oct 10 17:52:20 2011 -0700 Merge "OpenSL ES: test AudioPlayer playing MP2TS data" commit a88d60a29efa4ce1b4b2533dd06fa4a01a5f87e1 Merge: 35da149 4f63243 Author: Brian Muramatsu Date: Mon Oct 10 17:12:18 2011 -0700 resolved conflicts for merge of 4f63243f to master Change-Id: I646dfa74fbb76a31022e9427ccc9f9fa0fd1c5e6 commit 4f63243f79257f26003658259a0145de4fc65280 Merge: a5f40c5 d5bebc0 Author: Brian Muramatsu Date: Mon Oct 10 16:42:25 2011 -0700 am d5bebc0b: am e11132b8: Merge "Delete Performance Tests" into gingerbread * commit 'd5bebc0b7dbb1d8c467e92786f33448b4f79884b': Delete Performance Tests commit d5bebc0b7dbb1d8c467e92786f33448b4f79884b Merge: bb1abab e11132b Author: Brian Muramatsu Date: Mon Oct 10 16:39:08 2011 -0700 am e11132b8: Merge "Delete Performance Tests" into gingerbread * commit 'e11132b887387f50bb9f788aa440d0eb54446406': Delete Performance Tests commit e11132b887387f50bb9f788aa440d0eb54446406 Merge: 8f2e48a 18dae33 Author: Brian Muramatsu Date: Mon Oct 10 16:35:56 2011 -0700 Merge "Delete Performance Tests" into gingerbread commit 18dae332020a4123392230cac2ea609d4a895a01 Author: Brian Muramatsu Date: Mon Oct 10 14:44:32 2011 -0700 Delete Performance Tests Bug 5432523 Change-Id: I1d79ff0e2ad2abf126ef62a2b9c12ae05b503163 commit 35da149d1c21ba4b5a24f71c9f1f98d45df1c7b0 Merge: ed122f1 56f494e Author: jeffhao Date: Mon Oct 10 14:50:21 2011 -0700 Merge "Various fixes to vm tests for new verifier." commit ed122f1a156b7e8ab92ac8e7b8778eead2c6cc99 Merge: 36297f2 fcfd502 Author: Jeff Brown Date: Mon Oct 10 14:06:13 2011 -0700 Merge "Update CTS tests as part of ContentProvider cleanup. Bug: 5332296" commit 36297f2817ade8a8572124986e3e35bbd717f0ea Merge: 50e98b7 a5f40c5 Author: android-htc-contribute Date: Mon Oct 10 12:42:58 2011 -0700 am a5f40c52: am bb1ababe: am 8f2e48a7: Data call establish time is related to network condition which can’t be controlled by the device. Extend the time limitation to 30 seconds to cover most of the cases. * commit 'a5f40c52c954e5f8f33a29f4fc0123b3cf44533e': Data call establish time is related to network condition which can’t be controlled by the device. Extend the time limitation to 30 seconds to cover most of the cases. commit a5f40c52c954e5f8f33a29f4fc0123b3cf44533e Merge: 9d05229 bb1abab Author: android-htc-contribute Date: Mon Oct 10 12:41:03 2011 -0700 am bb1ababe: am 8f2e48a7: Data call establish time is related to network condition which can’t be controlled by the device. Extend the time limitation to 30 seconds to cover most of the cases. * commit 'bb1ababef8fd8f0ba3e671b426ccc0d26f115ff7': Data call establish time is related to network condition which can’t be controlled by the device. Extend the time limitation to 30 seconds to cover most of the cases. commit bb1ababef8fd8f0ba3e671b426ccc0d26f115ff7 Merge: 9a33222 8f2e48a Author: android-htc-contribute Date: Mon Oct 10 12:37:31 2011 -0700 am 8f2e48a7: Data call establish time is related to network condition which can’t be controlled by the device. Extend the time limitation to 30 seconds to cover most of the cases. * commit '8f2e48a7b58f08fadbb8b213154961cc4a2ffd68': Data call establish time is related to network condition which can’t be controlled by the device. Extend the time limitation to 30 seconds to cover most of the cases. commit 8f2e48a7b58f08fadbb8b213154961cc4a2ffd68 Author: android-htc-contribute Date: Wed Oct 5 11:09:36 2011 +0800 Data call establish time is related to network condition which can’t be controlled by the device. Extend the time limitation to 30 seconds to cover most of the cases. Change-Id: I522f7eb23baa9a652fb3fd633d200cd6307180c8 commit 50e98b76f1127968ced93715b7f3d31c58897fcf Merge: 55b96ef cd47f4a Author: Gilles Debunne Date: Mon Oct 10 10:54:57 2011 -0700 Merge "Adapted WordIterator tests after refactoring" commit fcfd502de1270c2d5565b386799240d9b68c2df5 Author: Jeff Brown Date: Sun Oct 9 20:52:40 2011 -0700 Update CTS tests as part of ContentProvider cleanup. Bug: 5332296 Remove references to removed hidden APIs. Change-Id: I9ef14a3006afba91ae75ae072af52e387439d88f commit 55b96ef39d78af3cbd6951e670052f68f7f9273c Merge: 3d27d85 9d05229 Author: Nick Kralevich Date: Sat Oct 8 13:00:12 2011 -0700 am 9d05229e: am 9a33222e: am 33a1e5c6: Merge "FileSystemPermissionTest: add one dir" into gingerbread * commit '9d05229e9503e64a631bf1a07f2a6ef3a7a9f8b4': FileSystemPermissionTest: add one dir commit 3d27d859abf0ab808cf5002a70006736e81b0046 Merge: 1e149c2 b7eda62 Author: Masanori Ogino Date: Sat Oct 8 13:00:02 2011 -0700 am b7eda620: am 4c6decb7: am cf4b7436: Remove a test case for mms intent-filter * commit 'b7eda620e06d6edc6a092d25b06eb18f3af1d7cc': Remove a test case for mms intent-filter commit 1e149c2a48c2d5330df2a2a864a906da90899ced Merge: 2c483d9 2804593 Author: Masanori Ogino Date: Sat Oct 8 13:00:00 2011 -0700 am 28045932: (-s ours) am 6b113548: am 5f568898: Allow the variety of font and density * commit '28045932da692d3f9667979a4e7a32e2ae84d18a': Allow the variety of font and density commit 9d05229e9503e64a631bf1a07f2a6ef3a7a9f8b4 Merge: b7eda62 9a33222 Author: Nick Kralevich Date: Fri Oct 7 17:49:27 2011 -0700 am 9a33222e: am 33a1e5c6: Merge "FileSystemPermissionTest: add one dir" into gingerbread * commit '9a33222e6e604585e8d9ca048273584a65360844': FileSystemPermissionTest: add one dir commit 9a33222e6e604585e8d9ca048273584a65360844 Merge: 4c6decb 33a1e5c Author: Nick Kralevich Date: Fri Oct 7 17:45:51 2011 -0700 am 33a1e5c6: Merge "FileSystemPermissionTest: add one dir" into gingerbread * commit '33a1e5c6c64d246d27f4a8166586c7b846ad6784': FileSystemPermissionTest: add one dir commit 33a1e5c6c64d246d27f4a8166586c7b846ad6784 Merge: cf4b743 311c700 Author: Nick Kralevich Date: Fri Oct 7 17:43:00 2011 -0700 Merge "FileSystemPermissionTest: add one dir" into gingerbread commit 311c700d5437f04678d0ec08a9ebcc9b966fa4f0 Author: Nick Kralevich Date: Fri Oct 7 17:16:18 2011 -0700 FileSystemPermissionTest: add one dir Change-Id: I0780e3c183154dfccda6978d84b64457d0b8793a commit 2c483d9492ac6014faea10f14b2f2743c081b75d Merge: 823c236 40fbbf1 Author: Jeff Brown Date: Fri Oct 7 15:08:44 2011 -0700 Merge "Delete test for hidden API that is being removed. Bug: 5332296" commit b7eda620e06d6edc6a092d25b06eb18f3af1d7cc Merge: 2804593 4c6decb Author: Masanori Ogino Date: Fri Oct 7 13:42:03 2011 -0700 am 4c6decb7: am cf4b7436: Remove a test case for mms intent-filter * commit '4c6decb7cee320ee40b8ddd60764b4f342f26066': Remove a test case for mms intent-filter commit 28045932da692d3f9667979a4e7a32e2ae84d18a Merge: f2cc81e 6b11354 Author: Masanori Ogino Date: Fri Oct 7 13:40:27 2011 -0700 am 6b113548: am 5f568898: Allow the variety of font and density * commit '6b1135482ee585db671ec482454ab08fe3789ac9': Allow the variety of font and density commit 4c6decb7cee320ee40b8ddd60764b4f342f26066 Merge: 6b11354 cf4b743 Author: Masanori Ogino Date: Fri Oct 7 13:39:10 2011 -0700 am cf4b7436: Remove a test case for mms intent-filter * commit 'cf4b7436f9264b918abd49415de1c4eceb298bb3': Remove a test case for mms intent-filter commit 6b1135482ee585db671ec482454ab08fe3789ac9 Merge: b008ead 5f56889 Author: Masanori Ogino Date: Fri Oct 7 13:36:18 2011 -0700 am 5f568898: Allow the variety of font and density * commit '5f5688987fe6049a7ac116fa588bbe8cd00c7858': Allow the variety of font and density commit 823c236343fb87680bd9849f9c56158e6f5dc408 Merge: 02e2e2a 53e68a3 Author: Brett Chabot Date: Fri Oct 7 13:34:27 2011 -0700 Merge "Run plan with excluded tests." commit cf4b7436f9264b918abd49415de1c4eceb298bb3 Author: Masanori Ogino Date: Wed Oct 5 16:08:47 2011 +0900 Remove a test case for mms intent-filter This test case will make sure a existence of activities for the implicit intent which has the type of "vnd.android.cursor.dir/mms". In AOSP, the intent-filter such as above is declared by Mms application. However it isn't included in core applications defined by CDD. So CTS shouldn't have that test case for all devices. Change-Id: Ib8a322cd7b62a561767cced69bea69958a877128 commit 02e2e2a74cae847b091f81ec80182d634797960b Merge: 1d6e27e 6fdb6bf Author: Brian Muramatsu Date: Fri Oct 7 13:30:08 2011 -0700 Merge "Fix(?) Theme Tests" commit 5f5688987fe6049a7ac116fa588bbe8cd00c7858 Author: Masanori Ogino Date: Sat Oct 8 17:22:00 2011 +0900 Allow the variety of font and density If the font hinting is set to off and also the device is configured extra high density (xhdpi), the testGetFocusedRect will fail. So please loose the precision for value compalison. Change-Id: I299ca2e0b841b64a44a2b771291a44b3d68f11fa commit 1d6e27e54693fe973b6167980998ee30d67608cf Merge: c873cdc 4f146a4 Author: Brett Chabot Date: Fri Oct 7 10:29:33 2011 -0700 Merge "Add remote debug flags to cts-tradefed." commit c873cdc3ca51dddbaa1f64b40604b1241b4b0777 Merge: 0eb514e 5c7d7fe Author: Wu-cheng Li Date: Fri Oct 7 03:08:47 2011 -0700 Merge "Update Camera.setDisplayOrientation test." commit 5c7d7fe5391b6333053cc6061456ca247aac72ce Author: Wu-cheng Li Date: Fri Oct 7 17:21:48 2011 +0800 Update Camera.setDisplayOrientation test. Make sure setDisplayOrientation can be called during preview. bug:5422679 Change-Id: I5bbbc408e30117972c6c0eb5b71fab2e7362dbe9 commit 53e68a3707bd017f69eec7a75c1cbd5513cb96ef Author: Brett Chabot Date: Wed Oct 5 14:14:55 2011 -0700 Run plan with excluded tests. Also add support for excluded class names, and stop running extra tesst when --class and --method are specified. Bug 5412014,5171576 Change-Id: I1f76b206d6b6487dfb3711433d2ab27fdd6f247e commit 0eb514e51fe09ac08a504494319a720045274393 Merge: 63deb75 c289464 Author: Brett Chabot Date: Thu Oct 6 16:23:12 2011 -0700 Merge "Add 'list results' command to cts-tradefed." commit c289464a34080a3ea1ef9679c3873a6a818dcb66 Author: Brett Chabot Date: Tue Oct 4 21:44:11 2011 -0700 Add 'list results' command to cts-tradefed. Change-Id: Ic108832cd8df09a5eb07e23f3f719eec491aa3c9 commit 40fbbf16e3e741950e337bcb3435de670dbe502d Author: Jeff Brown Date: Thu Oct 6 15:31:48 2011 -0700 Delete test for hidden API that is being removed. Bug: 5332296 Change-Id: Id09c9092dbfc36a514207d1138a9731d8a7d529c commit 63deb755bf125f6e9e258aefd650298f45e717b1 Merge: d1c423b 18fe51a Author: Andy McFadden Date: Thu Oct 6 14:20:43 2011 -0700 Merge "More tests for Attendees and Reminders, EPs" commit 18fe51ad48ee95af173747000203598ba34b0bf9 Author: Andy McFadden Date: Tue Oct 4 17:05:17 2011 -0700 More tests for Attendees and Reminders, EPs Exercise bulk updates for Attendees + Reminders, self-status changes for Attendees, and basic functions for ExtendedProperties. Bug 5373449 Change-Id: I21744efc9aeea622cff5aeded5597ad990ebc486 commit 56f494ed9757c19bf9db6c608d66f9202b63a4ac Author: jeffhao Date: Thu Oct 6 11:05:44 2011 -0700 Various fixes to vm tests for new verifier. Change-Id: I8f3232ae6dd3c62bbdb53ece8706a9ea281bf846 This changes the expected results of various tests cases to match the new verifier: - invalid version number test bumped up to never be valid - add-long/2addr, add-double/2addr tests for mixing long/double changed from using const to define type which can be ambiguous - if-eqz can't take float values for arguments, and a test for this failure already exists, so the extra tests were removed - invoke-super/invoke-virtual superclass ToInt method should use float-to-int, not int-to-float commit 6fdb6bf512c0759f10e611ac4eddfbbe0be8786f Author: Brian Muramatsu Date: Thu Oct 6 12:42:43 2011 -0700 Fix(?) Theme Tests Bug 5404694 - ThemeTester and ActivitySnapshotTester were running into OOM errors. Add some bitmap.recycle() calls to fix these... - ActivitySnapshotTester was hitting an infinite loop, because the decor view's width and height for dialog themes didn't match the reference width and height that seems to be sized like a regular activity. Furthermore, the resource width and height attributes are always negative, so they never match the the decor's dimensions. The width and height attributes being negative appears to occur in GB too, so I don't know how this could have worked or why it is there... - Fixed the themetestscripts to only build what is necessary and pull the files into the CTS out directory. These scripts could be further improved to not require root by simply storing the files on external storage I think... Change-Id: I1a699241690f3afe52c68017290c6caef8447d1d commit d1c423bd1f7b50539ba62d2891c19074b4994862 Merge: 5361e17 ea299cf Author: Chet Haase Date: Thu Oct 6 12:14:11 2011 -0700 Merge "Remove BUFFER_CHANGED flag from WindowManager.LayoutParams" commit ea299cf9834e28c2a821b7fe4e2f496e08f37696 Author: Chet Haase Date: Thu Oct 6 11:57:40 2011 -0700 Remove BUFFER_CHANGED flag from WindowManager.LayoutParams This flag was used to track changes that require recreating the hardware surface. We use a more direct means now (size change), so this flag is not needed. Change-Id: I3977c0eed59233c19010e481b5b1b5bba19cc888 commit 5361e176fa03be128d356d26556eff22f81e43a7 Merge: 16af2d3 7df218f Author: Steve Block Date: Thu Oct 6 09:18:06 2011 -0700 Merge "Add tests for SslError" commit 4f146a4f2849693d042d12809cb825d22d57807d Author: Brett Chabot Date: Wed Oct 5 18:36:42 2011 -0700 Add remote debug flags to cts-tradefed. Change-Id: I3dffc3aac16615dbaf3a1388fa3995ad9359ed8f commit 16af2d3a24e93146e47552c9b2498a4fac22a79a Merge: c8dcb9b d1278ad Author: Steve Block Date: Wed Oct 5 14:56:27 2011 -0700 Merge "Add tests for WebViewClient.onReceivedSslError() and the WebView's re-use of previous responses" commit d1278adca4d8f3c723d9aadc6357b1713685b283 Author: Steve Block Date: Wed Oct 5 15:43:51 2011 +0100 Add tests for WebViewClient.onReceivedSslError() and the WebView's re-use of previous responses Bug: 5409251 Change-Id: I8572a744c9c71255aa7a1d1f3fe4eed202d1cf7a commit 7df218f525fc2049341b256d051ad6ebf14e7165 Author: Steve Block Date: Wed Oct 5 19:32:45 2011 +0100 Add tests for SslError Bug: 5416594 Change-Id: Iebbc9d02088ea986246a8c7e9d4f9b2b84dd8116 commit c8dcb9b2c7424aafa0a6f24739d8a50709eac7c4 Merge: 4081e7b 4fda9ca Author: jeffhao Date: Wed Oct 5 14:32:52 2011 -0700 Merge "Changed vm-tests-tf to expect failure when int/float double/long mix." commit 4081e7b9b8e3a522e1f5e99b7622b3afa3df083f Merge: 013caad a8e3ee7 Author: Brian Muramatsu Date: Wed Oct 5 11:57:02 2011 -0700 Merge "Fix BuildVersionTest for 4.0.1" commit a8e3ee7462a7a6c9eff84f63e8f519683cf05165 Author: Brian Muramatsu Date: Wed Oct 5 11:55:14 2011 -0700 Fix BuildVersionTest for 4.0.1 Bug 540445 Change-Id: I3bbf8f49ad8effed4de55c3f2f85fac803d4dd05 commit 013caade08ccf9fb08da78986936b9da2d647d1c Merge: e6bb13d f2cc81e Author: Nick Kralevich Date: Wed Oct 5 11:48:39 2011 -0700 am f2cc81ed: am b008eadb: am 7e45cf25: FileSystemPermissionTest: add more directories to writable check. * commit 'f2cc81ed5d48dd4c77a9e91fc48d0124e969923d': FileSystemPermissionTest: add more directories to writable check. commit f2cc81ed5d48dd4c77a9e91fc48d0124e969923d Merge: 57895f6 b008ead Author: Nick Kralevich Date: Wed Oct 5 11:45:35 2011 -0700 am b008eadb: am 7e45cf25: FileSystemPermissionTest: add more directories to writable check. * commit 'b008eadb84ea7c8010c6a0b6ba4d95d8d67db539': FileSystemPermissionTest: add more directories to writable check. commit b008eadb84ea7c8010c6a0b6ba4d95d8d67db539 Merge: 739152d 7e45cf2 Author: Nick Kralevich Date: Wed Oct 5 11:42:37 2011 -0700 am 7e45cf25: FileSystemPermissionTest: add more directories to writable check. * commit '7e45cf25283c97a5d3300bba10c9d4a871d16c2b': FileSystemPermissionTest: add more directories to writable check. commit 7e45cf25283c97a5d3300bba10c9d4a871d16c2b Author: Nick Kralevich Date: Wed Oct 5 11:25:40 2011 -0700 FileSystemPermissionTest: add more directories to writable check. Change-Id: Ia51a25c0d7987e0f2b095dd7ba36f4880fe9358f commit e6bb13d7759706c8af44706e6012e210a04586e1 Merge: 9d83abe 77c1cf4 Author: Brian Muramatsu Date: Wed Oct 5 11:17:01 2011 -0700 Merge remote branch 'goog/honeycomb-mr2' Conflicts: apps/CtsVerifier/AndroidManifest.xml tests/core/ctscore.mk tests/tests/os/src/android/os/cts/BuildVersionTest.java tools/host/src/com/android/cts/Version.java Change-Id: Ic3a6a3754f1db91947217af64c43e8b7fb35695e commit 4fda9ca3a281ea399282a3fb080c77dbdbb723bd Author: jeffhao Date: Tue Oct 4 19:20:23 2011 -0700 Changed vm-tests-tf to expect failure when int/float double/long mix. There are still roughly 70 test cases failing. Some are caused by the verifier not checking this new condition in certain cases (array indexes, arguments to if statements). Some are caused by other issues that need more investigation. See Bug: 5399299 Change-Id: I6fecad07d0131b4128874094b892ee7c8a959e18 commit 9d83abe9b440c24e7b0ba0598ebed3952d6fd27f Merge: 1412b72 57895f6 Author: Nick Kralevich Date: Wed Oct 5 10:54:09 2011 -0700 am 57895f64: am 739152d2: am e0bf4a7c: ListeningPortsTest: Make error message more useful. * commit '57895f642256786548da5226d88e11d3a17b3ede': ListeningPortsTest: Make error message more useful. commit 57895f642256786548da5226d88e11d3a17b3ede Merge: 44c10ea 739152d Author: Nick Kralevich Date: Wed Oct 5 10:51:21 2011 -0700 am 739152d2: am e0bf4a7c: ListeningPortsTest: Make error message more useful. * commit '739152d27899821227e7cc07670d1f47a9a4e39d': ListeningPortsTest: Make error message more useful. commit 739152d27899821227e7cc07670d1f47a9a4e39d Merge: 4d76884 e0bf4a7 Author: Nick Kralevich Date: Wed Oct 5 10:49:06 2011 -0700 am e0bf4a7c: ListeningPortsTest: Make error message more useful. * commit 'e0bf4a7cec03dc1ca42d82395373672f08e139ec': ListeningPortsTest: Make error message more useful. commit e0bf4a7cec03dc1ca42d82395373672f08e139ec Author: Nick Kralevich Date: Wed Oct 5 10:43:01 2011 -0700 ListeningPortsTest: Make error message more useful. - Add UID of listener to error message. - Convert hex port number to decimal for easier reading by humans. Change-Id: I0b8edcf14ebd0c039b936055a265f4706558f9fe commit 1412b722d73102407c7fe15a099a612d3b15f37e Author: Steve Block Date: Wed Oct 5 14:23:35 2011 +0100 Test that WebViewClient.onReceivedSslError() is called with the correct WebView and URL Bug: 5410252 Change-Id: Iba9d394b8c36038914ad3c1fcbdae612f1039a2b commit cd47f4afed03eeb319c9e6381e284fce5926151f Author: Gilles Debunne Date: Tue Oct 4 18:22:30 2011 -0700 Adapted WordIterator tests after refactoring Change-Id: I364a388021ba8629757f8f52c8043639eeb42122 commit 241eeeeb4bacbc826a4c2437c414d77899ff15bd Merge: 41f2159 79f2222 Author: Brian Carlstrom Date: Tue Oct 4 09:50:55 2011 -0700 Merge "Change BuildDalvikSuite to include "adb shell" output and command in test failures" commit 41f2159687011d968e1ce3ac2a5b3fcba2e6af83 Author: Fabrice Di Meglio Date: Mon Oct 3 17:00:19 2011 -0700 Fix bug #5051860 android.widget.cts.TextViewTest#testGetFadingEdgeStrength fails on IRK18 - fix the CTS tests Change-Id: I4055e1c994f68d7bde7f2946d65bf235ccd9eb5a commit c5daf5b05fbe64e987b1e0d866f6dd076eb91a18 Merge: 48a6a26 44c10ea Author: Nick Kralevich Date: Mon Oct 3 14:53:48 2011 -0700 am 44c10eaa: am 4d76884c: am 25566061: FileSystemPermissionTest: alphabetize list of directories. * commit '44c10eaa51d3226c98bf3f47328cc241f513bdbe': FileSystemPermissionTest: alphabetize list of directories. commit 44c10eaa51d3226c98bf3f47328cc241f513bdbe Merge: 047696e 4d76884 Author: Nick Kralevich Date: Mon Oct 3 14:50:57 2011 -0700 am 4d76884c: am 25566061: FileSystemPermissionTest: alphabetize list of directories. * commit '4d76884c4a52d4fbfdd39e9bb7d25a8ac23af9ac': FileSystemPermissionTest: alphabetize list of directories. commit 4d76884c4a52d4fbfdd39e9bb7d25a8ac23af9ac Merge: 02ccda0 2556606 Author: Nick Kralevich Date: Mon Oct 3 14:49:11 2011 -0700 am 25566061: FileSystemPermissionTest: alphabetize list of directories. * commit '25566061d2708ba8a107adcc847e7b32a3c1f243': FileSystemPermissionTest: alphabetize list of directories. commit 48a6a268290a4c1b011bbb1008f4aa0f2e1555b4 Merge: b0bec66 047696e Author: Nick Kralevich Date: Mon Oct 3 14:46:35 2011 -0700 am 047696e4: am 02ccda0b: am f2e30e04: FileSystemPermissionTest: Add directories, fix documentation * commit '047696e41c5963d5b9bdb4aa7f6381fdec52b040': FileSystemPermissionTest: Add directories, fix documentation commit 25566061d2708ba8a107adcc847e7b32a3c1f243 Author: Nick Kralevich Date: Mon Oct 3 14:42:59 2011 -0700 FileSystemPermissionTest: alphabetize list of directories. No other changes other than putting the entries in alphabetical order. Change-Id: I8cde5659ddb006bbc5bd6e000a1e91dc2eae4d2e commit 047696e41c5963d5b9bdb4aa7f6381fdec52b040 Merge: 23d349f 02ccda0 Author: Nick Kralevich Date: Mon Oct 3 14:35:24 2011 -0700 am 02ccda0b: am f2e30e04: FileSystemPermissionTest: Add directories, fix documentation * commit '02ccda0b9d4e3f7309344fdc71b65d527ba8e693': FileSystemPermissionTest: Add directories, fix documentation commit 02ccda0b9d4e3f7309344fdc71b65d527ba8e693 Merge: f1526dd f2e30e0 Author: Nick Kralevich Date: Mon Oct 3 14:29:05 2011 -0700 am f2e30e04: FileSystemPermissionTest: Add directories, fix documentation * commit 'f2e30e04f341042dc2c188d71cef98b156c08983': FileSystemPermissionTest: Add directories, fix documentation commit b0bec662fb65980b6b1535ef9d9aadf540bfd68f Merge: cb0a0ee 6d328db Author: Fabrice Di Meglio Date: Mon Oct 3 13:38:52 2011 -0700 Merge "Fix bug #5382767 android.view.cts.ViewTest#testInitializeScrollbarsAndFadingEdge fails on IRK89 mysid-userdebug" commit f2e30e04f341042dc2c188d71cef98b156c08983 Author: Nick Kralevich Date: Mon Oct 3 13:38:47 2011 -0700 FileSystemPermissionTest: Add directories, fix documentation Add checks for additional directories which may be world writable. World writable directories are a security hole. An application should only be able to write to it's own home directory. Change-Id: I2b031451ffc3a77d24d4109d92ee013a6161013a commit cb0a0ee0a0f9548e507961c206e13ca7f34ca1ae Merge: cbf4ad2 1ca4db5 Author: Brett Chabot Date: Mon Oct 3 11:31:52 2011 -0700 Merge "Support parsing of 'exclude' attribute in cts plan XML." commit cbf4ad2e4c3433e6c67f81a3f755a73258c8da1c Author: Brett Chabot Date: Wed Sep 28 10:39:55 2011 -0700 Support tracking not executed cts tests. Also fix issue in InstrumentationApkTest where it attempts to communicate with device after its already deemed not available. Bug 5376439 Change-Id: I1619586629d27e80be7586ece37908dc0e50be1c commit df50273f369ae1bfdaf41391db0c005a5dc0e0df Merge: 9c7fe46 ce31a10 Author: Brett Chabot Date: Mon Oct 3 11:26:01 2011 -0700 Merge "Add zip of results dir to cts-tradefed." commit 9c7fe46f99389821f368f91f68a4d7c3ebba3e6c Merge: 252ec4b ac91509 Author: Brett Chabot Date: Mon Oct 3 11:25:53 2011 -0700 Merge "Adjust to tradefed console API changes." commit 6d328dbd5a22e4b7ca1a5b215ee61a2b1b9fbb1f Author: Fabrice Di Meglio Date: Mon Oct 3 10:59:08 2011 -0700 Fix bug #5382767 android.view.cts.ViewTest#testInitializeScrollbarsAndFadingEdge fails on IRK89 mysid-userdebug - CTS tests broken when disabling ICS fadding edges see: https://android-git.corp.google.com/g/#/c/134291/ Change-Id: I3851a3053cda33bfee8f83957babc1633faa9a27 commit 47beef59703d292430a537560739fd6699711df3 Author: Jean-Michel Trivi Date: Mon Oct 3 10:09:22 2011 -0700 OpenSL ES: test AudioPlayer playing MP2TS data Test the creation and realize an OpenSL ES AudioPlayer that plays MP2TS data received through the Android Buffer Queue interface. Change-Id: I168edcc7af5e41c9fff9e82d6f96653c7f36c930 commit 252ec4bd339298655ffa50589f79605f11b79153 Merge: 071f799 3d34732 Author: Andy McFadden Date: Mon Oct 3 09:57:23 2011 -0700 Merge "Add tests for new provider URI" commit 79f2222a59f45d21a65921e499777aea816a4cbf Author: Brian Carlstrom Date: Sat Oct 1 16:04:26 2011 -0700 Change BuildDalvikSuite to include "adb shell" output and command in test failures Change-Id: I133cdbe602cf6dd4309d8f9631994931b2762c02 commit 3d347321b5e86f835805e78aa3b63024d47349a8 Author: Andy McFadden Date: Thu Sep 29 12:37:05 2011 -0700 Add tests for new provider URI This adds basic tests for the newly added "syncstate/#" URI, plus some additional tests and helpers for Reminders and Attendees. Bug 5373449 Change-Id: I5a17baf9add9fb05b3df6bfc8bca0c4f287f66a2 commit 071f7991ee0ed8ffdaa0f29588a020a5c03364fe Merge: c555f87 fb0961a Author: Fabrice Di Meglio Date: Fri Sep 30 11:31:44 2011 -0700 Merge "Fix bug #5198365 android.widget.cts.TextViewTest#testGetFocusedRect fails on IRK49E mysid-userdebug" commit c555f874c65bb6b2f0063238f5316ed21246cf66 Merge: 8526051 3c28541 Author: Brett Chabot Date: Thu Sep 29 18:12:36 2011 -0700 Merge "Add install of CtsDeviceAdmin." commit fb0961aa68799b42121f3d8cac094b341c2f9084 Author: Fabrice Di Meglio Date: Thu Sep 29 16:06:44 2011 -0700 Fix bug #5198365 android.widget.cts.TextViewTest#testGetFocusedRect fails on IRK49E mysid-userdebug - CTS test was broken because it was not updated after the change: Change Ia200c58e: Fix issue #5016544: IME keyboard hides folder rename text field - add more tests for covering the new cases Change-Id: I8b64480c7b1ef1c4458bb2f60e3678dabb18b21d commit 3c285419de185134e28c8781005cdcdf19c734cb Author: Brett Chabot Date: Thu Sep 29 17:42:41 2011 -0700 Add install of CtsDeviceAdmin. Bug 4946611 Change-Id: Id69940221ec9f657240b7bd7d278af9919c38458 commit 85260511f4fe0c7500ddff201ae4b06381561b5c Merge: f43f3c9 3582bf2 Author: Jean-Michel Trivi Date: Thu Sep 29 14:11:50 2011 -0700 Merge "Bug 4970300 CTS test for OpenSL ES" commit 1ca4db518593bf0d022e9fb6ced71e8604b4b24b Author: Brett Chabot Date: Thu Sep 29 10:50:45 2011 -0700 Support parsing of 'exclude' attribute in cts plan XML. Change-Id: I81ccbfc87537eac8a8b7383bc6551791db497399 commit f43f3c9b527c3ae88b47348b9a3f6aa934651d8b Merge: a1a0717 c2b40ba Author: Andy McFadden Date: Wed Sep 28 13:42:01 2011 -0700 Merge "Add _sync_state tests" commit c2b40bac7a4e3717821e67e98d567ed923c90eef Author: Andy McFadden Date: Mon Sep 26 16:02:44 2011 -0700 Add _sync_state tests This adds a simple _sync_state test, and a bunch of helper code (largely cloned from the Calendar equivalent). Also, fix the extendedproperties test so it creates the events as a sync adapter. Related to bug 5373449 Change-Id: I4af7b2a9f4d0132278519977bf2d00d71ae0e16c commit a1a0717d67eae37dc69b5d13402afe2d97ca8839 Merge: 26031d1 04b3c8e Author: Steve Block Date: Wed Sep 28 10:12:55 2011 -0700 Merge "Improve test coverage for WebView.get/setCertificate()" commit 04b3c8e6f32aec2af720fee0e3a417b0433b5050 Author: Steve Block Date: Tue Sep 27 14:09:12 2011 +0100 Improve test coverage for WebView.get/setCertificate() Note that this depends on https://android-git.corp.google.com/g/138147 and https://android-git.corp.google.com/g/#/c/138309. Also fix the comment for testClearSslPreferences(), which incorrectly claims that WebViewClient.onReceivedSslError() is not public, and remove SslErrorHandlerTest.java, which does nothing. Bug: 5287216 Change-Id: I1d6d7b1d2645392bc190a980483233528343a9da commit 26031d1d8f88840617c2eeadb16d114f228d9c5e Merge: 8700ba8 46aa0aa Author: Steve Block Date: Tue Sep 27 13:18:23 2011 -0700 Merge "Add a CTS test for WebView.pause/resumeTimers()" commit 8700ba807332b5255f4035117c1350e2873096dc Merge: 6127f9c 23d349f Author: Brian Muramatsu Date: Tue Sep 27 12:36:17 2011 -0700 am 23d349fe: am f1526dd4: am 52f3b6f8: Replace Copy Function with Report Viewer * commit '23d349fe834d0d2a0fbad83f7198521baacc779d': Replace Copy Function with Report Viewer commit 3582bf29a69116838b74fdc65eb3884d9699f317 Author: Jean-Michel Trivi Date: Mon Sep 26 17:27:25 2011 -0700 Bug 4970300 CTS test for OpenSL ES Add a test in CTS to verify successfull creation of OpenSL ES object in the mandatory use cases. Change-Id: Ib0de50b14dbc6cac1c6b2f7c8f741a44ea13e18f commit 46aa0aa9922816472f9e3f567ae755f76b7ce42c Author: Steve Block Date: Tue Sep 27 16:48:43 2011 +0100 Add a CTS test for WebView.pause/resumeTimers() Bug: 5372718 Change-Id: Id0dd35c9d98c7b60f1deace64a137d4c415afc2f commit 6127f9cdb2482023969e1ec1eb570287968a4815 Merge: 335ae48 8c59214 Author: The Android Open Source Project Date: Tue Sep 27 10:10:38 2011 -0700 Reconcile with ics-factoryrom-release Change-Id: I384d85460707f157159f4c627857ae363d74a7a7 commit 335ae4882c6787ea97dcae2107f43d04335be204 Merge: 9ea14d0 9a0b2b7 Author: Tyler Luu Date: Tue Sep 27 04:36:23 2011 -0700 am 9a0b2b7c: Fix for #testCancelAutofocus * commit '9a0b2b7c6f29cca7984ba9afc3ce97c9ffcb50c6': Fix for #testCancelAutofocus commit 8c59214476a26eb0c478b4a28c3b1bf3d254ad39 Merge: 9a0b2b7 9d94ed2 Author: The Android Automerger Date: Tue Sep 27 04:18:43 2011 -0700 merge in ics-factoryrom-release history after reset to ics-factoryrom commit 9a0b2b7c6f29cca7984ba9afc3ce97c9ffcb50c6 Author: Tyler Luu Date: Thu Sep 22 19:32:24 2011 -0500 Fix for #testCancelAutofocus Need to try to set auto focus mode in case CameraHal implementation uses one of the CAF modes as a default. This test only makes sense for FOCUS_MODE_AUTO and FOCUS_MODE_MACRO where the lens actually moves so return if neither of these modes are supported. bug:5332932 Change-Id: I1da1e9d5498e8d4ebd37fb5b181c115ea31be8e6 Signed-off-by: Tyler Luu commit 9ea14d091071d56aef036237bf548998d62835b3 Merge: ddcccc0 9d94ed2 Author: The Android Open Source Project Date: Mon Sep 26 12:11:21 2011 -0700 Reconcile with ics-factoryrom-release Change-Id: I4dbf28f00e751c0676ef35080b20a0718e53bb37 commit ddcccc07785a975ad67e78b6689358ce64427c8e Merge: 5ee9690 908c893 Author: Andy McFadden Date: Mon Sep 26 11:27:19 2011 -0700 Merge "Add INSTANCES_SEARCH query test" commit ce31a10279f42d04b0b0d7b986b21d85f92a4fbd Author: Brett Chabot Date: Sun Sep 25 13:22:56 2011 -0700 Add zip of results dir to cts-tradefed. Change-Id: I0440213e5c2e12b8b6a8dfde8b031a8fb3499ba6 commit ac915092d37836f9b5505370f1e8acd6b7d1aa5f Author: Brett Chabot Date: Sun Sep 25 13:13:09 2011 -0700 Adjust to tradefed console API changes. Change-Id: I3ba46393988c2c1820135cf0f3b31515bb5c4412 commit 908c893aa0e6452e7ab1b5f1e4ee950ddd8c9002 Author: Andy McFadden Date: Fri Sep 23 14:55:43 2011 -0700 Add INSTANCES_SEARCH query test Added a simple test that exercises the "find instances with search string filter" URI. Related to bug 5366218 Change-Id: I5ceff1b9d1984dff50191147249fdaa2cc136e05 commit 5ee9690820b5b877080e8d7d92dc19b92e9fe634 Author: John Reck Date: Fri Sep 23 14:52:11 2011 -0700 Fix testSaveAndRestorePicture CTS test Bug: 5361506 Change-Id: I0bf916134992300a423d5cb74a437a6e3ce771ed commit 23d349fe834d0d2a0fbad83f7198521baacc779d Merge: fcdfa6c f1526dd Author: Brian Muramatsu Date: Fri Sep 23 14:04:31 2011 -0700 am f1526dd4: am 52f3b6f8: Replace Copy Function with Report Viewer * commit 'f1526dd4fc07488eb21f2cdadb82ad2277cf3da9': Replace Copy Function with Report Viewer commit f1526dd4fc07488eb21f2cdadb82ad2277cf3da9 Merge: b986e78 52f3b6f Author: Brian Muramatsu Date: Fri Sep 23 14:00:52 2011 -0700 am 52f3b6f8: Replace Copy Function with Report Viewer * commit '52f3b6f872849fee6e263a33ad3ceb51a434ab1c': Replace Copy Function with Report Viewer commit 52f3b6f872849fee6e263a33ad3ceb51a434ab1c Author: Brian Muramatsu Date: Fri Sep 23 12:09:59 2011 -0700 Replace Copy Function with Report Viewer It was difficult to check report changes while developing, so I have replaced the "Copy" button with a "View" button that displays the report in an EditText to make things easier. Change-Id: I5bdfe3f951895bf5b1ead925a92728725f97c21d commit 9d94ed2179a8d6e1d0f12c3d92c1b4f92296ee7a Merge: a90d752 dcaa8ec Author: The Android Automerger Date: Fri Sep 23 11:33:32 2011 -0700 merge in ics-factoryrom-release history after reset to ics-factoryrom commit 48c7e87949c673ea575454fae27cb1b9ec505839 Merge: ac5293d fcdfa6c Author: Brian Muramatsu Date: Thu Sep 22 16:52:23 2011 -0700 am fcdfa6ca: am b986e78b: am 74e2dcf8: Merge "Include Audio Quality Details in XML Report" into gingerbread * commit 'fcdfa6ca82a0f04096000976bcd7ef8f9f33360a': Include Audio Quality Details in XML Report commit fcdfa6ca82a0f04096000976bcd7ef8f9f33360a Merge: 77e1aef b986e78 Author: Brian Muramatsu Date: Thu Sep 22 16:48:47 2011 -0700 am b986e78b: am 74e2dcf8: Merge "Include Audio Quality Details in XML Report" into gingerbread * commit 'b986e78be0f8f89707a112f866c9bddf48505f65': Include Audio Quality Details in XML Report commit b986e78be0f8f89707a112f866c9bddf48505f65 Merge: 1dd2f05 74e2dcf Author: Brian Muramatsu Date: Thu Sep 22 16:44:59 2011 -0700 am 74e2dcf8: Merge "Include Audio Quality Details in XML Report" into gingerbread * commit '74e2dcf8e8804dc2de7b67039ffe4233a964e78e': Include Audio Quality Details in XML Report commit 74e2dcf8e8804dc2de7b67039ffe4233a964e78e Merge: 4102cb4 26e9d0f Author: Brian Muramatsu Date: Thu Sep 22 16:41:12 2011 -0700 Merge "Include Audio Quality Details in XML Report" into gingerbread commit 26e9d0fb97c0d9de8bcd80090170d4e609404cc0 Author: Brian Muramatsu Date: Wed Sep 21 16:17:09 2011 -0700 Include Audio Quality Details in XML Report Bug 5352891 This will add a
Log from test...
for tests that pass an optional string when setting the test result or from overriding the getTestResult method. This is implemented by adding another column to the test results database. I modified the backup agent to backup this column as well. I removed a line in the backup agent that marked the test to fail due to a mismatched backup key. I kept getting the key "../databases/results.db" and I think that is from some older backup that I have... I confirmed backup still works fine though. Change-Id: Iffec1853d8e1dcbcf9feda821716d071860be069 commit 77c1cf40e61843409e89ef6ed69ab30351352df7 Merge: 5e62e88 3a85f5a Author: Brian Muramatsu Date: Thu Sep 22 14:44:30 2011 -0700 Merge "Increment CTS Verifier Version to 3.2_r2" into honeycomb-mr2 commit 3a85f5aa987226c37f530c7146e2b35e8ca5596a Author: Brian Muramatsu Date: Thu Sep 22 14:42:31 2011 -0700 Increment CTS Verifier Version to 3.2_r2 Change-Id: I490d92b2ef980e8ea248a9add81952f2e93ec29e commit 5e62e8823413d1aa83d128815ff852b97e8c9d36 Author: Brian Muramatsu Date: Thu Sep 22 14:20:08 2011 -0700 Undo Version Increment Accidentally bumped it up to 6 in the merge... Change-Id: If942ae6c3f8a523a061ea8dd2780c343cbb80e76 commit ac5293df8c4d1d70156b7c5cf6fa08ca0a8289e9 Merge: cc87371 77e1aef Author: Jeff Davidson Date: Thu Sep 22 13:28:56 2011 -0700 resolved conflicts for merge of 77e1aef8 to master Change-Id: I793bf58354df98ff1dd32c9bec25610c1d849ea2 commit 77e1aef8131b9f15f1b610d50cd2f758116e729d Merge: 91d9ab5 1dd2f05 Author: Jeff Davidson Date: Thu Sep 22 11:31:52 2011 -0700 am 1dd2f053: am 4102cb4b: Retry stream playback 5 times before failing test. * commit '1dd2f0535a6154abd77e1e0de3e84bdfec1846e5': Retry stream playback 5 times before failing test. commit 1dd2f0535a6154abd77e1e0de3e84bdfec1846e5 Merge: d6e1392 4102cb4 Author: Jeff Davidson Date: Thu Sep 22 11:28:02 2011 -0700 am 4102cb4b: Retry stream playback 5 times before failing test. * commit '4102cb4b7be71406e18e3960aafbf16aedb2ff30': Retry stream playback 5 times before failing test. commit cc87371f54a6893543887602db9ff88657a50ac3 Merge: c06afa4 dcaa8ec Author: The Android Open Source Project Date: Thu Sep 22 10:57:15 2011 -0700 Reconcile with ics-factoryrom-release Change-Id: I71205e439e617946bacb96c5857f7ba56754c9e5 commit c06afa440be3fd5055c297ba399c4ef1e7d13451 Merge: 7cdbad7 a90d752 Author: Wu-cheng Li Date: Thu Sep 22 10:29:04 2011 -0700 am a90d752a: Update camera AE and AWB lock tests. * commit 'a90d752ab94cb97453b30d7a947e50114c5f0952': Update camera AE and AWB lock tests. commit a90d752ab94cb97453b30d7a947e50114c5f0952 Author: Wu-cheng Li Date: Thu Sep 22 14:10:06 2011 +0800 Update camera AE and AWB lock tests. Now camera API specifies autofocus does not lock AE and AWB. stopPreview and takePicture do not clear AE and AWB locks. bug:5356404 Change-Id: I0d6805514b060b21c51e4114b0bd44050030ec0e commit 3b8c302bf43ea2da96b3f3797b423f5b2899ddbb Merge: 0f701b7 173bd38 Author: Brian Muramatsu Date: Wed Sep 21 18:29:10 2011 -0700 Merge remote branch 'goog/honeycomb-mr1' into honeycomb-mr2 Change-Id: If389ccc9fb16a0e81f95eb1f4e31896fb4ec1f02 commit 4102cb4b7be71406e18e3960aafbf16aedb2ff30 Author: Jeff Davidson Date: Wed Sep 21 17:07:23 2011 -0700 Retry stream playback 5 times before failing test. Should help with general network flakiness. Change-Id: I1e4768dbaaeea702973be318f1762b8e6da723cd commit 7cdbad771580e0cffd2531a1d8428044f412f8c2 Merge: 004685f 91d9ab5 Author: Jeff Davidson Date: Wed Sep 21 16:10:40 2011 -0700 am 91d9ab57: (-s ours) am d6e1392b: (-s ours) am aa8d1ea6: DO NOT MERGE * commit '91d9ab57cc945ffdcccd423f62a5139dd678ede1': DO NOT MERGE commit 91d9ab57cc945ffdcccd423f62a5139dd678ede1 Merge: 2b0b6a3 d6e1392 Author: Jeff Davidson Date: Wed Sep 21 16:08:59 2011 -0700 am d6e1392b: (-s ours) am aa8d1ea6: DO NOT MERGE * commit 'd6e1392b361341ad1052b38fb337e10b3255773d': DO NOT MERGE commit d6e1392b361341ad1052b38fb337e10b3255773d Merge: 5af99fe aa8d1ea Author: Jeff Davidson Date: Wed Sep 21 16:07:17 2011 -0700 am aa8d1ea6: DO NOT MERGE * commit 'aa8d1ea63cd6635c44e846815ff9dde8ca8ec0c6': DO NOT MERGE commit aa8d1ea63cd6635c44e846815ff9dde8ca8ec0c6 Author: Jeff Davidson Date: Wed Sep 21 16:01:24 2011 -0700 DO NOT MERGE Create /mnt/sdcard/Downloads if needed to work around a GB platform bug. This was fixed in Honeycomb so it shouldn't be merged up. Bug: 5354093 Change-Id: I0666ebcf507a668ec5e6e9df7b113d71e295e146 commit 004685f88a31c2956880186860ceaa4cd51512de Merge: e1dbc70 2b0b6a3 Author: Brian Muramatsu Date: Wed Sep 21 14:15:46 2011 -0700 am 2b0b6a34: am 5af99fed: (-s ours) am 167f66ac: Merge "Increment CTS Verifier Version to 2.3_r2" into gingerbread * commit '2b0b6a3412056af58841772b499a019a59ad0461': Increment CTS Verifier Version to 2.3_r2 commit 2b0b6a3412056af58841772b499a019a59ad0461 Merge: ad6a1c1 5af99fe Author: Brian Muramatsu Date: Wed Sep 21 14:13:58 2011 -0700 am 5af99fed: (-s ours) am 167f66ac: Merge "Increment CTS Verifier Version to 2.3_r2" into gingerbread * commit '5af99fed7d98fffa824e71bd1cc49b31edfbdedb': Increment CTS Verifier Version to 2.3_r2 commit e1dbc7089d120e6812dfbe120b359a6c417728de Merge: bdb1873 ad6a1c1 Author: Brian Muramatsu Date: Wed Sep 21 14:06:51 2011 -0700 am ad6a1c19: am d47bb38e: (-s ours) am 32d65628: Merge "Update CTS to 2.3_r9" into gingerbread * commit 'ad6a1c1902021e799192c688159312731f580c91': Update CTS to 2.3_r9 commit ad6a1c1902021e799192c688159312731f580c91 Merge: c83bca2 d47bb38 Author: Brian Muramatsu Date: Wed Sep 21 14:05:28 2011 -0700 am d47bb38e: (-s ours) am 32d65628: Merge "Update CTS to 2.3_r9" into gingerbread * commit 'd47bb38e772655677b910c3870c7bb9a13966ed0': Update CTS to 2.3_r9 commit bdb1873836d87734da8e655f09b4eb91e6a1bd72 Merge: 3b35d9d c83bca2 Author: Brian Muramatsu Date: Wed Sep 21 14:05:03 2011 -0700 am c83bca2c: am c6d1d6a7: (-s ours) am 9bc0b46d: Update BuildVersionTest for 2.3.7 * commit 'c83bca2c0173a0f02f1d9a96efe9c8eb30a534a5': Update BuildVersionTest for 2.3.7 commit c83bca2c0173a0f02f1d9a96efe9c8eb30a534a5 Merge: 910e784 c6d1d6a Author: Brian Muramatsu Date: Wed Sep 21 13:58:21 2011 -0700 am c6d1d6a7: (-s ours) am 9bc0b46d: Update BuildVersionTest for 2.3.7 * commit 'c6d1d6a70cd178bba8f40a3d7e0a256379d6f81f': Update BuildVersionTest for 2.3.7 commit 5af99fed7d98fffa824e71bd1cc49b31edfbdedb Merge: d47bb38 167f66a Author: Brian Muramatsu Date: Wed Sep 21 11:59:27 2011 -0700 am 167f66ac: Merge "Increment CTS Verifier Version to 2.3_r2" into gingerbread * commit '167f66ac7be8ad5c4b2175fe15f3b6f9776f551d': Increment CTS Verifier Version to 2.3_r2 commit 167f66ac7be8ad5c4b2175fe15f3b6f9776f551d Merge: 32d6562 a0eaa8e Author: Brian Muramatsu Date: Wed Sep 21 11:57:40 2011 -0700 Merge "Increment CTS Verifier Version to 2.3_r2" into gingerbread commit a0eaa8e9be6f2f6695acb9e932c210c94c620315 Author: Brian Muramatsu Date: Wed Sep 21 11:55:47 2011 -0700 Increment CTS Verifier Version to 2.3_r2 Bug 5333650 Change-Id: Ib6378451e23ac09e0c0b6ca0a3c2d9ce86fcbc8d commit dcaa8ecfadc9d976d47ac510c2d9a8264f172b3d Merge: 0a242bb 2ffaed9 Author: The Android Automerger Date: Wed Sep 21 06:28:31 2011 -0700 merge in ics-factoryrom-release history after reset to ics-factoryrom commit 3b35d9d7f0f114b158af9a03b6bee71893bf0b77 Merge: e885540 2ffaed9 Author: The Android Open Source Project Date: Wed Sep 21 06:19:08 2011 -0700 Reconcile with ics-factoryrom-release Change-Id: I0789d1180a32b30c1870d0e21009cc2dc3d2b489 commit 2ffaed904805bf98e6dec50ce80b366ab2248eb4 Merge: 29005c3 0a242bb Author: The Android Automerger Date: Tue Sep 20 20:43:00 2011 -0700 merge in ics-factoryrom-release history after reset to ics-factoryrom commit 173bd38715ed760b6c9fd30a82bc2ade1e7f5a55 Merge: d4aea14 826a236 Author: Brian Muramatsu Date: Tue Sep 20 18:01:17 2011 -0700 Merge "Skip JNI Tests for None CPU ABI" into honeycomb-mr1 commit d4aea1416e0b237eb10a1ede5cb247edcd41da74 Author: Brian Muramatsu Date: Tue Sep 20 17:23:22 2011 -0700 Add Required Feature for USB Accessory Test Change-Id: I67135d0fd13763eb8c5af0572bcf09270284d35c commit c23d7c18d406270f22f115019d9f20987f0b3096 Merge: 1eacc52 833b45e Author: Brian Muramatsu Date: Tue Sep 20 17:12:31 2011 -0700 Merge remote branch 'goog/honeycomb' into honeycomb-mr1 commit 833b45e9a6ac4e718c1a38732cb72c770bad6acd Merge: 92e3235 32d6562 Author: Brian Muramatsu Date: Tue Sep 20 16:39:15 2011 -0700 Merge remote branch 'goog/gingerbread' into honeycomb Conflicts: tests/tests/os/src/android/os/cts/BuildVersionTest.java tools/host/src/com/android/cts/Version.java Change-Id: I4cc970c618c69c0fb4baf56d6ac7ff79d65dbff2 commit 826a2362278395fd8a29855a057a5b379bba99da Author: Brian Muramatsu Date: Tue Sep 20 16:25:18 2011 -0700 Skip JNI Tests for None CPU ABI Bug 5342179 Don't run the JNI tests when CPU ABI is "none" by overriding the TestCase#runTest method to skip the test when Build.CPU_ABI is none. Also don't load the JNI libraries when it the ABI is none as well. Change-Id: I99a23993057d9884055e1d0b721f52893dd175c9 commit d47bb38e772655677b910c3870c7bb9a13966ed0 Merge: c6d1d6a 32d6562 Author: Brian Muramatsu Date: Tue Sep 20 12:30:43 2011 -0700 am 32d65628: Merge "Update CTS to 2.3_r9" into gingerbread * commit '32d65628f658fc0a6b7604ce1ec0d02397903339': Update CTS to 2.3_r9 commit c6d1d6a70cd178bba8f40a3d7e0a256379d6f81f Merge: de919bf 9bc0b46 Author: Brian Muramatsu Date: Tue Sep 20 12:30:42 2011 -0700 am 9bc0b46d: Update BuildVersionTest for 2.3.7 * commit '9bc0b46d2f7bf49fc8db0896af6024cc6aed3e0e': Update BuildVersionTest for 2.3.7 commit 32d65628f658fc0a6b7604ce1ec0d02397903339 Merge: 9bc0b46 3b04f30 Author: Brian Muramatsu Date: Tue Sep 20 12:10:13 2011 -0700 Merge "Update CTS to 2.3_r9" into gingerbread commit 3b04f30a646793863b4b7149b19e87c8f03c68ff Author: Brian Muramatsu Date: Tue Sep 20 12:08:42 2011 -0700 Update CTS to 2.3_r9 Bug 5333650 Change-Id: I3d19cfb8118bd44c21381e005ebff5ef692ea556 commit 9bc0b46d2f7bf49fc8db0896af6024cc6aed3e0e Author: Brian Muramatsu Date: Tue Sep 20 11:45:50 2011 -0700 Update BuildVersionTest for 2.3.7 Bug 5333650 Change-Id: Ifedda1e9902d3dee54f9f475dfdb78346a9a539a commit e885540972f3b59b0a98a75e32ec682051c23c6e Merge: 8f227bf5 58c43a8 Author: Brett Chabot Date: Mon Sep 19 12:16:20 2011 -0700 Merge "Round 2 of cts-tradefed XML tweaks" commit 8f227bf56da56423c36541e94dbfbad53e0d8dd4 Author: Dianne Hackborn Date: Sun Sep 18 17:02:37 2011 -0700 Update memory class checks. Logic is: - Going from mdpi to hdpi doubles memory needed, and hdpi to xhdpi doubles memory needed. (mdpi->xhdpi is 2x larger, or 4x memory needed.) - Going from normal to xlarge doubles memory needed. Change-Id: I2caf4cf9282cd186634e7f24865c51f82a0ad04d commit df72518f3620fbd683ba8203ef0a23b220b34c4c Merge: 76832ad 0a242bb Author: Tyler Luu Date: Mon Sep 19 09:11:37 2011 -0700 am 0a242bb6: CtsHardwareTestCases: Fix for #testGetParameterDuringFocus * commit '0a242bb608a7cc9002e456cf81f38924594fc7a0': CtsHardwareTestCases: Fix for #testGetParameterDuringFocus commit 76832ad3c0ad86da21d8edd0954af0502babd881 Author: Steve Block Date: Mon Sep 19 13:02:51 2011 +0100 Fix WebViewTest.testGetOriginalUrl() This test requires a callback to be made to WebViewClient.shouldOverrideUrlLoading(), which happens on the UI thread. We must therefore yield the UI thread while waiting for the load to complete. This was broken by the addition of the @UiThreadTest annotation in https://android-git.corp.google.com/g/#/c/109366. Bug: 5327443 Change-Id: I3c7ccb3260b531c98ad62b187200440070e83593 commit 0a242bb608a7cc9002e456cf81f38924594fc7a0 Author: Tyler Luu Date: Mon Aug 29 14:25:35 2011 +0300 CtsHardwareTestCases: Fix for #testGetParameterDuringFocus - After calling 'autoFocus()' for a second time, the test was neither waiting for the focus to finish, nor canceling AF, before calling 'autoFocus()' yet again. This sequence will inevitably lead to an error. bug:5314001 Change-Id: I259ff5b1e2e4385c325f19536a519db4ac2c3acf Original-author: Emilian Peev Signed-off-by: Emilian Peev Signed-off-by: Tyler Luu commit 8953f38c2fb12dc41cb7a66f2a0096b085c52a9e Merge: 8333008 910e784 Author: Brian Muramatsu Date: Thu Sep 15 15:00:37 2011 -0700 am 910e784c: am de919bfd: am e4b59693: Allow Tests to Require Some Features * commit '910e784cf0556db3949c581b636d834904ff3b21': Allow Tests to Require Some Features commit 910e784cf0556db3949c581b636d834904ff3b21 Merge: 4e82928 de919bf Author: Brian Muramatsu Date: Thu Sep 15 14:54:15 2011 -0700 am de919bfd: am e4b59693: Allow Tests to Require Some Features * commit 'de919bfd2887c6894e77fe41b8fb2ffa245cd302': Allow Tests to Require Some Features commit de919bfd2887c6894e77fe41b8fb2ffa245cd302 Merge: 60f1273 e4b5969 Author: Brian Muramatsu Date: Thu Sep 15 14:31:14 2011 -0700 am e4b59693: Allow Tests to Require Some Features * commit 'e4b59693ffc0ebd678ad6b77b93caac4988194d3': Allow Tests to Require Some Features commit e4b59693ffc0ebd678ad6b77b93caac4988194d3 Author: Brian Muramatsu Date: Thu Sep 15 11:09:40 2011 -0700 Allow Tests to Require Some Features Bug 5104638 Add the ability to specify what features are required for a test. If the device doesn't have all of the required features then the test will not appear in the menu. Specify the required features by specifying a meta-data entry in the Android manifest. This does create a possibility where a device doesn't report the right features and doesn't see a test that it should. However, they should review the features in the feature summary activity I hope... ...also remove some unused resources! Change-Id: I8233510c586f3b2547ac40cd0502b9c6b7d03484 commit 8333008202a36b879b580658d420697f8475fd01 Merge: 742263c 402d881 Author: Brian Muramatsu Date: Thu Sep 15 13:58:50 2011 -0700 Merge "Fix for BuildVersionTest" commit 742263cf9ebaab3457b0c3c088d2a908d9e6c4e0 Merge: 703c47d 17e8578 Author: Brian Muramatsu Date: Thu Sep 15 13:56:22 2011 -0700 Merge "Fix for ContactsContract_PhotoTest" commit 402d881a80ab5ac495252f0b7c0fc05dadfd0659 Author: Brian Muramatsu Date: Thu Sep 15 12:59:19 2011 -0700 Fix for BuildVersionTest Hello, Android 4.0 Change-Id: I5d9e5dc735ce1dbaa25b57e9c826afc6abacda36 commit 17e85780def4e469535d2c1338698329cf15f727 Author: Brian Muramatsu Date: Thu Sep 15 12:35:50 2011 -0700 Fix for ContactsContract_PhotoTest Bug 5319468 Change-Id: I5e3028a4b5ed036d9178599739186794ab2b1c46 commit 703c47df94604f7651d7ad48a90c4c6fc887baf2 Merge: 3695742 4b77a8c Author: Eric Laurent Date: Thu Sep 15 12:30:20 2011 -0700 Merge "Fix issue 5319044: CTS testVolume fails on CIS" commit 4b77a8c877d8a63dfb47b84494dc6696d8fc972f Author: Eric Laurent Date: Thu Sep 15 12:06:24 2011 -0700 Fix issue 5319044: CTS testVolume fails on CIS Change volume test according to new silent mode policy introduced by ICS. Change-Id: Iab1e0f1d990832295f8d167626aa62f3db8c0177 commit 3695742150dab4c2eba0ea0d43d01749fb98e1ea Merge: 804916f 7c57475 Author: Brian Muramatsu Date: Thu Sep 15 11:20:24 2011 -0700 Merge "Fix Layout for WebViewTest" commit 804916f2edeb5b5c42d10ccfddfd9333bdf5f93d Merge: a21f731 ab78ab9 Author: Brian Muramatsu Date: Thu Sep 15 11:16:42 2011 -0700 Merge "Fix WindowManager_LayoutParamsTest" commit a21f731c593e64bf0550298f2e36d179c223c7be Merge: b717bd4 4e82928 Author: Brian Muramatsu Date: Thu Sep 15 10:59:23 2011 -0700 am 4e82928b: am 60f12730: am 0cf6951f: Merge "Bluetooth Security Test" into gingerbread * commit '4e82928b1e9e39cc5dc6d5ff15dfd350090e6b86': Bluetooth Security Test commit b717bd4828994e64b02b0a724aa47dac64bfe9d5 Merge: 98ec850 1285e51 Author: Nick Kralevich Date: Thu Sep 15 10:59:20 2011 -0700 am 1285e514: am 528e5821: am eae61cca: Merge "VoldExploitTest: verify PIDs exist when calling getPids()" into gingerbread * commit '1285e5143a75a39441bafad84ca5f63dc40c570b': VoldExploitTest: verify PIDs exist when calling getPids() commit 98ec850382f3e0256fc00a2b393b738e9ab5c526 Merge: 29005c3 d74600e Author: Nick Kralevich Date: Thu Sep 15 10:59:10 2011 -0700 am d74600e8: am 5dc8b946: am 2206e9c1: BannedFilesTest: block setuid "ip" command, fix tcpdump * commit 'd74600e85b7704711c2e08b61a3effa11a8a575d': BannedFilesTest: block setuid "ip" command, fix tcpdump commit 29005c34de063be6bb6d74ec7c0ff3edc3ed9e53 Merge: 9ead1cf 1bbc5ef Author: Jeff Brown Date: Wed Sep 14 21:27:31 2011 -0700 Merge "Update velocity tracker tests. Bug: 5265529" commit 1bbc5ef022e2f44fd7f3444fe5511f9dd2fe92f7 Author: Jeff Brown Date: Wed Sep 14 19:21:01 2011 -0700 Update velocity tracker tests. Bug: 5265529 New algorithm, new data. Change-Id: Id85a55b74daf871b7e701c7d2a1504564a76342f commit 58c43a865d7f7763dfe83507dbbea99e772128b1 Author: Brett Chabot Date: Tue Sep 13 14:13:57 2011 -0700 Round 2 of cts-tradefed XML tweaks - add deviceID - add TestPackage name and digest - remove erroneous extra TestCase result - default testPlan to 'NA' instead of 'unknown' Change-Id: I20acde9654ba61a488b17248713d3bb592692c70 commit 4e82928b1e9e39cc5dc6d5ff15dfd350090e6b86 Merge: 1285e51 60f1273 Author: Brian Muramatsu Date: Wed Sep 14 16:52:31 2011 -0700 am 60f12730: am 0cf6951f: Merge "Bluetooth Security Test" into gingerbread * commit '60f12730b08e2dba481c65a178c199625a7f3994': Bluetooth Security Test commit 60f12730b08e2dba481c65a178c199625a7f3994 Merge: 528e582 0cf6951 Author: Brian Muramatsu Date: Wed Sep 14 16:50:28 2011 -0700 am 0cf6951f: Merge "Bluetooth Security Test" into gingerbread * commit '0cf6951fe0b4045ebe809321bf320cbacda1d0d5': Bluetooth Security Test commit 0cf6951fe0b4045ebe809321bf320cbacda1d0d5 Merge: eae61cc 0822bf4 Author: Brian Muramatsu Date: Wed Sep 14 16:48:39 2011 -0700 Merge "Bluetooth Security Test" into gingerbread commit 7c57475340a1f1a90fd50bc5299626bfdf435e93 Author: Brian Muramatsu Date: Wed Sep 14 14:44:24 2011 -0700 Fix Layout for WebViewTest The WebView had 0 height causing the testFind* tests to fail. Fix the layout to make the WebView fill its container. Change-Id: Iff234dd1236483adfce94028c2e7b35bd241f9f8 commit 9ead1cf06b6ce2452aed0261e0b821c729c0572f Merge: 9f72298 1ca2987 Author: Alex Sakhartchouk Date: Wed Sep 14 14:28:48 2011 -0700 Merge "Renderscript gl context creation test" commit ab78ab934e55e93f010b536310f3fb8371d0a211 Author: Brian Muramatsu Date: Wed Sep 14 11:32:53 2011 -0700 Fix WindowManager_LayoutParamsTest Adjust the test after commit f21c9b0f5 Change-Id: I322df043ef249341d35411fd742294b8a83cb720 commit 1285e5143a75a39441bafad84ca5f63dc40c570b Merge: d74600e 528e582 Author: Nick Kralevich Date: Wed Sep 14 11:14:01 2011 -0700 am 528e5821: am eae61cca: Merge "VoldExploitTest: verify PIDs exist when calling getPids()" into gingerbread * commit '528e582153634cc71e385f152f8ff0cd235d537f': VoldExploitTest: verify PIDs exist when calling getPids() commit 528e582153634cc71e385f152f8ff0cd235d537f Merge: 5dc8b94 eae61cc Author: Nick Kralevich Date: Wed Sep 14 11:11:43 2011 -0700 am eae61cca: Merge "VoldExploitTest: verify PIDs exist when calling getPids()" into gingerbread * commit 'eae61ccad3d68af259089ad8eaeffc5d70f50688': VoldExploitTest: verify PIDs exist when calling getPids() commit eae61ccad3d68af259089ad8eaeffc5d70f50688 Merge: 2206e9c 8f8947c Author: Nick Kralevich Date: Wed Sep 14 11:09:12 2011 -0700 Merge "VoldExploitTest: verify PIDs exist when calling getPids()" into gingerbread commit 8f8947c164f26d4b4a18c7c5ed2926fd7f9aa943 Author: Nick Kralevich Date: Wed Sep 14 10:48:39 2011 -0700 VoldExploitTest: verify PIDs exist when calling getPids() should fix http://code.google.com/p/android/issues/detail?id=18727 Change-Id: I5d0d385f04bbd6735be38babed4879be373b13a5 commit 0f701b71b37a0793a7a8d7456e58501ebe953e82 Merge: 867336a 38dfb6b Author: Brian Muramatsu Date: Wed Sep 14 10:54:19 2011 -0700 Merge "Increment CTS Version to 3.2_r5" into honeycomb-mr2 commit 38dfb6b13116be4605a042bba0b49fd78ac48f0d Author: Brian Muramatsu Date: Wed Sep 14 10:52:46 2011 -0700 Increment CTS Version to 3.2_r5 Change-Id: I511a3eca1b1c3645f06ee8073b1d117aa46f5857 commit 867336ad77204b9b222084eda030131dc04b52f1 Author: Brian Muramatsu Date: Wed Sep 14 10:50:33 2011 -0700 Remove Debuggable Flag This was causing the debuggabe test to fail. :-) Change-Id: I7a29106d503e2e2bbeb98bdbe67d5279329fcc67 commit d74600e85b7704711c2e08b61a3effa11a8a575d Merge: 40f95a1 5dc8b94 Author: Nick Kralevich Date: Wed Sep 14 10:38:03 2011 -0700 am 5dc8b946: am 2206e9c1: BannedFilesTest: block setuid "ip" command, fix tcpdump * commit '5dc8b946f2b175c976763891197ef1cfb867ffaa': BannedFilesTest: block setuid "ip" command, fix tcpdump commit 5dc8b946f2b175c976763891197ef1cfb867ffaa Merge: d4d79ac 2206e9c Author: Nick Kralevich Date: Wed Sep 14 10:34:54 2011 -0700 am 2206e9c1: BannedFilesTest: block setuid "ip" command, fix tcpdump * commit '2206e9c1b5daa060696413676b0a1a57d3b01c47': BannedFilesTest: block setuid "ip" command, fix tcpdump commit 2206e9c1b5daa060696413676b0a1a57d3b01c47 Author: Nick Kralevich Date: Wed Sep 14 09:55:24 2011 -0700 BannedFilesTest: block setuid "ip" command, fix tcpdump Don't allow a setuid/setgid "ip" command. The "ip" command can modify the network routing tables, which may allow a malicious attacker to intercept and modify network traffic to and from the device. Add an additional check for tcpdump in /vendor/bin Change-Id: Ied72676fd67582b30cbcafab2210346a0f9d9536 commit 9f722980e8815c704b1ba15ba5ac498640dd435b Author: Jeff Davidson Date: Tue Sep 13 18:42:02 2011 -0700 Fix download destinations in testDownloadManagerDestination() Bug: 5313654 Change-Id: I036dfd6085165622b4e45f84d2f6cc1d5ec3f039 commit 1ca2987f09d241df4eea2bfb560befb013039a02 Author: Alex Sakhartchouk Date: Tue Sep 13 16:33:11 2011 -0700 Renderscript gl context creation test Change-Id: Ica3da4da7c7fbd4b5b1c2384289edcd4e94e8a1d commit 668344dd326be0e6f91fa2852f7e18fed3267653 Merge: e08370d 1eacc52 Author: Brian Muramatsu Date: Tue Sep 13 16:10:14 2011 -0700 Merge remote branch 'goog/honeycomb-mr1' into honeycomb-mr2 Conflicts: tests/tests/dpi/src/android/dpi/cts/ConfigurationTest.java Change-Id: I7c1af2c95488db0e14e2973b6d0dc6ad33059dfe commit 51b9caaebb4a732bed435f69cfbc6b617bf0dff2 Author: Brett Chabot Date: Wed Sep 7 18:44:22 2011 -0700 Round 1 of cts-tradefed XML tweaks. Bug 5264339 Change-Id: I8e4cd92cced94c7ff3be106b04923b47f0345d8e commit 1eacc524d600f8740b421fdaa3bae2c538a8eb0c Merge: d9ccd22 92e3235 Author: Brian Muramatsu Date: Tue Sep 13 14:23:39 2011 -0700 Merge remote branch 'goog/honeycomb' into honeycomb-mr1 commit 0822bf4cf167b89c40e3e356890f9478eb14ab54 Author: Brian Muramatsu Date: Mon Sep 12 12:29:32 2011 -0700 Bluetooth Security Test Bug 4793037 Add another Bluetooth test that requires two Android Bluetooth devices. The test uses a specific UUID and checks that a connection access request dialog was shown. Change-Id: I786bd05ab5440f99855c8e89c6e2d901b0777355 commit c82a4c022a6e3ecaeb47f1a5543dc00bc23a5fef Merge: 69416cc a8d334e Author: Costin Manolache Date: Tue Sep 13 11:21:28 2011 -0700 Merge "Adjust options check based on the current API changes" commit d9ccd2272ee92dcb120fb1f104a3e3ef0489ab34 Author: Jason Bayer Date: Mon Sep 12 11:50:26 2011 -0700 Bypass a record test if there is no microphone Change-Id: Ieaaf59a5fc561c0b249bc313a908c72dbbb59adc commit 69416cc1942e36b9991e0f826e435d45521bee50 Author: Nick Kralevich Date: Mon Sep 12 16:14:21 2011 -0700 Revert "Revert "Check "Unknown Sources" is Enabled by Default"" This reverts commit d05a0e34781c6b32624ef8eef98079e99a845283. Bug: 4552723 commit bf46cb699118ed130ea887915f48a539484c19fc Merge: 9dd9972 cf0265d Author: Gloria Wang Date: Mon Sep 12 14:08:47 2011 -0700 Merge "Reset surface after a seek. For bug 5189069." commit 9dd9972dfce9d7576f0c6734c6bbbab677eed8f2 Merge: bd8ffa9 c6c3188 Author: Jeff Brown Date: Fri Sep 9 17:01:22 2011 -0700 Merge "Tweak velocity tracker. Bug: 5265529" commit 92e323585370f2e8dd51053597a6b19927cc7630 Merge: 66ad0cc ae3c9c4 Author: Brian Muramatsu Date: Fri Sep 9 16:22:37 2011 -0700 Merge remote branch 'goog/gingerbread' into honeycomb Conflicts: tests/tests/os/src/android/os/cts/BuildVersionTest.java tests/tests/security/src/android/security/cts/CertificateTest.java tools/host/src/com/android/cts/Version.java Change-Id: Ieb48bc2906fbc9f07e6cf4e161a3dc0195aedcc2 commit c6c318860cdc9ea9124989c97e15a8ebf2f3a894 Author: Jeff Brown Date: Fri Sep 9 16:09:10 2011 -0700 Tweak velocity tracker. Bug: 5265529 New velocity tracker algorithm prefers more recent data points. We can observe this effect in the test by noticing that after moving at constant velocity for 100ms and another 10ms later the velocity reported by the VelocityTracker is unchanged. Change-Id: I0a71e62ade0937d9de7702925d701e8e95dc16e6 commit 66ad0ccd647315b6f5d4206048376c1b4798a5f4 Merge: c8a7375 e669e04 Author: Brian Muramatsu Date: Fri Sep 9 16:01:43 2011 -0700 Merge "Hardware Acceleration Test" into honeycomb commit cf0265d0b6efff1b54c44aea56b945df790e73e0 Author: Gloria Wang Date: Fri Sep 9 15:48:45 2011 -0700 Reset surface after a seek. For bug 5189069. Change-Id: I9a51f85a57f25093d3f682e4935e37681ca511aa commit a8d334ed2441094d306e341ccc5096dd7323235f Author: Costin Manolache Date: Fri Sep 9 13:36:36 2011 -0700 Adjust options check based on the current API changes b/5278759 API changes to pass package, options Change-Id: Ib2794aefc14f13b9ca8648ebaef301f8b2839ef7 commit bd8ffa90a931ecdbab57555065bdfd5a5114c535 Merge: 8772737 40f95a1 Author: Brian Muramatsu Date: Fri Sep 9 12:04:59 2011 -0700 am 40f95a13: am d4d79ac0: am ae3c9c48: Merge "More Detailed Report Names" into gingerbread * commit '40f95a13ecd72f53e0100d6788f44903a919e64c': More Detailed Report Names commit 87727379384baaa57f86aa2140b28c2b916de0f0 Merge: a801701 71d45f8 Author: Brian Muramatsu Date: Fri Sep 9 12:04:48 2011 -0700 am 71d45f89: am d860242c: am 7234280e: Merge "Fix Suid File Scanner Activity" into gingerbread * commit '71d45f89824a18ea03c081bf4bd4f1cb87440b88': Fix Suid File Scanner Activity commit a8017014e1f967ba9ba6fbddc5883c96cd76fade Merge: 77a4b1c d982863 Author: Brian Muramatsu Date: Fri Sep 9 12:04:43 2011 -0700 am d9828636: am 0b3efda0: (-s ours) am 7186fa34: Increment CTS Version to 2.3_r8 * commit 'd9828636676e354ecc36059e8f265ec23497e282': Increment CTS Version to 2.3_r8 commit 40f95a13ecd72f53e0100d6788f44903a919e64c Merge: 71d45f8 d4d79ac Author: Brian Muramatsu Date: Fri Sep 9 11:31:41 2011 -0700 am d4d79ac0: am ae3c9c48: Merge "More Detailed Report Names" into gingerbread * commit 'd4d79ac0f947d2caf589931f04563dd8e937a977': More Detailed Report Names commit d4d79ac0f947d2caf589931f04563dd8e937a977 Merge: d860242 ae3c9c4 Author: Brian Muramatsu Date: Fri Sep 9 11:27:20 2011 -0700 am ae3c9c48: Merge "More Detailed Report Names" into gingerbread * commit 'ae3c9c48748f5e536610159ca67a8b344092e500': More Detailed Report Names commit ae3c9c48748f5e536610159ca67a8b344092e500 Merge: 7234280 e1e13c3 Author: Brian Muramatsu Date: Fri Sep 9 11:23:53 2011 -0700 Merge "More Detailed Report Names" into gingerbread commit 77a4b1cce445ccb3f564853239eb2adae0871270 Merge: f596927 064b0bd Author: Ying Wang Date: Thu Sep 8 15:36:23 2011 -0700 resolved conflicts for merge of 064b0bde to master Change-Id: Ie9f002a0921bc1cbeae3171114cb1b26ad6af481 commit 71d45f89824a18ea03c081bf4bd4f1cb87440b88 Merge: d982863 d860242 Author: Brian Muramatsu Date: Thu Sep 8 15:26:41 2011 -0700 am d860242c: am 7234280e: Merge "Fix Suid File Scanner Activity" into gingerbread * commit 'd860242cbc99096179845c1d67758ce071959af5': Fix Suid File Scanner Activity commit d860242cbc99096179845c1d67758ce071959af5 Merge: 0b3efda 7234280 Author: Brian Muramatsu Date: Thu Sep 8 15:22:18 2011 -0700 am 7234280e: Merge "Fix Suid File Scanner Activity" into gingerbread * commit '7234280efe27eea9afb32732651a0da806440bb3': Fix Suid File Scanner Activity commit 7234280efe27eea9afb32732651a0da806440bb3 Merge: 7186fa3 51c26c1 Author: Brian Muramatsu Date: Thu Sep 8 15:18:50 2011 -0700 Merge "Fix Suid File Scanner Activity" into gingerbread commit e669e04f422fe9f77683072ad3248e27a36e879c Author: Brian Muramatsu Date: Thu Sep 1 15:10:54 2011 -0700 Hardware Acceleration Test Bug 4186680 Tests the View#isHardwareAccelerated and Canvas#isHardwareAccelerated methods. Since this required the addition of android:hardwareAccelerated to the application, I decided to make a separate stub to avoid affecting existing tests. Change-Id: Ia56d7f98ded41d64885c36b9d5131045bb2c8e61 commit f59692709771fe1a7ec0e8448ee8e8563f9a89dc Merge: f694219 8a05a95 Author: Jeff Davidson Date: Thu Sep 8 14:48:28 2011 -0700 am 8a05a952: am b3bb4a4d: am 25eeacbb: MediaPlayerTest local video fixes. * commit '8a05a952cbeb94eaf5ba6fd9e710b5afd7ca1fee': MediaPlayerTest local video fixes. commit e1e13c3e4bbc9fe06c2b98a4563c173a5af4f75d Author: Brian Muramatsu Date: Thu Sep 8 14:05:30 2011 -0700 More Detailed Report Names Bug 5205273 - Formatted the time the report was made - Added product, device, id, and manufacturer - Both zip and xml file inside renamed... Example: ctsVerifierReport-2011.09.08-14.16.48-samsung-soju-crespo-GRK39.xml ...pretty long... Change-Id: I0c91587899910e4e84292d9f4eccf680278e2e72 commit 51c26c1df39c4891b5049155b965d5854774a3f0 Author: Brian Muramatsu Date: Wed Sep 7 18:33:23 2011 -0700 Fix Suid File Scanner Activity I am pretty sure this used to work, but it seems the SUID scanner test result isn't recorded since the only option you get is to use the back button after the test completes. I added some pass fail buttons to the activity. Created a general layout that can be reused in the future. Change-Id: I6f12fd4d46130045a6ca8f69a8a7d6644fa2a916 commit f694219d8114ccf82d626659706dcfb580513693 Merge: cc3f8bf 906234b Author: Svetoslav Ganov Date: Thu Sep 8 13:31:01 2011 -0700 Merge "Failing testTypeWindowStateChangedAccessibilityEvent test." commit d9828636676e354ecc36059e8f265ec23497e282 Merge: 064b0bd 0b3efda Author: Brian Muramatsu Date: Thu Sep 8 12:17:35 2011 -0700 am 0b3efda0: (-s ours) am 7186fa34: Increment CTS Version to 2.3_r8 * commit '0b3efda005b1c7425799134f0068a62935ace6d2': Increment CTS Version to 2.3_r8 commit 0b3efda005b1c7425799134f0068a62935ace6d2 Merge: d1c3248 7186fa3 Author: Brian Muramatsu Date: Thu Sep 8 12:13:52 2011 -0700 am 7186fa34: Increment CTS Version to 2.3_r8 * commit '7186fa34cbcff9793360a179da6cbf8ffead3f22': Increment CTS Version to 2.3_r8 commit 7186fa34cbcff9793360a179da6cbf8ffead3f22 Author: Brian Muramatsu Date: Thu Sep 8 12:10:19 2011 -0700 Increment CTS Version to 2.3_r8 Bug 5278025 Change-Id: Ib6b08e528ffd2d568791dfff0ffde3a7fdbd80f4 commit cc3f8bf6dc54cd5b3a293c4d11fdfe1b18d5cfe6 Author: Jesse Wilson Date: Wed Sep 7 14:49:47 2011 -0400 Remove a reference to an obsolete Bouncycastle keystore file. Without this, some SSL code fails with an exception: java.io.FileNotFoundException: /system/etc/security/cacerts.bks: open failed: ENOENT (No such file or directory) at libcore.io.IoBridge.open(IoBridge.java:410) at java.io.FileInputStream.(FileInputStream.java:78) at java.io.FileInputStream.(FileInputStream.java:105) at org.apache.harmony.xnet.provider.jsse.DefaultSSLContextImpl.getTrustManagers(DefaultSSLContextImpl.java:115) at org.apache.harmony.xnet.provider.jsse.SSLContextImpl.(SSLContextImpl.java:71) at org.apache.harmony.xnet.provider.jsse.OpenSSLContextImpl.(OpenSSLContextImpl.java:34) at org.apache.harmony.xnet.provider.jsse.DefaultSSLContextImpl.(DefaultSSLContextImpl.java:59) at java.lang.Class.newInstanceImpl(Native Method) at java.lang.Class.newInstance(Class.java:1319) at java.security.Provider.newInstance(Provider.java:989) ... 15 more Caused by: libcore.io.ErrnoException: open failed: ENOENT (No such file or directory) at libcore.io.Posix.open(Native Method) at libcore.io.BlockGuardOs.open(BlockGuardOs.java:98) at libcore.io.IoBridge.open(IoBridge.java:393) ... 24 more Change-Id: I631a8ee3f5b3e8c0e1caf43e85673ef77500b579 commit 064b0bde4e4844182aab0d276ccacdc3da9ffea9 Merge: 8a05a95 d1c3248 Author: Ying Wang Date: Wed Sep 7 11:27:19 2011 -0700 am d1c32480: am fa28e3e4: Merge "Use a separate apk module definition to add core-tests resource." into gingerbread * commit 'd1c32480c66147dbffd6cb7c9cf8a8a8a0e38fc9': Use a separate apk module definition to add core-tests resource. commit d1c32480c66147dbffd6cb7c9cf8a8a8a0e38fc9 Merge: b3bb4a4 fa28e3e Author: Ying Wang Date: Wed Sep 7 11:23:38 2011 -0700 am fa28e3e4: Merge "Use a separate apk module definition to add core-tests resource." into gingerbread * commit 'fa28e3e404f1a417717ccc31220c0ef427efd827': Use a separate apk module definition to add core-tests resource. commit fa28e3e404f1a417717ccc31220c0ef427efd827 Merge: 25eeacb 95d94eb Author: Ying Wang Date: Wed Sep 7 10:59:29 2011 -0700 Merge "Use a separate apk module definition to add core-tests resource." into gingerbread commit 95d94eb3d293e4a0c343e48c9cbd601cce14f97a Author: Ying Wang Date: Tue Sep 6 21:24:03 2011 -0700 Use a separate apk module definition to add core-tests resource. Bug: 5264671 With this change the package.apk.unaligned is consistent with package.apk. Meanwhile it fixes a makefile bug: Previously the rule updated both the target and the prerequisite. Such behavors confuse make that we should avoid. Change-Id: I1ce40a50450136355aa6489f82ad5ff29b82709c commit 8a05a952cbeb94eaf5ba6fd9e710b5afd7ca1fee Merge: 7373775 b3bb4a4 Author: Jeff Davidson Date: Tue Sep 6 20:17:04 2011 -0700 am b3bb4a4d: am 25eeacbb: MediaPlayerTest local video fixes. * commit 'b3bb4a4d392daf141c9574bca6e128b5603f8a30': MediaPlayerTest local video fixes. commit b3bb4a4d392daf141c9574bca6e128b5603f8a30 Merge: 6d381dd 25eeacb Author: Jeff Davidson Date: Tue Sep 6 18:12:15 2011 -0700 am 25eeacbb: MediaPlayerTest local video fixes. * commit '25eeacbbe9ed622f8da22345e4d324324db6f674': MediaPlayerTest local video fixes. commit 25eeacbbe9ed622f8da22345e4d324324db6f674 Author: Jeff Davidson Date: Tue Sep 6 17:20:59 2011 -0700 MediaPlayerTest local video fixes. Includes regenerated 480x360 content with correct aspect ratio set. Regenerated 176x144 files seem to be identical to the manually tweaked ones that had already been submitted. Also fixes a typo that was omitting a test (two tests referred to the same video resource. Bug: 5231649 Change-Id: I3228be4392ce2f013e3d3c6cebe16f81b4211c5c commit 63691c76926d24015270aa9c58f2eb0d72cf4412 Author: Eino-Ville Talvala Date: Mon Sep 5 16:14:23 2011 -0700 Add Camera tests for auto-exposure and auto-white-balance locks. Bug: 4945711 Change-Id: Ib12fe2b07a395921fe72828fe1c0aa9f3655e812 commit 906234bfc930cd412e3e47a9326261140608fbc2 Author: Svetoslav Ganov Date: Mon Sep 5 13:59:00 2011 -0700 Failing testTypeWindowStateChangedAccessibilityEvent test. 1. Some accessibility events generated while the activity under test is started may be undelivered before a test is run, thus interfering with test results. Added a timeout wait to avoid that. 2. New properties to were not checked by the tests. bug:5197074 Change-Id: I7ae4e7a22a0be03b904215796ce661e56d279caf commit 5494639c1cae6bfe85fc9028cb99a737345d5f72 Merge: f6f71d6 7373775 Author: Brian Muramatsu Date: Fri Sep 2 13:51:37 2011 -0700 am 7373775f: am 6d381dd7: (-s ours) am c090a5b8: Merge "Allow 2.3.6 in BuildVersionTest" into gingerbread * commit '7373775fa756723a088ea4452497954b8f21a5c0': Allow 2.3.6 in BuildVersionTest commit 7373775fa756723a088ea4452497954b8f21a5c0 Merge: 0dee108 6d381dd Author: Brian Muramatsu Date: Fri Sep 2 13:49:32 2011 -0700 am 6d381dd7: (-s ours) am c090a5b8: Merge "Allow 2.3.6 in BuildVersionTest" into gingerbread * commit '6d381dd7d21a6a2f82223a5807262f9ea2ea6343': Allow 2.3.6 in BuildVersionTest commit 6d381dd7d21a6a2f82223a5807262f9ea2ea6343 Merge: 04bd961 c090a5b Author: Brian Muramatsu Date: Fri Sep 2 13:43:52 2011 -0700 am c090a5b8: Merge "Allow 2.3.6 in BuildVersionTest" into gingerbread * commit 'c090a5b82b334e47795922ac48c412a5d0ff6804': Allow 2.3.6 in BuildVersionTest commit c090a5b82b334e47795922ac48c412a5d0ff6804 Merge: 404d6bd a34614c Author: Brian Muramatsu Date: Fri Sep 2 13:40:16 2011 -0700 Merge "Allow 2.3.6 in BuildVersionTest" into gingerbread commit a34614c36c9aa5ac768b03d7d0e1f03ec4dd1696 Author: Brian Muramatsu Date: Fri Sep 2 13:36:42 2011 -0700 Allow 2.3.6 in BuildVersionTest Bug 5156068 Change-Id: I3ba1e4e71f780fa9e53240305884861c00926546 commit f6f71d6c7ad57b6e0587244ef1d4c5877a0e8710 Merge: 0f67149 0dee108 Author: Brian Muramatsu Date: Fri Sep 2 13:31:05 2011 -0700 am 0dee108f: am 04bd9610: (-s ours) am 404d6bdd: CTS Version 2.3 R7 * commit '0dee108f1505b1520153348cc9a7de2e4ee5d60e': CTS Version 2.3 R7 commit 0dee108f1505b1520153348cc9a7de2e4ee5d60e Merge: aa11613 04bd961 Author: Brian Muramatsu Date: Fri Sep 2 13:25:37 2011 -0700 am 04bd9610: (-s ours) am 404d6bdd: CTS Version 2.3 R7 * commit '04bd9610d91278c457fcc481826da927f4eb33d6': CTS Version 2.3 R7 commit 04bd9610d91278c457fcc481826da927f4eb33d6 Merge: edb0943 404d6bd Author: Brian Muramatsu Date: Fri Sep 2 12:17:33 2011 -0700 am 404d6bdd: CTS Version 2.3 R7 * commit '404d6bdde265245c1d90e019cb75ffd4a809eab9': CTS Version 2.3 R7 commit 404d6bdde265245c1d90e019cb75ffd4a809eab9 Author: Brian Muramatsu Date: Fri Sep 2 12:12:30 2011 -0700 CTS Version 2.3 R7 Bug 5252989 Change-Id: Iecd665897297f93efcb0f5370e0740ab24a7bb70 commit 5e2dd4f69f3bb4399ca654e65c4ccb7aab06480d Author: Erdi Chen Date: Thu Sep 1 15:06:56 2011 -0700 Use float compare with delta to account for integer rounding error. densityDpi is calculated with padding of 0.5f, so there is possible rounding error when the calculation is reversed for comparison to the float version of density. densityDpi = (int)((density*DisplayMetrics.DENSITY_DEFAULT)+.5f) Change-Id: I16ef30548ed5078c0611448f3b37d7679a096eb3 commit 0f67149685e9916b12be028d746162348216e2ee Merge: 1b019fa aa11613 Author: Brian Muramatsu Date: Thu Sep 1 15:24:25 2011 -0700 resolved conflicts for merge of aa116133 to master Change-Id: Ie3800395211c2d47cf0083dec00a6a45aef14c4a commit aa116133c68e5ee3704b40a0d343ae39413795c5 Merge: 266e1aa edb0943 Author: Brian Muramatsu Date: Thu Sep 1 14:51:43 2011 -0700 am edb09439: am 662a985e: CertificateTest Update * commit 'edb09439e3276fc98995513a43b2f770e85c6a0e': CertificateTest Update commit edb09439e3276fc98995513a43b2f770e85c6a0e Merge: a426851 662a985 Author: Brian Muramatsu Date: Thu Sep 1 14:47:50 2011 -0700 am 662a985e: CertificateTest Update * commit '662a985e463f56477340bb810148a1b2250773b5': CertificateTest Update commit 662a985e463f56477340bb810148a1b2250773b5 Author: Brian Muramatsu Date: Tue Aug 30 12:16:38 2011 -0700 CertificateTest Update Bug 5232736 Change-Id: I526c4cf394fe2c3914f046efc769adabe83fc734 commit 1b019fa247064491a6dc2edd68c364688434ab2f Merge: d6b80a0 2d12727 Author: Brian Muramatsu Date: Thu Sep 1 10:48:48 2011 -0700 Merge "Fix for More Broken Paint Tests" commit d6b80a0e8a365c556c074dff73d9dbb48b67bfd8 Merge: 20ab13d a55fa0d Author: Wu-cheng Li Date: Wed Aug 31 21:20:29 2011 -0700 Merge "Remove the check of takePicture during recording." commit 2d1272732ca8d0cdaba46a412d5f40c47bcea381 Author: Brian Muramatsu Date: Wed Aug 31 14:53:54 2011 -0700 Fix for More Broken Paint Tests Bug 5196444 These tests were using hard coded measurements which broke with font changes. Loosley check that the methods work... Change-Id: I839d6e7c94dd42b913f5ca2139b98de81ef3912e commit 20ab13d8b183ee14703468366a6ad395e25aa1a1 Author: Brian Muramatsu Date: Wed Aug 31 16:07:52 2011 -0700 Test for Invalid Ringer Modes Bug 4499450 Check that setting an invalid ringer mode doesn't do anything. Change-Id: I24fe167a8f266dbcbb239dd2c6221cd89783515c commit f9ede27f2cd9534d95679aa5b8c3ae017adda36c Merge: 9593b16 c45972a Author: Brian Muramatsu Date: Wed Aug 31 11:24:08 2011 -0700 Merge "Merge remote branch 'goog/honeycomb-mr2'" commit 9593b164da4ec3d48831911c82fd1a887c19c1fa Merge: f5d1d8a 9f0cb3b Author: Fabrice Di Meglio Date: Wed Aug 31 10:30:41 2011 -0700 Merge "Fix bug #5233207 android.graphics.cts.PaintTest#testBreakText fails on IRK56F trygon-userdebug" commit c45972aff0798c7fe430919b85af3c253786a4cb Merge: f5d1d8a e08370d Author: Brian Muramatsu Date: Tue Aug 30 16:06:33 2011 -0700 Merge remote branch 'goog/honeycomb-mr2' Conflicts: apps/CtsVerifier/AndroidManifest.xml apps/CtsVerifier/res/values/strings.xml apps/CtsVerifier/src/com/android/cts/verifier/features/FeatureSummaryActivity.java tests/core/runner/src/android/test/InstrumentationCtsTestRunner.java tests/expectations/knownfailures-3.0_r1.txt tests/expectations/knownfailures.txt tests/tests/app/src/android/app/cts/ActivityManagerMemoryClassTest.java tests/tests/dpi/src/android/dpi/cts/ConfigurationTest.java tests/tests/os/src/android/os/cts/BuildVersionTest.java tools/host/src/com/android/cts/Version.java Change-Id: If9da4508f8eee25351538e3118e6ae990be49c60 commit f5d1d8a8ac659c2af76e8b7a2a68c082a3e46c2e Merge: d976324 b4df88a Author: Jeff Davidson Date: Tue Aug 30 15:55:08 2011 -0700 Merge "Add test to check that DownloadManager maintains extensions." commit e08370d982cfc62f5d12fecec427e784a6a8e15b Merge: e31a224 ccb3f46 Author: Brian Muramatsu Date: Tue Aug 30 15:48:59 2011 -0700 Merge remote branch 'goog/honeycomb-mr1' into honeycomb-mr2 commit ccb3f4648473f4101be79ec573fbaa7a25cdcad7 Merge: e7ab987 c8a7375 Author: Brian Muramatsu Date: Tue Aug 30 15:40:44 2011 -0700 Merge remote branch 'goog/honeycomb' into honeycomb-mr1 commit c8a7375749ce87b6af15eeb54d185a5bb939796a Author: Brian Muramatsu Date: Tue Aug 30 12:16:38 2011 -0700 CertificateTest Update Bug 5232736 Change-Id: I526c4cf394fe2c3914f046efc769adabe83fc734 commit b4df88a0d7020ea59c0602113c96a7857fd530ea Author: Jeff Davidson Date: Tue Aug 30 14:53:38 2011 -0700 Add test to check that DownloadManager maintains extensions. HC introduced a regression where the extension of a file was changed to match the mimetype of the file, whereas GB left the requested file name alone. This will be fixed for ICS, and this test should ensure that no further regressions occur. Bug: 5196436 Change-Id: I68f6295a2d86022f1cdecb250ff8d5b3ab670019 commit 9f0cb3b4c900f3e5b769a767f70ccf4769758987 Author: Fabrice Di Meglio Date: Tue Aug 30 15:02:39 2011 -0700 Fix bug #5233207 android.graphics.cts.PaintTest#testBreakText fails on IRK56F trygon-userdebug - fix wrong test Change-Id: I259e5b5b0bf940f0d8aad1266ed4e4f6ee4e8f28 commit d976324fcdf17925cd9f6c014bb8881ca59bc285 Merge: a898e24 731a613 Author: Fabrice Di Meglio Date: Tue Aug 30 13:42:46 2011 -0700 Merge "Fix bug #5197549 android.text.cts.StaticLayoutTest#testGetEllipsisCount fails on IRK49E mysid-userdebug" commit a55fa0da0af5f00b8211e3a5ebd6fb2c6f18d58a Author: Wu-cheng Li Date: Tue Aug 30 21:36:01 2011 +0800 Remove the check of takePicture during recording. Some cameras support video snapshot. bug:5187868 Change-Id: Ife74a10a2c242a44ede04035977875a51b6e921a commit a898e248a773afbda61236003eddb7458a40dedc Merge: 7e0942f 266e1aa Author: Brian Muramatsu Date: Mon Aug 29 18:01:22 2011 -0700 am 266e1aa2: am a4268519: am fd6e5ff1: Merge "Test for Alarm Clock Intent" into gingerbread * commit '266e1aa21a845f4aa0d1e39e1c28d548d191adae': Test for Alarm Clock Intent commit 7e0942f8871656a248ecbf959735e6c88ba58782 Merge: 6c779b9 14d4943 Author: Brian Muramatsu Date: Mon Aug 29 18:01:18 2011 -0700 am 14d49432: am abfe9d36: am 77c916d9: Merge "create WallpaperManagerTest to test WallpaperManager. add test case on suggestDesiredDimensions Signed-off-by: Zhihong GUO " into gingerbread * commit '14d49432d916eb8c7036e44a32e1f7816fd0d689': create WallpaperManagerTest to test WallpaperManager. add test case on suggestDesiredDimensions Signed-off-by: Zhihong GUO commit 6c779b98872e64ed327fa5d24455a713381b222c Merge: 1f26199 035c57d Author: Brian Muramatsu Date: Mon Aug 29 18:01:06 2011 -0700 am 035c57d0: am 3a1c527b: am c6ce1a4b: Merge "CTS: Fixed BaseInputConnectionTest#testSendKeyEvent" into gingerbread * commit '035c57d08eb52c938ea90463f3cd2c4acfb2d885': CTS: Fixed BaseInputConnectionTest#testSendKeyEvent commit 266e1aa21a845f4aa0d1e39e1c28d548d191adae Merge: 14d4943 a426851 Author: Brian Muramatsu Date: Mon Aug 29 17:59:04 2011 -0700 am a4268519: am fd6e5ff1: Merge "Test for Alarm Clock Intent" into gingerbread * commit 'a4268519a8f855148966a9b6151efa0459e7b9de': Test for Alarm Clock Intent commit 14d49432d916eb8c7036e44a32e1f7816fd0d689 Merge: 035c57d abfe9d3 Author: Brian Muramatsu Date: Mon Aug 29 17:59:02 2011 -0700 am abfe9d36: am 77c916d9: Merge "create WallpaperManagerTest to test WallpaperManager. add test case on suggestDesiredDimensions Signed-off-by: Zhihong GUO " into gingerbread * commit 'abfe9d36d319a75222bdcbaab6e33485af076b48': create WallpaperManagerTest to test WallpaperManager. add test case on suggestDesiredDimensions Signed-off-by: Zhihong GUO commit 035c57d08eb52c938ea90463f3cd2c4acfb2d885 Merge: be3f714 3a1c527 Author: Brian Muramatsu Date: Mon Aug 29 17:59:00 2011 -0700 am 3a1c527b: am c6ce1a4b: Merge "CTS: Fixed BaseInputConnectionTest#testSendKeyEvent" into gingerbread * commit '3a1c527b318b55fedb60fc97c31ee0eb4592530b': CTS: Fixed BaseInputConnectionTest#testSendKeyEvent commit a4268519a8f855148966a9b6151efa0459e7b9de Merge: abfe9d3 fd6e5ff Author: Brian Muramatsu Date: Mon Aug 29 17:56:54 2011 -0700 am fd6e5ff1: Merge "Test for Alarm Clock Intent" into gingerbread * commit 'fd6e5ff133c20473c3749508788c885a794c764c': Test for Alarm Clock Intent commit abfe9d36d319a75222bdcbaab6e33485af076b48 Merge: 3a1c527 77c916d Author: Brian Muramatsu Date: Mon Aug 29 17:56:50 2011 -0700 am 77c916d9: Merge "create WallpaperManagerTest to test WallpaperManager. add test case on suggestDesiredDimensions Signed-off-by: Zhihong GUO " into gingerbread * commit '77c916d976b888706279c20a887d35082b5318e0': create WallpaperManagerTest to test WallpaperManager. add test case on suggestDesiredDimensions Signed-off-by: Zhihong GUO commit 3a1c527b318b55fedb60fc97c31ee0eb4592530b Merge: 23f944d c6ce1a4 Author: Brian Muramatsu Date: Mon Aug 29 17:56:38 2011 -0700 am c6ce1a4b: Merge "CTS: Fixed BaseInputConnectionTest#testSendKeyEvent" into gingerbread * commit 'c6ce1a4bcf76b0ba6349a383c70607b405cedbe4': CTS: Fixed BaseInputConnectionTest#testSendKeyEvent commit 731a61344383f593aef5d07b460d7a1fbd036e60 Author: Fabrice Di Meglio Date: Mon Aug 29 15:44:12 2011 -0700 Fix bug #5197549 android.text.cts.StaticLayoutTest#testGetEllipsisCount fails on IRK49E mysid-userdebug - update tests to reflect the Framework code: allow ellipsizing only and only if - not MARQUEE - single line - END only on the last visible line when multiple lines Change-Id: Iab4dbc6ac8da9636c0961eb7523a45b3d0b7050f commit 1f26199ab40f8fdb33be8b637cd9978d35f4271c Author: Brian Muramatsu Date: Mon Aug 29 15:27:57 2011 -0700 Fix for Contacts_PeopleTest#testAccessPhotoData Bug 5039368 Change-Id: I9417d5a53cea6120d6ca597f546fdc80083e31ad commit e31a2249a548852355e56811bb6f80b97592990e Merge: 25a507b 6d85c55 Author: Brian Muramatsu Date: Mon Aug 29 11:13:28 2011 -0700 Merge "Fix BuildVersionTest" into honeycomb-mr2 commit 6d85c55395f792b79d17450026ff5de15d6cef24 Author: Brian Muramatsu Date: Mon Aug 29 10:54:03 2011 -0700 Fix BuildVersionTest Allow 3.2.1 in the allowed versions. Change-Id: I6e2bbf6fdf650d2c6e041c3fdab98258ffffd513 commit 6fd8063aa409e0d61b5207468a4f12adb831f4c2 Author: Wu-cheng Li Date: Sun Aug 28 18:19:43 2011 +0800 Fix camera zoom CTS bug. The test starts from the camera id 0. If the zoom is not supported, camera 0 is not released and the CTS starts to test id 1. The camera should be released before testing the next one. bug:5144206 Change-Id: I72b204eaa3f399ae09a4529f2acd84bfa4f00438 commit 25a507bb0ddff80889eef36912540660057af1ff Merge: c3709ba e7ab987 Author: Brian Muramatsu Date: Fri Aug 26 17:16:34 2011 -0700 Merge remote branch 'goog/honeycomb-mr1' into honeycomb-mr2 Conflicts: apps/CtsVerifier/AndroidManifest.xml tools/host/src/com/android/cts/Version.java Change-Id: I66f076447658a6628a46b88229ff16e1109e308f commit fd6e5ff133c20473c3749508788c885a794c764c Merge: 77c916d fe08b1c Author: Brian Muramatsu Date: Fri Aug 26 16:15:26 2011 -0700 Merge "Test for Alarm Clock Intent" into gingerbread commit fe08b1c4092f1eb3de27af46b7b11fc79b0ee65d Author: Wade Gobel Date: Fri Aug 26 16:05:11 2011 -0700 Test for Alarm Clock Intent Bug 4159550 Change-Id: I8d6cb82649f835e43e75065d158adf5e4c32149f commit 77c916d976b888706279c20a887d35082b5318e0 Merge: c6ce1a4 3b9c509 Author: Brian Muramatsu Date: Fri Aug 26 15:50:58 2011 -0700 Merge "create WallpaperManagerTest to test WallpaperManager. add test case on suggestDesiredDimensions Signed-off-by: Zhihong GUO " into gingerbread commit 3b9c5092c509aa37f93d545ed6b7ff0c124d5896 Author: Zhihong GUO Date: Thu Aug 4 13:43:02 2011 +0800 create WallpaperManagerTest to test WallpaperManager. add test case on suggestDesiredDimensions Signed-off-by: Zhihong GUO Change-Id: I75c5a38c101fd18fcd8dacfe47716d2a758be3c1 commit c6ce1a4bcf76b0ba6349a383c70607b405cedbe4 Merge: c99805c 2842cec Author: Brian Muramatsu Date: Fri Aug 26 14:59:32 2011 -0700 Merge "CTS: Fixed BaseInputConnectionTest#testSendKeyEvent" into gingerbread commit 2842cecf3c2d3878be3ddd7f8c525d738ebbad84 Author: Sebastian Rylance Date: Mon Aug 22 14:09:16 2011 +0200 CTS: Fixed BaseInputConnectionTest#testSendKeyEvent - Replaced incorrect usage of KEYCODE_Q with a lookup in the KeyCharacterMap. - Test case now also passes for AZERTY software. Change-Id: I6784bd55e5165055120bd9f2e72afab69342be4b Signed-off-by: Sebastian Rylance commit e7ab987437e096df0b15c490693040825790ffa0 Merge: c98733e ae0c107 Author: Brian Muramatsu Date: Thu Aug 25 11:56:07 2011 -0700 Merge remote branch 'goog/honeycomb' into honeycomb-mr1 Conflicts: apps/CtsVerifier/AndroidManifest.xml apps/CtsVerifier/res/values/strings.xml tests/tests/media/src/android/media/cts/MediaPlayerTest.java tests/tests/media/src/android/media/cts/MediaRecorderTest.java tools/host/src/com/android/cts/Version.java Change-Id: Ic0ec7b9654683d7686c9d7f714caf5cbacef7aad commit c3709ba4fdd9d80bd73f42e2092d0d631ea8c344 Author: Brian Muramatsu Date: Thu Aug 25 11:28:34 2011 -0700 Fix for ConfigurationTest Density Comparison Bug 5200365 Add a delta factor of 0.001F.. Change-Id: I859b76cdd9bb3c611eb92744690dcf483e5871f6 commit ae0c107f7e4a6b7dd0db5481fa3fd51f85df66b3 Author: Jeff Davidson Date: Thu Aug 25 11:05:13 2011 -0700 Add .bin extension to filenames to make DownloadManagerTest happy. Change-Id: Ie81b64baa19e792557c4dd5c746274c075481982 commit 75aa28b03c321decb0cc64e9ba82ed6040d46861 Author: Jeff Davidson Date: Wed Aug 24 17:19:11 2011 -0700 Add HLS streaming tests to ICS CTS. Change-Id: Ib993521231a60d277f4cf8dbd2eb4261370682c2 commit 39ee2c14b9a8ce79e6a3f32f72114d50e39d8a99 Merge: c6ee615 c99805c Author: Brian Muramatsu Date: Wed Aug 24 14:00:27 2011 -0700 Merge remote branch 'goog/gingerbread' into honeycomb commit d877b88f63019863b592067d3e810f6ca73f8032 Merge: 0cfb568 be3f714 Author: Jeff Davidson Date: Wed Aug 24 13:17:48 2011 -0700 am be3f7148: am 23f944dd: am c99805c4: Merge "Fix presentation sizes for CTS video assets." into gingerbread * commit 'be3f7148ff2f898e123eb125d5403abaaed733af': Fix presentation sizes for CTS video assets. commit be3f7148ff2f898e123eb125d5403abaaed733af Merge: 86c27b1 23f944d Author: Jeff Davidson Date: Wed Aug 24 13:11:35 2011 -0700 am 23f944dd: am c99805c4: Merge "Fix presentation sizes for CTS video assets." into gingerbread * commit '23f944ddab383f3f6b094c08c4a0d66c3d99af21': Fix presentation sizes for CTS video assets. commit 23f944ddab383f3f6b094c08c4a0d66c3d99af21 Merge: bffab5c c99805c Author: Jeff Davidson Date: Wed Aug 24 13:07:21 2011 -0700 am c99805c4: Merge "Fix presentation sizes for CTS video assets." into gingerbread * commit 'c99805c4b3d1b0f2f24a2c69a3f2d440358d3446': Fix presentation sizes for CTS video assets. commit c99805c4b3d1b0f2f24a2c69a3f2d440358d3446 Merge: 63cbe37 ac39143 Author: Jeff Davidson Date: Wed Aug 24 12:50:23 2011 -0700 Merge "Fix presentation sizes for CTS video assets." into gingerbread commit ac39143135098aac47659fbcbca1b7195d82351a Author: Jeff Davidson Date: Wed Aug 24 11:26:12 2011 -0700 Fix presentation sizes for CTS video assets. There appears to be a bug in ffmpeg that sets the presentation size for the video (a header field that specifies the size of the frame that the window should be presented in) based on the original video's aspect ratio, ignoring -cropleft and -cropright which change the aspect ratio. So, this tweaks the presentation sizes to match the video content, allowing this test to pass no matter how the size is calculated. Commands run: for file in `ls *176x144*`; do xxd $file | sed 's/00000e0:\([0-9 ]*\)0100 0000/00000e0:\100b0 0000/' | xxd -r > $file.tmp && mv $file.tmp $file; done for file in `ls *480x360*`; do xxd $file | sed 's/00000f0: 0280 0000/00000f0: 01E0 0000/' | xxd -r > $file.tmp && mv $file.tmp $file; done Bug: 5197374 Change-Id: Ibfaa47f5123bfc9e0a5bafbeec5bbaa61326f2f8 commit c6ee61599563866822f3f46d9d56256121588999 Merge: 396df3e 63cbe37 Author: Brian Muramatsu Date: Wed Aug 24 11:15:08 2011 -0700 Merge remote branch 'goog/gingerbread' into manualmerge Conflicts: apps/CtsVerifier/AndroidManifest.xml tests/tests/media/src/android/media/cts/AudioManagerTest.java tools/host/src/com/android/cts/Version.java Change-Id: I3ab7d4bc883e3ed6dd853401d9537e3e0ff58f1c commit 0cfb5684345b98714571a2a7394c5839f3fb9602 Merge: 3076e74 c4275d8 Author: Brett Chabot Date: Wed Aug 24 09:26:44 2011 -0700 Merge "Update to new buildinfo api." commit c4275d86686dbd836a186a79d4d27fafc2fdb010 Author: Brett Chabot Date: Wed Aug 24 09:17:29 2011 -0700 Update to new buildinfo api. Change-Id: I06a592989590e18855e36eabbe14398684de0cf0 commit 3076e74dacbe254bb050bf28a1bf0f8e192f55f0 Merge: f552086 86c27b1 Author: Brian Muramatsu Date: Tue Aug 23 19:37:24 2011 -0700 resolved conflicts for merge of 86c27b16 to master Change-Id: Ie4d5d50c98215c5e423e38722ef3edce1ef2bc4d commit f55208671c5585dc5c8bcc7b99b3ccfcdd0b0774 Merge: 9a91652 892899d Author: Brian Muramatsu Date: Tue Aug 23 19:29:06 2011 -0700 Merge "Fix for ContactsContract_PhotoTest" commit 86c27b16f361ede3a05ea9b5671f6c092196f5e0 Merge: 21fbc12 bffab5c Author: Brian Muramatsu Date: Tue Aug 23 18:36:43 2011 -0700 am bffab5cd: am 63cbe37d: Merge "Fix for P R O G U A R D Issues" into gingerbread * commit 'bffab5cd06317a0b01faebd1e6b548a83670d44f': Fix for P R O G U A R D Issues commit bffab5cd06317a0b01faebd1e6b548a83670d44f Merge: 1bc4bb8 63cbe37 Author: Brian Muramatsu Date: Tue Aug 23 18:35:35 2011 -0700 am 63cbe37d: Merge "Fix for P R O G U A R D Issues" into gingerbread * commit '63cbe37d537f5ba030b4a495f8b08b457ba7ffa5': Fix for P R O G U A R D Issues commit 9a916526e9fd7c94b78849eccd9203f59eb4b8e1 Merge: 57a684e 21fbc12 Author: Jeff Davidson Date: Tue Aug 23 18:27:08 2011 -0700 am 21fbc127: am 1bc4bb82: am 1fb40650: Merge "Fix expected RTSP stream sizes." into gingerbread * commit '21fbc127f2a52ab525787065cffabac73d67979f': Fix expected RTSP stream sizes. commit 21fbc127f2a52ab525787065cffabac73d67979f Merge: 193e7e0 1bc4bb8 Author: Jeff Davidson Date: Tue Aug 23 18:24:53 2011 -0700 am 1bc4bb82: am 1fb40650: Merge "Fix expected RTSP stream sizes." into gingerbread * commit '1bc4bb8229c9dbd2279964cf510c92a35ed6fe15': Fix expected RTSP stream sizes. commit 63cbe37d537f5ba030b4a495f8b08b457ba7ffa5 Merge: 1fb4065 9d3a257 Author: Brian Muramatsu Date: Tue Aug 23 18:24:22 2011 -0700 Merge "Fix for P R O G U A R D Issues" into gingerbread commit 1bc4bb8229c9dbd2279964cf510c92a35ed6fe15 Merge: 606665e 1fb4065 Author: Jeff Davidson Date: Tue Aug 23 18:22:47 2011 -0700 am 1fb40650: Merge "Fix expected RTSP stream sizes." into gingerbread * commit '1fb40650cd530bc06c590c2fd1f8688f2d15d628': Fix expected RTSP stream sizes. commit 1fb40650cd530bc06c590c2fd1f8688f2d15d628 Merge: 2995b7b f33f536 Author: Jeff Davidson Date: Tue Aug 23 18:19:38 2011 -0700 Merge "Fix expected RTSP stream sizes." into gingerbread commit f33f5361ffdf5d4644e0a2f15395af0872df0901 Author: Jeff Davidson Date: Tue Aug 23 18:14:33 2011 -0700 Fix expected RTSP stream sizes. Change-Id: Ifa5097b32875ec2d0ae69e2cd1f0e7082783f545 commit 9d3a2577469f9c23c72fbadd7d9024e5d41e7e08 Author: Brian Muramatsu Date: Tue Aug 23 17:12:51 2011 -0700 Fix for P R O G U A R D Issues Bug 5187314 The SUID file scanner didn't work on userdebug or user builds where P R O G U A R D was enabled. Add some flags to make sure P R O G U A R D doesn't remove fields filled in by the native code and make sure the native methods are preserved. Change-Id: Ife1bd813c2f07aff606654e3c777e6b399ce2210 commit 396df3e708160c5bbab9156d708468a2c796daf8 Merge: 4d2136b a220baa Author: Brian Muramatsu Date: Tue Aug 23 16:54:28 2011 -0700 Merge "Add delay to webview loadUrl for complete loading" into honeycomb commit a220baaa24d8bcc68d7cdca91a75f182850e12f5 Author: pnath Date: Tue Aug 23 16:06:29 2011 -0700 Add delay to webview loadUrl for complete loading WebView loadUrl method needs some delay for complete loading. Sometimes NullPointerException gets thrown if url does not get loaded completely. Change-Id: I29c7df9a5bd52353c106d62cab8c1c2f4a69d80d commit 57a684e9e837b0d67624bb7b54542d641200597c Merge: ce493c0 193e7e0 Author: Brian Muramatsu Date: Tue Aug 23 16:31:26 2011 -0700 am 193e7e0a: am 606665e2: am 2995b7b8: Merge "Fix Build" into gingerbread * commit '193e7e0a1273db558901620044761cdd7d1882cc': Fix Build commit 193e7e0a1273db558901620044761cdd7d1882cc Merge: 1c4e69f 606665e Author: Brian Muramatsu Date: Tue Aug 23 16:30:25 2011 -0700 am 606665e2: am 2995b7b8: Merge "Fix Build" into gingerbread * commit '606665e23d63a024c41324646458eb8a9cc639cc': Fix Build commit 606665e23d63a024c41324646458eb8a9cc639cc Merge: 5eaacf6 2995b7b Author: Brian Muramatsu Date: Tue Aug 23 16:28:41 2011 -0700 am 2995b7b8: Merge "Fix Build" into gingerbread * commit '2995b7b85266dec01e8fb977b9d30dda3a45bca7': Fix Build commit ce493c0349aa57571f6c9d4f4c88451508b8f16f Merge: f934fc0 1c4e69f Author: Brian Muramatsu Date: Tue Aug 23 16:19:25 2011 -0700 am 1c4e69f9: am 5eaacf66: (-s ours) am 9cf59510: Merge "CTS Version 2.3 R6" into gingerbread * commit '1c4e69f991d02244b261977a1ea1f028fa9dedd4': CTS Version 2.3 R6 commit 1c4e69f991d02244b261977a1ea1f028fa9dedd4 Merge: 42d90de 5eaacf6 Author: Brian Muramatsu Date: Tue Aug 23 16:17:29 2011 -0700 am 5eaacf66: (-s ours) am 9cf59510: Merge "CTS Version 2.3 R6" into gingerbread * commit '5eaacf660064cec02cbf07f3b6d6597c9b8f9c45': CTS Version 2.3 R6 commit 2995b7b85266dec01e8fb977b9d30dda3a45bca7 Merge: 9cf5951 d675edf Author: Brian Muramatsu Date: Tue Aug 23 16:14:54 2011 -0700 Merge "Fix Build" into gingerbread commit d675edf708eac3c25ba71088c5354978ac171e25 Author: Brian Muramatsu Date: Tue Aug 23 16:14:23 2011 -0700 Fix Build Change-Id: Id3a0c14accd6732a9a6b96683246c7878f2b6b3b commit f934fc02c4873047e29166df4193debcf905eef1 Merge: 3c6d391 42d90de Author: Jeff Davidson Date: Tue Aug 23 16:01:16 2011 -0700 am 42d90de1: am 0465d4fb: am 455358bb: Merge "Enable RTSP tests." into gingerbread * commit '42d90de13142322ff4087188e5ed4514c313dee0': Enable RTSP tests. commit 892899d0e184e9d0c960e07a387ad8485de29ca5 Author: Brian Muramatsu Date: Tue Aug 23 16:01:06 2011 -0700 Fix for ContactsContract_PhotoTest Bug 5039365 Use a real photo so that the provider will create a row. Change the test builder's load method to return null rather than failing since we want to check that no row is inserted when a blank image is attempted to be put in. Change-Id: I0c05dc9c3ac5d1703f253dff7728c640b1c91e88 commit 42d90de13142322ff4087188e5ed4514c313dee0 Merge: e252693 0465d4f Author: Jeff Davidson Date: Tue Aug 23 15:58:33 2011 -0700 am 0465d4fb: am 455358bb: Merge "Enable RTSP tests." into gingerbread * commit '0465d4fbd20a8d216cc903ea997b04e69e3bb3e3': Enable RTSP tests. commit 5eaacf660064cec02cbf07f3b6d6597c9b8f9c45 Merge: 0465d4f 9cf5951 Author: Brian Muramatsu Date: Tue Aug 23 15:56:32 2011 -0700 am 9cf59510: Merge "CTS Version 2.3 R6" into gingerbread * commit '9cf59510e8219d320cfbc9ffea2fdf50a9c00e9a': CTS Version 2.3 R6 commit 0465d4fbd20a8d216cc903ea997b04e69e3bb3e3 Merge: 08969fd 455358b Author: Jeff Davidson Date: Tue Aug 23 15:56:30 2011 -0700 am 455358bb: Merge "Enable RTSP tests." into gingerbread * commit '455358bb2fb14ffb7ee82a9be78061ac15123c39': Enable RTSP tests. commit 9cf59510e8219d320cfbc9ffea2fdf50a9c00e9a Merge: 455358b 38d4778 Author: Brian Muramatsu Date: Tue Aug 23 15:33:15 2011 -0700 Merge "CTS Version 2.3 R6" into gingerbread commit 38d47782e9c5a5b47aab39bbd04acb1f83349a28 Author: Brian Muramatsu Date: Tue Aug 23 15:29:35 2011 -0700 CTS Version 2.3 R6 Change-Id: I4913f6f6f4a3382da52676b4476f1fc93486a1d0 commit 455358bb2fb14ffb7ee82a9be78061ac15123c39 Merge: cbf8793 a32dba6 Author: Jeff Davidson Date: Tue Aug 23 15:20:42 2011 -0700 Merge "Enable RTSP tests." into gingerbread commit a32dba6ff06b95c0eb0bd9f1b36a9b378c2e16e3 Author: Jeff Davidson Date: Tue Aug 23 15:17:59 2011 -0700 Enable RTSP tests. Change-Id: Ibe9c49225d9418300fa098a2750571b1a5300e94 commit 3c6d39145d31a83cb8be3c87b98b29556888ce44 Merge: 913a7ed e252693 Author: Brian Muramatsu Date: Tue Aug 23 14:15:24 2011 -0700 am e2526935: am 08969fdb: am cbf87939: Merge "ArrayTestListAdapter Class" into gingerbread * commit 'e252693571992507203cc84c228703d0c20f2bd9': ArrayTestListAdapter Class commit e252693571992507203cc84c228703d0c20f2bd9 Merge: 4b02fdf 08969fd Author: Brian Muramatsu Date: Tue Aug 23 14:13:24 2011 -0700 am 08969fdb: am cbf87939: Merge "ArrayTestListAdapter Class" into gingerbread * commit '08969fdb9c66a24ac4bf4d16d80c694b61241a93': ArrayTestListAdapter Class commit 08969fdb9c66a24ac4bf4d16d80c694b61241a93 Merge: deee76c cbf8793 Author: Brian Muramatsu Date: Tue Aug 23 14:11:36 2011 -0700 am cbf87939: Merge "ArrayTestListAdapter Class" into gingerbread * commit 'cbf87939576ea5849cbba44e793dfe312af076f1': ArrayTestListAdapter Class commit 913a7ed63bd35e3bc5384ec50bc854a8af92fd10 Merge: 2b1c549 4b02fdf Author: Brian Muramatsu Date: Tue Aug 23 14:04:24 2011 -0700 am 4b02fdf8: am deee76ce: am de6ee5ce: Merge "Test for AudioRecord#getMinBufferSize" into gingerbread * commit '4b02fdf898b91f171634fe03de25fba58a6caafb': Test for AudioRecord#getMinBufferSize commit 4b02fdf898b91f171634fe03de25fba58a6caafb Merge: 38b854e deee76c Author: Brian Muramatsu Date: Tue Aug 23 14:01:35 2011 -0700 am deee76ce: am de6ee5ce: Merge "Test for AudioRecord#getMinBufferSize" into gingerbread * commit 'deee76cef31a66a388805fce5c994b74e0158206': Test for AudioRecord#getMinBufferSize commit deee76cef31a66a388805fce5c994b74e0158206 Merge: e43f83e de6ee5c Author: Brian Muramatsu Date: Tue Aug 23 13:59:51 2011 -0700 am de6ee5ce: Merge "Test for AudioRecord#getMinBufferSize" into gingerbread * commit 'de6ee5ce2b5983ed64dbf6faa6de648828e5172e': Test for AudioRecord#getMinBufferSize commit cbf87939576ea5849cbba44e793dfe312af076f1 Merge: de6ee5c dae1e18 Author: Brian Muramatsu Date: Tue Aug 23 13:58:46 2011 -0700 Merge "ArrayTestListAdapter Class" into gingerbread commit de6ee5ce2b5983ed64dbf6faa6de648828e5172e Merge: 06f3009 7d4d594 Author: Brian Muramatsu Date: Tue Aug 23 13:43:17 2011 -0700 Merge "Test for AudioRecord#getMinBufferSize" into gingerbread commit 7d4d5945a42618edda2a7be0356ad975647f7660 Author: Brian Muramatsu Date: Mon Aug 22 10:52:31 2011 -0700 Test for AudioRecord#getMinBufferSize Bug 5067912 Call AudioRecord#getMinBufferSize with 16-bit PCM encoding and sample rates of 8000, 11025, 16000, and 44100. Start recording and call read once. Change-Id: I08b4fe04d6513fdce6f165b92d4caeebf2c54c2b commit dae1e185d40bf8ddb7840b114be63402d4dee09c Author: Brian Muramatsu Date: Tue Aug 23 13:20:43 2011 -0700 ArrayTestListAdapter Class I wanted to do what StreamingVideoActivity was doing with TestListAdapter where it customized what rows were being returned by overriding getRows. So I moved code in TestListAdapter that scanned the AndroidManifest to its own class called ManifestTestListAdapter. I then extracted ArrayTestListAdapter from StreamingVideoActivity, so you can call add(TestListItem) to build up a list of tests. Change-Id: If3d2bacc52e19f326467a36ab55aa52c49f765cc commit 2b1c5491c5ba68d1d7a1cfa12f0cb56421fc6ca1 Merge: 1f59423 38b854e Author: Jeff Davidson Date: Tue Aug 23 10:49:12 2011 -0700 resolved conflicts for merge of 38b854e6 to master Change-Id: Ib1d24f3004da13a48dcec8c8044b62d4e0cf6ec7 commit 1f59423083eb4e48e3e53a7f06ed5f3bc81a2912 Merge: 8c5f215 74adc05 Author: Brian Muramatsu Date: Tue Aug 23 10:38:08 2011 -0700 Merge "Fix for TabHost_TabSpecTest" commit 38b854e666dccada9da88c7f943375c370cbdc15 Merge: 07c67eb e43f83e Author: Jeff Davidson Date: Tue Aug 23 10:36:00 2011 -0700 am e43f83ec: am 06f3009e: Merge "Add HTTP/RTSP streaming tests to CtsVerifier." into gingerbread * commit 'e43f83ec66b2b78149b11f403670a48aaeedf856': Add HTTP/RTSP streaming tests to CtsVerifier. commit e43f83ec66b2b78149b11f403670a48aaeedf856 Merge: 2b755c5 06f3009 Author: Jeff Davidson Date: Tue Aug 23 10:32:24 2011 -0700 am 06f3009e: Merge "Add HTTP/RTSP streaming tests to CtsVerifier." into gingerbread * commit '06f3009e6c59adbbe914729293771946ecd9b857': Add HTTP/RTSP streaming tests to CtsVerifier. commit 06f3009e6c59adbbe914729293771946ecd9b857 Merge: d7c6d9d 112f279 Author: Jeff Davidson Date: Tue Aug 23 10:26:37 2011 -0700 Merge "Add HTTP/RTSP streaming tests to CtsVerifier." into gingerbread commit 8c5f2151edf04f8bfa3c2b6e28659a6e69a22387 Merge: bba09fd 07c67eb Author: Jeff Davidson Date: Mon Aug 22 20:12:03 2011 -0700 am 07c67ebd: am 2b755c50: am d7c6d9dc: Merge "Add basic HTTP and RTSP streaming tests to CTS." into gingerbread * commit '07c67ebdd10440e37fa2b971eea3839db3415b51': Add basic HTTP and RTSP streaming tests to CTS. commit 07c67ebdd10440e37fa2b971eea3839db3415b51 Merge: f573ac0 2b755c5 Author: Jeff Davidson Date: Mon Aug 22 20:08:10 2011 -0700 am 2b755c50: am d7c6d9dc: Merge "Add basic HTTP and RTSP streaming tests to CTS." into gingerbread * commit '2b755c50129e08f1f8dbe996d9cd49189eb28bc2': Add basic HTTP and RTSP streaming tests to CTS. commit 112f2791282c56f72be28aba8452609da03b09bc Author: Jeff Davidson Date: Mon Aug 22 09:46:46 2011 -0700 Add HTTP/RTSP streaming tests to CtsVerifier. RTSP tests are temporarily disabled while network issues are worked out. Also, this refactors the class hierarchy (in particular, for test Activities) to remove some duplicated code, and introduces the concept of a Test ID appended to the class name instead of merely using the class name, allowing us to use the same class for multiple tests. Change-Id: I0a9feedaa92c23f1bf366ca16ccae672ad7e783f commit 2b755c50129e08f1f8dbe996d9cd49189eb28bc2 Merge: 0602112 d7c6d9d Author: Jeff Davidson Date: Mon Aug 22 20:06:13 2011 -0700 am d7c6d9dc: Merge "Add basic HTTP and RTSP streaming tests to CTS." into gingerbread * commit 'd7c6d9dcafb00b897a96e5ca7bc2f193ea8a3d39': Add basic HTTP and RTSP streaming tests to CTS. commit d7c6d9dcafb00b897a96e5ca7bc2f193ea8a3d39 Merge: bc934fd 42ddd86 Author: Jeff Davidson Date: Mon Aug 22 19:57:44 2011 -0700 Merge "Add basic HTTP and RTSP streaming tests to CTS." into gingerbread commit 74adc05436908125a9ead1da7be8ed0bda0d1df6 Author: Brian Muramatsu Date: Mon Aug 22 15:57:07 2011 -0700 Fix for TabHost_TabSpecTest Bug 5198068 New design only shows the icon when no TextView label is present. Change-Id: Ie70a9690e985443b64281a8db673d6155dedecea commit bba09fd76d94f90464c3fac197ce3c63da8faadd Merge: 7913616 f573ac0 Author: Brian Muramatsu Date: Mon Aug 22 11:35:56 2011 -0700 am f573ac0e: am 06021120: am bc934fd5: Merge "Remove test cases for the comparison with a binary asset" into gingerbread * commit 'f573ac0ecf146f230d96d487eef4721bb5b4ff33': Remove test cases for the comparison with a binary asset commit f573ac0ecf146f230d96d487eef4721bb5b4ff33 Merge: 4ccaaea 0602112 Author: Brian Muramatsu Date: Mon Aug 22 11:29:45 2011 -0700 am 06021120: am bc934fd5: Merge "Remove test cases for the comparison with a binary asset" into gingerbread * commit '0602112069e3280d74dd846655e5dfbf7c85531b': Remove test cases for the comparison with a binary asset commit 0602112069e3280d74dd846655e5dfbf7c85531b Merge: 4ef44d6 bc934fd Author: Brian Muramatsu Date: Mon Aug 22 11:28:03 2011 -0700 am bc934fd5: Merge "Remove test cases for the comparison with a binary asset" into gingerbread * commit 'bc934fd55f486e6b1386b4eabdef5699d0e3a714': Remove test cases for the comparison with a binary asset commit bc934fd55f486e6b1386b4eabdef5699d0e3a714 Merge: c286c6a b930b83 Author: Brian Muramatsu Date: Mon Aug 22 11:16:54 2011 -0700 Merge "Remove test cases for the comparison with a binary asset" into gingerbread commit 42ddd86a297a6a7035d09b4540b7f5acf4fdb293 Author: Jeff Davidson Date: Wed Aug 17 16:30:13 2011 -0700 Add basic HTTP and RTSP streaming tests to CTS. Reviewers from Media team: Most of the work for this was done in previous CLs - you'll probably want to look at the functions that actually do the work of playing the video to make sure they're okay. Change-Id: Ia8d9cbc23ddacef2ba2cf862377033ecca7e1260 commit b930b836e99a09ae8a72fb7337085b3329916b31 Author: Masanori Ogino Date: Mon Aug 22 16:19:18 2011 +0900 Remove test cases for the comparison with a binary asset These comparisons will cause to fail on a device has fonts configured without hinting. So could you please remove them. About this issue, I heard from Norio Nasu that he has already discussed with Kisihmoto-san. Change-Id: Ic652411695b864e82b78b064efead5954c5f8843 commit 7913616f4a8d5dde262b55763951750f65b5b6a8 Merge: 651dbf6 6fbbe16 Author: Jeff Davidson Date: Fri Aug 19 14:57:50 2011 -0700 Merge "Re-add test for replacing surface during video playback." commit 651dbf698865eee935e290f9b466953bf56269bd Merge: e69178c 4ccaaea Author: Brian Muramatsu Date: Fri Aug 19 13:50:58 2011 -0700 am 4ccaaea7: am 4ef44d6f: (-s ours) am c286c6ab: Merge "add a possible volume behavior. Some device will be silent mode after the first volume up from vibrate mode.(removed tab)" into gingerbread * commit '4ccaaea70836a9c2bc1e38d5ce1ce5af19958b29': add a possible volume behavior. Some device will be silent mode after the first volume up from vibrate mode.(removed tab) commit 4ccaaea70836a9c2bc1e38d5ce1ce5af19958b29 Merge: db0006e 4ef44d6 Author: Brian Muramatsu Date: Fri Aug 19 13:45:33 2011 -0700 am 4ef44d6f: (-s ours) am c286c6ab: Merge "add a possible volume behavior. Some device will be silent mode after the first volume up from vibrate mode.(removed tab)" into gingerbread * commit '4ef44d6fc35c151dcf3ead0fff1018200bb9b836': add a possible volume behavior. Some device will be silent mode after the first volume up from vibrate mode.(removed tab) commit 6fbbe16e2cf82518b3e251d74bd5763f6007da9b Author: Jeff Davidson Date: Fri Aug 19 12:31:50 2011 -0700 Re-add test for replacing surface during video playback. Bug: 5189863 Change-Id: Ie2ddd90d5a6469bf7320b9585a38a9c48c1846d2 commit 4ef44d6fc35c151dcf3ead0fff1018200bb9b836 Merge: a1ca8d8 c286c6a Author: Brian Muramatsu Date: Fri Aug 19 11:53:35 2011 -0700 am c286c6ab: Merge "add a possible volume behavior. Some device will be silent mode after the first volume up from vibrate mode.(removed tab)" into gingerbread * commit 'c286c6ab6d9bc0ef787a079440200eedaf98706d': add a possible volume behavior. Some device will be silent mode after the first volume up from vibrate mode.(removed tab) commit c286c6ab6d9bc0ef787a079440200eedaf98706d Merge: 8fee3e8 846df58 Author: Brian Muramatsu Date: Fri Aug 19 11:37:39 2011 -0700 Merge "add a possible volume behavior. Some device will be silent mode after the first volume up from vibrate mode.(removed tab)" into gingerbread commit e69178c298f7aaeef6af2f9ced181fab84fa25a1 Merge: dac37bb 3670c36 Author: Andy McFadden Date: Fri Aug 19 09:40:26 2011 -0700 Merge "EventsEntity iterator test" commit 846df5849873107868e6c4d06182c0d3e3cdea60 Author: sam_chiu Date: Fri May 20 17:58:37 2011 +0800 add a possible volume behavior. Some device will be silent mode after the first volume up from vibrate mode.(removed tab) Change-Id: Ibf8c323a160ca1e3f2611c0b746976ac9b1942e7 commit 4d2136b6d4ab29c6368f4bb622f079c55a629345 Merge: 79b6de4 4bb3a07 Author: Brian Muramatsu Date: Thu Aug 18 17:59:19 2011 -0700 Merge "Add Tests for ClipboardManager" into honeycomb commit 3670c3621110aeb1cddf6f6785752cedbdeab2d0 Author: Andy McFadden Date: Thu Aug 18 16:42:05 2011 -0700 EventsEntity iterator test This adds an EventsEntity iterator test, ported over from the CalendarProvider2 testEntityQuery test, and a new CalendarEntity test. Bug 5086664 Change-Id: Ic6a7c08867420b1294a8c998df05e994ab10421e commit dac37bb4760fdb27c6966139fe067430dffbd73f Merge: 6467e12 db0006e Author: Brian Muramatsu Date: Thu Aug 18 13:01:56 2011 -0700 am db0006e7: am a1ca8d8c: am 8fee3e84: Merge "Backup Unit Tests" into gingerbread * commit 'db0006e710b70cdecc4bda4486f49986a5d49c77': Backup Unit Tests commit db0006e710b70cdecc4bda4486f49986a5d49c77 Merge: c273a6d a1ca8d8 Author: Brian Muramatsu Date: Thu Aug 18 12:59:22 2011 -0700 am a1ca8d8c: am 8fee3e84: Merge "Backup Unit Tests" into gingerbread * commit 'a1ca8d8ce46090f74c06ff8755c66076606edc58': Backup Unit Tests commit a1ca8d8ce46090f74c06ff8755c66076606edc58 Merge: 47935f6 8fee3e8 Author: Brian Muramatsu Date: Thu Aug 18 12:57:49 2011 -0700 am 8fee3e84: Merge "Backup Unit Tests" into gingerbread * commit '8fee3e84beb7785993b47e9a3ca8700224179c18': Backup Unit Tests commit 8fee3e84beb7785993b47e9a3ca8700224179c18 Merge: 655fedb b7c201b Author: Brian Muramatsu Date: Thu Aug 18 12:45:02 2011 -0700 Merge "Backup Unit Tests" into gingerbread commit 8f338e1fb029703e3d5b577bd89de7c5d92bafca Merge: cdd476a 18e1ac9 Author: Brian Muramatsu Date: Thu Aug 18 11:09:00 2011 -0700 Merge "Allow Build Version 3.2.2" into honeycomb-mr2 commit 18e1ac971afc0226a56983b77c678ee16976e024 Author: Brian Muramatsu Date: Thu Aug 18 11:02:45 2011 -0700 Allow Build Version 3.2.2 Bug 5183931 Change-Id: Ic1632b82752bfbece9f5a3e0a21c4bddb4527965 commit 6467e126630dfbae7a04f0c4122851f6be458a5f Merge: 33abf62 8f6f8e8 Author: Andy McFadden Date: Thu Aug 18 10:03:39 2011 -0700 Merge "Add EMMA-coverage runner for Calendar provider" commit cdd476a329bc28e3f04e4cc7bf5a9b95029a954c Merge: a0f4f76 9fc7097 Author: Brian Muramatsu Date: Wed Aug 17 18:25:28 2011 -0700 Merge "Fix for ConnectivityManagerTest" into honeycomb-mr2 commit 8f6f8e8e98d04fa54b3e5d80b554152a66e7eed9 Author: Andy McFadden Date: Wed Aug 17 16:26:47 2011 -0700 Add EMMA-coverage runner for Calendar provider To get EMMA test coverage information for the Calendar provider CTS test, we need a way to tell the provider to dump its coverage state when the CTS test finishes. To that end, we define an alternate instrumentation test runner that issues special provider queries at the start and end of the testrun. Bug 2361048 Change-Id: I9130506366a194626eddd98eaccac5e1fc85b471 commit 33abf6247e8e6a2f2f50c90c1278accd76a1830b Merge: 56ce0bb c273a6d Author: Brian Muramatsu Date: Wed Aug 17 17:03:58 2011 -0700 resolved conflicts for merge of c273a6d6 to master Change-Id: I408f368231213158f88ff4baa8de31e9a398f852 commit c273a6d60d4ed5690f30f225dd486bb2d31e9b3e Merge: b775953 47935f6 Author: Brian Muramatsu Date: Wed Aug 17 16:57:20 2011 -0700 am 47935f6a: am 655fedbf: Merge "Check Only Settings Intent" into gingerbread * commit '47935f6a61f9c1309cb89608801531275ad846b3': Check Only Settings Intent commit 47935f6a61f9c1309cb89608801531275ad846b3 Merge: 9652870 655fedb Author: Brian Muramatsu Date: Wed Aug 17 16:55:24 2011 -0700 am 655fedbf: Merge "Check Only Settings Intent" into gingerbread * commit '655fedbfd5387cb749fa32e3b41e867fe903304d': Check Only Settings Intent commit 655fedbfd5387cb749fa32e3b41e867fe903304d Merge: 0c80417 a7e18a2 Author: Brian Muramatsu Date: Wed Aug 17 16:41:00 2011 -0700 Merge "Check Only Settings Intent" into gingerbread commit a7e18a272b71f140547381a08a22e25f375efe98 Author: Brian Muramatsu Date: Wed Aug 17 14:48:12 2011 -0700 Check Only Settings Intent Remove the checks on other intents since the JavaDocs say they are optional. However, keep the check for Settings intent. Change-Id: Ibe0b801398883f9bf34de97566964e6b30597820 commit 56ce0bb8441d3bbdbf134d962f38ecb1e10b338c Merge: 666ddab b775953 Author: Jeff Davidson Date: Wed Aug 17 16:19:48 2011 -0700 am b7759530: am 9652870a: am 0c804176: Merge "Add local video tests." into gingerbread * commit 'b7759530e3bbec85e5a9cf1e7e0ff75656290b55': Add local video tests. commit b7759530e3bbec85e5a9cf1e7e0ff75656290b55 Merge: c102ad9 9652870 Author: Jeff Davidson Date: Wed Aug 17 16:16:31 2011 -0700 am 9652870a: am 0c804176: Merge "Add local video tests." into gingerbread * commit '9652870abb8917070724643831d40762cb8557ff': Add local video tests. commit 9fc70979f85a68de463a5f51750ba3aae4a8c1fe Author: Brian Muramatsu Date: Wed Aug 17 14:16:48 2011 -0700 Fix for ConnectivityManagerTest Bug 5178134 Some network types can throw SecurityExceptions and depend on the build configuration. Don't fail the test if those throw exceptions. Change-Id: I5365f85280a348ef1777d05ce50b2dff17a1312f commit 9652870abb8917070724643831d40762cb8557ff Merge: c272086 0c80417 Author: Jeff Davidson Date: Wed Aug 17 16:13:48 2011 -0700 am 0c804176: Merge "Add local video tests." into gingerbread * commit '0c804176bad4a4a25e7d885abb76ddda67ffe4f0': Add local video tests. commit 0c804176bad4a4a25e7d885abb76ddda67ffe4f0 Merge: 8672abd bae7843 Author: Jeff Davidson Date: Wed Aug 17 16:03:26 2011 -0700 Merge "Add local video tests." into gingerbread commit 666ddab1d8460d187a52ee0d71e4a2be102e5782 Merge: 0074e77 c102ad9 Author: Brian Muramatsu Date: Wed Aug 17 15:00:37 2011 -0700 am c102ad99: am c2720867: am 8672abdb: Merge "disable test for user dictionary settings" into gingerbread * commit 'c102ad998d9658fd7596b05826aacb8984265892': disable test for user dictionary settings commit c102ad998d9658fd7596b05826aacb8984265892 Merge: 7b6c26d c272086 Author: Brian Muramatsu Date: Wed Aug 17 14:58:40 2011 -0700 am c2720867: am 8672abdb: Merge "disable test for user dictionary settings" into gingerbread * commit 'c2720867511456ce7812c8a6331bb6e307b31e38': disable test for user dictionary settings commit c2720867511456ce7812c8a6331bb6e307b31e38 Merge: 047b695 8672abd Author: Brian Muramatsu Date: Wed Aug 17 14:57:04 2011 -0700 am 8672abdb: Merge "disable test for user dictionary settings" into gingerbread * commit '8672abdb9fd1bc9b3e4795567cb502422a24e503': disable test for user dictionary settings commit 8672abdb9fd1bc9b3e4795567cb502422a24e503 Merge: cf19e60 270ba16 Author: Brian Muramatsu Date: Wed Aug 17 14:40:26 2011 -0700 Merge "disable test for user dictionary settings" into gingerbread commit bae7843b6073feb1b18763d2b9ed7e08288decc3 Author: Jeff Davidson Date: Wed Aug 17 12:31:13 2011 -0700 Add local video tests. Also, clean up playVideoTest - removes seemingly unnecessary signal handling logic, and fixes check to onVideoSizeChangedCalled, as the size was being changed before our call to wait(), leading us to wait until a 60 second timeout was reached before proceeding with the test. Change-Id: Ie4c42e8d66c13ac434b734f0a079620a1381c1b0 commit 0074e778678363fb64d3c7f893220f12f9c58227 Merge: 0bb1b3e 7b6c26d Author: Brian Muramatsu Date: Wed Aug 17 13:54:16 2011 -0700 am 7b6c26db: am 047b695d: (-s ours) am cf19e604: Merge "Avoid 2 fails if no camera on device" into gingerbread * commit '7b6c26db58fed76e373a141d2cb34739c0b505e9': Avoid 2 fails if no camera on device commit 7b6c26db58fed76e373a141d2cb34739c0b505e9 Merge: 31ef52f 047b695 Author: Brian Muramatsu Date: Wed Aug 17 13:50:51 2011 -0700 am 047b695d: (-s ours) am cf19e604: Merge "Avoid 2 fails if no camera on device" into gingerbread * commit '047b695dcfce90fea1c9cc3b88800a7e1c6cf449': Avoid 2 fails if no camera on device commit 047b695dcfce90fea1c9cc3b88800a7e1c6cf449 Merge: 5cc8974 cf19e60 Author: Brian Muramatsu Date: Wed Aug 17 12:42:30 2011 -0700 am cf19e604: Merge "Avoid 2 fails if no camera on device" into gingerbread * commit 'cf19e6043551f36681795cd73e0d0317bbe90137': Avoid 2 fails if no camera on device commit 0bb1b3e79897d7cd816d24e5ef3712350d5a0c96 Merge: f9117a9 31ef52f Author: Brian Muramatsu Date: Wed Aug 17 12:32:28 2011 -0700 am 31ef52f6: am 5cc89744: am d8cd704c: Merge "Needs more columns for large screen device" into gingerbread * commit '31ef52f6d3db227853043727886580cfe0e146ca': Needs more columns for large screen device commit f9117a9e75eb3183d8ab3872576d6e2f40741dbb Merge: 3fc4ffb 95b1cc8 Author: Brian Muramatsu Date: Wed Aug 17 12:32:26 2011 -0700 am 95b1cc8d: am 4732bcf2: am f3293490: Merge "Update list of Korea network operator." into gingerbread * commit '95b1cc8de1423b21032c2579f7bfa6d22dbff417': Update list of Korea network operator. commit 31ef52f6d3db227853043727886580cfe0e146ca Merge: 95b1cc8 5cc8974 Author: Brian Muramatsu Date: Wed Aug 17 12:31:22 2011 -0700 am 5cc89744: am d8cd704c: Merge "Needs more columns for large screen device" into gingerbread * commit '5cc89744379407ee8103173b808b17f623280f7b': Needs more columns for large screen device commit 95b1cc8de1423b21032c2579f7bfa6d22dbff417 Merge: aedc5a6 4732bcf Author: Brian Muramatsu Date: Wed Aug 17 12:31:20 2011 -0700 am 4732bcf2: am f3293490: Merge "Update list of Korea network operator." into gingerbread * commit '4732bcf2984a1a72031605e35f39eeaa027d2858': Update list of Korea network operator. commit 3fc4ffb3e76135e18ab134d3a82511fdf5cc927d Merge: e5fdf6c aedc5a6 Author: Brian Muramatsu Date: Wed Aug 17 12:30:44 2011 -0700 am aedc5a63: am f3ab5095: am a9adc0d5: Merge "update the NO_DELIVERY_REPORTS list" into gingerbread * commit 'aedc5a63259fb110a9636513c423664e3ad3ce60': update the NO_DELIVERY_REPORTS list commit e5fdf6c37de35272f0f40a1dcbf333acc9ccb73f Merge: 87168fa fd35df1 Author: Brian Muramatsu Date: Wed Aug 17 12:30:42 2011 -0700 am fd35df1e: am 007a789e: am 638a4277: Merge "i have removed the blank line, please review this change\n thank you" into gingerbread * commit 'fd35df1e86d75b06dec1f34b9aab2f3544b2437b': i have removed the blank line, please review this change\n thank you commit 87168fafc0844ab404a838b8c5d8ce27fbb63e54 Merge: 5f7816a a53139a Author: Brian Muramatsu Date: Wed Aug 17 12:30:39 2011 -0700 am a53139a8: am 56e1c142: am 7a2144ce: Merge "CTS: Set default drag fromY point depend on status bar height for android.view.cts.GestureDetectorTest#testOnTouchEvent" into gingerbread * commit 'a53139a83ac66d45ea85b9c807c0bc9e9db3f2af': CTS: Set default drag fromY point depend on status bar height for android.view.cts.GestureDetectorTest#testOnTouchEvent commit 5f7816ae5101dd9043c8d10ecbbd20a583cccad2 Merge: 9e4c43b 7198ce0 Author: Jeff Davidson Date: Wed Aug 17 12:30:36 2011 -0700 am 7198ce08: am 263ec97b: am 28afbe5f: Merge "Add CTS test for setting download destinations in DownloadManager." into gingerbread * commit '7198ce08d10278844aab203a519896bcf1261141': Add CTS test for setting download destinations in DownloadManager. commit 5cc89744379407ee8103173b808b17f623280f7b Merge: 4732bcf d8cd704 Author: Brian Muramatsu Date: Wed Aug 17 12:29:37 2011 -0700 am d8cd704c: Merge "Needs more columns for large screen device" into gingerbread * commit 'd8cd704c7309e4a907ebff3341de171eb7ebb926': Needs more columns for large screen device commit 4732bcf2984a1a72031605e35f39eeaa027d2858 Merge: f3ab509 f329349 Author: Brian Muramatsu Date: Wed Aug 17 12:29:35 2011 -0700 am f3293490: Merge "Update list of Korea network operator." into gingerbread * commit 'f3293490d18d2b3079e148d9c944096a95190655': Update list of Korea network operator. commit 9e4c43b0ed1d7cd2522c222008ad84fcf58152c9 Merge: 4bffd81 2cf803d Author: Jeff Davidson Date: Wed Aug 17 12:27:24 2011 -0700 resolved conflicts for merge of 2cf803de to master Change-Id: I3cda5ecf88894d314204a585fb03a1d441fc97f4 commit cf19e6043551f36681795cd73e0d0317bbe90137 Merge: d8cd704 7e06ff8 Author: Brian Muramatsu Date: Wed Aug 17 12:25:49 2011 -0700 Merge "Avoid 2 fails if no camera on device" into gingerbread commit d8cd704c7309e4a907ebff3341de171eb7ebb926 Merge: f329349 daa9dc6 Author: Brian Muramatsu Date: Wed Aug 17 12:23:01 2011 -0700 Merge "Needs more columns for large screen device" into gingerbread commit aedc5a63259fb110a9636513c423664e3ad3ce60 Merge: fd35df1 f3ab509 Author: Brian Muramatsu Date: Wed Aug 17 12:19:25 2011 -0700 am f3ab5095: am a9adc0d5: Merge "update the NO_DELIVERY_REPORTS list" into gingerbread * commit 'f3ab5095302eb632fa18ed31b841210278cb31de': update the NO_DELIVERY_REPORTS list commit fd35df1e86d75b06dec1f34b9aab2f3544b2437b Merge: a53139a 007a789 Author: Brian Muramatsu Date: Wed Aug 17 12:19:22 2011 -0700 am 007a789e: am 638a4277: Merge "i have removed the blank line, please review this change\n thank you" into gingerbread * commit '007a789effa8afab818f3d7abddb1bfda8982765': i have removed the blank line, please review this change\n thank you commit a53139a83ac66d45ea85b9c807c0bc9e9db3f2af Merge: 7198ce0 56e1c14 Author: Brian Muramatsu Date: Wed Aug 17 12:19:20 2011 -0700 am 56e1c142: am 7a2144ce: Merge "CTS: Set default drag fromY point depend on status bar height for android.view.cts.GestureDetectorTest#testOnTouchEvent" into gingerbread * commit '56e1c1426f8cf18227cf14bfb4a4a2c4197d2e30': CTS: Set default drag fromY point depend on status bar height for android.view.cts.GestureDetectorTest#testOnTouchEvent commit f3293490d18d2b3079e148d9c944096a95190655 Merge: a9adc0d e642755 Author: Brian Muramatsu Date: Wed Aug 17 12:18:35 2011 -0700 Merge "Update list of Korea network operator." into gingerbread commit f3ab5095302eb632fa18ed31b841210278cb31de Merge: 007a789 a9adc0d Author: Brian Muramatsu Date: Wed Aug 17 12:17:49 2011 -0700 am a9adc0d5: Merge "update the NO_DELIVERY_REPORTS list" into gingerbread * commit 'a9adc0d56c980005d410019ba68f14e15b7f402f': update the NO_DELIVERY_REPORTS list commit 007a789effa8afab818f3d7abddb1bfda8982765 Merge: 56e1c14 638a427 Author: Brian Muramatsu Date: Wed Aug 17 12:17:47 2011 -0700 am 638a4277: Merge "i have removed the blank line, please review this change\n thank you" into gingerbread * commit '638a42773272f20308315010c881455624fa2a5e': i have removed the blank line, please review this change\n thank you commit 56e1c1426f8cf18227cf14bfb4a4a2c4197d2e30 Merge: 263ec97 7a2144c Author: Brian Muramatsu Date: Wed Aug 17 12:17:45 2011 -0700 am 7a2144ce: Merge "CTS: Set default drag fromY point depend on status bar height for android.view.cts.GestureDetectorTest#testOnTouchEvent" into gingerbread * commit '7a2144ce24660ccc2eff26ecf31e9b039afac1ca': CTS: Set default drag fromY point depend on status bar height for android.view.cts.GestureDetectorTest#testOnTouchEvent commit e64275550ff17b55cac5daa166d92d7453f688a9 Author: mo2communication Date: Tue Aug 16 17:52:49 2011 +0900 Update list of Korea network operator. Update list of Korea network operator. mo2communication mo2communication@gmail.com Change-Id: I8e3d44236424a7a885f831314c008e63297824ff commit a9adc0d56c980005d410019ba68f14e15b7f402f Merge: 638a427 4cb1ba0 Author: Brian Muramatsu Date: Wed Aug 17 12:13:12 2011 -0700 Merge "update the NO_DELIVERY_REPORTS list" into gingerbread commit 638a42773272f20308315010c881455624fa2a5e Merge: 7a2144c 0333205 Author: Brian Muramatsu Date: Wed Aug 17 12:04:18 2011 -0700 Merge "i have removed the blank line, please review this change\n thank you" into gingerbread commit 7a2144ce24660ccc2eff26ecf31e9b039afac1ca Merge: 28afbe5 6a68f16 Author: Brian Muramatsu Date: Wed Aug 17 12:04:00 2011 -0700 Merge "CTS: Set default drag fromY point depend on status bar height for android.view.cts.GestureDetectorTest#testOnTouchEvent" into gingerbread commit 7198ce08d10278844aab203a519896bcf1261141 Merge: 2cf803d 263ec97 Author: Jeff Davidson Date: Wed Aug 17 11:39:45 2011 -0700 am 263ec97b: am 28afbe5f: Merge "Add CTS test for setting download destinations in DownloadManager." into gingerbread * commit '263ec97bc9d8610a093dba805572583798cb8810': Add CTS test for setting download destinations in DownloadManager. commit 2cf803dec1535b778bb98ffc91cfa46e08b6df41 Merge: 8def0f4 40d755c Author: Jeff Davidson Date: Wed Aug 17 11:39:42 2011 -0700 am 40d755c2: am f22b3ecc: Merge "Additional refactoring of MediaPlayer tests." into gingerbread * commit '40d755c2c49c328a64a1bdada8a609a825dabd94': Additional refactoring of MediaPlayer tests. commit 263ec97bc9d8610a093dba805572583798cb8810 Merge: 40d755c 28afbe5 Author: Jeff Davidson Date: Wed Aug 17 11:38:19 2011 -0700 am 28afbe5f: Merge "Add CTS test for setting download destinations in DownloadManager." into gingerbread * commit '28afbe5f028511121dab579785f1b061a4a68717': Add CTS test for setting download destinations in DownloadManager. commit 40d755c2c49c328a64a1bdada8a609a825dabd94 Merge: ad892b2 f22b3ec Author: Jeff Davidson Date: Wed Aug 17 11:38:17 2011 -0700 am f22b3ecc: Merge "Additional refactoring of MediaPlayer tests." into gingerbread * commit 'f22b3eccc6ec1e730a41aaf1f96a455cea5e6eb2': Additional refactoring of MediaPlayer tests. commit 28afbe5f028511121dab579785f1b061a4a68717 Merge: f22b3ec 80b5d66 Author: Jeff Davidson Date: Wed Aug 17 11:26:15 2011 -0700 Merge "Add CTS test for setting download destinations in DownloadManager." into gingerbread commit f22b3eccc6ec1e730a41aaf1f96a455cea5e6eb2 Merge: 79fe6e5 45dd2f1 Author: Jeff Davidson Date: Wed Aug 17 11:25:46 2011 -0700 Merge "Additional refactoring of MediaPlayer tests." into gingerbread commit 03332057636b9587cde087616f3759e056599138 Author: sungh.hong Date: Wed Aug 17 20:53:23 2011 +0900 i have removed the blank line, please review this change\n thank you Change-Id: I35723168823895d072bf98bc2771f9b086a1640e commit 270ba163ac8eb2e950912386c6db6509262ff4fb Author: Madan Ankapura Date: Wed Aug 17 00:53:44 2011 -0700 disable test for user dictionary settings not all devices will support user dictionary, and those devices will not have the user dictionary related settings Change-Id: Ic0199b6b49d225276cd803bc0e61cf320fef0202 Signed-off-by: Madan Ankapura commit 4bffd81ee27982093b6601aaa36b4278f6ce620f Author: Andy McFadden Date: Tue Aug 16 16:28:38 2011 -0700 Expand test of _sync_id backfill Bug 5137544 Change-Id: I501e9ed37a7650d620f122de9359ba5b814cc47d commit 80b5d6666d6635d6ff4c68d81b6c00d882b9441b Author: Jeff Davidson Date: Mon Aug 15 18:45:57 2011 -0700 Add CTS test for setting download destinations in DownloadManager. Bug: 5020997 Change-Id: I068d2ba535eeaedd1a9ee1d974961784199eb7f6 commit 45dd2f15092680526902b37d7118f039783fe893 Author: Jeff Davidson Date: Mon Aug 15 10:04:51 2011 -0700 Additional refactoring of MediaPlayer tests. Rename MediaPlayerTestHelpers to MediaPlayerTestBase, a base class that can be extended to easily create new MediaPlayer tests. MediaPlayerTest now consists of tests of local files, and MediaPlayerStreamingTest consists of tests of streams (such as the local HTTP streams that were previously in MediaPlayerTest). Change-Id: I9aac07e8fdbc79bcd763e0a5e0c16254c42b39b0 commit 9bc544890c132d251f2c85c7ff283d245fd2fd9d Merge: b564b22 8def0f4 Author: Brian Muramatsu Date: Fri Aug 12 17:37:31 2011 -0700 am 8def0f46: resolved conflicts for merge of ad892b2c to honeycomb-plus-aosp * commit '8def0f46d1fa58d032931db6a6f242672f870158': CTS Verifier Packaging and Versioning commit 8def0f46d1fa58d032931db6a6f242672f870158 Merge: 89116fe ad892b2 Author: Brian Muramatsu Date: Fri Aug 12 17:32:47 2011 -0700 resolved conflicts for merge of ad892b2c to honeycomb-plus-aosp Change-Id: Ic76b6f74f2bd73828211122ef4b06d79d0fd25bb commit b564b2295353fa68f6e6a18a201e60cbf5325f1e Merge: 36c25c0 89116fe Author: Jeff Davidson Date: Fri Aug 12 16:27:10 2011 -0700 am 89116fe6: am 8b570fd4: am 4f9a2d4f: Merge "MediaPlayer test cleanup + new streaming test placeholder." into gingerbread * commit '89116fe61d021dd7479b099860ebf70e18521944': MediaPlayer test cleanup + new streaming test placeholder. commit 36c25c084614d72333aeba17e979b43211247311 Merge: 3061de5 5c7114f Author: Brian Muramatsu Date: Fri Aug 12 16:27:08 2011 -0700 am 5c7114f9: am 77aaded2: am cba59344: Merge "Change Icon for Export Function" into gingerbread * commit '5c7114f9626bfe5de26a1672e66eb97993131f13': Change Icon for Export Function commit 3061de5bb1f10ccd42862de0b71c801f048712ce Merge: 80f2b29 3f09f89 Author: Brian Muramatsu Date: Fri Aug 12 16:27:05 2011 -0700 am 3f09f895: am eccea871: am 5ad29c0b: Merge "CTS Verifier Data Backup Test" into gingerbread * commit '3f09f89549e656181a65bebfeeeee951891f73f7': CTS Verifier Data Backup Test commit 80f2b297822da8dc63a2dd8ac4d0b40f34a68dd0 Merge: 6f2b5b0 db12b7b Author: Brian Muramatsu Date: Fri Aug 12 16:26:45 2011 -0700 am db12b7bd: am 1a84cda6: am a2d453d0: Merge "Output android-cts-verifier.zip in the CTS Dist" into gingerbread * commit 'db12b7bd054c856d17c270d353a2b434eecba2a6': Output android-cts-verifier.zip in the CTS Dist commit 6f2b5b0e28d6bed943ca952aeffb0e52a9928b19 Merge: fdcce83 2674aef Author: Brian Muramatsu Date: Fri Aug 12 16:26:22 2011 -0700 am 2674aef2: am 9a1b3754: am 9fad3f3d: Merge "Avoid testSetKeepUpdated to be scheduling dependant" into gingerbread * commit '2674aef29b462cbed2af4c7e426f1ddb36bb5059': Avoid testSetKeepUpdated to be scheduling dependant commit fdcce833a46c83811ccf243b11c4a034ffbeca8e Author: Andrew Sapperstein Date: Fri Aug 12 16:22:02 2011 -0700 Adding Theme test generation scripts and a README. Change-Id: I0eebb8192be01f63ab1b34c826e0e2942f74ee10 commit ad892b2c40c5260bdabc3b969a0fe005eaec6a13 Merge: 8b570fd 79fe6e5 Author: Brian Muramatsu Date: Fri Aug 12 16:16:42 2011 -0700 am 79fe6e5c: Merge "CTS Verifier Packaging and Versioning" into gingerbread * commit '79fe6e5cb08d176adf90233b6b818ed558f5967a': CTS Verifier Packaging and Versioning commit a0f4f7607de48aa7e76ae991a6de5ea7414e3d74 Merge: 122a277 c487b8d Author: Brian Muramatsu Date: Fri Aug 12 15:44:24 2011 -0700 Merge "CTS Verifier Version 3.2 R1" into honeycomb-mr2 commit c487b8d696eec567c328b03b95bfa17d95d32062 Author: Brian Muramatsu Date: Fri Aug 12 15:43:37 2011 -0700 CTS Verifier Version 3.2 R1 Change-Id: I5d86ff705d8011cb2c4d90e79f5b72a02cb963cf commit c98733e3666769104600c218edbeb56c21da7ff5 Merge: dd2bf71 8924dfc Author: Brian Muramatsu Date: Fri Aug 12 15:42:33 2011 -0700 Merge "CTS Verifier Version 3.1 R1" into honeycomb-mr1 commit 8924dfc486279a5a68b1027bfba54dee79bef413 Author: Brian Muramatsu Date: Fri Aug 12 15:41:47 2011 -0700 CTS Verifier Version 3.1 R1 Change-Id: I315fbbae02a2fbe7754f761559b0d7a270ebda4d commit 79b6de456b9f949f29494e85bbd2b84ffe36d639 Merge: d8e96e4 6d6465a Author: Brian Muramatsu Date: Fri Aug 12 15:41:12 2011 -0700 Merge "CTS Verifier Version 3.0_r1" into honeycomb commit 6d6465aa021b0bb0b84c6bb27c6266d3f3333339 Author: Brian Muramatsu Date: Fri Aug 12 15:38:26 2011 -0700 CTS Verifier Version 3.0_r1 Change-Id: Ifccf7db2328cf36f5dcbf7cd78e1076ae57589b7 commit 79fe6e5cb08d176adf90233b6b818ed558f5967a Merge: 4f9a2d4 66cb746 Author: Brian Muramatsu Date: Fri Aug 12 15:33:48 2011 -0700 Merge "CTS Verifier Packaging and Versioning" into gingerbread commit 66cb74650097a3a3603cbcb589aaf517659b749f Author: Brian Muramatsu Date: Fri Aug 12 14:52:32 2011 -0700 CTS Verifier Packaging and Versioning Don't include the CTS Verifier with CTS anymore. Make the Verifier version number independent from the CTS versioning. - Reset the version to 2.3_r1. - Iterate the r* number each time a new APK is uploaded. - Version code will match the release number. Change-Id: I0c8ca29ca409942e3d8a67f4ec705729b98d4982 commit 89116fe61d021dd7479b099860ebf70e18521944 Merge: 5c7114f 8b570fd Author: Jeff Davidson Date: Fri Aug 12 15:28:45 2011 -0700 am 8b570fd4: am 4f9a2d4f: Merge "MediaPlayer test cleanup + new streaming test placeholder." into gingerbread * commit '8b570fd47c096a3d54ccc0f9d2fa71c0805339f2': MediaPlayer test cleanup + new streaming test placeholder. commit 5c7114f9626bfe5de26a1672e66eb97993131f13 Merge: 3f09f89 77aaded Author: Brian Muramatsu Date: Fri Aug 12 15:28:42 2011 -0700 am 77aaded2: am cba59344: Merge "Change Icon for Export Function" into gingerbread * commit '77aaded2626edd285c210d48dad41b2f4bc008e8': Change Icon for Export Function commit 3f09f89549e656181a65bebfeeeee951891f73f7 Merge: db12b7b eccea87 Author: Brian Muramatsu Date: Fri Aug 12 15:28:40 2011 -0700 am eccea871: am 5ad29c0b: Merge "CTS Verifier Data Backup Test" into gingerbread * commit 'eccea87150dfe957e8e47cdd366ca2f1fbc92ba7': CTS Verifier Data Backup Test commit 8b570fd47c096a3d54ccc0f9d2fa71c0805339f2 Merge: 77aaded 4f9a2d4 Author: Jeff Davidson Date: Fri Aug 12 15:26:58 2011 -0700 am 4f9a2d4f: Merge "MediaPlayer test cleanup + new streaming test placeholder." into gingerbread * commit '4f9a2d4f442879f2ad8dd42444595358051c159b': MediaPlayer test cleanup + new streaming test placeholder. commit 77aaded2626edd285c210d48dad41b2f4bc008e8 Merge: eccea87 cba5934 Author: Brian Muramatsu Date: Fri Aug 12 15:26:56 2011 -0700 am cba59344: Merge "Change Icon for Export Function" into gingerbread * commit 'cba59344289f759d60cfc376b8ec53c4febc5b80': Change Icon for Export Function commit eccea87150dfe957e8e47cdd366ca2f1fbc92ba7 Merge: 1a84cda 5ad29c0 Author: Brian Muramatsu Date: Fri Aug 12 15:26:54 2011 -0700 am 5ad29c0b: Merge "CTS Verifier Data Backup Test" into gingerbread * commit '5ad29c0b31197ba1c69e2b4a7c4d888d7f3de450': CTS Verifier Data Backup Test commit 122a27754ec6bc1a0bea2ac1dc1755d4141bf0af Merge: f76dc1e dd2bf71 Author: Brian Muramatsu Date: Fri Aug 12 14:38:03 2011 -0700 Merge remote branch 'goog/honeycomb-mr1' into manualmerge commit 0f1b5cb4c40e14ca8752a48cee2b76797946ab0d Merge: c38973c f5e71d2 Author: Brian Muramatsu Date: Fri Aug 12 14:23:07 2011 -0700 Merge "ActionBar tests." commit c38973c571f5aedc5f6c4c92cbf063485993be9b Merge: 009e22b 6adf274 Author: John Reck Date: Fri Aug 12 14:20:08 2011 -0700 Merge "Remove WebDriver" commit dd2bf71e6ee4a111ec73462db29f649cba090873 Author: Brian Muramatsu Date: Fri Aug 12 12:46:07 2011 -0700 Bundle CTS USB Accessory Tool with CTS Verifier Bundle cts-usb-accessory with the android-cts-verifier.zip and don't include it with the CTS anymore. Change-Id: I05044fa91b28f550f5b91443cbbaf59d7d4d4826 commit 6adf2742b8fde0b80e9ae9b8891a18002cad72d0 Author: John Reck Date: Fri Aug 12 13:47:52 2011 -0700 Remove WebDriver Bug: 5155997 Change-Id: I4369e5caa0a7497a057ab038dddabcc2df62b7bb commit 4f9a2d4f442879f2ad8dd42444595358051c159b Merge: cba5934 4c29d97 Author: Jeff Davidson Date: Fri Aug 12 13:31:29 2011 -0700 Merge "MediaPlayer test cleanup + new streaming test placeholder." into gingerbread commit db12b7bd054c856d17c270d353a2b434eecba2a6 Merge: 2674aef 1a84cda Author: Brian Muramatsu Date: Fri Aug 12 13:16:24 2011 -0700 am 1a84cda6: am a2d453d0: Merge "Output android-cts-verifier.zip in the CTS Dist" into gingerbread * commit '1a84cda66c35bd84d6607f2fd049f62aef62c8e1': Output android-cts-verifier.zip in the CTS Dist commit 009e22ba88239f7bcfb3afa8137dccd2b6cc6691 Merge: d885c09 3204484 Author: Eric Laurent Date: Fri Aug 12 12:49:49 2011 -0700 Merge "Fix issue 5144429: CTS test fails for AudioEffects" commit 4c29d970b828238a25b4b708692bff0fe47d5449 Author: Jeff Davidson Date: Fri Aug 12 12:23:08 2011 -0700 MediaPlayer test cleanup + new streaming test placeholder. Removes unneeded annotations and clears compiler warnings. Since there are already many MediaPlayer API tests in MediaPlayerTest, additional API tests that we add (like the null stream location added in this CL) should be here. New tests related to streaming should go in MediaPlayerStreamingTest. Change-Id: I239930c058fabf65fb7c4e34af0c142255f59f32 commit ad3e3780c5f1ea186339bf18a625387b960a0cf2 Merge: 80fd411 d8e96e4 Author: Brian Muramatsu Date: Fri Aug 12 12:23:08 2011 -0700 Merge remote branch 'goog/honeycomb' into manualmerge commit d8e96e4f305ccfd5454f30f1ea6cff7212047a75 Merge: 30e241c a2d453d Author: Brian Muramatsu Date: Fri Aug 12 11:59:13 2011 -0700 Merge remote branch 'goog/gingerbread' into manualmerge commit cba59344289f759d60cfc376b8ec53c4febc5b80 Merge: 5ad29c0 914e7a5 Author: Brian Muramatsu Date: Fri Aug 12 11:19:32 2011 -0700 Merge "Change Icon for Export Function" into gingerbread commit 914e7a5c25b6b2422c75814cb467ea20353e167f Author: Brian Muramatsu Date: Fri Aug 12 11:17:59 2011 -0700 Change Icon for Export Function Change-Id: I17356acee7303a686c07f094fbb789d7a8ef8473 commit 5ad29c0b31197ba1c69e2b4a7c4d888d7f3de450 Merge: a2d453d 0ac3cdf Author: Brian Muramatsu Date: Fri Aug 12 11:03:12 2011 -0700 Merge "CTS Verifier Data Backup Test" into gingerbread commit 2674aef29b462cbed2af4c7e426f1ddb36bb5059 Merge: 497e3a1 9a1b375 Author: Brian Muramatsu Date: Fri Aug 12 10:28:58 2011 -0700 am 9a1b3754: am 9fad3f3d: Merge "Avoid testSetKeepUpdated to be scheduling dependant" into gingerbread * commit '9a1b37542c719cad1a5d133510d02a98a5cbcb11': Avoid testSetKeepUpdated to be scheduling dependant commit f5e71d214127b7172a2b0a9b7d349a47b8c4ae23 Author: Andrew Sapperstein Date: Mon Aug 1 14:56:34 2011 -0700 ActionBar tests. Uses a new framework for the action bar tests that has an activity that takes its own snapshot. These are then compared or saved as necessary. Tests are run in both portrait and landscape and are also run with uiOptions="SplitActionBarWhenNarrow". To fix orientation errors, we now retry the specific test on that specific theme whenever a failure case is detected. Change-Id: I6b9d0e7b83ceba2b1e9cfc211d1dec707e93a1c3 commit daa9dc6131c758c7b36dc1b49379e90ac3a7077b Author: Masanori Ogino Date: Fri Aug 12 19:20:10 2011 +0900 Needs more columns for large screen device If a horizontal size of a device display exceeds 960 pixels, the testSetHorizontalSpacing() will be failed. Because a space between views doesn't equal zero. So the parameter of GridView#setNumColumns() should be slightly large rether than 20 for large screen device. Change-Id: Ic033ca6741eb70c2112104caf1bd93f803f8283b commit 7e06ff8c197221bb81847759083436e62869f827 Author: Fabou Date: Mon Aug 8 20:07:44 2011 +0200 Avoid 2 fails if no camera on device If there is no camera on the device testRecorderVideo and testRecorderCamera can't be achieved. Test before recording if there is a camera on the device Change-Id: I311472c889aa5110aa0a2e9bbaf101ee0e9df9e3 Signed-off-by: Fabou commit 4cb1ba042962c4740127887f83560d4351652a58 Author: lge-aosp Date: Fri Aug 12 15:31:42 2011 +0900 update the NO_DELIVERY_REPORTS list add Tracfone, virgin mobile that don't support SMS delivery support Change-Id: I94c748842b3bf7a199bf53525eb7449c9a070bcb commit 32044842516b181a7dde85e030ce34bdf9d76285 Author: Eric Laurent Date: Thu Aug 11 17:13:40 2011 -0700 Fix issue 5144429: CTS test fails for AudioEffects AudioEffect constructor tests should specify a valid AudioRecord audio session for pre processing effects. Change-Id: I0836de1855d7e5675ffadaa4338ed375889d4ddb commit d885c092aa25381fc060f4e825de7743f1aabe2c Author: Justin Ho Date: Thu Aug 11 15:41:29 2011 -0700 Updating tests for system font Roboto Change-Id: Iae70d5ebec829e032162a165c3be2621262b4e6b commit 1a84cda66c35bd84d6607f2fd049f62aef62c8e1 Merge: 9a1b375 a2d453d Author: Brian Muramatsu Date: Thu Aug 11 15:20:53 2011 -0700 am a2d453d0: Merge "Output android-cts-verifier.zip in the CTS Dist" into gingerbread * commit 'a2d453d00a142278c7bafe4306c0e9bd92068c45': Output android-cts-verifier.zip in the CTS Dist commit 0ac3cdf08167c4be521cf741fa413dd7e78c0430 Author: Brian Muramatsu Date: Wed Aug 3 11:47:10 2011 -0700 CTS Verifier Data Backup Test Bug 2749924 Add a test activity that shows some values for preferences and files. It has a button to populate these preferences and files with random values. Request the user to run several adb commands to execute the backup process, unistall the app, and then verify that the random values are still present. This is a pretty loose test but better than nothing I suppose... Also add support for backing up the current test results... Change-Id: I8f0555c97cc74efc4c082735733c01c7d136e790 commit a2d453d00a142278c7bafe4306c0e9bd92068c45 Merge: 9fad3f3 2ddd805 Author: Brian Muramatsu Date: Thu Aug 11 13:48:53 2011 -0700 Merge "Output android-cts-verifier.zip in the CTS Dist" into gingerbread commit 9a1b37542c719cad1a5d133510d02a98a5cbcb11 Merge: 1324107 9fad3f3 Author: Brian Muramatsu Date: Thu Aug 11 11:39:35 2011 -0700 am 9fad3f3d: Merge "Avoid testSetKeepUpdated to be scheduling dependant" into gingerbread * commit '9fad3f3d3be11299fea19ae2bbbd4c1fd55dc6bc': Avoid testSetKeepUpdated to be scheduling dependant commit 2ddd8055293baa4910e80560944b8a36a62e515e Author: Brian Muramatsu Date: Wed Aug 10 16:55:44 2011 -0700 Output android-cts-verifier.zip in the CTS Dist Bug 5149412 Made it output a zip so that other tools that could be required by the CTS Verifier could be included. Change-Id: Icdccee3069e715f1c05d1db3cb7313713c70d7f2 commit 9fad3f3d3be11299fea19ae2bbbd4c1fd55dc6bc Merge: 4b9260f 0f52dc9 Author: Brian Muramatsu Date: Thu Aug 11 11:26:22 2011 -0700 Merge "Avoid testSetKeepUpdated to be scheduling dependant" into gingerbread commit 0f52dc9ce080970eac3540e3784d6ad71dae16a9 Author: Fabou Date: Mon Aug 8 18:28:15 2011 +0200 Avoid testSetKeepUpdated to be scheduling dependant Thread listening the changing event was started after changing event launched in testSetKeepUpdated method Adding waiting condition between the thread startup and the onChange event will permits to the listening thread to be fully started before. Change-Id: Ib9c5842657051abc9b44d7e0a0e007a86fe9db65 Signed-off-by: Fabou commit 80fd41193765fad7143c6b1a6a1d130665347cbb Merge: 61f9755 54652f4 Author: Brian Muramatsu Date: Wed Aug 10 17:24:04 2011 -0700 Merge "Changed CTS runner to work with emulator" into honeycomb-mr1 commit 54652f48bfb67be2dc7b5852b22d679eda04ae1d Author: Maciek Molerus Date: Tue Aug 9 19:16:07 2011 +0200 Changed CTS runner to work with emulator Changes the code so it would reset emulator devices as well. One needs to run emulator in the loop for the test to work. Fixed exception handling so the test wouldn't dead lock when IDevice class throws. Change-Id: Ic507ebaad399c5a7ee4404715c54c132186acc05 commit abc8de965d1daa6c28fe68512c22d3d232dbcdcd Merge: 66c144c ed3f33c Author: Gloria Wang Date: Wed Aug 10 09:28:16 2011 -0700 Merge "Test runtime switch between null surface and non-null surface." commit ed3f33cb01f3f7156b45f9ebf2e65ec5f4f0c55b Author: Gloria Wang Date: Tue Aug 9 14:58:22 2011 -0700 Test runtime switch between null surface and non-null surface. Change-Id: I1378cd61885d9437364e773777bc1600e689d115 commit 66c144cf901397ebd650c246e84cf509e9adeda7 Author: Wu-cheng Li Date: Tue Aug 2 16:44:45 2011 +0800 Add camera recording hint tests. bug:4266229 Change-Id: I1b84e9991fd0cf01cf9b2afbcfd9406540bde5f2 commit 0e11553e82d04db4babce00613c87620d54c4ed3 Merge: 0ec4f23 b88be17 Author: Andy McFadden Date: Fri Aug 5 10:45:14 2011 -0700 Merge "Add Calendar provider tests to CTS" commit b88be17c8bea39222da69c66d16255d1d3151b43 Author: Andy McFadden Date: Fri Aug 5 09:57:48 2011 -0700 Add Calendar provider tests to CTS This relocates the provider's CalendarCts class, renaming it to CalendarTest. No other changes were made to the tests. All tests currently pass. Bug 2361048 Change-Id: Ib2632f95b8e2c7ded4dce63bbf2d7487ced5ba5d commit 0ec4f23c379284aabe10c98cf5c5c35afcc849e9 Merge: 1becbe5 028269d Author: Stephen Hines Date: Thu Aug 4 17:27:02 2011 -0700 Merge "Test that structs are being padded appropriately." commit 61f9755ffca5092115000088a6c91883c5fed905 Author: Jason Bayer Date: Thu Aug 4 15:43:37 2011 -0700 Check new mediarecorder tests that require mic Change-Id: I57d23cbec45f736b2d103682e3f1525b92e280ae commit 028269d8d1547ee04c5431e8bd20a19a6f92c809 Author: Stephen Hines Date: Thu Aug 4 15:10:02 2011 -0700 Test that structs are being padded appropriately. BUG=5081813 Change-Id: I87ce92ee99f5366e490c619b111161a81a3db946 commit 1becbe57154d26d4be8560dfb2f5c28c07984dda Merge: 4cf713d 497e3a1 Author: Brian Muramatsu Date: Thu Aug 4 12:02:27 2011 -0700 am 497e3a17: am 13241079: am 4b9260f7: Merge "Merge remote branch \'korg/froyo\' into manualmerge" into gingerbread * commit '497e3a1719d95acdef7bd87670d2e67de2d42414': detect tab reuse Check Prefs and DB Values in AppSecurityTests CTS : modify "loadURL" method that wait until getProgress returns 100. Changed the condition to consider negative value for PID. commit 497e3a1719d95acdef7bd87670d2e67de2d42414 Merge: d601b8a 1324107 Author: Brian Muramatsu Date: Thu Aug 4 11:59:51 2011 -0700 am 13241079: am 4b9260f7: Merge "Merge remote branch \'korg/froyo\' into manualmerge" into gingerbread * commit '1324107914b2873af028e76a647e5a8b98d3bda8': detect tab reuse Check Prefs and DB Values in AppSecurityTests CTS : modify "loadURL" method that wait until getProgress returns 100. Changed the condition to consider negative value for PID. commit 1324107914b2873af028e76a647e5a8b98d3bda8 Merge: d6c3bc1 4b9260f Author: Brian Muramatsu Date: Thu Aug 4 11:58:20 2011 -0700 am 4b9260f7: Merge "Merge remote branch \'korg/froyo\' into manualmerge" into gingerbread * commit '4b9260f70e2b32864eaf9ac4c1ddaa57a422985a': detect tab reuse Check Prefs and DB Values in AppSecurityTests CTS : modify "loadURL" method that wait until getProgress returns 100. Changed the condition to consider negative value for PID. commit 4b9260f70e2b32864eaf9ac4c1ddaa57a422985a Merge: 9093c93 b8abb4b Author: Brian Muramatsu Date: Thu Aug 4 11:44:06 2011 -0700 Merge "Merge remote branch 'korg/froyo' into manualmerge" into gingerbread commit b8abb4b294215d8bcc0b7f8fca894abb06e455d4 Merge: 4b41a9e a582fe2 Author: Brian Muramatsu Date: Thu Aug 4 11:38:51 2011 -0700 Merge remote branch 'korg/froyo' into manualmerge commit 4cf713d34f77a6893def45d6402f7769def3a1c6 Merge: d4d7c92 d601b8a Author: Brian Muramatsu Date: Wed Aug 3 18:16:32 2011 -0700 am d601b8ad: am d6c3bc15: am 9093c936: Merge "add test on the Intent to add event in Calendar app, to view call logs, to view Inbox in Message app, to view music playback" into gingerbread * commit 'd601b8adace98814978ef519f8d5897d5d69c403': add test on the Intent to add event in Calendar app, to view call logs, to view Inbox in Message app, to view music playback commit d4d7c92515c447e3cecb6002275df6aa3c876360 Merge: f8a2a88 b4d38ab Author: Brian Muramatsu Date: Wed Aug 3 18:16:30 2011 -0700 am b4d38abe: (-s ours) am f0c01dee: am f4a97b55: Merge "Do coverage tests on package.apk.unaligned" into gingerbread * commit 'b4d38abef87aaa70303aecb9a56fab1f0e8ce7f3': Do coverage tests on package.apk.unaligned commit f8a2a884522c1f7c9f616cfc1075ebf6cd138a7f Merge: 91d3e5f 3de9a8b Author: Brian Muramatsu Date: Wed Aug 3 17:42:00 2011 -0700 am 3de9a8bb: am 470e4b05: am 4b41a9e3: Merge "Manual Gyroscope Test for CTS Verifier" into gingerbread * commit '3de9a8bb5aa1636f4d44f485e0965820b7464eee': Manual Gyroscope Test for CTS Verifier commit 91d3e5f423257861ba3fd07bc68d28be2ef4ebbd Merge: 5e1b765 ef9fe11 Author: Brian Muramatsu Date: Wed Aug 3 17:03:48 2011 -0700 Merge "More tests." commit b7c201b431f7f7d641802d9d4b9d1b1fb62fe752 Author: Brian Muramatsu Date: Wed Aug 3 15:01:13 2011 -0700 Backup Unit Tests Bug 2749924 There doesn't seem much to test...but maybe this will prevent obvious NPEs... Change-Id: I38a9157a26e0be0514e849e823a098595581e4bf commit 5e1b7652c549e132de60669904ed748af13a5272 Merge: fe90ef2 1686dfe Author: Gloria Wang Date: Wed Aug 3 13:47:42 2011 -0700 Merge "Add a CTS test for replacing a surface at run time during video playback. Fix for bug 5088614." commit d601b8adace98814978ef519f8d5897d5d69c403 Merge: b4d38ab d6c3bc1 Author: Brian Muramatsu Date: Wed Aug 3 12:39:27 2011 -0700 am d6c3bc15: am 9093c936: Merge "add test on the Intent to add event in Calendar app, to view call logs, to view Inbox in Message app, to view music playback" into gingerbread * commit 'd6c3bc15fedf8de73c3e49d4a2423cc2a2139ef9': add test on the Intent to add event in Calendar app, to view call logs, to view Inbox in Message app, to view music playback commit b4d38abef87aaa70303aecb9a56fab1f0e8ce7f3 Merge: 3de9a8b f0c01de Author: Brian Muramatsu Date: Wed Aug 3 12:39:25 2011 -0700 am f0c01dee: am f4a97b55: Merge "Do coverage tests on package.apk.unaligned" into gingerbread * commit 'f0c01dee6b3e86725ff37d15a2889a54c17224f1': Do coverage tests on package.apk.unaligned commit d6c3bc15fedf8de73c3e49d4a2423cc2a2139ef9 Merge: f0c01de 9093c93 Author: Brian Muramatsu Date: Wed Aug 3 12:36:42 2011 -0700 am 9093c936: Merge "add test on the Intent to add event in Calendar app, to view call logs, to view Inbox in Message app, to view music playback" into gingerbread * commit '9093c9364a87aabed819613453a3bceb0a6eb55d': add test on the Intent to add event in Calendar app, to view call logs, to view Inbox in Message app, to view music playback commit f0c01dee6b3e86725ff37d15a2889a54c17224f1 Merge: 470e4b0 f4a97b5 Author: Brian Muramatsu Date: Wed Aug 3 12:36:40 2011 -0700 am f4a97b55: Merge "Do coverage tests on package.apk.unaligned" into gingerbread * commit 'f4a97b553355752651eb42b9688f3fde1ae8a7c5': Do coverage tests on package.apk.unaligned commit 9093c9364a87aabed819613453a3bceb0a6eb55d Merge: f4a97b5 d3ac912 Author: Brian Muramatsu Date: Wed Aug 3 12:21:26 2011 -0700 Merge "add test on the Intent to add event in Calendar app, to view call logs, to view Inbox in Message app, to view music playback" into gingerbread commit d3ac9123e21df98aa27a23dbe72cbb373726d1aa Author: Brian Muramatsu Date: Wed Aug 3 12:20:28 2011 -0700 add test on the Intent to add event in Calendar app, to view call logs, to view Inbox in Message app, to view music playback Change-Id: I7d8001d31c4493639cb76fe479364636e39a9895 commit f4a97b553355752651eb42b9688f3fde1ae8a7c5 Merge: 4b41a9e 6885142 Author: Brian Muramatsu Date: Wed Aug 3 11:55:13 2011 -0700 Merge "Do coverage tests on package.apk.unaligned" into gingerbread commit 688514265abf4bb682b5eea3e59fb9d2e34b18b9 Author: Ying Wang Date: Wed Jul 13 16:14:59 2011 -0700 Do coverage tests on package.apk.unaligned Instead of package.apk, which may be stripped off classes.dex. Change-Id: Ia9121fe464e618444c3101ea97398af26c6d9730 commit f76dc1e65aff9cc06af8389bb482a3cdf5b5cf7b Author: Brian Muramatsu Date: Wed Aug 3 11:39:09 2011 -0700 Update Version to 3.2 R3 Bug 5115864 Change-Id: I462841f167aefa60dc70fdb919b3a9b9fb9f8a9a commit 3fafc674364284016cd03d68f6633cd18691b76a Merge: 20abc2a 446004f Author: Brian Muramatsu Date: Wed Aug 3 11:15:58 2011 -0700 Merge remote branch 'goog/honeycomb-mr1' into manualmerge Conflicts: apps/CtsVerifier/AndroidManifest.xml Change-Id: Idae96c502113b2bcd1e4a63c702f9b7f105133f5 commit 1686dfe54c110ea64f5a2a4f3736d90224c6c1a2 Author: Gloria Wang Date: Thu Jul 28 16:40:20 2011 -0700 Add a CTS test for replacing a surface at run time during video playback. Fix for bug 5088614. Change-Id: Ic22f919432579328b8bd282700b1020950e49a41 commit 6a68f169a02297b30d928912f222f73f6b0bb395 Author: sungh.hong Date: Wed Aug 3 13:02:38 2011 +0900 CTS: Set default drag fromY point depend on status bar height for android.view.cts.GestureDetectorTest#testOnTouchEvent Change-Id: I7b1ac980e08fbfa50cefcb5bffedb337bc2db7a7 commit 3de9a8bb5aa1636f4d44f485e0965820b7464eee Merge: eae29cd 470e4b0 Author: Brian Muramatsu Date: Tue Aug 2 15:34:58 2011 -0700 am 470e4b05: am 4b41a9e3: Merge "Manual Gyroscope Test for CTS Verifier" into gingerbread * commit '470e4b05204bd506e5394dcb4ddbbf637485379b': Manual Gyroscope Test for CTS Verifier commit 470e4b05204bd506e5394dcb4ddbbf637485379b Merge: 36b9437 4b41a9e Author: Brian Muramatsu Date: Tue Aug 2 15:33:33 2011 -0700 am 4b41a9e3: Merge "Manual Gyroscope Test for CTS Verifier" into gingerbread * commit '4b41a9e34b22d95b6a0163313d130b79063c6870': Manual Gyroscope Test for CTS Verifier commit 4b41a9e34b22d95b6a0163313d130b79063c6870 Merge: fbcdba2 729de48 Author: Brian Muramatsu Date: Tue Aug 2 15:23:33 2011 -0700 Merge "Manual Gyroscope Test for CTS Verifier" into gingerbread commit 729de4853a93f45496850f7995b84fd0bd0f1623 Author: Brian Muramatsu Date: Thu May 12 12:26:58 2011 -0700 Manual Gyroscope Test for CTS Verifier This manual test consists of 6 stages. Each stage asks the tester to rotate the device along an axis in a certain direction. The activity turns green when the device is reporting the expected values and red when it is reporting unexpected values. Finally, there is a warning when the sensor values are higher than expected and may be in degrees. Change-Id: I1b653f00d2375cf34f225023c663d824dba0eec2 commit 446004f35dc426ef8a8a470548a47e3817cecb22 Merge: 3b1a9ca 92304b8 Author: Brian Muramatsu Date: Tue Aug 2 14:09:25 2011 -0700 Merge "Require USB Accessory Features" into honeycomb-mr1 commit fe90ef2f7de5630742b85488b7a31117a7df3646 Merge: 574e0b7 eae29cd Author: Jeff Davidson Date: Tue Aug 2 13:54:46 2011 -0700 am eae29cdf: am 36b9437a: am fbcdba23: Merge "Export CTS Verifier reports to the SD card." into gingerbread * commit 'eae29cdfa98ab9119b79ead021699dbaab69d80f': Export CTS Verifier reports to the SD card. commit eae29cdfa98ab9119b79ead021699dbaab69d80f Merge: a242744 36b9437 Author: Jeff Davidson Date: Tue Aug 2 13:52:25 2011 -0700 am 36b9437a: am fbcdba23: Merge "Export CTS Verifier reports to the SD card." into gingerbread * commit '36b9437a8752b1c6c6aefaeacbf861a83bf669e8': Export CTS Verifier reports to the SD card. commit 36b9437a8752b1c6c6aefaeacbf861a83bf669e8 Merge: 8c76388 fbcdba2 Author: Jeff Davidson Date: Tue Aug 2 13:50:40 2011 -0700 am fbcdba23: Merge "Export CTS Verifier reports to the SD card." into gingerbread * commit 'fbcdba2339bc1f7761ee4e9a44a74b9bdef8fcb8': Export CTS Verifier reports to the SD card. commit fbcdba2339bc1f7761ee4e9a44a74b9bdef8fcb8 Merge: 4ad91e4 4c3bbd8 Author: Jeff Davidson Date: Tue Aug 2 13:46:01 2011 -0700 Merge "Export CTS Verifier reports to the SD card." into gingerbread commit 4c3bbd897942713e587bf558774c4d8b571f4a29 Author: Jeff Davidson Date: Tue Aug 2 11:51:43 2011 -0700 Export CTS Verifier reports to the SD card. Also add additional build info to the report. Change-Id: If4e6185194dbf331784f55cd0ba113c96968c368 commit 92304b827eb72b062e24631a11dddec5a1494bf7 Author: Brian Muramatsu Date: Tue Aug 2 11:51:24 2011 -0700 Require USB Accessory Features Bug 5035596 Change-Id: Ifcf22f2c30c78d49b57105975eac237a667e1bbf commit 3b1a9ca1975b169f745157903b7817abaf8c9b4d Author: Brian Muramatsu Date: Tue Aug 2 11:34:49 2011 -0700 Update Expectations for HC MR1 MediaRecorder tests work in HC MR1. Browser security test is expected to fail in MR1 but is fixed in MR2. TypefaceTests are known to fail in HC and beyond... Change-Id: I099b7bbe2652ef493abd2d996b4033387377ecd6 commit 88d1e1137f1e7836bf585621010c04773382a309 Merge: a3cdc70 30e241c Author: Brian Muramatsu Date: Mon Aug 1 17:30:29 2011 -0700 Merge remote branch 'goog/honeycomb' into manualmerge commit 30e241ce6477a768ff954d1439a5df546c376994 Author: Brian Muramatsu Date: Mon Aug 1 16:07:47 2011 -0700 Don't Require Touch Screen Feature Bug 5104638 Change-Id: I659798d08bfb5b1d9d98d38dea54acafc75a1960 commit ef9fe117b443f736d9490ccbe7494662bd418b15 Author: Andrew Sapperstein Date: Thu Jul 21 11:31:59 2011 -0700 More tests. Now testing pretty much all of the UI widgets. Exception: ActionBar which requires some hackery. Now also doing portrait and landscape tests because some things (Dialogs, mostly) will be different based upon orientation. Also added some mdpi versions of the masters. Change-Id: Ib061e18ad563cf767070adb69329dde499f27331 commit a3cdc70dcf3e3ff5810ab857aab38af05ae40a54 Merge: 3445eb2 cee4559 Author: Brian Muramatsu Date: Mon Aug 1 14:56:45 2011 -0700 Merge remote branch 'goog/honeycomb' into HEAD Conflicts: apps/CtsVerifier/AndroidManifest.xml Change-Id: I1a651f9f5c10cc59612ead5e926bb39e8ee68fb8 commit cee45593a82038187bd438f818235af2595a87fa Merge: 4e9df1a 4ad91e4 Author: Brian Muramatsu Date: Mon Aug 1 14:23:52 2011 -0700 Merge remote branch 'goog/gingerbread' into manualmerge Conflicts: apps/CtsVerifier/AndroidManifest.xml apps/CtsVerifier/src/com/android/cts/verifier/features/FeatureSummaryActivity.java tests/expectations/knownfailures.txt tests/tests/os/src/android/os/cts/BuildVersionTest.java tools/host/src/com/android/cts/Version.java Change-Id: I9521c6c60c60a1a36d7a882637290303bcee4997 commit 3445eb20b75e7609ed8980b40bb6d5ab486dd185 Merge: 12c8691 5036c4f Author: Brian Muramatsu Date: Mon Aug 1 12:54:05 2011 -0700 Merge "Allow tv density in HC MR1 to support tv 720p" into honeycomb-mr1 commit 12c8691d48342c8cc95b4d14f0a2f5ea316ee754 Author: Brian Muramatsu Date: Thu Jul 21 17:26:46 2011 -0700 CTS Verifier USB Accessory Test Bug 5001945 This test is an adaptation of the AccessoryChat and accessorychat USB accessory testing programs found in frameworks/base/libs/usb/tests. It requires starting up the CTS Verifier, connecting a device, and then running the cts-usb-accessory program. The accessorychat is now called cts-usb-accessory. I removed the condition that limited accessorychat to connect to only a certain vendor's device. Furthermore, you do not type messages to send a message. The program merely responds with an acknowledgement message that the Android device receives and logs. AccessoryChat was melded into the CTS Verifier, the manual tester. It also does not allow a user to enter custom messages, but it sends a message to start a dialog with the cts-usb-accessory. After 10 or messages are collected, the test activates the pass button. Finally, there is an additional variable in CtsTestCaseList to add cts-usb-accessory to the CTS tools directory. There will need to be another change in build/core/tasks/cts.mk to make sure all the executables specified by the variable are copied over properly. Change-Id: I79add3fa169d28de206b7ed2de97cc8904592765 commit 574e0b731c71421250bd0c6597c6f9ddb371dc20 Merge: c923925 a242744 Author: Brian Muramatsu Date: Mon Aug 1 12:19:19 2011 -0700 am a242744a: am 8c76388d: (-s ours) am 4ad91e4d: Merge "Blacklist Failing MediaRecorder Tests" into gingerbread * commit 'a242744aa1d7d84edee0ae819ce0d36c43cc48f1': Blacklist Failing MediaRecorder Tests commit a242744aa1d7d84edee0ae819ce0d36c43cc48f1 Merge: b4a0caf 8c76388 Author: Brian Muramatsu Date: Mon Aug 1 12:17:45 2011 -0700 am 8c76388d: (-s ours) am 4ad91e4d: Merge "Blacklist Failing MediaRecorder Tests" into gingerbread * commit '8c76388dbe2f0b9dfb8661b629aaf828a96a27f9': Blacklist Failing MediaRecorder Tests commit 8c76388dbe2f0b9dfb8661b629aaf828a96a27f9 Merge: 0e79bf7 4ad91e4 Author: Brian Muramatsu Date: Mon Aug 1 12:12:37 2011 -0700 am 4ad91e4d: Merge "Blacklist Failing MediaRecorder Tests" into gingerbread * commit '4ad91e4d2e7f62b7e2e3aef5089536a4f0cd8ce2': Blacklist Failing MediaRecorder Tests commit 4ad91e4d2e7f62b7e2e3aef5089536a4f0cd8ce2 Merge: 416af5f d5181f4 Author: Brian Muramatsu Date: Mon Aug 1 12:02:26 2011 -0700 Merge "Blacklist Failing MediaRecorder Tests" into gingerbread commit d5181f46847ecb5e31d504fb0df92cd4af133232 Author: Brian Muramatsu Date: Mon Aug 1 11:49:41 2011 -0700 Blacklist Failing MediaRecorder Tests Bug 5092826 These tests should pass. Filed bugs and blacklisting them for now. Change-Id: Ia42cfe023204aa603be2b36125346b81446db63b commit c9239251aab0fb6f7a996da3901fc78145458953 Merge: fdc307a 7c10a40 Author: Eino-Ville Talvala Date: Mon Aug 1 10:57:11 2011 -0700 Merge "Relax timestamp consistency checking for SurfaceTextures and Camera." commit 5036c4f2d427b7773433d24787bdd636d9cd77be Author: Jason Bayer Date: Mon Aug 1 10:46:14 2011 -0700 Allow tv density in HC MR1 to support tv 720p Starting in HC mr2, this is in the public SDK so this change is temporary in hc mr1 -- for mr2 and beyond, it should check displaymetrics' constants directly This is similar to tests/tests/app/src/android/app/cts/ActivityManagerMemoryClassTest.java: Change-Id: I5b8c31342caffe6bce902d85c8e7f029332b08d3 commit fdc307ab87b859a783c61cb06cd3227138fad7d1 Merge: 70c4d96 b0f6ad6 Author: Kenny Root Date: Fri Jul 29 13:51:53 2011 -0700 Merge "Improve SignatureTest and ParcelTest" commit 20abc2a305e95aab12e18e247706d843e9aebace Merge: 0421603 2705890 Author: Brian Muramatsu Date: Fri Jul 29 11:55:03 2011 -0700 Merge "Fix Dimension Calculations" into honeycomb-mr2 commit a582fe2440e191334925e184da538ea6697c0093 Merge: a8bfbef fdeb8a6 Author: Brian Muramatsu Date: Fri Jul 29 11:53:52 2011 -0700 Merge "detect tab reuse" into froyo commit fdeb8a6853a40be5d8188d3bca7cf6ca47712d52 Author: Nick Kralevich Date: Wed Jul 27 13:28:35 2011 -0700 detect tab reuse Verify that state isn't transitioning from one browser window to another browser window via javascript URIs. Bug: 5020329 Change-Id: Id87730d1f76112d1aebae7204c4d8c83fa7bc2a5 commit 70c4d96d65805b0b92592fbfe5fec7ac36ab2667 Merge: 7190486 c5625c1 Author: Derek Sollenberger Date: Fri Jul 29 05:06:26 2011 -0700 Merge "Extended BitmapRegionDecoderTest for WEBP image." commit 27058909e9fc702fa62c62945cf51bc43c281da0 Author: Brian Muramatsu Date: Thu Jul 28 18:12:24 2011 -0700 Fix Dimension Calculations Bug 5086216 Change-Id: I7c6b7ccd74c46d0cf789ceff0c663924741e4657 commit 719048633b56bcaf9a4251ff5375a62742018da7 Merge: 47d263d 5b60a4d Author: Brian Muramatsu Date: Thu Jul 28 17:49:27 2011 -0700 Merge "sleep(POLL_TIME) before checking state change in enable, disable functions" commit 5b60a4dcbc02228b85c6e117ed2e43bc6028995e Author: Matthew Xie Date: Thu Jul 28 17:38:00 2011 -0700 sleep(POLL_TIME) before checking state change in enable, disable functions Recently, The bluetooth adpater introduced a statemachine to handle state change. The enable and disable method post a message to the state machine. The statemachine starts the switch in a different thread. There might be a little bit delay of the real state change. We change the test cases to wait a little bit before checking state change. bug5092306 Change-Id: I14eceda9a3c9b3ad31cac3e6418fb93afdb3fc03 commit 47d263d6c7c618d24c93bf9a8821d1660a7bc20f Merge: f634899 b4a0caf Author: Brian Muramatsu Date: Thu Jul 28 17:07:12 2011 -0700 am b4a0caf0: am 0e79bf70: (-s ours) am 416af5f3: Merge "Increment CTS Version to 2.3 R5" into gingerbread * commit 'b4a0caf079cdb9f776e8efcad907abd743367449': Increment CTS Version to 2.3 R5 commit b4a0caf079cdb9f776e8efcad907abd743367449 Merge: 3e2e036 0e79bf7 Author: Brian Muramatsu Date: Thu Jul 28 17:03:18 2011 -0700 am 0e79bf70: (-s ours) am 416af5f3: Merge "Increment CTS Version to 2.3 R5" into gingerbread * commit '0e79bf70ca298eb4df35373b286b1491ecd087b1': Increment CTS Version to 2.3 R5 commit b0f6ad65097a9082d756f8b2a62a730bb2e5718d Author: Kenny Root Date: Thu Jul 28 16:59:51 2011 -0700 Improve SignatureTest and ParcelTest SignatureTest was in one giant method call, so break it out so coverage can be more easily seen. Also add a few more test cases for SignatureTest. Improve ParcelTest to actually use valid Signatures. Change-Id: Ic589485a83606200d591db7f416122838d08b8da commit 0e79bf70ca298eb4df35373b286b1491ecd087b1 Merge: 58da8bc 416af5f Author: Brian Muramatsu Date: Thu Jul 28 16:58:18 2011 -0700 am 416af5f3: Merge "Increment CTS Version to 2.3 R5" into gingerbread * commit '416af5f3cf91e6a0c848821b7cf62b96e84892b5': Increment CTS Version to 2.3 R5 commit 416af5f3cf91e6a0c848821b7cf62b96e84892b5 Merge: 4637dc4 9cbd59b Author: Brian Muramatsu Date: Thu Jul 28 16:51:21 2011 -0700 Merge "Increment CTS Version to 2.3 R5" into gingerbread commit 7c10a407b89ae32855606ffea522225148ab45a1 Author: Eino-Ville Talvala Date: Tue Jul 26 16:17:24 2011 -0700 Relax timestamp consistency checking for SurfaceTextures and Camera. Until proper vendor support can be added, timestamps will not be as accurate as they should be, so relax the CTS test for now. Bug: 5049691 Change-Id: I20e430dc86b58f369ef0bd25cfd091abf98b9981 commit 9cbd59b7367f131c9d75fb1742703c7354a3ac5e Author: Brian Muramatsu Date: Thu Jul 28 15:01:30 2011 -0700 Increment CTS Version to 2.3 R5 Bug 5092826 Change-Id: I63d3d784780651849c5533b675f8f4b3b18b57b4 commit f6348995c4e233b6ee4c5e04a679ab494c249086 Merge: 6430fe8 3e2e036 Author: Brian Muramatsu Date: Thu Jul 28 14:58:20 2011 -0700 am 3e2e036f: am 58da8bc7: (-s ours) am 4637dc40: Merge "Update BuildVersionTest" into gingerbread * commit '3e2e036ff03b247843bb349bca13a1e9f56b47f8': Update BuildVersionTest commit 3e2e036ff03b247843bb349bca13a1e9f56b47f8 Merge: 1628b2d 58da8bc Author: Brian Muramatsu Date: Thu Jul 28 14:56:51 2011 -0700 am 58da8bc7: (-s ours) am 4637dc40: Merge "Update BuildVersionTest" into gingerbread * commit '58da8bc7c2467bf0e0a60fc00fe7a06f05bc1e4b': Update BuildVersionTest commit 58da8bc7c2467bf0e0a60fc00fe7a06f05bc1e4b Merge: b11c2cf 4637dc4 Author: Brian Muramatsu Date: Thu Jul 28 14:49:51 2011 -0700 am 4637dc40: Merge "Update BuildVersionTest" into gingerbread * commit '4637dc40b954e32217c103f6e2401e941a03af43': Update BuildVersionTest commit 4637dc40b954e32217c103f6e2401e941a03af43 Merge: 0efa145 ee8edf7 Author: Brian Muramatsu Date: Thu Jul 28 14:35:26 2011 -0700 Merge "Update BuildVersionTest" into gingerbread commit ee8edf79fa2a9b6d2f0bda00a71fca3d7d10ad7f Author: Brian Muramatsu Date: Thu Jun 30 14:14:31 2011 -0700 Update BuildVersionTest Bug 4981539 Change-Id: I80a5527283026535a330ac5f65768d2a5e1e4145 commit 6430fe83da8e8e1f7392e6de0c35fb915fad9d1c Merge: 1233e57 1628b2d Author: Brian Muramatsu Date: Thu Jul 28 12:14:21 2011 -0700 am 1628b2d2: am b11c2cf9: am 0efa145a: Merge "detect tab reuse" into gingerbread * commit '1628b2d2329f20d6b8be57524fbef2f3266a5b87': detect tab reuse commit 1628b2d2329f20d6b8be57524fbef2f3266a5b87 Merge: f28be6e b11c2cf Author: Brian Muramatsu Date: Thu Jul 28 12:09:54 2011 -0700 am b11c2cf9: am 0efa145a: Merge "detect tab reuse" into gingerbread * commit 'b11c2cf94fa991546f8b423d804404bf2c5413f3': detect tab reuse commit b11c2cf94fa991546f8b423d804404bf2c5413f3 Merge: d384f81 0efa145 Author: Brian Muramatsu Date: Thu Jul 28 12:08:30 2011 -0700 am 0efa145a: Merge "detect tab reuse" into gingerbread * commit '0efa145ab484e9c01e2e65308e79996b8b61540e': detect tab reuse commit 0efa145ab484e9c01e2e65308e79996b8b61540e Merge: fabaa0c 7e48fb8 Author: Brian Muramatsu Date: Thu Jul 28 11:59:26 2011 -0700 Merge "detect tab reuse" into gingerbread commit 1233e57d9b41783ba4e1c3dc4650a6edd53677ce Merge: 2663053 0df2dfc Author: Gloria Wang Date: Thu Jul 28 10:07:12 2011 -0700 Merge "Add CTS test for MediaStore column IS_DRM." commit 7e48fb87d48d27e65942b53b7918288c8d740e17 Author: Nick Kralevich Date: Wed Jul 27 13:28:35 2011 -0700 detect tab reuse Verify that state isn't transitioning from one browser window to another browser window via javascript URIs. Bug: 5020329 Change-Id: Id87730d1f76112d1aebae7204c4d8c83fa7bc2a5 commit 26630533a618009f648f70461eb181619b736b86 Merge: 732525e f28be6e Author: Brian Muramatsu Date: Wed Jul 27 18:24:50 2011 -0700 resolved conflicts for merge of f28be6e1 to master Change-Id: If362e5241e4fad5f297871223554e3583af1081f commit f28be6e1ed2065cf45cab2996c3f561754bd64c9 Merge: 49ab102 d384f81 Author: Brian Muramatsu Date: Wed Jul 27 17:55:16 2011 -0700 Merge commit 'd384f817' into manualmerge Conflicts: apps/CtsVerifier/src/com/android/cts/verifier/features/FeatureSummaryActivity.java Change-Id: I73476a374652a478aafd2a16e7b633110276aa9c commit d384f817dfa3b356b45c33e2572633ef5df7d598 Merge: f475d01 fabaa0c Author: Brian Muramatsu Date: Wed Jul 27 16:30:42 2011 -0700 am fabaa0c9: Merge "Add GB MR1 USB Accessory Feature" into gingerbread * commit 'fabaa0c94ff074f8d0d80a7269f4c738d2037697': Add GB MR1 USB Accessory Feature commit 732525e64ac797f40bb7f13947003517ea7e17c3 Merge: c5de257 49ab102 Author: Brian Muramatsu Date: Wed Jul 27 16:23:19 2011 -0700 am 49ab1020: am f475d016: am 3a6fe852: Merge "CTS always fail. KT doesn\'t support this case(SMS MULTIPART MESSAAGE)." into gingerbread * commit '49ab102082b2758bc02a92b7cf8b2db3fab1bcf1': CTS always fail. KT doesn't support this case(SMS MULTIPART MESSAAGE). commit 0df2dfcd3b728c6a9f6a94b1aa014c80afcc63c6 Author: Gloria Wang Date: Wed Jul 6 17:33:29 2011 -0700 Add CTS test for MediaStore column IS_DRM. Change-Id: I96076c19debc1b2053d70529f4ba8dd070a60685 commit 49ab102082b2758bc02a92b7cf8b2db3fab1bcf1 Merge: 7ebd53c f475d01 Author: Brian Muramatsu Date: Wed Jul 27 16:20:43 2011 -0700 am f475d016: am 3a6fe852: Merge "CTS always fail. KT doesn\'t support this case(SMS MULTIPART MESSAAGE)." into gingerbread * commit 'f475d0164e5154eb42862c009a81a727206fcebf': CTS always fail. KT doesn't support this case(SMS MULTIPART MESSAAGE). commit fabaa0c94ff074f8d0d80a7269f4c738d2037697 Merge: 3a6fe85 fc13382 Author: Brian Muramatsu Date: Wed Jul 27 16:19:48 2011 -0700 Merge "Add GB MR1 USB Accessory Feature" into gingerbread commit f475d0164e5154eb42862c009a81a727206fcebf Merge: 5fe4095 3a6fe85 Author: Brian Muramatsu Date: Wed Jul 27 16:18:54 2011 -0700 am 3a6fe852: Merge "CTS always fail. KT doesn\'t support this case(SMS MULTIPART MESSAAGE)." into gingerbread * commit '3a6fe8525c99cab0277283e8f7920231192c3fd1': CTS always fail. KT doesn't support this case(SMS MULTIPART MESSAAGE). commit 3a6fe8525c99cab0277283e8f7920231192c3fd1 Merge: 38fd55a 86a10d1 Author: Brian Muramatsu Date: Wed Jul 27 16:06:21 2011 -0700 Merge "CTS always fail. KT doesn't support this case(SMS MULTIPART MESSAAGE)." into gingerbread commit 86a10d1fc057ce11b28170a2bea7b4b7fb9a1655 Author: Brian Muramatsu Date: Wed Jul 27 15:51:21 2011 -0700 CTS always fail. KT doesn't support this case(SMS MULTIPART MESSAAGE). Change-Id: I5c3afe5750ad969568e29c553dd183ac20016a53 commit 9ceaf260efdcb2e006732b29066a47933beeb9e4 Merge: 23574c9 4e9df1a Author: Brian Muramatsu Date: Wed Jul 27 14:49:05 2011 -0700 Merge remote branch 'goog/honeycomb' into manualmerge commit 4e9df1a479d6fe383fed0adf9ab3c4f9b7729934 Merge: 1b3e391 38fd55a Author: Brian Muramatsu Date: Wed Jul 27 12:09:32 2011 -0700 Merge remote branch 'goog/gingerbread' into manualmerge commit 04216033b75210cebd6f1e0c8bceb3645758ca78 Author: Brian Muramatsu Date: Wed Jul 27 11:56:02 2011 -0700 Allow TV Density in Tests Bug 5085115 Change-Id: I04beb0142083d5bb8b89687a080943e7fd1a3764 commit fc1338265d297af51d3aa075b72ffe7e9e0d6b04 Author: Brian Muramatsu Date: Wed Jul 27 11:16:29 2011 -0700 Add GB MR1 USB Accessory Feature Bug 3403491 Change-Id: Ic3770c904535a196f14420c41f963cd1653b3a4e commit c5625c10a9ba9cdcff93dfd4c6ef74ac09d4b2fe Author: Vikas Arora Date: Wed Jul 20 14:46:27 2011 +0530 Extended BitmapRegionDecoderTest for WEBP image. Added WebP image to the list of images tested for BitmapRegionDecoder functionality. - In the last patch, some of the testcases got left w.r.t WEBP. - WEBP Region Decoder for RGB_565 color mode requires more MSE Margin. Refactored the tests to specify the MSE Margin for individual cases. - Added separate distance function for RGB_565 color-space. - Rolled back the last patch. Investigated it further and found that irrespective of the color-space, the Bitmap.getPixels() returns the 'int' (4 bytes) for a pixel corresponding to ARGB channels (8 bits each). Not sure, where but (5,6,5) bits of RGB_565 pixel are converted to 8 bits each by logic (r[4..0] << 3 | r[4..0] >> 5, g[5..0] << 2 | g[5..0] >> 6, b[4..0] << 3 | b[4..0] >> 5). Similarly for ARGB_4444 pixel, the 4 bits per channel are converted to 8 bits (r[3..0] << 4 | r[3..0] and so on). - Added decoder test for other color-configs for BitmapFactory class as well. Change-Id: Ib885cdae6f24052aa17269950eed7b527ef1921b commit c5de257fc7cf440c0222e022eae0c7dfc3c5bb3a Merge: 79779e5 7ebd53c Author: Brian Muramatsu Date: Mon Jul 25 17:25:20 2011 -0700 am 7ebd53ce: am 5fe40958: am 38fd55a8: Merge "Fix Info Dialog Leak" into gingerbread * commit '7ebd53ce7680e8cc008e62d9d6211456e94414c9': Fix Info Dialog Leak commit 23574c9a3ce2c5a4dbe699a2f9f6a634a68fcec9 Author: Jason Bayer Date: Mon Jul 25 17:02:16 2011 -0700 Change truststore location in test runner libcore says java.home is /system, so the truststore path should be /system/etc/... This worked on existing android devices because they symlink /etc to /system/etc. Googletv doesn't symlink, but the test should mimic reality and look in /system/etc Confirmed on moto xoom and googletv Change-Id: I5a7db6842e60ab3aa141d1dc72452ecc47f8fd84 commit 79779e5dccc9a49fd938239a4cee921635c2df16 Author: Kenny Root Date: Mon Jul 25 16:35:15 2011 -0700 Add Time#compare null check test Change-Id: Ia9238055eb64acb8dce2ac3658e6d32ed68bcf04 commit 7ebd53ce7680e8cc008e62d9d6211456e94414c9 Merge: ec9f5cb 5fe4095 Author: Brian Muramatsu Date: Mon Jul 25 13:07:41 2011 -0700 am 5fe40958: am 38fd55a8: Merge "Fix Info Dialog Leak" into gingerbread * commit '5fe409581b49dd75d5ae401beed621ed7b0fade4': Fix Info Dialog Leak commit 5fe409581b49dd75d5ae401beed621ed7b0fade4 Merge: 2a17399 38fd55a Author: Brian Muramatsu Date: Mon Jul 25 11:48:25 2011 -0700 am 38fd55a8: Merge "Fix Info Dialog Leak" into gingerbread * commit '38fd55a8505172318c0c3a458241b9a5384af522': Fix Info Dialog Leak commit 38fd55a8505172318c0c3a458241b9a5384af522 Merge: 22bdacf ac735ad Author: Brian Muramatsu Date: Mon Jul 25 11:32:47 2011 -0700 Merge "Fix Info Dialog Leak" into gingerbread commit 42f2013ae61e1f87258443341ed5325b3f18280d Merge: 69fe176 e2d7465 Author: Brian Muramatsu Date: Mon Jul 25 11:08:17 2011 -0700 Merge "Remove name collisions in the vertex and fragment shader" into honeycomb-mr1 commit e2d74651f96c7d27332a3c6559df0c303e40af9f Author: Alex Sakhartchouk Date: Mon May 9 15:30:33 2011 -0700 Remove name collisions in the vertex and fragment shader Change-Id: I6885f73f2a0444c21d08a4f225b8e4d74b7cf2c9 commit ac735ad230528b70430f259cae7cf4a069ac65e0 Author: Brian Muramatsu Date: Fri Jul 22 16:08:47 2011 -0700 Fix Info Dialog Leak Properly use showDialog/onCreateDialog for creating the info dialog shown for each test activity, so that it does not leak when changing screen orientation in some tests. Change-Id: I18f0e75be79f7d7786c42126d0a0dfb71ffbc983 commit 7c60cc947d9a240fde1d0cde281618f80857b4d8 Merge: bf4bcc1 1f4ece7 Author: Brian Muramatsu Date: Fri Jul 22 13:05:37 2011 -0700 Merge "Increment Version to 3.2_r2" into honeycomb-mr2 commit bf4bcc15137deb87b29dea6ed4b9ba1777144196 Merge: cefca5e 0173ef5 Author: Brian Muramatsu Date: Fri Jul 22 13:05:10 2011 -0700 Merge "Permit Aspect Ratios Between 1.333 and 1.86" into honeycomb-mr2 commit 1f4ece744c6d415e497b54a6892f2569f205b10d Author: Brian Muramatsu Date: Fri Jul 22 12:13:08 2011 -0700 Increment Version to 3.2_r2 Bug 5064558 Change-Id: I0b9b5069ed8fcb88ceec344b448f885008d55bd4 commit 0173ef53bf988389089b629da32332cab957eb72 Author: Brian Muramatsu Date: Fri Jul 22 11:59:16 2011 -0700 Permit Aspect Ratios Between 1.333 and 1.86 Bug 5064558 Change-Id: I0f38ec157c643aa78d0dc6fe3cc72e05410eda46 commit 8435c12d91ffb5f34898d7bcdffe21daf2b3aa81 Merge: b8ea36a d7d392d Author: Svetoslav Ganov Date: Thu Jul 21 20:11:55 2011 -0700 Merge "CTS accessibility event test failing." commit d7d392def29d6aab372346a0d15b715d460cdac0 Author: Svetoslav Ganov Date: Thu Jul 21 20:09:37 2011 -0700 CTS accessibility event test failing. 1. I have added new members to the AccessibilityEvent class and changed the initial values for some properties nto -1 to convey that for this value they are irrelevant. bug:5051158 Change-Id: I1f2ad1fa2e1b6a050b3c07ffc2352e2f08d4d8d3 commit b8ea36a9157ecac758bfc85cd00bf638b6b9599a Merge: dbc7084 50cdcd8 Author: Dianne Hackborn Date: Thu Jul 21 16:08:29 2011 -0700 Merge "Fix CTS tests for CheckedTextView" commit 69fe1768a556374d2aad22d870dfb65bcf7f3bc1 Merge: 677fe34 c61ba23 Author: Brian Muramatsu Date: Thu Jul 21 13:02:09 2011 -0700 Merge "Skip testRecordAndPlay when the system does not have a microphone." into honeycomb-mr1 commit c61ba23df1820f349fead5703953f23d120294b5 Author: Le-Chun Wu Date: Thu Jul 21 10:39:30 2011 -0700 Skip testRecordAndPlay when the system does not have a microphone. Change-Id: I436d4188d455cad214025d818955f33eb8aef813 commit 50cdcd81108486e52cfb22c1ef52a27655fae14d Author: Fabrice Di Meglio Date: Thu Jul 21 11:38:08 2011 -0700 Fix CTS tests for CheckedTextView Change-Id: Iaf84e486a38100ec61d91b0302179d52fdb5dda0 commit dbc7084c5cd8fdf0f665dd6705417a8cba530a45 Merge: c71837f b9d1670 Author: Brian Muramatsu Date: Thu Jul 21 11:30:34 2011 -0700 Merge "Adding tests for most of the layout widgets." commit b9d1670d9885556385811f4e52b0bb4b9b0076dc Author: Andrew Sapperstein Date: Tue Jul 19 17:27:42 2011 -0700 Adding tests for most of the layout widgets. Additionally, built individual manual lookup tool for OEMs when a certain test does not pass. Also, the generator can now be run from the command line to generate the master versions of our tests. Script to automate this is coming soon. Change-Id: Iadbd8d53ccf0f8a6d0beb74daf729f60c385aeae commit c71837f4f702040f9c0ec3f613221d3f817ca424 Merge: e983c1e ec9f5cb Author: Brian Muramatsu Date: Wed Jul 20 11:33:14 2011 -0700 am ec9f5cb2: am 2a17399b: am 22bdacf2: Merge "Added and updated test cases in CTS." into gingerbread * commit 'ec9f5cb25a4320b595c9fbf0cea7d5c1311d9f42': Added and updated test cases in CTS. commit ec9f5cb25a4320b595c9fbf0cea7d5c1311d9f42 Merge: ddca3d0 2a17399 Author: Brian Muramatsu Date: Wed Jul 20 11:30:31 2011 -0700 am 2a17399b: am 22bdacf2: Merge "Added and updated test cases in CTS." into gingerbread * commit '2a17399b0e74effcb712167430876281dad57828': Added and updated test cases in CTS. commit 2a17399b0e74effcb712167430876281dad57828 Merge: 408d52a 22bdacf Author: Brian Muramatsu Date: Wed Jul 20 11:21:04 2011 -0700 am 22bdacf2: Merge "Added and updated test cases in CTS." into gingerbread * commit '22bdacf2f4c47f0e4d731a286f62ab1f9f8d08cd': Added and updated test cases in CTS. commit 22bdacf2f4c47f0e4d731a286f62ab1f9f8d08cd Merge: f5a3664 399ffda Author: Brian Muramatsu Date: Wed Jul 20 11:08:33 2011 -0700 Merge "Added and updated test cases in CTS." into gingerbread commit e983c1ecf0896f34292c5fc66fc3cdee3a0d0ea9 Merge: fb45d12 48c3925 Author: Brian Muramatsu Date: Tue Jul 19 17:47:30 2011 -0700 Merge "Initial import of Theme Verification Test." commit 48c39254eb518647711af34ccfc462bbfffbe66b Author: Andrew Sapperstein Date: Thu Jul 14 15:35:03 2011 -0700 Initial import of Theme Verification Test. Most of what is left is writing more individual tests. The framework itself is pretty much there at this point. Change-Id: I838d90529212e6a1741dc5dc70f0d6ea505e637a commit 399ffdacc357d863058baa8de926e57dbedc4fc8 Author: Maheshwar Singh Date: Fri Jul 8 14:26:29 2011 +0530 Added and updated test cases in CTS. Added and updated test cases in CTS for improving the code coverage for android.graphics package. Change-Id: Id701213b77055ae737c4a92cf81c4eb8ac75f6fc commit cefca5e397c1c951b111729788f9bc70253f6eaf Merge: 1aaaf94 bc2422a Author: Xavier Ducrohet Date: Sun Jul 17 13:50:04 2011 -0700 Merge "Do coverage tests on package.apk.unaligned" into honeycomb-mr2 commit fb45d12759f1ef78a7127d2a06c98e6daa4b77ca Merge: 869ab3f ddca3d0 Author: Brian Muramatsu Date: Fri Jul 15 14:57:17 2011 -0700 resolved conflicts for merge of ddca3d0a to master Change-Id: I89b0ba198e5ea333e89e2c3cfe79e9385d7c5069 commit 869ab3fdaa1828429d95377653211c1fda706dd7 Merge: c20bbb6 6f0426a Author: Brian Muramatsu Date: Fri Jul 15 14:12:13 2011 -0700 am 6f0426a8: am 0cb11a51: am 89a86d90: Merge "Improve a performance of a download file creation" into gingerbread * commit '6f0426a8c97da340ab48a6ee51acde9aea10846b': Improve a performance of a download file creation commit ddca3d0a3ad7ea0c7f04771b5104ad4a9e3199fd Merge: 6f0426a 408d52a Author: Brian Muramatsu Date: Fri Jul 15 11:41:37 2011 -0700 am 408d52a2: am f5a36645: Merge "Test for Settings Intents" into gingerbread * commit '408d52a22751688f9df445cb26a80cd2b81cf31b': Test for Settings Intents commit 408d52a22751688f9df445cb26a80cd2b81cf31b Merge: 0cb11a5 f5a3664 Author: Brian Muramatsu Date: Fri Jul 15 11:40:11 2011 -0700 am f5a36645: Merge "Test for Settings Intents" into gingerbread * commit 'f5a36645c1ed3cb3087f76d9cbb20f6271ead68f': Test for Settings Intents commit f5a36645c1ed3cb3087f76d9cbb20f6271ead68f Merge: 89a86d9 1b97113 Author: Brian Muramatsu Date: Fri Jul 15 11:30:49 2011 -0700 Merge "Test for Settings Intents" into gingerbread commit 1b97113721ae60723baba1e4745ce7ce35dd7e0b Author: Brian Muramatsu Date: Thu Jul 14 14:29:39 2011 -0700 Test for Settings Intents Bug 4983978 Tested on NS, Xoom, and Xoom Wi-fi. Change-Id: I3b3d18d0a1f4e1703b984ef9222f249ad78f3c1c commit c20bbb6cab21a515355dbeda60c17d7211e19789 Merge: e4af16c 7f94a0f Author: Brian Muramatsu Date: Fri Jul 15 11:20:41 2011 -0700 am 7f94a0f6: (-s ours) am 25414743: am 792b821b: Merge "Check Device Certificates" into gingerbread * commit '7f94a0f6f65d5b8382efdfe44d4e1690aa89ef3f': Check Device Certificates commit 6f0426a8c97da340ab48a6ee51acde9aea10846b Merge: 7f94a0f 0cb11a5 Author: Brian Muramatsu Date: Fri Jul 15 11:17:01 2011 -0700 am 0cb11a51: am 89a86d90: Merge "Improve a performance of a download file creation" into gingerbread * commit '0cb11a5147f78f43f0f7593e225379f8ece8c9a9': Improve a performance of a download file creation commit 1aaaf94fe5a31ced6e0644f18d3425cbf9449c4e Merge: bcb9ab8 677fe34 Author: Brian Muramatsu Date: Fri Jul 15 11:07:01 2011 -0700 Merge remote branch 'goog/honeycomb-mr1' into manualmerge commit e4af16caefc41e25ff454974aecaacc2f88a18c5 Merge: e28a611 7fe2717 Author: Brian Muramatsu Date: Fri Jul 15 11:04:21 2011 -0700 am 7fe27176: am 5a908db3: am 27b44809: Merge "add test case on broadcast notification of MediaScanner when it start and finish scaning the external storage" into gingerbread * commit '7fe27176863ee820e61b625cbb74dc30946b92c7': add test case on broadcast notification of MediaScanner when it start and finish scaning the external storage commit e28a611569055a19bd3e7ab97411f53ddd4c7294 Merge: f2515e0 4b4dda7 Author: Brian Muramatsu Date: Fri Jul 15 11:04:19 2011 -0700 am 4b4dda71: am 002b462b: am e1939ece: Merge "Cannot test properly if a quality is \'unspecified\'" into gingerbread * commit '4b4dda71cad32f5e6b60cd0cdcdd49f5948ee44f': Cannot test properly if a quality is 'unspecified' commit f2515e09e527b6b2c72d65e2f8450eb0c59af079 Merge: 03f8fef ea7e25e Author: Brian Muramatsu Date: Fri Jul 15 11:04:16 2011 -0700 am ea7e25e3: am b4eac90a: resolved conflicts for merge of 3f743e45 to gingerbread-plus-aosp * commit 'ea7e25e3fbd98d897e1fd649c4ba3978a81f8621': It is neccessary to keep a reference to ParcelFileDescriptor commit 03f8fef3346841a907ef84a0388de21e2fd6ff4b Merge: d3fce29 878f5bf Author: Brian Muramatsu Date: Fri Jul 15 11:04:13 2011 -0700 am 878f5bfe: am 21273a6a: am bf50d266: Merge "Fix Optional Features Being Required" into gingerbread * commit '878f5bfe3a960cb5d4e79a452fb1bc13b5375862': Fix Optional Features Being Required commit d3fce2920335f16c26b9d451c3920daabc1330d7 Merge: 543aefb e258c23 Author: Brian Muramatsu Date: Fri Jul 15 11:04:03 2011 -0700 am e258c23a: am 4c061b27: am fdc7fdb1: Merge "Don\'t fail if vold.fstab doesn\'t exist." into gingerbread * commit 'e258c23af6518f5306f434734a1dd41feaef346e': Don't fail if vold.fstab doesn't exist. commit 677fe3459b2facdf1da53f106688e5f5ec3924eb Author: Brian Muramatsu Date: Fri Jul 15 10:46:28 2011 -0700 Revert "Requires USB Features in HC MR1" Bug 5035596 This reverts commit 08c3c23cb652e8c23de1b2cc8f9c0a41276ed640. Change-Id: Iffbbf579d56984cdaefe0a7e734fabc4f331d78c commit 7f94a0f6f65d5b8382efdfe44d4e1690aa89ef3f Merge: 7fe2717 2541474 Author: Brian Muramatsu Date: Fri Jul 15 10:47:30 2011 -0700 am 25414743: am 792b821b: Merge "Check Device Certificates" into gingerbread * commit '25414743f91c27b3c2ef0388b70100dade0a6308': Check Device Certificates commit 7fe27176863ee820e61b625cbb74dc30946b92c7 Merge: 4b4dda7 5a908db Author: Brian Muramatsu Date: Fri Jul 15 10:47:27 2011 -0700 am 5a908db3: am 27b44809: Merge "add test case on broadcast notification of MediaScanner when it start and finish scaning the external storage" into gingerbread * commit '5a908db3c8e9202ee841082fd3a8fff04a9afa58': add test case on broadcast notification of MediaScanner when it start and finish scaning the external storage commit 4b4dda71cad32f5e6b60cd0cdcdd49f5948ee44f Merge: ea7e25e 002b462 Author: Brian Muramatsu Date: Fri Jul 15 10:47:25 2011 -0700 am 002b462b: am e1939ece: Merge "Cannot test properly if a quality is \'unspecified\'" into gingerbread * commit '002b462b018facaa516fc1eec9c9bc543db38287': Cannot test properly if a quality is 'unspecified' commit ea7e25e3fbd98d897e1fd649c4ba3978a81f8621 Merge: 878f5bf b4eac90 Author: Brian Muramatsu Date: Fri Jul 15 10:47:22 2011 -0700 am b4eac90a: resolved conflicts for merge of 3f743e45 to gingerbread-plus-aosp * commit 'b4eac90a09c7cfcb95c43d07fb9241fd46869e10': It is neccessary to keep a reference to ParcelFileDescriptor commit 878f5bfe3a960cb5d4e79a452fb1bc13b5375862 Merge: e258c23 21273a6 Author: Brian Muramatsu Date: Fri Jul 15 10:47:07 2011 -0700 am 21273a6a: am bf50d266: Merge "Fix Optional Features Being Required" into gingerbread * commit '21273a6a9ca8a43cd90521f6d6bb4dc6015b842a': Fix Optional Features Being Required commit e258c23af6518f5306f434734a1dd41feaef346e Merge: de45562 4c061b2 Author: Brian Muramatsu Date: Fri Jul 15 10:47:04 2011 -0700 am 4c061b27: am fdc7fdb1: Merge "Don\'t fail if vold.fstab doesn\'t exist." into gingerbread * commit '4c061b270214394ea8ad6586dec9f9cdb4d11a34': Don't fail if vold.fstab doesn't exist. commit 543aefbe337fb9e1c0776be198bf474f17397902 Merge: c87fd6b 061c611 Author: Gilles Debunne Date: Fri Jul 15 09:30:03 2011 -0700 Merge changes I211f4996,I3b3d18d0 * changes: Merge of AOSP I3b3d18d0: Test for Settings Intents Test for Settings Intents commit c87fd6be69f1b3859e7b9d197ee7529a5c1b45ba Author: Tsu Chiang Chuang Date: Wed Jul 13 17:04:40 2011 -0700 add a check to make sure that the javapackage format is correct. Change-Id: I85c27ccfa37f588e39a17d3a507efebf12efae3b commit 061c611d66f337e3ec7afeaa6899e0d88ad84951 Author: Gilles Debunne Date: Thu Jul 14 18:07:56 2011 -0700 Merge of AOSP I3b3d18d0: Test for Settings Intents Uncommented the 3 tests that did not pass. Now all pass after change https://android-git.corp.google.com/g/121469 in Settings's manifest Change-Id: I211f499669e943f0c91d6a1d5814e3b495a75191 commit 6dc8fc88bd4e55131bf534dacb49964e5afa4dca Author: Brian Muramatsu Date: Thu Jul 14 14:29:39 2011 -0700 Test for Settings Intents Bug 4983978 Tested on NS, Xoom, and Xoom Wi-fi. Most of these intents are commented with "In some cases, a matching Activity may not exist, so ensure you safeguard against this." ... Change-Id: I3b3d18d0a1f4e1703b984ef9222f249ad78f3c1c commit 5fbb7145850293109feafa76a56d3da50da7e80c Merge: 0164e03 8fe4f54 Author: Wu-cheng Li Date: Thu Jul 14 17:19:55 2011 -0700 Merge "Test calling startPreview in jpeg callback." commit 0cb11a5147f78f43f0f7593e225379f8ece8c9a9 Merge: 2541474 89a86d9 Author: Brian Muramatsu Date: Thu Jul 14 16:51:54 2011 -0700 am 89a86d90: Merge "Improve a performance of a download file creation" into gingerbread * commit '89a86d90644286d85e4f8ec67a69215a87368596': Improve a performance of a download file creation commit 89a86d90644286d85e4f8ec67a69215a87368596 Merge: 792b821 a57ad6f Author: Brian Muramatsu Date: Thu Jul 14 16:43:05 2011 -0700 Merge "Improve a performance of a download file creation" into gingerbread commit a57ad6f5b3bfd8ed4cae03788ddcc305e0795159 Author: Masanori Ogino Date: Thu Jul 14 12:59:20 2011 +0900 Improve a performance of a download file creation CtsTestServer may take a long time on a slower device when it creates 55MB download file. If the time was over 20 sec, then Http request would be timed-out. In that case, the test android.app.cts.DownloadManagerTest#testMinimumDownload fails. (It's not 2min time-out in this test case.) So it is needed to improve file write performance like this patch. Change-Id: I1b153e02d15b4db786d407f5f2fa9b04566e9caa commit 8fe4f547c45f2757e390e8a754acd4fec05ca516 Author: Wu-cheng Li Date: Fri Jul 15 06:22:24 2011 +0800 Test calling startPreview in jpeg callback. Some camera drivers incorrectly think the capture is still in progress after jpeg callback is sent to apps. bug:3362253 Change-Id: I223593a59836808db26db9a46e5ff4fb50adf2dd commit 0164e039ea222e26ecc30399404900351b5163aa Merge: 6c19f84 1107377 Author: Brian Muramatsu Date: Thu Jul 14 15:13:16 2011 -0700 Merge "Fix LocationManagerTest#testAddProximityAlert" commit 110737758de167e4392d4b03620db92e7ece5b9d Author: Brian Muramatsu Date: Thu Jul 14 15:02:55 2011 -0700 Fix LocationManagerTest#testAddProximityAlert Bug 5004572 It was trying to pass a null value as the PendingIntent. Change-Id: I86100d567a3c20554e22168a096973280dde7ec6 commit d1a9ec6b670009c6597b7d45015b2181daac3d72 Author: Wade Guthrie Date: Mon Jul 11 09:38:02 2011 -0700 Fix for testPlayVideo timeout (thanks to Jason Bayer for CountDownLatch). Change-Id: I5ac61daf583f7a087c4b28b04c6167a1a7b98ea4 commit bc2422afa4112dd6d60568ff3f8271db5ef00e58 Author: Ying Wang Date: Wed Jul 13 16:14:59 2011 -0700 Do coverage tests on package.apk.unaligned Instead of package.apk, which may be stripped off classes.dex. Change-Id: I7f0ff47ae2800b0f6be922886243d32c72df37ef commit 25414743f91c27b3c2ef0388b70100dade0a6308 Merge: 5a908db 792b821 Author: Brian Muramatsu Date: Thu Jul 14 11:04:06 2011 -0700 am 792b821b: Merge "Check Device Certificates" into gingerbread * commit '792b821b662675414304b5b4342d19ba3400c6f9': Check Device Certificates commit 5a908db3c8e9202ee841082fd3a8fff04a9afa58 Merge: 002b462 27b4480 Author: Brian Muramatsu Date: Thu Jul 14 11:04:04 2011 -0700 am 27b44809: Merge "add test case on broadcast notification of MediaScanner when it start and finish scaning the external storage" into gingerbread * commit '27b448090e9045e827b67b3cbdf0f4ea6e39fc3c': add test case on broadcast notification of MediaScanner when it start and finish scaning the external storage commit 002b462b018facaa516fc1eec9c9bc543db38287 Merge: b4eac90 e1939ec Author: Brian Muramatsu Date: Thu Jul 14 11:04:02 2011 -0700 am e1939ece: Merge "Cannot test properly if a quality is \'unspecified\'" into gingerbread * commit 'e1939eceac5a8082284fe2c6e5f79b9c12282515': Cannot test properly if a quality is 'unspecified' commit b4eac90a09c7cfcb95c43d07fb9241fd46869e10 Merge: 21273a6 3f743e4 Author: Brian Muramatsu Date: Thu Jul 14 10:59:37 2011 -0700 resolved conflicts for merge of 3f743e45 to gingerbread-plus-aosp Change-Id: I20a6f2ceabe9ee43a141348442c45cb2314a46cf commit 21273a6a9ca8a43cd90521f6d6bb4dc6015b842a Merge: 4c061b2 bf50d26 Author: Brian Muramatsu Date: Wed Jul 13 22:38:57 2011 -0700 am bf50d266: Merge "Fix Optional Features Being Required" into gingerbread * commit 'bf50d26612d0f6db72406264cbbf9c19ae215be9': Fix Optional Features Being Required commit 4c061b270214394ea8ad6586dec9f9cdb4d11a34 Merge: bebff62 fdc7fdb Author: Brian Muramatsu Date: Wed Jul 13 22:38:54 2011 -0700 am fdc7fdb1: Merge "Don\'t fail if vold.fstab doesn\'t exist." into gingerbread * commit 'fdc7fdb1603d2413e4e3532a0445d1ba67a5753a': Don't fail if vold.fstab doesn't exist. commit 6c19f846a2800e5ea4eb7bad839700db6fc9e0ba Merge: c3d2f1d 670fe90 Author: Ying Wang Date: Wed Jul 13 16:25:58 2011 -0700 Merge "Do coverage tests on package.apk.unaligned" commit 670fe90e588f78f3eb0db18fe7856aa25bb1e5b6 Author: Ying Wang Date: Wed Jul 13 16:14:59 2011 -0700 Do coverage tests on package.apk.unaligned Instead of package.apk, which may be stripped off classes.dex. Change-Id: I3ff49007013492be5b72dd4fa5c1d815557670f8 commit c3d2f1d781427a42cb7d8a6cee3a416da789aae3 Author: Brian Muramatsu Date: Fri Jul 8 15:39:16 2011 -0700 Check Device Certificates (ICS Version) Bug 4968279 Add CertificateTest that loads certificate fingerprints from CertificateData and checks that the device has matching certificates. The java-cert-list-generator.sh script loads certificates from a libcore directory and generates a Java file with the fingerprints. Change-Id: I0d015d9eba777c4e9fc6ca5acb5879e669e8f7bc commit bcb9ab8d1dec48384b1d3f38a2bd90de070cfa87 Merge: 177bac5 03eae65 Author: Brian Muramatsu Date: Wed Jul 13 12:51:42 2011 -0700 Merge remote branch 'goog/honeycomb-mr1' into manualmerge Conflicts: apps/CtsVerifier/AndroidManifest.xml tools/host/src/com/android/cts/Version.java Change-Id: I774af5228660f860a64e3bfec8baaab6643c3d84 commit 03eae653f7bb0ed2299620c9c95837e5e0f48b7e Merge: 08c3c23 95e7618 Author: Brian Muramatsu Date: Wed Jul 13 12:46:55 2011 -0700 Merge "Update CTS Version to 3.1_r3" into honeycomb-mr1 commit 95e7618b9b884658423264355c46030fe1c5a0c8 Author: Brian Muramatsu Date: Wed Jul 13 12:43:20 2011 -0700 Update CTS Version to 3.1_r3 Change-Id: Ic52925ae05a0187a06700c7fe856bb0424315388 commit 08c3c23cb652e8c23de1b2cc8f9c0a41276ed640 Author: Brian Muramatsu Date: Wed Jul 13 12:39:35 2011 -0700 Requires USB Features in HC MR1 Bug 5008280 Change-Id: I00e98a0cb797b4d4e1785d27b174210d7e84c506 commit 177bac55f443aeeb10679345c9a56d0e764f48c6 Author: Brian Muramatsu Date: Tue Jul 12 18:28:18 2011 -0700 Add HC MR2 Features to CTS Verifier Bug 5008280 Change-Id: I509b011a261ed1abcac76cf7d29673b7e846bed3 commit dab0be0823e7eb242679cea2e876b3ed45232d49 Merge: 59bdf69 23c84d9 Author: Brian Muramatsu Date: Tue Jul 12 18:05:21 2011 -0700 Merge remote branch 'goog/honeycomb-mr1' into manualmerge commit 23c84d9d2a87928518c5a4a5bbe5774f581f64e6 Merge: 5952c67 1b3e391 Author: Brian Muramatsu Date: Tue Jul 12 17:39:28 2011 -0700 Merge remote branch 'goog/honeycomb' into manualmerge Change-Id: If2682edd4c0264eefe4c3ac669333ac6785da606 commit 1b3e3911c9918d0a8091c3cf83923618e9da6efa Author: Brian Muramatsu Date: Tue Jul 12 16:21:05 2011 -0700 Update Certificates Data for HC Bug 4968279 Change-Id: I44b977d65118768f4a76d3b901ffe17da1d5ab86 commit 68bce37aef5da453011cd6180cd799cc3bf94ea7 Merge: 6712ccc 792b821 Author: Brian Muramatsu Date: Tue Jul 12 15:22:47 2011 -0700 Merge remote branch 'goog/gingerbread' into manualmerge Change-Id: I9ec4b97612365d5b10908da2dd45c4b03c9af3c2 commit 792b821b662675414304b5b4342d19ba3400c6f9 Merge: 27b4480 972e5ce Author: Brian Muramatsu Date: Tue Jul 12 14:48:25 2011 -0700 Merge "Check Device Certificates" into gingerbread commit 972e5ceec29270f5a42f4bf35560e8b68088c239 Author: Brian Muramatsu Date: Fri Jul 8 15:39:16 2011 -0700 Check Device Certificates Bug 4968279 Add CertificateTest that loads certificate fingerprints from CertificateData and checks that the device has matching certificates. The java-cert-list-generator.sh script loads certificates from a libcore directory and generates a Java file with the fingerprints. Change-Id: I0d015d9eba777c4e9fc6ca5acb5879e669e8f7bc commit cb6ff89c96ce26171bf9b9660976e06860c9aace Merge: e875fa4 90391d2 Author: Jeff Brown Date: Tue Jul 12 12:11:41 2011 -0700 Merge "Remove the simulator target from all makefiles. Bug: 5010576" commit 27b448090e9045e827b67b3cbdf0f4ea6e39fc3c Merge: e1939ec d541b30 Author: Brian Muramatsu Date: Tue Jul 12 11:23:33 2011 -0700 Merge "add test case on broadcast notification of MediaScanner when it start and finish scaning the external storage" into gingerbread commit e1939eceac5a8082284fe2c6e5f79b9c12282515 Merge: 3f743e4 2a0e344 Author: Brian Muramatsu Date: Tue Jul 12 11:11:47 2011 -0700 Merge "Cannot test properly if a quality is 'unspecified'" into gingerbread commit 3f743e45420e7f6925bc94f7404edea748f99ca3 Merge: bf50d26 508cd74 Author: Brian Muramatsu Date: Tue Jul 12 11:05:00 2011 -0700 Merge "It is neccessary to keep a reference to ParcelFileDescriptor" into gingerbread commit 5952c67d33fb738816b0dcf3716bf431c2b7afd8 Author: Nick Kralevich Date: Mon Jul 11 11:34:44 2011 -0700 Don't fail if vold.fstab doesn't exist. Bug: 5014713 Change-Id: Iddd7837833599327982fd7a1371ecc4078e3af6e commit 90391d284e6d14bf36e5c078ea5ca12d8cc51703 Author: Jeff Brown Date: Mon Jul 11 22:11:47 2011 -0700 Remove the simulator target from all makefiles. Bug: 5010576 Change-Id: I381792a456e19403a661b3e1ba640fd626e3607e commit d541b30396364d4455596ad11dce8a11111028de Author: Zhihong GUO Date: Tue Jul 5 15:52:26 2011 +0800 add test case on broadcast notification of MediaScanner when it start and finish scaning the external storage Change-Id: I4cd46718e6ed413a29630a78b3734f90e99f7ed7 commit 2a0e344e1821cb8f92fe19db5e9d8ddf76b32639 Author: Masanori Ogino Date: Tue Jul 12 10:30:13 2011 +0900 Cannot test properly if a quality is 'unspecified' If a test generates 'unspecified' as a password quality, then it fails at a test case of password minimum length. DevicePolicyManager won't save the length a setting file, when the password quality is configured as 'unspecified'. In that case, the test compares an actual min-length with an empty expected value. This test won't check any case exhaustively. So I believe the 'unspecified' case can be omitted. Change-Id: Id6a1284b77832691f6fd0761557f78811e272403 commit e875fa4e59eff5ee4d1fcf46a71e731841e5eb60 Merge: 5a24d24 de45562 Author: Brian Muramatsu Date: Mon Jul 11 17:09:32 2011 -0700 am de455621: am 07559ced: am 59bdf69e: Update Version Numbers for HC MR2 CTS * commit 'de45562119ead4e84a09d9ae69c83a76f4ccbc02': Update Version Numbers for HC MR2 CTS commit 5a24d2452ca18fe3d1295280690a7851f1a41291 Merge: 9868aca 3dd3b6a Author: Brian Muramatsu Date: Mon Jul 11 16:51:59 2011 -0700 resolved conflicts for merge of 3dd3b6a8 to master Change-Id: I27437b34ee8792334b18f3d888092b28b16c0b33 commit bf50d26612d0f6db72406264cbbf9c19ae215be9 Merge: fdc7fdb d8d37a4 Author: Brian Muramatsu Date: Mon Jul 11 14:29:29 2011 -0700 Merge "Fix Optional Features Being Required" into gingerbread commit fdc7fdb1603d2413e4e3532a0445d1ba67a5753a Merge: 424f5b0 9060c0a Author: Brian Muramatsu Date: Mon Jul 11 14:22:03 2011 -0700 Merge "Don't fail if vold.fstab doesn't exist." into gingerbread commit 9060c0a4c3e8fc04127e8b262aa3c77ee59c92dd Author: Nick Kralevich Date: Mon Jul 11 11:34:44 2011 -0700 Don't fail if vold.fstab doesn't exist. Bug: 5014713 Change-Id: Iddd7837833599327982fd7a1371ecc4078e3af6e commit 9868acac4c88bfff32f86c6b045765536a4d2e38 Author: Jeff Brown Date: Fri Jul 8 18:22:03 2011 -0700 Eliminate single-process mode. Bug: 5010576 Change-Id: I9a0a2724ba00619b7ac8d48b514dae2df54e1db2 commit de45562119ead4e84a09d9ae69c83a76f4ccbc02 Merge: 3dd3b6a 07559ce Author: Brian Muramatsu Date: Fri Jul 8 14:24:18 2011 -0700 am 07559ced: am 59bdf69e: Update Version Numbers for HC MR2 CTS * commit '07559ceddd4ba849457ba3269485ba481d3b5d29': Update Version Numbers for HC MR2 CTS commit 07559ceddd4ba849457ba3269485ba481d3b5d29 Merge: 21bfd26 59bdf69 Author: Brian Muramatsu Date: Fri Jul 8 14:20:04 2011 -0700 am 59bdf69e: Update Version Numbers for HC MR2 CTS * commit '59bdf69e32037ca9e8e2dcab53a39268407fc191': Update Version Numbers for HC MR2 CTS commit 59bdf69e32037ca9e8e2dcab53a39268407fc191 Author: Brian Muramatsu Date: Fri Jul 8 14:07:19 2011 -0700 Update Version Numbers for HC MR2 CTS Bug 5008280 Change-Id: Ia19aa953fca2882dd5b41e8e9c86271dd365d2bf commit 3dd3b6a8ba8aa697105d6fe5a3a814eed202afc0 Merge: 79930fe 21bfd26 Author: Brian Muramatsu Date: Fri Jul 8 11:48:10 2011 -0700 am 21bfd26f: am 111f5e92: Merge remote branch \'goog/honeycomb-mr1\' into manualmerge * commit '21bfd26fd69ac180ae35bf727dc8500fc56289ea': Add test to ensure data/drm directory exists for drm process to write the certificate files. For bug 4950503. Update Test Expectations for HC Fix DeviceAdminReceiverTest NPE Add a header for string.h for strerror and memset Fix Screen Lock Test for HC Update CTS Version to 3.0_r3 Fix webkit flakiness when waiting for results Increase HDPI/XHDPI Non-XLarge Min Memory to 32 Use Uri.encode with HTML that contains special characters Fix view tests to account for alternate actionbars Bug fix for b/4491376 CTS failure in CtsAccessibilityServiceTestCases. Changed to holo.notitle theme and test code. Add a case for density 213, which is used for some tv devices. The memory requirements are set to be the same as high and xhigh dpi Fixes AudioRecorderTest and MediaRecorderTest when there are no mics or cameras present commit 21bfd26fd69ac180ae35bf727dc8500fc56289ea Merge: 17d34ca 111f5e9 Author: Brian Muramatsu Date: Fri Jul 8 11:44:54 2011 -0700 am 111f5e92: Merge remote branch \'goog/honeycomb-mr1\' into manualmerge * commit '111f5e9222fb5c3069421fa70597fe2a3903e49b': (27 commits) Add test to ensure data/drm directory exists for drm process to write the certificate files. For bug 4950503. Update Test Expectations for HC Fix DeviceAdminReceiverTest NPE Add a header for string.h for strerror and memset Fix PolicySerializationTest Fix Screen Lock Test for HC Update CTS Version to 3.0_r3 Device Admin CTS Verifier Tests Add More Packages Required by CTS to Whitelist. Fix webkit flakiness when waiting for results Update NO_DELIVERY_REPORTS list for SMS CTS Verifier XML Reports Increase HDPI/XHDPI Non-XLarge Min Memory to 32 DevicePolicyManager Tests Use Uri.encode with HTML that contains special characters Fix view tests to account for alternate actionbars Bug fix for b/4491376 CTS failure in CtsAccessibilityServiceTestCases. Changed to holo.notitle theme and test code. Add a case for density 213, which is used for some tv devices. The memory requirements are set to be the same as high and xhigh dpi Fixes AudioRecorderTest and MediaRecorderTest when there are no mics or cameras present add source code to test if the data sms sent on port can be received correctly. ... commit a8bfbefaeabd66b3ae315d50e056cdd6e2a1270f Merge: f2c2cf5 af99cdf Author: Brian Muramatsu Date: Fri Jul 8 11:38:39 2011 -0700 Merge "Check Prefs and DB Values in AppSecurityTests" into froyo commit 111f5e9222fb5c3069421fa70597fe2a3903e49b Merge: d73a98c 421642d Author: Brian Muramatsu Date: Fri Jul 8 11:24:50 2011 -0700 Merge remote branch 'goog/honeycomb-mr1' into manualmerge commit d8d37a49a161a61ffc2d6e56e1a300738511c60c Author: Brian Muramatsu Date: Thu Jul 7 14:11:26 2011 -0700 Fix Optional Features Being Required Bug 4597917 Some features required in Froyo are now optional in GB, but appeared as required in GB. Fix this by using a set and placing the latest requirements in the set first. Change-Id: I0e8ad11bfc3179b8fd312cafdddacaaa2f40a3b5 commit b95cd54696ce6b5280d825b20556c0bdaad91e67 Merge: 37e9cf4 79930fe Author: Brian Muramatsu Date: Thu Jul 7 11:05:41 2011 -0700 am 79930fef: am bebff625: am 424f5b0b: Merge "Update lists for SMS" into gingerbread * commit '79930fef5b2495e622f16636e92421d1871d0508': Update lists for SMS commit 37e9cf44e766cd0f992dcfef02dfd215f36b7bf6 Merge: c24d894 2a8d45f Author: Brian Muramatsu Date: Thu Jul 7 11:05:26 2011 -0700 am 2a8d45fe: am c1ff203d: am 2066cd5e: am 9c051c78: Merge "Incorporated reviewer\'s comment on the Unit tests." * commit '2a8d45fe09fc863f8a7f69c331ef78da86475bb3': Incorporated reviewer's comment on the Unit tests. commit c24d894ff72febfbd2710eba136f50f3f98a5b1c Merge: f9e59dc e03605e Author: Brian Muramatsu Date: Thu Jul 7 10:49:14 2011 -0700 Merge commit 'e03605e3' into manualmerge Conflicts: tests/tests/graphics/src/android/graphics/cts/BitmapFactoryTest.java Change-Id: Iffce2a082c0019c12e7bea729a97a784e2f68594 commit af99cdf19a20ec938c97d9e7513f687b28b5f31c Author: Brian Muramatsu Date: Wed Jul 6 17:43:55 2011 -0700 Check Prefs and DB Values in AppSecurityTests Issue 14359 Expand the test to check that shared preferences and database values are removed after uninstalling an app. Change-Id: I6f52d3e61b69e2d044b1fcbd6a6b1dea9fdd5697 commit 421642dd58a7dc145f3f3c0fc87c9d6e45a2a804 Merge: 0048304 630d8cf Author: Brian Muramatsu Date: Wed Jul 6 16:21:53 2011 -0700 Merge "Merge remote branch 'goog/honeycomb' into manualmerge" into honeycomb-mr1 commit 630d8cf21b39104557763a5518cfb1e80ab8fb76 Merge: 5b457c1 6712ccc Author: Brian Muramatsu Date: Wed Jul 6 16:15:08 2011 -0700 Merge remote branch 'goog/honeycomb' into manualmerge Conflicts: tests/expectations/knownfailures-3.0_r1.txt Change-Id: I9f7a4cc4b089dfdad914d97b2f6b02b9396b7539 commit 00483041dbb4e371204f19b78a4adef7571a58c9 Author: Gloria Wang Date: Wed Jul 6 15:57:41 2011 -0700 Add test to ensure data/drm directory exists for drm process to write the certificate files. For bug 4950503. Change-Id: I4477d4aa1dfae0e06383c6f8afc1c0e91ebc9c26 commit 6712ccc9235ff5082cf229e607bfbf46618b62c9 Author: Brian Muramatsu Date: Wed Jul 6 15:43:09 2011 -0700 Update Test Expectations for HC Bug 4998308 Change-Id: I0e0bd40a3b7bb7330de6bb7e05478d9df31276ea commit 7178746315b47b6f0bcd405f126c52c216e6434b Author: Brian Muramatsu Date: Wed Jul 6 15:26:05 2011 -0700 Fix DeviceAdminReceiverTest NPE This unit test threw a NPE because getting the extras requires a pending result in the receiver which can only be set by a private API. The test could be changed to be a functional test to test this bit, but for now just remove these lines. Change-Id: I992b7813353c7f8e8f84cf5c8bc3898d1b1a9600 commit 79930fef5b2495e622f16636e92421d1871d0508 Merge: 2a8d45f bebff62 Author: Brian Muramatsu Date: Wed Jul 6 12:01:55 2011 -0700 am bebff625: am 424f5b0b: Merge "Update lists for SMS" into gingerbread * commit 'bebff625b5f8969ba55b519fcad04694031383dd': Update lists for SMS commit bebff625b5f8969ba55b519fcad04694031383dd Merge: c1ff203 424f5b0 Author: Brian Muramatsu Date: Wed Jul 6 11:59:52 2011 -0700 am 424f5b0b: Merge "Update lists for SMS" into gingerbread * commit '424f5b0bc38335a3f2150b32c2a8e56e1cabb0ae': Update lists for SMS commit f9e59dcb9a8f97dae2bfb931e907bcfcfa80897f Merge: a0f71b1 fb0f3f8 Author: Brian Muramatsu Date: Wed Jul 6 11:57:22 2011 -0700 Merge "Move ViewFlipperTest to UI Thread" commit a0f71b117fb799c01f710d8c5fa8741161f396ba Merge: c127c3e 31f2a0b Author: Brian Muramatsu Date: Wed Jul 6 11:57:06 2011 -0700 Merge "Fix View_AnimationTest" commit 2a8d45fe09fc863f8a7f69c331ef78da86475bb3 Merge: e03605e c1ff203 Author: Brian Muramatsu Date: Wed Jul 6 11:47:33 2011 -0700 am c1ff203d: am 2066cd5e: am 9c051c78: Merge "Incorporated reviewer\'s comment on the Unit tests." * commit 'c1ff203de7c919ff8b6d665dfadca3662a3acc93': Incorporated reviewer's comment on the Unit tests. commit c1ff203de7c919ff8b6d665dfadca3662a3acc93 Merge: ef67e86 2066cd5 Author: Brian Muramatsu Date: Wed Jul 6 11:46:18 2011 -0700 am 2066cd5e: am 9c051c78: Merge "Incorporated reviewer\'s comment on the Unit tests." * commit '2066cd5ede36dfc05a06a80c0deec55e65e376f1': Incorporated reviewer's comment on the Unit tests. commit 2066cd5ede36dfc05a06a80c0deec55e65e376f1 Merge: 6a70184 9c051c7 Author: Brian Muramatsu Date: Wed Jul 6 11:44:43 2011 -0700 am 9c051c78: Merge "Incorporated reviewer\'s comment on the Unit tests." * commit '9c051c782b966c15dfebe2349336d89bb217c0f8': Incorporated reviewer's comment on the Unit tests. commit 424f5b0bc38335a3f2150b32c2a8e56e1cabb0ae Merge: 5af12c5 48af391 Author: Brian Muramatsu Date: Wed Jul 6 11:43:47 2011 -0700 Merge "Update lists for SMS" into gingerbread commit e03605e3067ab2587a670c479cf1440e73651f46 Merge: 3c36e02 ef67e86 Author: Brian Muramatsu Date: Wed Jul 6 11:35:46 2011 -0700 am ef67e86e: am 6a70184e: am ecc7fa15: Merge "Add more comprehensive unit tests for WebP Image." * commit 'ef67e86e7aa9d5b434fbf0afc86349698681e75f': Add more comprehensive unit tests for WebP Image. commit ef67e86e7aa9d5b434fbf0afc86349698681e75f Merge: f07d18c 6a70184 Author: Brian Muramatsu Date: Wed Jul 6 11:33:29 2011 -0700 am 6a70184e: am ecc7fa15: Merge "Add more comprehensive unit tests for WebP Image." * commit '6a70184e006cbd96e5c8eb487f3bc1aa5c47ee28': Add more comprehensive unit tests for WebP Image. commit 6a70184e006cbd96e5c8eb487f3bc1aa5c47ee28 Merge: f3df907 ecc7fa1 Author: Brian Muramatsu Date: Wed Jul 6 11:31:08 2011 -0700 am ecc7fa15: Merge "Add more comprehensive unit tests for WebP Image." * commit 'ecc7fa15c69b89190b1e5c525527b012b257d280': Add more comprehensive unit tests for WebP Image. commit 9c051c782b966c15dfebe2349336d89bb217c0f8 Merge: ecc7fa1 8e1361e Author: Brian Muramatsu Date: Wed Jul 6 11:29:47 2011 -0700 Merge "Incorporated reviewer's comment on the Unit tests." commit ecc7fa15c69b89190b1e5c525527b012b257d280 Merge: 777fcb6 b45c9c8 Author: Brian Muramatsu Date: Wed Jul 6 11:25:23 2011 -0700 Merge "Add more comprehensive unit tests for WebP Image." commit c127c3e17279e0e870ec8ace5e094cbc8acff560 Merge: 68d71ba 50f888e Author: Brian Muramatsu Date: Wed Jul 6 11:06:50 2011 -0700 Merge "Fix Coverage Report Rules" commit 68d71ba81f7c498817eabfb6ec54782f13c60167 Merge: 5f8a647 3c36e02 Author: Brian Muramatsu Date: Wed Jul 6 07:53:07 2011 -0700 am 3c36e02f: am f07d18c3: am f3df9078: am 777fcb6f: Merge "Extended Compression testcase for WEBP compression." * commit '3c36e02f6c5e773d8b2cd0716240d48b2b2ff257': Extended Compression testcase for WEBP compression. commit 3c36e02f6c5e773d8b2cd0716240d48b2b2ff257 Merge: 3798acd f07d18c Author: Brian Muramatsu Date: Wed Jul 6 07:46:38 2011 -0700 am f07d18c3: am f3df9078: am 777fcb6f: Merge "Extended Compression testcase for WEBP compression." * commit 'f07d18c31c1e5c34cab1cf392a74ae6c6426dc49': Extended Compression testcase for WEBP compression. commit f07d18c31c1e5c34cab1cf392a74ae6c6426dc49 Merge: e5b7b7d f3df907 Author: Brian Muramatsu Date: Wed Jul 6 07:40:24 2011 -0700 am f3df9078: am 777fcb6f: Merge "Extended Compression testcase for WEBP compression." * commit 'f3df9078822fc3931d1ac449b7057114627fc256': Extended Compression testcase for WEBP compression. commit 5f8a647b187a1375c0f8be4d98417ae2217f1ff3 Merge: 4a02fe6 3798acd Author: Brian Muramatsu Date: Wed Jul 6 07:35:22 2011 -0700 am 3798acd6: am e5b7b7d4: am 5af12c57: Merge "add test on the Intent to start Camera." into gingerbread * commit '3798acd64947dd77b9a8cc7b155c26bc0617f696': add test on the Intent to start Camera. commit f3df9078822fc3931d1ac449b7057114627fc256 Merge: 952fb86 777fcb6 Author: Brian Muramatsu Date: Wed Jul 6 07:32:44 2011 -0700 am 777fcb6f: Merge "Extended Compression testcase for WEBP compression." * commit '777fcb6fd1de8f43ff5132ca47a6fa8186e65b35': Extended Compression testcase for WEBP compression. commit 3798acd64947dd77b9a8cc7b155c26bc0617f696 Merge: 96d9611 e5b7b7d Author: Brian Muramatsu Date: Wed Jul 6 07:29:05 2011 -0700 am e5b7b7d4: am 5af12c57: Merge "add test on the Intent to start Camera." into gingerbread * commit 'e5b7b7d430378f4f8e3e08c0944815ada8115507': add test on the Intent to start Camera. commit e5b7b7d430378f4f8e3e08c0944815ada8115507 Merge: 814b544 5af12c5 Author: Brian Muramatsu Date: Wed Jul 6 07:25:28 2011 -0700 am 5af12c57: Merge "add test on the Intent to start Camera." into gingerbread * commit '5af12c57a3990c00e4d0b5ae26c628ec98fb97dc': add test on the Intent to start Camera. commit 4a02fe6b9210fc3ee22da627018fc93ce329e35e Merge: 76c3490 db59f04 Author: Steve Block Date: Tue Jul 5 07:44:31 2011 -0700 Merge "Add a test for WebView.loadDataWithBaseURL() when the base URL uses the 'data' scheme" commit 76c34908d399984e07c28a0a274566e6783fe1d0 Merge: 82c7f7f 1625d90 Author: Steve Block Date: Tue Jul 5 06:35:09 2011 -0700 Merge "Test that JavaScript in the WebView can use a removed Java object" commit db59f04f5e2f654ff1a9172f71e8bb0f0d3ea061 Author: Steve Block Date: Mon Jul 4 18:30:20 2011 +0100 Add a test for WebView.loadDataWithBaseURL() when the base URL uses the 'data' scheme Bug: 4726284 Change-Id: I876b5082411f77fa4495abe41ef97758966bf661 commit 82c7f7fbd5644efb7f385c68e9a7e25f178dba68 Merge: 27578ec 7f8b399 Author: Steve Block Date: Mon Jul 4 10:08:53 2011 -0700 Merge "Add tests for WebView.loadData() and WebView.loadDataWithBaseURL() for cross-origin URLs" commit 7f8b3998e964b874792d1510e5a8c12cc4f5ce27 Author: Steve Block Date: Mon Jul 4 13:29:17 2011 +0100 Add tests for WebView.loadData() and WebView.loadDataWithBaseURL() for cross-origin URLs Bug: 4985285 Change-Id: I3b7faf46a40bc6ef99291ff416cfeaafda9fc798 commit 1625d907f7fbefa4dcf1991b222933c98ee0cd46 Author: Steve Block Date: Mon Jul 4 12:07:40 2011 +0100 Test that JavaScript in the WebView can use a removed Java object The Java object should remian usable until the WebView is navigated away from the current page. Bug: 4990734 Change-Id: Ie198b705bf840ddf82209ca1ad8642ce9eb73d38 commit 27578ec57308c9c6bdd17dc8b3e00ec1aa5184ae Merge: 5069f5f abd17ae Author: Narayan Kamath Date: Sat Jul 2 06:45:26 2011 -0700 Merge "Remove CTS tests for completeAudioAvailable" commit 50f888e7fd5459aae76506478c872e3f98ee53c0 Author: Brian Muramatsu Date: Thu Jun 30 17:06:13 2011 -0700 Fix Coverage Report Rules Both coverage report rules were using the same TEST_APKS variable so the two reports ended up using pretty much the same APKs. Change-Id: Ic2e1972f0714ebbb1830ee93253d450dd47e5760 commit fb0f3f80faa77067dc0354550b89d13108fc9ec8 Author: Brian Muramatsu Date: Fri Jul 1 16:55:29 2011 -0700 Move ViewFlipperTest to UI Thread This fixes: android.view.ViewAncestor$CalledFromWrongThreadException: Only the original thread that created a view hierarchy can touch its views. ...but the test then fails for another reason to be inspected later. Change-Id: I7ea5eb58b8633701f631f76bc74ec83132026d84 commit 31f2a0b8dd3b64a7b31e3011cd2b44437db8ed00 Author: Brian Muramatsu Date: Fri Jul 1 16:29:53 2011 -0700 Fix View_AnimationTest Exception for calling clearAnimation on non-UI thread.. Change-Id: I418eb9045e8f2e3239ac142a922d7d0561318945 commit 777fcb6fd1de8f43ff5132ca47a6fa8186e65b35 Merge: cf04eab bb7ecc7 Author: Brian Muramatsu Date: Fri Jul 1 15:45:45 2011 -0700 Merge "Extended Compression testcase for WEBP compression." commit 5b457c12938ce7e6d077f2897d9cb3c74cb2ebbb Merge: 37b9f94 53868d8 Author: Brian Muramatsu Date: Fri Jul 1 14:42:39 2011 -0700 Merge "Add a header for string.h for strerror and memset" into honeycomb-mr1 commit 5af12c57a3990c00e4d0b5ae26c628ec98fb97dc Merge: 99ca2c6 7dfa5f3 Author: Brian Muramatsu Date: Fri Jul 1 14:12:32 2011 -0700 Merge "add test on the Intent to start Camera." into gingerbread commit 7dfa5f3440ea612ef9b9f92dbcc06532a95eafa2 Author: Zhihong GUO Date: Wed Jun 29 21:43:12 2011 +0800 add test on the Intent to start Camera. Change-Id: I95f29dd1f6c6c9b1ef4e103fcfd599bf31a8cb55 commit 53868d8dd0a46ffbd5e86458e1ae4dfb15a89017 Author: Jason Bayer Date: Fri Jul 1 13:03:31 2011 -0700 Add a header for string.h for strerror and memset Change-Id: I98dbc5447362f032b3646791c489e1961ddbf9db commit 48af39166baa10fb8b9882b71ae8e40dbe0e0780 Author: pnath Date: Fri Jul 1 12:03:06 2011 -0700 Update lists for SMS Update the lists NO_DELIVERY_REPORTS, UNSUPPORT_DATA_SMS_MESSAGES and UNSUPPORT_MULTIPART_SMS_MESSAGES Change-Id: Ia706ca9539ac06b95ca6cd1de3d9da4a6955fa18 commit 37b9f948bcf51f6d3ab3b04f5c11869d8372578e Merge: c2d7966 7651941 Author: Brian Muramatsu Date: Fri Jul 1 10:50:24 2011 -0700 Merge "Fixes AudioRecorderTest and MediaRecorderTest when there are no mics or cameras present" into honeycomb-mr1 commit 5069f5f5f5ed935bc358138a28e6b01cbcb93a60 Merge: 2bb2449 96d9611 Author: Brian Muramatsu Date: Fri Jul 1 07:56:30 2011 -0700 am 96d9611e: am 17d34ca0: am d73a98c3: Revert "Restore Null Device Id for PHONE_TYPE_NONE Devices." * commit '96d9611e798c4e4ad313b2bcf50b1ff517dbae50': Revert "Restore Null Device Id for PHONE_TYPE_NONE Devices." commit abd17ae36aa7c115b156f7910bc765539f2dc004 Author: Narayan Kamath Date: Fri Jul 1 10:29:13 2011 +0100 Remove CTS tests for completeAudioAvailable Change-Id: I23d66d2daf52518ecc90bef067681681839ce6e2 commit 8e1361e05cea6087db7272a05c7d1c037d967a6a Author: Vikas Arora Date: Fri Jul 1 14:18:11 2011 +0530 Incorporated reviewer's comment on the Unit tests. Incorporated comments from reviewer (pascal.massimino@gmail.com), mostly nits. Change-Id: I8d28177d2f08ec162606069465da0d8cca6fa8c7 commit 2bb244906e847897e7cdebc896c72019c9d2fe48 Merge: b32c10e 998944d Author: Brian Muramatsu Date: Thu Jun 30 18:23:45 2011 -0700 am 998944d0: am 814b544e: am 99ca2c61: Merge "Fix PolicySerializationTest" into gingerbread * commit '998944d0e829269387863f44349aafff00e67fce': Fix PolicySerializationTest commit b32c10eb8ce6d5c0a7eed2152522e65af74148f2 Merge: 7f457cc 63224a0 Author: Brian Muramatsu Date: Thu Jun 30 18:10:29 2011 -0700 resolved conflicts for merge of 63224a0f to master Change-Id: Ie75c8627b15d86af47473a10026d7522ffb2c3f5 commit 7f457cc08921e5ee587b07cc9f02bd053753517e Merge: 28c8181 23a09f8 Author: Brian Muramatsu Date: Thu Jun 30 16:40:21 2011 -0700 am 23a09f85: am 94732487: am 3298c62a: Merge "Update NO_DELIVERY_REPORTS list for SMS" into gingerbread * commit '23a09f85a384e909722ee24655c07d397b9f9827': Update NO_DELIVERY_REPORTS list for SMS commit 28c81816882aa10c21aa3072f6ee238b3ea06e3d Merge: 34b4661 9b85374 Author: Brian Muramatsu Date: Thu Jun 30 16:40:09 2011 -0700 am 9b85374d: am d9d5b289: am b48147eb: Merge "Add More Packages Required by CTS to Whitelist." into gingerbread * commit '9b85374dc1e7365a0cb8a0a14e38c0be7d1592a9': Add More Packages Required by CTS to Whitelist. commit 96d9611e798c4e4ad313b2bcf50b1ff517dbae50 Merge: 998944d 17d34ca Author: Brian Muramatsu Date: Thu Jun 30 14:36:37 2011 -0700 am 17d34ca0: am d73a98c3: Revert "Restore Null Device Id for PHONE_TYPE_NONE Devices." * commit '17d34ca053e16a950e6de668e24d57926e3dc075': Revert "Restore Null Device Id for PHONE_TYPE_NONE Devices." commit 17d34ca053e16a950e6de668e24d57926e3dc075 Merge: bd0710c d73a98c Author: Brian Muramatsu Date: Thu Jun 30 14:31:37 2011 -0700 am d73a98c3: Revert "Restore Null Device Id for PHONE_TYPE_NONE Devices." * commit 'd73a98c305bbecc5ec216f0a8c431cddcd0adff5': Revert "Restore Null Device Id for PHONE_TYPE_NONE Devices." commit d73a98c305bbecc5ec216f0a8c431cddcd0adff5 Author: Brian Muramatsu Date: Thu Jun 30 12:24:22 2011 -0700 Revert "Restore Null Device Id for PHONE_TYPE_NONE Devices." This reverts commit 5da49ff25b3f1070f6fc14aed8d16f55c39cfbe3. Bug 4964762 Couldn't get this fixed in time without causing other problems. Change-Id: I3d62787fb34014ab37b4aa4c1dd7c5ea5ca3777e commit b45c9c8a0082911e0b803f96d51757a4f2ac4f8b Author: Vikas Arora Date: Thu Jun 30 09:11:23 2011 +0530 Add more comprehensive unit tests for WebP Image. Added test for end-to-end WebP encoding and decoding, by encoding a PNG image to WebP and decode WebP image back to Bitmap and compare against the PNG BitMap. Note for integrator: The file 'res/drawable/webp_test.webp' is already present in the internal Android-git repo, but not present in AOSP (as AOSP is somehow not in sync with internal Android-git repo w.r.t 'platform/cts.git' project). I had to add this file to make this test complete w.r.t it's dependencies. Change-Id: I68cfa71290797aee1d5645be0deec0a3bc1fe727 commit c2d7966791c271eb47ed8bb607562b48db65a5e5 Merge: 9aa4343 88148d2 Author: Brian Muramatsu Date: Wed Jun 29 18:13:57 2011 -0700 Merge remote branch 'goog/honeycomb' into manualmerge Conflicts: tools/host/src/com/android/cts/Version.java Change-Id: I059dc4b100504988ab3b1ccbd0a0bd61c1b05787 commit 88148d24d66b6992245a130aa7810032ba5daba6 Merge: 76c5025 99ca2c6 Author: Brian Muramatsu Date: Wed Jun 29 17:47:14 2011 -0700 Merge remote branch 'goog/gingerbread' into manualmerge commit 998944d0e829269387863f44349aafff00e67fce Merge: 63224a0 814b544 Author: Brian Muramatsu Date: Wed Jun 29 17:44:37 2011 -0700 am 814b544e: am 99ca2c61: Merge "Fix PolicySerializationTest" into gingerbread * commit '814b544e56f0976a301043e3d1a6c4a2b9afbb6b': Fix PolicySerializationTest commit 814b544e56f0976a301043e3d1a6c4a2b9afbb6b Merge: 64d22cb 99ca2c6 Author: Brian Muramatsu Date: Wed Jun 29 17:42:14 2011 -0700 am 99ca2c61: Merge "Fix PolicySerializationTest" into gingerbread * commit '99ca2c610588d9f690d8738d965837607641153f': Fix PolicySerializationTest commit 99ca2c610588d9f690d8738d965837607641153f Merge: 8ced838 2600584 Author: Brian Muramatsu Date: Wed Jun 29 17:30:42 2011 -0700 Merge "Fix PolicySerializationTest" into gingerbread commit 26005845c962cb215232944ad6a12d5ab829c7b9 Author: Brian Muramatsu Date: Wed Jun 29 17:27:28 2011 -0700 Fix PolicySerializationTest ...that boolean should not be true! Change-Id: I7dbd1f0a6b1de7acac3f27b3bc7d8a07e8e11527 commit 76c5025ef36ca15e14c2dd4ffd13165dcd656110 Author: Brian Muramatsu Date: Wed Jun 29 17:12:29 2011 -0700 Fix Screen Lock Test for HC Ran into the following issue where resetting the password requires a secure setting. Remove the code that tried to reset the password as it isn't essential. Change-Id: I1a36f9bbc8edaf8f15e824227df9b910673a412c http://code.google.com/p/android/issues/detail?id=17083 commit ef563bc2ab9568ce9f8a74008d48ffa4e92c5b0b Author: Brian Muramatsu Date: Wed Jun 29 16:19:33 2011 -0700 Update CTS Version to 3.0_r3 Change-Id: I759310544a1df9c9b451ad95ab4cc86d25c9a315 commit 6e3f892b41a6b68077916fcfc31bd2df540447c1 Merge: 75ba828 8ced838 Author: Brian Muramatsu Date: Wed Jun 29 15:58:54 2011 -0700 Merge remote branch 'goog/gingerbread' into manualmerge commit 63224a0fd90d99fff32b5497ec4e0b1e55fdf9ed Merge: 23a09f8 64d22cb Author: Brian Muramatsu Date: Wed Jun 29 14:33:37 2011 -0700 am 64d22cb9: am 8ced8381: Merge "Device Admin CTS Verifier Tests" into gingerbread * commit '64d22cb947a2b6eb4569ee56d02584049366438f': Device Admin CTS Verifier Tests commit 64d22cb947a2b6eb4569ee56d02584049366438f Merge: 9473248 8ced838 Author: Brian Muramatsu Date: Wed Jun 29 14:31:39 2011 -0700 am 8ced8381: Merge "Device Admin CTS Verifier Tests" into gingerbread * commit '8ced8381d62cbc29429dd4daf9adb80e4114780b': Device Admin CTS Verifier Tests commit 8ced8381d62cbc29429dd4daf9adb80e4114780b Merge: 3298c62 713049d Author: Brian Muramatsu Date: Wed Jun 29 14:22:27 2011 -0700 Merge "Device Admin CTS Verifier Tests" into gingerbread commit 713049de576cfd4c8c3558f1e8984d995fccb558 Author: Brian Muramatsu Date: Thu Jun 23 18:35:36 2011 -0700 Device Admin CTS Verifier Tests Bug 4562272 1. Screen Lock Test Checks that the screen locks immediately after calling DevicePolicyManager's lockNow() method. 2. Policy Serialization Test Checks that policies are saved and loaded properly across reboots. Change-Id: I47edeed4118ee5b3c8181df43eab43dd9a730be2 commit 9aa43435ddbc42160acdc811777fb2f5004ddb61 Merge: 9c66e1c 28fa111 Author: Brian Muramatsu Date: Wed Jun 29 12:17:50 2011 -0700 Merge "Fix view tests to account for alternate actionbars" into honeycomb-mr1 commit 23a09f85a384e909722ee24655c07d397b9f9827 Merge: 9b85374 9473248 Author: Brian Muramatsu Date: Wed Jun 29 11:44:37 2011 -0700 am 94732487: am 3298c62a: Merge "Update NO_DELIVERY_REPORTS list for SMS" into gingerbread * commit '94732487df3e187260500acc46f00424654f19a4': Update NO_DELIVERY_REPORTS list for SMS commit 94732487df3e187260500acc46f00424654f19a4 Merge: d9d5b28 3298c62 Author: Brian Muramatsu Date: Wed Jun 29 11:42:51 2011 -0700 am 3298c62a: Merge "Update NO_DELIVERY_REPORTS list for SMS" into gingerbread * commit '3298c62a91d3276a5ff5a08ee443ad300a59b7ec': Update NO_DELIVERY_REPORTS list for SMS commit 3298c62a91d3276a5ff5a08ee443ad300a59b7ec Merge: b48147e 399d62d Author: Brian Muramatsu Date: Wed Jun 29 11:36:56 2011 -0700 Merge "Update NO_DELIVERY_REPORTS list for SMS" into gingerbread commit 9c66e1c58bfc1479ae05cf488ad11fb9d92d8de5 Merge: bb7cbd0 9f968c8 Author: Brian Muramatsu Date: Wed Jun 29 11:31:43 2011 -0700 Merge "Fix webkit flakiness when waiting for results" into honeycomb-mr1 commit 9b85374dc1e7365a0cb8a0a14e38c0be7d1592a9 Merge: bcc95e5 d9d5b28 Author: Brian Muramatsu Date: Wed Jun 29 11:30:31 2011 -0700 am d9d5b289: am b48147eb: Merge "Add More Packages Required by CTS to Whitelist." into gingerbread * commit 'd9d5b289a19ee83243f73c8d352ab0dbbe11319d': Add More Packages Required by CTS to Whitelist. commit bb7cbd02327164cb3feccd0a01b70a473659e63f Merge: 67f3d95 65f7b4c Author: Brian Muramatsu Date: Wed Jun 29 11:30:15 2011 -0700 Merge "Use Uri.encode with HTML that contains special characters" into honeycomb-mr1 commit d9d5b289a19ee83243f73c8d352ab0dbbe11319d Merge: baa11a1 b48147e Author: Brian Muramatsu Date: Wed Jun 29 11:28:59 2011 -0700 am b48147eb: Merge "Add More Packages Required by CTS to Whitelist." into gingerbread * commit 'b48147eb0bfd57d59af831f6f42e3dcee46c9714': Add More Packages Required by CTS to Whitelist. commit b48147eb0bfd57d59af831f6f42e3dcee46c9714 Merge: c0a1361 8f1e437 Author: Brian Muramatsu Date: Wed Jun 29 11:14:02 2011 -0700 Merge "Add More Packages Required by CTS to Whitelist." into gingerbread commit 8f1e4372667c48ff1afa8020b3c7d707cf3747b5 Author: Brian Muramatsu Date: Wed Jun 29 11:09:07 2011 -0700 Add More Packages Required by CTS to Whitelist. Change-Id: I57bae4943e1c171ae1ebca98cd8ea35025967c9b commit 9f968c8e5b042144f8c63c71a6c1ed6e9cf4621d Author: Jason Bayer Date: Sat Jun 4 11:48:49 2011 -0700 Fix webkit flakiness when waiting for results Allow title to temporarily be null when waiting for the expected value; in the existing webkit implementation, title may be null Repro'ed flakiness on both tv and tablet, confirmed fixed afterward Change-Id: I62543d96dc334d04f259e8f07aa44619175f24cf commit 34b4661cc83cdea2edd3b8d704a8afe625771175 Merge: 7f8be95 cf4dd1c Author: Steve Block Date: Wed Jun 29 07:53:36 2011 -0700 Merge "Remove superfluous WebView_HitTestResultTest.java" commit cf4dd1c99ec3dfdfb08e38b76d69fbb12c65861a Author: Steve Block Date: Tue Jun 21 19:03:48 2011 +0100 Remove superfluous WebView_HitTestResultTest.java This test file calls WebView methods on the wrong thread and the tests it provides are a subset of those provided by WebViewTest.testLoadDataWithBaseURL() and WebViewTest.testGetHitTestResult(). Change-Id: I35720631a017d6f06d130c8565d9c8e0a3c9eb4c commit 7f8be95b2ad955b4aa055530422624d80d8889ee Merge: d6b216b f8f8dcd Author: Wu-cheng Li Date: Wed Jun 29 03:16:55 2011 -0700 Merge "Check if cameras return raw picture callback." commit d6b216be200c8ece8f863d797208d6a336781abb Merge: 66f2e58 b87926d Author: Wu-cheng Li Date: Wed Jun 29 03:16:07 2011 -0700 Merge "Add CTS to use camera during recording." commit f8f8dcd2b50d28e263331a19fecb09d808b1ec86 Author: Wu-cheng Li Date: Wed Jun 29 17:38:01 2011 +0800 Check if cameras return raw picture callback. bug:4967771 Change-Id: Ib38be2c2ae34cc50b33846d959b12c393d3b1cfc commit 66f2e582edf24f174721573d8e9e373bfaa3f339 Merge: ae98917 bcc95e5 Author: Brian Muramatsu Date: Tue Jun 28 13:20:08 2011 -0700 am bcc95e5b: am baa11a18: am c0a13610: Merge "CTS Verifier XML Reports" into gingerbread * commit 'bcc95e5ba970b6f0033d8fd288bb0bc2835a36f0': CTS Verifier XML Reports commit bcc95e5ba970b6f0033d8fd288bb0bc2835a36f0 Merge: 05e9758 baa11a1 Author: Brian Muramatsu Date: Tue Jun 28 13:18:23 2011 -0700 am baa11a18: am c0a13610: Merge "CTS Verifier XML Reports" into gingerbread * commit 'baa11a1832cb7124cb9154c89cec50f474e06d9b': CTS Verifier XML Reports commit ae9891762c76e2bf0570f6e2cb486ae6d07a7d25 Merge: cb92e6d 05e9758 Author: Brian Muramatsu Date: Tue Jun 28 13:17:22 2011 -0700 am 05e97589: am bd0710ca: am 2cc4fd5f: Fix BuildVersionTest * commit '05e975892b74dc5560e94aaf22da655b94f4636d': Fix BuildVersionTest commit baa11a1832cb7124cb9154c89cec50f474e06d9b Merge: 952fb86 c0a1361 Author: Brian Muramatsu Date: Tue Jun 28 13:16:14 2011 -0700 am c0a13610: Merge "CTS Verifier XML Reports" into gingerbread * commit 'c0a13610b4c967bfd67ce68412b43040c94ff1ee': CTS Verifier XML Reports commit 05e975892b74dc5560e94aaf22da655b94f4636d Merge: d290c17 bd0710c Author: Brian Muramatsu Date: Tue Jun 28 13:15:41 2011 -0700 am bd0710ca: am 2cc4fd5f: Fix BuildVersionTest * commit 'bd0710caa97a3fd7248b8996c0b21ee8f5a272f2': Fix BuildVersionTest commit bd0710caa97a3fd7248b8996c0b21ee8f5a272f2 Merge: 923c526 2cc4fd5 Author: Brian Muramatsu Date: Tue Jun 28 13:13:40 2011 -0700 am 2cc4fd5f: Fix BuildVersionTest * commit '2cc4fd5f6f7fc361f42f8a35f8ebc9c7035b0a21': Fix BuildVersionTest commit 399d62d28a52307ce56f6b26d6239755ff4b7f5b Author: pnath Date: Tue Jun 28 11:56:08 2011 -0700 Update NO_DELIVERY_REPORTS list for SMS Add "USCC" to the NO_DELIVERY_REPORTS list Change-Id: I5c67d281632281e1ddad11a746203be3ca84a813 commit 2cc4fd5f6f7fc361f42f8a35f8ebc9c7035b0a21 Author: Brian Muramatsu Date: Tue Jun 28 11:30:56 2011 -0700 Fix BuildVersionTest Bug 4964804 Change-Id: I1c6c928eeddddc812878b4913f31a5e2da201e2c commit c0a13610b4c967bfd67ce68412b43040c94ff1ee Merge: c2e543d 82ab52a Author: Brian Muramatsu Date: Tue Jun 28 11:18:57 2011 -0700 Merge "CTS Verifier XML Reports" into gingerbread commit 82ab52aeb917ed9a7f19bcc52b0cee83580814df Author: Brian Muramatsu Date: Mon Jun 27 14:02:12 2011 -0700 CTS Verifier XML Reports Bug 4878013 1. Add a version name and code to the CTS Verifier. Show the version name on the welcome screen. 2. Share a XML report instead of a plain text report. See TestResultsReport for the format. Change-Id: I10d21b7ea4d468472fc15866d7259e456d6741a6 commit cb92e6df2bbfdbc0bbfd6fe1342672609ea11a1c Merge: 6536f0d 44ed288 Author: Stephen Hines Date: Tue Jun 28 10:47:12 2011 -0700 Merge "Add type-checking tests for RS." commit 6536f0d50767494952c351a6004939234747d09c Merge: c9ed70b 6b4d831 Author: The Android Open Source Project Date: Mon Jun 27 16:04:48 2011 -0700 Reconcile with gingerbread-release Change-Id: I23e213bc6a30511922153a7859659d8dddc1c390 commit c9ed70b6038f3ad73d5de2328f97ff840bd7f24a Merge: 95d7ec2 d290c17 Author: Brian Muramatsu Date: Mon Jun 27 14:43:47 2011 -0700 am d290c173: am 952fb86a: am c2e543dc: Merge "Test for Apache HttpClient" into gingerbread * commit 'd290c173566d7b85482e73122688a29e3a4329d2': Test for Apache HttpClient commit d290c173566d7b85482e73122688a29e3a4329d2 Merge: 11a8550 952fb86 Author: Brian Muramatsu Date: Mon Jun 27 14:37:15 2011 -0700 am 952fb86a: am c2e543dc: Merge "Test for Apache HttpClient" into gingerbread * commit '952fb86af1e1cb4714ee3aa03fa5b36a6ad204d4': Test for Apache HttpClient commit 952fb86af1e1cb4714ee3aa03fa5b36a6ad204d4 Merge: 512016b c2e543d Author: Brian Muramatsu Date: Mon Jun 27 14:33:38 2011 -0700 am c2e543dc: Merge "Test for Apache HttpClient" into gingerbread * commit 'c2e543dc38907ab63b3e265bb179b6c602508d19': Test for Apache HttpClient commit c2e543dc38907ab63b3e265bb179b6c602508d19 Merge: 91f380a e6f3801 Author: Brian Muramatsu Date: Mon Jun 27 14:17:43 2011 -0700 Merge "Test for Apache HttpClient" into gingerbread commit 95d7ec2909da82eb044ee7a7b015c8b76bdac6fb Merge: 2331295 11a8550 Author: Brian Muramatsu Date: Mon Jun 27 14:15:25 2011 -0700 am 11a85507: am 512016bd: am 91f380a0: Merge "DevicePolicyManager Tests" into gingerbread * commit '11a85507d1eefad5d1748c4a21b8a4a586206713': DevicePolicyManager Tests commit 233129520c675cb9249b06c43ca359c766947c60 Merge: 50e6770 44b495d Author: Brian Muramatsu Date: Mon Jun 27 14:14:20 2011 -0700 am 44b495de: am 4e490d0c: am fa0f9d68: Merge "add source code to test if the data sms sent on port can be received correctly." into gingerbread * commit '44b495dee476e85c6e77d0b487d9116a5ecdd1e0': add source code to test if the data sms sent on port can be received correctly. commit 67f3d95c13014381eae011203c77e492ea348d1b Author: Brian Muramatsu Date: Mon Jun 27 11:16:45 2011 -0700 Increase HDPI/XHDPI Non-XLarge Min Memory to 32 Change-Id: I73783c8f24a29c87e35b4b2b9c0610fac0903064 commit 11a85507d1eefad5d1748c4a21b8a4a586206713 Merge: 44b495d 512016b Author: Brian Muramatsu Date: Fri Jun 24 17:23:29 2011 -0700 am 512016bd: am 91f380a0: Merge "DevicePolicyManager Tests" into gingerbread * commit '512016bd25b2c95c1528e9e65ac5c5ac16d00981': DevicePolicyManager Tests commit 512016bd25b2c95c1528e9e65ac5c5ac16d00981 Merge: 4e490d0 91f380a Author: Brian Muramatsu Date: Fri Jun 24 16:54:07 2011 -0700 am 91f380a0: Merge "DevicePolicyManager Tests" into gingerbread * commit '91f380a0191b0e9ec67d54599774bb62740e2b6a': DevicePolicyManager Tests commit 4f80e31dbd7d778dfbf4d3bfcfec2e5682889f4d Merge: 253c42a e93ffc3 Author: Brian Muramatsu Date: Fri Jun 24 16:23:36 2011 -0700 Merge "Add a case for density 213, which is used for some tv devices. The memory requirements are set to be the same as high and xhigh dpi" into honeycomb-mr1 commit 44ed288d5ab8437590c98631a6c65d36516cbf06 Author: Stephen Hines Date: Fri Jun 24 13:52:47 2011 -0700 Add type-checking tests for RS. BUG=4203264 Change-Id: Ifd979cdebd2947a0fdf2ebf7e417a216893af49b commit 91f380a0191b0e9ec67d54599774bb62740e2b6a Merge: fa0f9d6 714433d Author: Brian Muramatsu Date: Fri Jun 24 15:48:28 2011 -0700 Merge "DevicePolicyManager Tests" into gingerbread commit 714433ded1eb7d2af089d03569673650cd7900d8 Author: Brian Muramatsu Date: Fri Jun 17 10:27:10 2011 -0700 DevicePolicyManager Tests Bug 4562272 Create a package to house the DeviceAdminReceiver. This package must be installed and activated prior to the test much like how the Accessibility tests work. Add tests that instrument the receiver's package so that they can call the DevicePolicyManager methods without getting security exceptions. Change-Id: Iefec1ccec97709e8154fecb3c149e3f4e9ab7328 commit 65f7b4c73ea18ea7d04b3f13b2633ab104d17f49 Author: Terence Haddock Date: Mon May 9 10:21:39 2011 +0200 Use Uri.encode with HTML that contains special characters Change-Id: I13cfa244d2d8668c18a0a9ac6ef81decdee6fd82 Bug: 4497009 commit 28fa1117de4dc744897d26608c0db59216065944 Author: PY Laligand Date: Wed Jun 1 16:14:55 2011 -0700 Fix view tests to account for alternate actionbars don't assume action bar is on the top; and initial focus may be different when an action bar is present omit actionbar on window tests because the initial focus difference is not relevant for those tests TESTED= on tablet and tv Change-Id: Icdc6525ff9627d7532c4737da9cff21cfdd5ce79 commit 253c42abab73f7b749d11287ebfdf7ef5cbe9e51 Author: Jun Peng Date: Wed Jun 1 16:13:02 2011 -0700 Bug fix for b/4491376 CTS failure in CtsAccessibilityServiceTestCases. Changed to holo.notitle theme and test code. Change-Id: Ibeace90f0b266b9d452444a2c4ccef89958b375a commit e93ffc35ba041efdbb857b00c410e1be9b737cb9 Author: Jason Bayer Date: Fri Jun 3 15:28:15 2011 -0700 Add a case for density 213, which is used for some tv devices. The memory requirements are set to be the same as high and xhigh dpi The public tv density value was added in HC mr2, so this is to permit the density in mr1 Change-Id: If64a63a34558f04513037b002a2bd9adbc8ddcba commit 765194102fd8f94034704a1d9eb582129fd6ef05 Author: Yuncheol Heo Date: Thu Mar 31 14:23:17 2011 +0900 Fixes AudioRecorderTest and MediaRecorderTest when there are no mics or cameras present Change-Id: I00de93156c551acd007037979b9ee48e89698bef commit 50e677072cd4bd82f6ed1bb6bcd058b03dbf3566 Author: Stephen Hines Date: Thu Jun 23 14:46:05 2011 -0700 Add new tests for Script/ScriptC. 89% (442/498) Change-Id: I66561f4ef70b7c191ac1b7db165aa500f775a1b8 commit 43ad91fe246cc8240ba1deffe020dacdb82b0557 Merge: 06e5034 3f23d87 Author: Jake Hamby Date: Thu Jun 23 14:30:34 2011 -0700 am 3f23d87f: am d18d9dc3: am 2c4d1d8c: am cf04eabb: Merge "add source code to test if the data sms sent on port can be received correctly." * commit '3f23d87f134e4c9ab842ecc8fbc346d73acbb132': add source code to test if the data sms sent on port can be received correctly. commit 06e5034635cf6e0f5693ccbc49488e5dd808b3a8 Merge: 74879eb 497938e Author: Brian Muramatsu Date: Thu Jun 23 14:30:08 2011 -0700 am 497938ec: am 97d40818: am 381f2ae2: Merge "Update NO_DELIVERY_REPORTS list for SMS" into gingerbread * commit '497938ec3b5465f6cfac0a516456153cb6bc6304': Update NO_DELIVERY_REPORTS list for SMS commit 74879ebb37cf73fb115871db82b21c176f1031b2 Merge: 30172be 0721c2c Author: Stephen Hines Date: Thu Jun 23 14:12:53 2011 -0700 Merge "Add tests for new RS FieldPacker vector methods." commit 44b495dee476e85c6e77d0b487d9116a5ecdd1e0 Merge: 3f23d87 4e490d0 Author: Brian Muramatsu Date: Thu Jun 23 12:48:52 2011 -0700 am 4e490d0c: am fa0f9d68: Merge "add source code to test if the data sms sent on port can be received correctly." into gingerbread * commit '4e490d0c7fcdc933a8d38ca82e11ce6480e6566c': add source code to test if the data sms sent on port can be received correctly. commit 4e490d0c7fcdc933a8d38ca82e11ce6480e6566c Merge: d18d9dc fa0f9d6 Author: Brian Muramatsu Date: Thu Jun 23 12:33:31 2011 -0700 am fa0f9d68: Merge "add source code to test if the data sms sent on port can be received correctly." into gingerbread * commit 'fa0f9d680bb87964b6d294408a21b7c652416cee': add source code to test if the data sms sent on port can be received correctly. commit fa0f9d680bb87964b6d294408a21b7c652416cee Merge: 381f2ae 2255bc0 Author: Brian Muramatsu Date: Thu Jun 23 11:36:51 2011 -0700 Merge "add source code to test if the data sms sent on port can be received correctly." into gingerbread commit 2255bc05a9134454c1815d47ad0aea66a2d447fd Author: gzhhong Date: Sat May 7 15:34:09 2011 +0800 add source code to test if the data sms sent on port can be received correctly. add a receiver on port 19989 to get the data sms and verify if the content can be decode correclty. Signed-off-by: gzhhong modified: tests/tests/telephony/src/android/telephony/cts/SmsManagerTest.java Change-Id: I3f609ad58d4e1d6207a853e4ad0221f975af0e26 commit bb7ecc7f1c3bf6da6d16d8a65e4863ec0fa9d2e1 Author: Vikas Arora Date: Wed Jun 22 18:12:24 2011 +0530 Extended Compression testcase for WEBP compression. The Bitmap testcase for checking the 'CompressFormat' enum and compression for JPEG & PNG format has been extended for WEBP format. Change-Id: I5396d6d960fb8e85b5b41819123a1e92ff40aafc commit 508cd74ba307864e3fb80f17524708762be38cf5 Author: Masanori Ogino Date: Thu Jun 23 15:44:31 2011 +0900 It is neccessary to keep a reference to ParcelFileDescriptor When obtainDescriptor() returns back to test methods, ParcelFileDescriptor object is not reachable from them. So it might be destroyed by gc if a memory was low. ParcelFileDescriptor would close a real file descriptor when it was finalized. In that case, bitmap related tests will fail. (Because FileDescriptor$descriptor is gone! i.e. "-1") To avoid this fail, the test methods keep the reference to ParcelFileDescriptor object in them. Change-Id: I3980179b0545086e522fd327e265211c1f6d1d53 commit 3f23d87f134e4c9ab842ecc8fbc346d73acbb132 Merge: 497938e d18d9dc Author: Jake Hamby Date: Wed Jun 22 18:22:21 2011 -0700 am d18d9dc3: am 2c4d1d8c: am cf04eabb: Merge "add source code to test if the data sms sent on port can be received correctly." * commit 'd18d9dc349af9ca80bc1b798ae337b08a41d0d16': add source code to test if the data sms sent on port can be received correctly. commit e6f3801ebec044cb496390a3a3016c78b9635e31 Author: Brian Muramatsu Date: Tue Jun 21 14:32:38 2011 -0700 Test for Apache HttpClient Bug 4554251 This test launches multiple downloads at once to check that the device can open up multiple sockets without OOMing. One test tries to use wifi if available and the other tries to use mobile by disconnecting wifi. The CtsTestServer was modified to handle responses in separate threads to test concurrent downloads. Change-Id: Ifa1a11f409c69c1ae3ce621bf0542e0be56b50e0 commit d18d9dc349af9ca80bc1b798ae337b08a41d0d16 Merge: 97d4081 2c4d1d8 Author: Jake Hamby Date: Wed Jun 22 18:18:03 2011 -0700 am 2c4d1d8c: am cf04eabb: Merge "add source code to test if the data sms sent on port can be received correctly." * commit '2c4d1d8cc12ae6c7dcb773b1d1e47c61ee7b0922': add source code to test if the data sms sent on port can be received correctly. commit 2c4d1d8cc12ae6c7dcb773b1d1e47c61ee7b0922 Merge: 394b731 cf04eab Author: Jake Hamby Date: Wed Jun 22 18:13:52 2011 -0700 am cf04eabb: Merge "add source code to test if the data sms sent on port can be received correctly." * commit 'cf04eabb7344819cb0bb8d5167037299bff8a05e': add source code to test if the data sms sent on port can be received correctly. commit 497938ec3b5465f6cfac0a516456153cb6bc6304 Merge: 9a4ada2 97d4081 Author: Brian Muramatsu Date: Wed Jun 22 18:04:56 2011 -0700 am 97d40818: am 381f2ae2: Merge "Update NO_DELIVERY_REPORTS list for SMS" into gingerbread * commit '97d4081837443b32330632d5eb0f1dda7cf76b7b': Update NO_DELIVERY_REPORTS list for SMS commit cf04eabb7344819cb0bb8d5167037299bff8a05e Merge: a2ad41e 4c39dc5 Author: Jake Hamby Date: Wed Jun 22 18:00:40 2011 -0700 Merge "add source code to test if the data sms sent on port can be received correctly." commit 30172be5a921f5e50016950a11fabcf4b6ddfe63 Merge: a4ba0ba ee41cb4 Author: Brian Muramatsu Date: Wed Jun 22 17:40:01 2011 -0700 Merge "Fix NetworkInfo_DetailedStateTest Again" commit a4ba0baf0d22e26ea2aa58f5456dd449337d450e Author: Romain Guy Date: Wed Jun 22 16:18:25 2011 -0700 Correctly test the memory class on hdpi devices. Bug #4352933 Change-Id: I36d6069b55958af60f7aef7bf5f2d82ede426cad commit ee41cb428dceef121a6cc867d42ffa4377c55a08 Author: Brian Muramatsu Date: Wed Jun 22 15:35:43 2011 -0700 Fix NetworkInfo_DetailedStateTest Again Change-Id: I07d6a0ee21039859991a9594cd8b4e11ac4eecb6 commit 4c39dc5e5f80203063bfefb2161d8b22e2555199 Author: gzhhong Date: Sat May 7 15:34:09 2011 +0800 add source code to test if the data sms sent on port can be received correctly. add a receiver on port 19989 to get the data sms and verify if the content can be decode correclty. Signed-off-by: gzhhong modified: tests/tests/telephony/src/android/telephony/cts/SmsManagerTest.java Change-Id: I3f609ad58d4e1d6207a853e4ad0221f975af0e26 commit 97d4081837443b32330632d5eb0f1dda7cf76b7b Merge: c1cfed7 381f2ae Author: Brian Muramatsu Date: Wed Jun 22 12:36:36 2011 -0700 am 381f2ae2: Merge "Update NO_DELIVERY_REPORTS list for SMS" into gingerbread * commit '381f2ae229a832fea32aedb420e6f6da525a9dc5': Update NO_DELIVERY_REPORTS list for SMS commit 381f2ae229a832fea32aedb420e6f6da525a9dc5 Merge: 18464dc 2444c4b Author: Brian Muramatsu Date: Wed Jun 22 11:47:05 2011 -0700 Merge "Update NO_DELIVERY_REPORTS list for SMS" into gingerbread commit 2444c4bd3e6215442476fd6e3e1359b0f0314f9a Author: pnath Date: Wed Jun 22 11:32:09 2011 -0700 Update NO_DELIVERY_REPORTS list for SMS Add "Boost Mobile" to the NO_DELIVERY_REPORTS list Change-Id: Ia543dcf330e3294e679e71fb3a07453922aee21c commit 0721c2ce3f8833b9b11ce40dcf899919dc4fe996 Author: Stephen Hines Date: Tue Jun 21 17:20:34 2011 -0700 Add tests for new RS FieldPacker vector methods. Change-Id: Ic9d8545e011b025c2be5cc8a2ee66bdb24e0b5d3 commit 8d804e9052ad03c42b5aba52ff40f461a8a4126b Merge: 4c56743 9a4ada2 Author: Brian Muramatsu Date: Tue Jun 21 15:26:07 2011 -0700 am 9a4ada24: am c1cfed7e: am 18464dcf: Merge "CTS Verifier Sub Tests Implementation" into gingerbread * commit '9a4ada24ed2b0d6622e474395c3996194a3fbab9': CTS Verifier Sub Tests Implementation commit 4c567436d5e6e8fd9c52e6086d26d67223948a68 Merge: 58ae43f 7e54460 Author: Brett Chabot Date: Mon Jun 20 16:57:07 2011 -0700 Merge "Add 'screenshot' flag to cts-tradefed." commit 7e54460b9ae30a4d5f6f9fcaa41d90840950f3e2 Author: Brett Chabot Date: Mon Jun 20 14:48:25 2011 -0700 Add 'screenshot' flag to cts-tradefed. And update cts-tradefed to current API. Change-Id: I22558a60aefddf49a5c5c8028d8d82d918c0d4e4 commit 58ae43f9394a0cd04335c770d81142cdc49c1f17 Merge: 7626e2b 1960146 Author: Stephen Hines Date: Mon Jun 20 12:01:08 2011 -0700 Merge "Test new vector classes for RS Element." commit 7626e2b89cf0acd88eab6ca69b8ec25b13c62543 Merge: 5fafe49 0e43235 Author: Alex Sakhartchouk Date: Mon Jun 20 11:35:22 2011 -0700 Merge "Allocation 2d copy tests." commit f2c2cf597ee83a0e314dcf18bfc34faac43883a1 Merge: 963a45b 3b17501 Author: Brian Muramatsu Date: Mon Jun 20 10:35:39 2011 -0700 Merge "CTS : modify "loadURL" method that wait until getProgress returns 100." into froyo commit 5fafe496f07e5e679dd649b1579fa5a8be033cd2 Merge: 159504a fe731da Author: Brian Muramatsu Date: Mon Jun 20 10:01:11 2011 -0700 am fe731da9: am 1393f6b5: am ce1f2a94: Merge "Ban setuid or setgid tcpdump on devices." into gingerbread * commit 'fe731da9f5bb73f445075d066c4f81b20b870475': Ban setuid or setgid tcpdump on devices. commit 159504af526215ce4d11d0617358daa692ea71ea Merge: a946e44 47c4c69 Author: Brian Muramatsu Date: Mon Jun 20 10:00:48 2011 -0700 am 47c4c691: am d40b3af7: am 15c6734d: Merge "NX test should not fail on ARMv5 hardware." into gingerbread * commit '47c4c691f9c716b7c20f727b8129660a70e195bb': NX test should not fail on ARMv5 hardware. commit 9a4ada24ed2b0d6622e474395c3996194a3fbab9 Merge: fe731da c1cfed7 Author: Brian Muramatsu Date: Mon Jun 20 09:04:25 2011 -0700 am c1cfed7e: am 18464dcf: Merge "CTS Verifier Sub Tests Implementation" into gingerbread * commit 'c1cfed7e08b12efb084149eb44a5f014ec88e312': CTS Verifier Sub Tests Implementation commit b87926d04a097daa698a7887c24f892d0540526b Author: Wu-cheng Li Date: Mon Jun 20 16:35:25 2011 +0800 Add CTS to use camera during recording. bug:2644213 Change-Id: Ie672ca4544740b31171d8e2ff61436ba67b7e438 commit 3b17501163bc1b6d82480a81e1877e2eb6842eb2 Author: lge-aosp Date: Mon Jun 20 17:43:42 2011 +0900 CTS : modify "loadURL" method that wait until getProgress returns 100. CTS : modify "loadURL" method that wait until getProgress returns 100. - It appears that the updates returned by getProgress are not accurate unless there is a WebChromeClient set on the WebView as seen in the code of CallbackProxy#onProgressChanged. refer to :https://review.source.android.com//#change,22046 Change-Id: I21991f70b40d917dcf3d785269f600965d603550 commit a946e446056a530e1d55bf94367fdfd5b103a7a0 Merge: 703effe bb47ff0 Author: Wu-cheng Li Date: Mon Jun 20 00:38:27 2011 -0700 Merge "CameraTests: Only throw exceptions in main thread." commit bb47ff02d552e5920d82dcc4716fcec9b196d9f2 Author: Wu-cheng Li Date: Sat Jun 18 00:31:50 2011 +0800 CameraTests: Only throw exceptions in main thread. junit does not catch the exceptions in created threads. One test failure will stop all tests. bug:4575981 Change-Id: I0f2b5e1ed442aeb683cbc7ab891387a390d1d4fc commit c1cfed7e08b12efb084149eb44a5f014ec88e312 Merge: 1393f6b 18464dc Author: Brian Muramatsu Date: Fri Jun 17 16:30:02 2011 -0700 am 18464dcf: Merge "CTS Verifier Sub Tests Implementation" into gingerbread * commit '18464dcf5182a432233626139ce17b8b40229558': CTS Verifier Sub Tests Implementation commit 18464dcf5182a432233626139ce17b8b40229558 Merge: ce1f2a9 f942683 Author: Brian Muramatsu Date: Fri Jun 17 15:48:55 2011 -0700 Merge "CTS Verifier Sub Tests Implementation" into gingerbread commit f942683666d3ae59e44e69ed0ab77fe9db71f207 Author: Brian Muramatsu Date: Fri Jun 17 15:43:59 2011 -0700 CTS Verifier Sub Tests Implementation Refactor the Bluetooth test to use the same test results storage as the main test list. This will make it easy for future tests to have subtests like the Bluetooth test one does. Also it will be possible to send a report that has the results for the sub tests since all the data is in one place. Create subtests by adding a meta data with the tag "test_parent" to specify the class that this test belongs to. Change-Id: Id7ec5da311751bb8c1af7915137dacc89286a23c commit 0e43235fd0e598993a9638136e2e205745f5ac12 Author: Alex Sakhartchouk Date: Fri Jun 17 14:16:22 2011 -0700 Allocation 2d copy tests. Change-Id: Icb26c3afc0463a3a86ea1357ced1f69ba299748c commit 703effe460b70b175b97b09616c7e4a47a5d8637 Merge: e15dcb3 52ed1b7 Author: Stephen Hines Date: Fri Jun 17 13:53:26 2011 -0700 Merge "Test POSITVE -> POSITIVE typo fix." commit e15dcb3565987e03d4e3af136d2ba000849e1bb8 Merge: 5369278 19af5d3 Author: Stephen Hines Date: Fri Jun 17 13:53:00 2011 -0700 Merge "Add tests for RS Element.isCompatible()." commit fe731da9f5bb73f445075d066c4f81b20b870475 Merge: 47c4c69 1393f6b Author: Brian Muramatsu Date: Fri Jun 17 11:25:06 2011 -0700 am 1393f6b5: am ce1f2a94: Merge "Ban setuid or setgid tcpdump on devices." into gingerbread * commit '1393f6b5ceb866fea9017a9dc17f65410150fcd7': Ban setuid or setgid tcpdump on devices. commit 47c4c691f9c716b7c20f727b8129660a70e195bb Merge: 9c509f2 d40b3af Author: Brian Muramatsu Date: Fri Jun 17 11:24:54 2011 -0700 am d40b3af7: am 15c6734d: Merge "NX test should not fail on ARMv5 hardware." into gingerbread * commit 'd40b3af729cf1b7adaafe4dc957ab7a0b80afde3': NX test should not fail on ARMv5 hardware. commit 1393f6b5ceb866fea9017a9dc17f65410150fcd7 Merge: d40b3af ce1f2a9 Author: Brian Muramatsu Date: Fri Jun 17 11:11:35 2011 -0700 am ce1f2a94: Merge "Ban setuid or setgid tcpdump on devices." into gingerbread * commit 'ce1f2a9491cbe6ec0e006a2846718b818b0bde48': Ban setuid or setgid tcpdump on devices. commit d40b3af729cf1b7adaafe4dc957ab7a0b80afde3 Merge: 6d05594 15c6734 Author: Brian Muramatsu Date: Fri Jun 17 11:08:45 2011 -0700 am 15c6734d: Merge "NX test should not fail on ARMv5 hardware." into gingerbread * commit '15c6734d4ae4f3dfebd0f6c01f33e4c9d71ac874': NX test should not fail on ARMv5 hardware. commit ce1f2a9491cbe6ec0e006a2846718b818b0bde48 Merge: 15c6734 fc636a8 Author: Brian Muramatsu Date: Fri Jun 17 10:36:00 2011 -0700 Merge "Ban setuid or setgid tcpdump on devices." into gingerbread commit 15c6734d4ae4f3dfebd0f6c01f33e4c9d71ac874 Merge: 444ddca aaef84b Author: Brian Muramatsu Date: Fri Jun 17 10:31:35 2011 -0700 Merge "NX test should not fail on ARMv5 hardware." into gingerbread commit 5369278d6f5a755c40640b180f89cb2154a95398 Merge: 0aa52f6 63359f9 Author: Alex Sakhartchouk Date: Fri Jun 17 10:15:35 2011 -0700 Merge "More cts tests for copy functions on Allocation" commit 63359f99833ce1ae2cac1645c423025c729b7d4c Author: Alex Sakhartchouk Date: Thu Jun 16 18:09:20 2011 -0700 More cts tests for copy functions on Allocation Change-Id: I85dea997b9b7005777cd2f36a515cda1c30b018e commit 52ed1b71a1bd134b29feb234a73bacfe9f71991d Author: Stephen Hines Date: Thu Jun 16 17:45:40 2011 -0700 Test POSITVE -> POSITIVE typo fix. Change-Id: Ifeb554e8e8421670a125332fcaa7f0829648161d commit 6b4d831147bd65bc5a3d3e23c05626c831151615 Merge: 444ddca 2d0e631 Author: The Android Automerger Date: Thu Jun 16 17:29:31 2011 -0700 merge in gingerbread-release history after reset to gingerbread commit fc636a8d28cbe0082d8128b86585f6979cfa4a2b Author: Nick Kralevich Date: Thu Jun 16 16:18:50 2011 -0700 Ban setuid or setgid tcpdump on devices. Disallow a setuid or setgid tcpdump from appearing on devices. tcpdump can be used by programs to monitor all traffic into and out of the phone, potentially compromising private data. Change-Id: Icb59d1382984138929d66e19f84659e13ee6093c commit aaef84b3b2cfb13e78bac7a8f5125655dd1aa2ae Author: Nick Kralevich Date: Thu Jun 16 15:35:33 2011 -0700 NX test should not fail on ARMv5 hardware. http://code.google.com/p/android/issues/detail?id=17328 NX is only required on hardware that supports it. ARMv5 does not support NX, so don't even try running the test if we detect that condition. Change-Id: I259bb224c10da16fdadcfef531fb36c9e8e6da37 commit 0aa52f6ad574949f38315213af2fea0c0fd70cd4 Merge: 3a84fab 9c509f2 Author: Brian Muramatsu Date: Thu Jun 16 15:14:55 2011 -0700 am 9c509f24: am 6d05594c: am 444ddca6: Merge "Clarify vold isn\'t exploitable when no sd card exists" into gingerbread * commit '9c509f24ca9041fc845e04ef15ee39f3d0fffae8': Clarify vold isn't exploitable when no sd card exists commit 9c509f24ca9041fc845e04ef15ee39f3d0fffae8 Merge: 1d24c1e 6d05594 Author: Brian Muramatsu Date: Thu Jun 16 15:13:12 2011 -0700 am 6d05594c: am 444ddca6: Merge "Clarify vold isn\'t exploitable when no sd card exists" into gingerbread * commit '6d05594c2baf34bcdc04c68bded96497996fd7d1': Clarify vold isn't exploitable when no sd card exists commit 6d05594c2baf34bcdc04c68bded96497996fd7d1 Merge: 7b96222 444ddca Author: Brian Muramatsu Date: Thu Jun 16 15:08:06 2011 -0700 am 444ddca6: Merge "Clarify vold isn\'t exploitable when no sd card exists" into gingerbread * commit '444ddca6e9e89f223fb0c6e29a5696915ccfb51d': Clarify vold isn't exploitable when no sd card exists commit 444ddca6e9e89f223fb0c6e29a5696915ccfb51d Merge: 6ea091f 374a965 Author: Brian Muramatsu Date: Thu Jun 16 14:39:58 2011 -0700 Merge "Clarify vold isn't exploitable when no sd card exists" into gingerbread commit 374a9650f9a2a8b12ec88979c38473684023ebca Author: Nick Kralevich Date: Thu May 26 10:57:53 2011 -0700 Clarify vold isn't exploitable when no sd card exists Change-Id: I24903ca0f6267c0034df068abcece6091f25f38e commit 3a84fabde8305ba463f5fc41c077a851f172be38 Merge: 823b5e5 1d24c1e Author: Brian Muramatsu Date: Thu Jun 16 14:08:31 2011 -0700 am 1d24c1e7: am 7b962221: am 6ea091f3: Merge "Test for Checking Package Signatures" into gingerbread * commit '1d24c1e7694ded6c4135138ad8e6df666c189e25': Test for Checking Package Signatures commit 1d24c1e7694ded6c4135138ad8e6df666c189e25 Merge: ed63d79 7b96222 Author: Brian Muramatsu Date: Thu Jun 16 14:05:58 2011 -0700 am 7b962221: am 6ea091f3: Merge "Test for Checking Package Signatures" into gingerbread * commit '7b96222103090dbc04227097e5e18e28a679e685': Test for Checking Package Signatures commit 7b96222103090dbc04227097e5e18e28a679e685 Merge: 08b9666 6ea091f Author: Brian Muramatsu Date: Thu Jun 16 13:54:31 2011 -0700 am 6ea091f3: Merge "Test for Checking Package Signatures" into gingerbread * commit '6ea091f33d83f732db2ec423b2337869561c9dc0': Test for Checking Package Signatures commit 6ea091f33d83f732db2ec423b2337869561c9dc0 Merge: 5e50522 9803e0f Author: Brian Muramatsu Date: Thu Jun 16 13:16:51 2011 -0700 Merge "Test for Checking Package Signatures" into gingerbread commit 963a45b4827fa6f0f15bb9845254e3bc0e6b6ffb Merge: 01552d1 bc769b7 Author: Brian Muramatsu Date: Thu Jun 16 11:14:26 2011 -0700 Merge "Changed the condition to consider negative value for PID." into froyo commit 823b5e5bb20c9efe86bc6ea23f30f5141e717166 Merge: f78122c 2d0e631 Author: The Android Open Source Project Date: Thu Jun 16 10:32:46 2011 -0700 Reconcile with gingerbread-release Change-Id: I0414a2f1578116c37a818b22e537a11300311c84 commit f78122c82f8af67f440476d019353db52e19acb9 Merge: f3a0a1f ed63d79 Author: Brian Muramatsu Date: Thu Jun 16 10:29:06 2011 -0700 am ed63d79c: (-s ours) am 923c526f: am 640eed06: Merge remote branch \'goog/honeycomb-mr1\' into manualmerge * commit 'ed63d79c70008b75664a5dbdec5bc5fbcda2acc4': Fixes for the location manager cts tests Bug fix for b/4545066 CTS fail at AccessibilityEndToEndTest#testTypeWindowStateChangedAccessibilityEvent. Increase async wait time to ensure that notifications are passed thru. I was able to reproduce the error by cutting down the wait time(MAX_TIMEOUT_ASYNCHRONOUS_PROCESSING). Add HC MR1 Features to CTS Verifier Fix WindowTest#testDecorView location provider fixes: test the provider without assuming presence of any particular provider on the device Checking hardware feature when test rear camera Fixed bugs in test case that caused test failure. Fix testPreviewPictureSizesCombination Expect haptic feedback being performed only if it is turned on Make sensors optional for GoogleTV. Bypass bluetooth tests if not present DO NOT MERGE Suppress testSetCamera Test Don't fail if vold.fstab is empty Fix DATE_MODIFIED assertion fail in image media store test. Checking hardware feature when test rear camera Check Logical Density commit f3a0a1ff2b3285c7e0a054734e54f70d793e5801 Merge: 6014bc2 af0734b Author: Brian Muramatsu Date: Thu Jun 16 09:30:59 2011 -0700 am af0734bb: am 3f825123: am ac3763ef: Check Screen Features * commit 'af0734bb9a7e6521b0963042fabbda3534b40bb0': Check Screen Features commit bc769b73d9cebc8d1ca7e50b3c86487a3d084b8f Author: m-miyahara Date: Thu Jun 16 11:36:30 2011 +0900 Changed the condition to consider negative value for PID. In this test case inserted PID　can be negative, causing File.exist() to become false, and thus results in error. We modified the test case so that it considers negative value of PID. commit 19af5d3bdbe84cac86b31c80a07258ee796efea4 Author: Stephen Hines Date: Tue Jun 14 14:55:03 2011 -0700 Add tests for RS Element.isCompatible(). Change-Id: Ieb90fb5bc7741fda40a6014cae4d90a89ec76881 commit ed63d79c70008b75664a5dbdec5bc5fbcda2acc4 Merge: af0734b 923c526 Author: Brian Muramatsu Date: Wed Jun 15 18:14:51 2011 -0700 am 923c526f: am 640eed06: Merge remote branch \'goog/honeycomb-mr1\' into manualmerge * commit '923c526f9b139b3f0b62296ea574aa121183e4b3': Fixes for the location manager cts tests Bug fix for b/4545066 CTS fail at AccessibilityEndToEndTest#testTypeWindowStateChangedAccessibilityEvent. Increase async wait time to ensure that notifications are passed thru. I was able to reproduce the error by cutting down the wait time(MAX_TIMEOUT_ASYNCHRONOUS_PROCESSING). Add HC MR1 Features to CTS Verifier Fix WindowTest#testDecorView location provider fixes: test the provider without assuming presence of any particular provider on the device Checking hardware feature when test rear camera Fixed bugs in test case that caused test failure. Fix testPreviewPictureSizesCombination Expect haptic feedback being performed only if it is turned on Make sensors optional for GoogleTV. Bypass bluetooth tests if not present DO NOT MERGE Suppress testSetCamera Test Don't fail if vold.fstab is empty Fix DATE_MODIFIED assertion fail in image media store test. Checking hardware feature when test rear camera Check Logical Density commit 923c526f9b139b3f0b62296ea574aa121183e4b3 Merge: 3f82512 640eed0 Author: Brian Muramatsu Date: Wed Jun 15 18:11:12 2011 -0700 am 640eed06: Merge remote branch \'goog/honeycomb-mr1\' into manualmerge * commit '640eed067855cf981a6583032a80f6576ad3dbb0': (54 commits) Remove testUnknownSourcesByDefaultTest Increment Version to 2.3_r4 Add some strings for screen where the text stayed in Detect when BT Pairing Dialog is Incorrectly Shown Fixes for the location manager cts tests Fixes for the location manager cts tests location provider fixes: test the provider without assuming presence of any particular provider on the device Bug fix for b/4545066 CTS fail at AccessibilityEndToEndTest#testTypeWindowStateChangedAccessibilityEvent. Increase async wait time to ensure that notifications are passed thru. I was able to reproduce the error by cutting down the wait time(MAX_TIMEOUT_ASYNCHRONOUS_PROCESSING). Add HC MR1 Features to CTS Verifier Make sensors optional Fix WindowTest#testDecorView Revert "Check "Unknown Sources" is Enabled by Default" location provider fixes: test the provider without assuming presence of any particular provider on the device Increment Version to 2.2_r6 Copy Verifier Results to Clipboard Checking hardware feature when test rear camera Audio Latency Tests Fixed bugs in test case that caused test failure. Add more CTS tests. Skip Bluetooth tests if the device doesn't support Bluetooth. ... commit 640eed067855cf981a6583032a80f6576ad3dbb0 Merge: ac3763e d1759f5 Author: Brian Muramatsu Date: Wed Jun 15 17:56:54 2011 -0700 Merge remote branch 'goog/honeycomb-mr1' into manualmerge Conflicts: tests/tests/view/src/android/view/cts/WindowTest.java Change-Id: Icd191ae8287820e8257d8c732ad168898bad76b3 commit d1759f5ebe85f068469aa0c94cc6935648e5e28b Merge: d188ecd 75ba828 Author: Brian Muramatsu Date: Wed Jun 15 17:10:12 2011 -0700 Merge remote branch 'goog/honeycomb' into manualmerge Conflicts: tests/tests/hardware/src/android/hardware/cts/CameraTest.java tools/host/src/com/android/cts/Version.java Change-Id: I3ead5d59f72aaa760cac3aa694aec669607d64f4 commit af0734bb9a7e6521b0963042fabbda3534b40bb0 Merge: 5e3a2ab 3f82512 Author: Brian Muramatsu Date: Wed Jun 15 16:29:58 2011 -0700 am 3f825123: am ac3763ef: Check Screen Features * commit '3f82512331549b41b4f0dceaf9a090af3455db13': Check Screen Features commit 3f82512331549b41b4f0dceaf9a090af3455db13 Merge: ce2b453 ac3763e Author: Brian Muramatsu Date: Wed Jun 15 16:26:35 2011 -0700 am ac3763ef: Check Screen Features * commit 'ac3763ef39b6d20920105eefc93df0634480c0b6': Check Screen Features commit 6014bc28133548b6b577dfd291d63024f93e03a4 Merge: 0e85131 5e3a2ab Author: Brian Muramatsu Date: Wed Jun 15 16:14:54 2011 -0700 am 5e3a2abf: am 08b96664: am 5e50522a: Merge "Detect when BT Pairing Dialog is Incorrectly Shown" into gingerbread * commit '5e3a2abfda7c0220afe5b6002ade17f99d684b78': Detect when BT Pairing Dialog is Incorrectly Shown commit 0e85131db79567c84c720fe2f3eeca96e430d261 Merge: ff2bdff 8079d96 Author: Brian Muramatsu Date: Wed Jun 15 16:14:52 2011 -0700 am 8079d964: (-s ours) am 950090e4: am 248ec83f: Merge "Wait for completing the initialization of WebViewCore" into gingerbread * commit '8079d9643246b562025d45d944bf981da283fc7a': Wait for completing the initialization of WebViewCore commit 5e3a2abfda7c0220afe5b6002ade17f99d684b78 Merge: 8079d96 08b9666 Author: Brian Muramatsu Date: Wed Jun 15 15:27:35 2011 -0700 am 08b96664: am 5e50522a: Merge "Detect when BT Pairing Dialog is Incorrectly Shown" into gingerbread * commit '08b966648fcd7d395fd868f903c140b0baa22f5f': Detect when BT Pairing Dialog is Incorrectly Shown commit 8079d9643246b562025d45d944bf981da283fc7a Merge: 6873252 950090e Author: Brian Muramatsu Date: Wed Jun 15 15:27:32 2011 -0700 am 950090e4: am 248ec83f: Merge "Wait for completing the initialization of WebViewCore" into gingerbread * commit '950090e4e27b3e91fd200d3420095327158807ca': Wait for completing the initialization of WebViewCore commit ff2bdff1b9e0828ba6d55af6b605ec58a2b01a0d Merge: 92d5eb5 6873252 Author: Brian Muramatsu Date: Wed Jun 15 15:25:11 2011 -0700 am 6873252b: resolved conflicts for merge of b4d4bb23 to honeycomb-plus-aosp * commit '6873252b8cb1800d8ddb59b033e8c1a0598d6cad': Add some strings for screen where the text stayed in commit 6873252b8cb1800d8ddb59b033e8c1a0598d6cad Merge: 42cf1aa b4d4bb2 Author: Brian Muramatsu Date: Wed Jun 15 14:42:38 2011 -0700 resolved conflicts for merge of b4d4bb23 to honeycomb-plus-aosp Change-Id: Ie6d6bcac1360b81691cc3f35302f26221eccc8a8 commit 75ba8288c14150e448091c938ac9cbb15161fae8 Merge: a39c49b 5e50522 Author: Brian Muramatsu Date: Wed Jun 15 14:36:28 2011 -0700 Merge remote branch 'goog/gingerbread' into manualmerge Conflicts: tests/tests/text/src/android/text/method/cts/TouchTest.java tests/tests/webkit/src/android/webkit/cts/WebSettingsTest.java tools/host/src/com/android/cts/Version.java Change-Id: I6196b9bd85b4e93978dd0ae9b457812b08bd7f0e commit ac3763ef39b6d20920105eefc93df0634480c0b6 Author: Brian Muramatsu Date: Wed Jun 15 14:16:58 2011 -0700 Check Screen Features Bug 4651088 At least one of landscape or portrait must be defined. Change-Id: Iaa9ec117279b11ce0a69eafdb1429187832e5a60 commit 08b966648fcd7d395fd868f903c140b0baa22f5f Merge: 950090e 5e50522 Author: Brian Muramatsu Date: Wed Jun 15 14:13:12 2011 -0700 am 5e50522a: Merge "Detect when BT Pairing Dialog is Incorrectly Shown" into gingerbread * commit '5e50522aea7f9219467ecf4fd2a7addb7ba6fe29': Detect when BT Pairing Dialog is Incorrectly Shown commit 950090e4e27b3e91fd200d3420095327158807ca Merge: b4d4bb2 248ec83 Author: Brian Muramatsu Date: Wed Jun 15 14:13:01 2011 -0700 am 248ec83f: Merge "Wait for completing the initialization of WebViewCore" into gingerbread * commit '248ec83f3eacb98b3aa06709cbe4e3601ea17f65': Wait for completing the initialization of WebViewCore commit b4d4bb23469913995b643be74d59c5a327dee980 Merge: 7b03103 0ff8994 Author: Brian Muramatsu Date: Wed Jun 15 14:12:54 2011 -0700 am 0ff8994a: Merge "Add some strings for screen where the text stayed in" into gingerbread * commit '0ff8994a12eaf311c840f51db0458562abcf78c7': Add some strings for screen where the text stayed in commit 92d5eb594cc808b23f3b875b0d70576aa9251644 Author: Wei-Ta Chen Date: Wed Jun 15 13:35:37 2011 -0700 Add a test case of decoding WebP, PNG, GIF and BMP for BitmapFactoryTest. Handle the change on behalf of the WebP team. Change-Id: I6eaf0e1aa56e8e8619376de83cf91b19b227db5e commit 5e50522aea7f9219467ecf4fd2a7addb7ba6fe29 Merge: 248ec83 8b98f7c Author: Brian Muramatsu Date: Wed Jun 15 12:35:54 2011 -0700 Merge "Detect when BT Pairing Dialog is Incorrectly Shown" into gingerbread commit 9803e0f8e364fa919dc942643de13652add52e9f Author: Brian Muramatsu Date: Tue Jun 14 11:39:07 2011 -0700 Test for Checking Package Signatures Bug 4596332 Check that packages on the device are not signed with well known keys that may be used by malicious packages to gain privileges. Change-Id: Id11c31a1c91b79d30d082529cb2a2a99b1f189fe commit 4591b0c10ab6b3400ec7b60c06de9a0e12eea562 Merge: 07afc50 62c72f9 Author: Fabrice Di Meglio Date: Tue Jun 14 16:45:21 2011 -0700 Merge "Fix CTS broken test" commit 62c72f97a4cc7f24f26c6d1a40282c02a0e6b662 Author: Fabrice Di Meglio Date: Tue Jun 14 16:43:58 2011 -0700 Fix CTS broken test - the mock was not taking care of the direction passed in the constructor Change-Id: I840b3018a0c30fe21292d345a3d360d82aec3727 commit 07afc50bb647dc4632da4cb9fe7a2bcc7cb45c10 Merge: f22bef3 dc8744c Author: Fabrice Di Meglio Date: Tue Jun 14 16:23:25 2011 -0700 Merge "Update CTS tests following API change for Gravity.getAbsoluteGravity() and Gravity.apply()" commit dc8744c9fd11eacff3275ebc140e564d5855bdfa Author: Fabrice Di Meglio Date: Tue Jun 14 09:56:41 2011 -0700 Update CTS tests following API change for Gravity.getAbsoluteGravity() and Gravity.apply() - also remove calls to removed function Callback2.isLayoutRtl() Change-Id: I15a923afa096441d82f746b9542a2755daf883e1 commit f22bef378e0ad93820dd0e9e3464b0ad5e33f607 Merge: b518d3d aebe257 Author: Eino-Ville Talvala Date: Tue Jun 14 08:54:11 2011 -0700 Merge "Add pre-start checks to CameraTest#testMultiCameraRelease()." commit aebe2576e4d32a9a3516ad53a7ad3ae7defb21a0 Author: Eino-Ville Talvala Date: Thu Apr 7 13:17:41 2011 -0700 Add pre-start checks to CameraTest#testMultiCameraRelease(). Makes sure the device under test supports opening multiple cameras simultaneously before running test. Also adds more verbose logging. bug:4598435 Change-Id: I27fc4acb7f7ed70187b9c3981b7daf1c7717822d commit b518d3d096f24c321fe2cb0c692d947c525d55aa Merge: 3eafc62 1f54980 Author: Brian Muramatsu Date: Mon Jun 13 15:31:13 2011 -0700 Merge "Integrate CameraAnalyzer into CTS Verifier" commit 3eafc628fdd301ed8ce5635ef0e3d4ffd6ea4117 Merge: 6c8e431 42cf1aa Author: Brian Muramatsu Date: Mon Jun 13 14:46:09 2011 -0700 resolved conflicts for merge of 42cf1aab to master Change-Id: I0cdb4add4efe9bebd57a8810bd83bfcd63f94ac0 commit 6c8e4316f97d59e9be7c1ebfef2b793b3b48e5de Merge: 2159ac8 338ea00 Author: Stephen Hines Date: Mon Jun 13 13:38:29 2011 -0700 Merge "Add simple RS test to verify dimension check." commit 42cf1aab6e0dc53abd19a60d442426df21ef9860 Merge: ada1cf6 ce2b453 Author: Terence Haddock Date: Mon Jun 13 11:47:38 2011 -0700 am ce2b4539: am 79dad1b2: Use Uri.encode with HTML that contains special characters * commit 'ce2b45399cb813c72ba08a7b0e83236b3eb33d6f': Use Uri.encode with HTML that contains special characters commit 248ec83f3eacb98b3aa06709cbe4e3601ea17f65 Merge: 0ff8994 ad61525 Author: Brian Muramatsu Date: Mon Jun 13 11:35:10 2011 -0700 Merge "Wait for completing the initialization of WebViewCore" into gingerbread commit 0ff8994a12eaf311c840f51db0458562abcf78c7 Merge: bfa0ee9 9ef3eb6 Author: Brian Muramatsu Date: Mon Jun 13 11:29:23 2011 -0700 Merge "Add some strings for screen where the text stayed in" into gingerbread commit ce2b45399cb813c72ba08a7b0e83236b3eb33d6f Merge: c18daa3 79dad1b Author: Terence Haddock Date: Mon Jun 13 11:27:14 2011 -0700 am 79dad1b2: Use Uri.encode with HTML that contains special characters * commit '79dad1b25c85f169f2d60b4fe6dd12aa0e2bcd6a': Use Uri.encode with HTML that contains special characters commit 2159ac8752609c84bf408e2db08b370139dee906 Merge: f9401df ada1cf6 Author: Brian Muramatsu Date: Mon Jun 13 11:26:16 2011 -0700 am ada1cf67: am 7b031033: am bfa0ee94: Merge "Remove testUnknownSourcesByDefaultTest" into gingerbread * commit 'ada1cf673dc6837311d8779a7349769e5301184b': Remove testUnknownSourcesByDefaultTest commit f9401df9ced9d3a665e20e6e69a75207403057f5 Merge: 0f59aa7 950078c Author: Brian Muramatsu Date: Mon Jun 13 11:26:12 2011 -0700 am 950078c3: am 0dec94d8: (-s ours) am 4ed6a566: Merge "Increment Version to 2.3_r4" into gingerbread * commit '950078c3be155bbeff704ed1f3ea94097e363105': Increment Version to 2.3_r4 commit ada1cf673dc6837311d8779a7349769e5301184b Merge: 950078c 7b03103 Author: Brian Muramatsu Date: Mon Jun 13 10:57:07 2011 -0700 am 7b031033: am bfa0ee94: Merge "Remove testUnknownSourcesByDefaultTest" into gingerbread * commit '7b031033fc83f192ecfa43338a336572d3671316': Remove testUnknownSourcesByDefaultTest commit 950078c3be155bbeff704ed1f3ea94097e363105 Merge: c9c0ced 0dec94d Author: Brian Muramatsu Date: Mon Jun 13 10:56:46 2011 -0700 am 0dec94d8: (-s ours) am 4ed6a566: Merge "Increment Version to 2.3_r4" into gingerbread * commit '0dec94d8696a0ac37894605d43f71c00c4a31dc8': Increment Version to 2.3_r4 commit 7b031033fc83f192ecfa43338a336572d3671316 Merge: 0dec94d bfa0ee9 Author: Brian Muramatsu Date: Sat Jun 11 09:53:10 2011 -0700 am bfa0ee94: Merge "Remove testUnknownSourcesByDefaultTest" into gingerbread * commit 'bfa0ee94d95225388aa9c0d78dca0233e3920114': Remove testUnknownSourcesByDefaultTest commit 0dec94d8696a0ac37894605d43f71c00c4a31dc8 Merge: 159a800 4ed6a56 Author: Brian Muramatsu Date: Sat Jun 11 09:53:06 2011 -0700 am 4ed6a566: Merge "Increment Version to 2.3_r4" into gingerbread * commit '4ed6a566f62b7aca9f70c76f89de2cdf6ee96285': Increment Version to 2.3_r4 commit 0f59aa7532b52debca27031dddfe8ae7b05039ae Merge: 75e9da8 7711dac Author: Brian Muramatsu Date: Fri Jun 10 15:48:46 2011 -0700 Merge "Fix for NetworkInfo_DetailedStateTest" commit 2d0e6315a61a471756959522aa326dbd30c962d8 Merge: bfa0ee9 2d17ce8 Author: The Android Automerger Date: Fri Jun 10 14:57:23 2011 -0700 merge in gingerbread-release history after reset to gingerbread commit 79dad1b25c85f169f2d60b4fe6dd12aa0e2bcd6a Author: Terence Haddock Date: Mon May 9 10:21:39 2011 +0200 Use Uri.encode with HTML that contains special characters Change-Id: I13cfa244d2d8668c18a0a9ac6ef81decdee6fd82 Bug: 4497009 commit 75e9da868203c2f39a88abaa35558c7447a9e064 Merge: 4f07948 c9c0ced Author: Brian Muramatsu Date: Fri Jun 10 14:08:28 2011 -0700 am c9c0ced6: am c18daa3b: am 732ea4de: Merge "Fix broken Paint test cases." into honeycomb-mr2 * commit 'c9c0ced64a55d5a15dc1cab1afa34150f37d5b16': Fix broken Paint test cases. commit bfa0ee94d95225388aa9c0d78dca0233e3920114 Merge: 4ed6a56 0866696 Author: Brian Muramatsu Date: Fri Jun 10 12:00:53 2011 -0700 Merge "Remove testUnknownSourcesByDefaultTest" into gingerbread commit 0866696a341f481adb1d07e9a92eb634b942e10b Author: Brian Muramatsu Date: Fri Jun 10 11:53:49 2011 -0700 Remove testUnknownSourcesByDefaultTest This was expected to be removed by merging in the changes from Froyo. However, since the change originated in GB, the cherry-picking into Froyo and removing it in Froyo ended up as a no-op when merging the removal back into GB. Thus, remove this again! Change-Id: I95ff719a1ce6b276e00d33e3286bd49c2255759d commit 4ed6a566f62b7aca9f70c76f89de2cdf6ee96285 Merge: 7c2e6b1 244820e Author: Brian Muramatsu Date: Fri Jun 10 11:23:49 2011 -0700 Merge "Increment Version to 2.3_r4" into gingerbread commit 244820e3eb21a7f6494412fba083d893943f6c46 Author: Brian Muramatsu Date: Fri Jun 10 11:21:32 2011 -0700 Increment Version to 2.3_r4 Bug 4588939 Change-Id: I7aca7f0bc309b4e63ff59c0c2abf0aa28cf5e008 commit 4f07948e6ca0c8fb94e6ed271ab3212b11343e47 Merge: 860a35f 4415f0f Author: Brian Muramatsu Date: Fri Jun 10 10:32:46 2011 -0700 am 4415f0f7: am 159a8001: am 7c2e6b1c: Merge "Fixes for the location manager cts tests" into gingerbread * commit '4415f0f7cd1ba2d4266178017bf6634751fbb66b': Fixes for the location manager cts tests commit 338ea006d2cb0008cbcf5324d194010da865631c Author: Stephen Hines Date: Fri Jun 10 09:44:55 2011 -0700 Add simple RS test to verify dimension check. Change-Id: Ie217b8cf7fb8ae09639697f8d4bb5091584ceb1b commit c9c0ced64a55d5a15dc1cab1afa34150f37d5b16 Merge: 4415f0f c18daa3 Author: Brian Muramatsu Date: Fri Jun 10 07:46:21 2011 -0700 am c18daa3b: am 732ea4de: Merge "Fix broken Paint test cases." into honeycomb-mr2 * commit 'c18daa3b0229adf6b405b9d9d05341ba98501a5a': Fix broken Paint test cases. commit 9ef3eb64f8fc3afa435923d6bb0fb09f45378e72 Author: KaoriFujimoto Date: Fri Jun 10 13:52:59 2011 +0900 Add some strings for screen where the text stayed in When the text - "Scrolls the specified widget to the specified coordinates, except constrains the X scrolling position to the horizontal regions of the text that will be visible after scrolling to the specified Y position." - has stayed in the screen, it is not scrolled. Therefore, some strings is added to make the text scroll. Change-Id: I149f3d89ba60266527a08cf5fd3562f22272a304 commit c18daa3b0229adf6b405b9d9d05341ba98501a5a Merge: 28f8fcf 732ea4d Author: Brian Muramatsu Date: Thu Jun 9 17:40:00 2011 -0700 am 732ea4de: Merge "Fix broken Paint test cases." into honeycomb-mr2 * commit '732ea4de0a43930d9baa32c5aa2dd641fc1b2d35': Fix broken Paint test cases. commit 732ea4de0a43930d9baa32c5aa2dd641fc1b2d35 Merge: 72369e1 9d9641b Author: Brian Muramatsu Date: Thu Jun 9 17:38:25 2011 -0700 Merge "Fix broken Paint test cases." into honeycomb-mr2 commit 860a35f271dae47158441955303329ff52c44d52 Merge: 1489edf 3624abc Author: Fabrice Di Meglio Date: Thu Jun 9 16:34:22 2011 -0700 Merge "Fix CTS tests for Configuration" commit 3624abc9bb8ab78a16b172e7df8e49cc80a6ec0a Author: Fabrice Di Meglio Date: Thu Jun 9 16:19:42 2011 -0700 Fix CTS tests for Configuration - use the read parcel implementation instead of recoding it Change-Id: I67d2ba73d5ebbcfabe50384dd403596ef7d3a3c4 commit 1f54980dfe7c9591ef4d5cf84cc54e55173b21d1 Author: Brian Muramatsu Date: Thu Jun 9 15:25:28 2011 -0700 Integrate CameraAnalyzer into CTS Verifier Move the Java source to com.android.cts.verifier.camera.analyzer and move the includes and libraries into a colorchecker subdirectory. It didn't seem like libandroid was necessary to compile the libraries, so I took out that dependency. Some further work will be needed like providing instructions and adding a pass fail condition. Change-Id: Ic6f0400b299f1828e4a0bff7a0d5d8512a2bbb39 commit 1489edfbb79f9b152bc765da07b29354d28aee32 Merge: 25d39ec 9d3e07c Author: Stephen Hines Date: Thu Jun 9 15:06:43 2011 -0700 Merge "Test equals() for RS Element/Type." commit 25d39ec3e8d460dd776f8f6930587189968675e3 Merge: 83ba293 a9fc3d7 Author: Adam Powell Date: Thu Jun 9 13:51:30 2011 -0700 resolved conflicts for merge of a9fc3d7a to master Change-Id: I1d995a08a8275e33eae26ecd7445e2184ea506f8 commit 2d17ce8dfb2a199c7f5996d5319e5954a6f195cc Merge: 311b547 feeeaf9 Author: The Android Automerger Date: Thu Jun 9 13:45:35 2011 -0700 merge in gingerbread-release history after reset to gingerbread commit 4415f0f7cd1ba2d4266178017bf6634751fbb66b Merge: a9fc3d7 159a800 Author: Brian Muramatsu Date: Thu Jun 9 13:04:49 2011 -0700 am 159a8001: am 7c2e6b1c: Merge "Fixes for the location manager cts tests" into gingerbread * commit '159a8001af8ed3c38550e30b4ac63047499e107d': Fixes for the location manager cts tests commit 159a8001af8ed3c38550e30b4ac63047499e107d Merge: 67b20a6 7c2e6b1 Author: Brian Muramatsu Date: Thu Jun 9 12:59:10 2011 -0700 am 7c2e6b1c: Merge "Fixes for the location manager cts tests" into gingerbread * commit '7c2e6b1c889a298839ce793382e73256262c13a9': Fixes for the location manager cts tests commit 8b98f7c62976339792181a7993aeb63b8c7e3d7e Author: Brian Muramatsu Date: Wed Jun 8 14:50:24 2011 -0700 Detect when BT Pairing Dialog is Incorrectly Shown - Show a dialog when a pairing dialog intent is shown when an insecure connection is made between devices. The pairing dialog should only be shown when trying to make a secure connection. - Fix a bug where the results from the "Secure client" or "Insecure client" tests were not being recorded. Change-Id: I9886945df4cd0e1e652a7121624e9cc52497cc64 commit 7c2e6b1c889a298839ce793382e73256262c13a9 Merge: 311b547 7a54af9 Author: Brian Muramatsu Date: Thu Jun 9 11:58:26 2011 -0700 Merge "Fixes for the location manager cts tests" into gingerbread commit 7a54af96564d8df87256a22e2bc7c36c23a638f4 Author: Jason Bayer Date: Mon Mar 21 16:28:04 2011 -0700 Fixes for the location manager cts tests If the gps feature isn't declared on the system, it should not be required to return a gps provider Change-Id: I1eda27e133d78a384f77b7b2bf09863631479313 commit 83ba293a39bb61e27f2964de3c7c3e7b7f051515 Merge: 9895bb8 8eba12a Author: Brian Muramatsu Date: Thu Jun 9 11:21:09 2011 -0700 am 8eba12a4: am 67b20a66: am 311b547a: Merge "location provider fixes: test the provider without assuming presence of any particular provider on the device" into gingerbread * commit '8eba12a4f7c520bce10b9744f7ec1c751ba60b21': location provider fixes: test the provider without assuming presence of any particular provider on the device commit 9d3e07c946d426095980fd19040a2707227ea8b9 Author: Stephen Hines Date: Thu Jun 9 10:14:36 2011 -0700 Test equals() for RS Element/Type. Change-Id: Ie819d4bb46eecd1b3007e0340a11819376c27407 commit 9895bb81c13ec73302ee5ee950b39a030b45c402 Merge: dcdecbf 489eab4 Author: Narayan Kamath Date: Thu Jun 9 04:09:29 2011 -0700 Merge "Update CTS stub to use the new framework API." commit dcdecbfdd2288f72b919b6041d31c4b02a2e4683 Merge: 5c706d1 b53ff92 Author: Narayan Kamath Date: Thu Jun 9 00:49:28 2011 -0700 Merge "Fix speech CTS test." commit 5c706d1df9cf3ac759a21c97674af36f815e48ad Merge: 98af2e1 443a362 Author: Brian Muramatsu Date: Wed Jun 8 23:52:55 2011 -0700 am 443a3623: am b9e6bc87: am 22fd9b67: Merge "Merge remote branch \'korg/froyo\' into manualmerge" into gingerbread * commit '443a36234ffbcf01db0bf3d476e2f0929c9f4d95': Revert "Check "Unknown Sources" is Enabled by Default" Increment Version to 2.2_r6 Add more CTS tests. Check "Unknown Sources" is Enabled by Default Don't fail if vold.fstab is empty Don't fail on netlink socket closing. commit 98af2e12d991fb765b8f155a21fadfe19e4f8d82 Merge: 265e886 433537e Author: Brian Muramatsu Date: Wed Jun 8 23:52:52 2011 -0700 am 433537e3: am 6c927620: am 5998c47c: Merge "Make sensors optional" into gingerbread * commit '433537e31e3ff0750ce5030d4f391f23799b6d68': Make sensors optional commit 265e8862f6e88a605d5bf9ffe2c2f940870d921a Merge: f18d8fe 2c98e31 Author: Brian Muramatsu Date: Wed Jun 8 23:52:43 2011 -0700 am 2c98e31a: am f0bc316f: am ff55edcd: Merge "Copy Verifier Results to Clipboard" into gingerbread * commit '2c98e31a4e255e0bcec3cee4d42a7e8e855544c9': Copy Verifier Results to Clipboard commit f18d8fe01dcd3c468ca625e217955e3ae1c72fe7 Merge: b4dbbbe a58b297 Author: Brian Muramatsu Date: Wed Jun 8 23:52:39 2011 -0700 am a58b2973: am e7ce5bc3: am 5e710c7a: Merge "Audio Latency Tests" into gingerbread * commit 'a58b2973de03d4d0835a4a2389948c87c1d919d8': Audio Latency Tests commit b4dbbbe9cdd301b40e17038d29c294375fab9b09 Merge: ee3ca5e 225f154 Author: Brian Muramatsu Date: Wed Jun 8 23:52:30 2011 -0700 am 225f154e: am 3cb27f18: am 2131922a: Merge "Skip Bluetooth tests if the device doesn\'t support Bluetooth." into gingerbread * commit '225f154e1b0299368bc58f8a875af76396dfadc6': Skip Bluetooth tests if the device doesn't support Bluetooth. commit ee3ca5e0facc893acff8f0f3d0faf395b34da758 Merge: 426ad47 ad11359 Author: Brian Muramatsu Date: Wed Jun 8 23:52:20 2011 -0700 am ad113597: am e9ab05bf: am 567abb68: Merge "CTS Verifier Bluetooth Test" into gingerbread * commit 'ad113597ec842c6ab80e532d3c09f71d7cf6be1b': CTS Verifier Bluetooth Test commit a9fc3d7a0c001f752d86c35457aeff511f2076cb Merge: 8eba12a 28f8fcf Author: Adam Powell Date: Wed Jun 8 18:53:01 2011 -0700 am 28f8fcf8: am 72369e10: Fix testDecorView for new behavior of DisplayMetrics * commit '28f8fcf8eb2177f9848d002d47d5bf8c7e02016a': Fix testDecorView for new behavior of DisplayMetrics commit 28f8fcf8eb2177f9848d002d47d5bf8c7e02016a Merge: a410209 72369e1 Author: Adam Powell Date: Wed Jun 8 18:51:39 2011 -0700 am 72369e10: Fix testDecorView for new behavior of DisplayMetrics * commit '72369e10fd0feaf8289cdcd28984a875f21466aa': Fix testDecorView for new behavior of DisplayMetrics commit 72369e10fd0feaf8289cdcd28984a875f21466aa Author: Adam Powell Date: Tue Jun 7 17:06:43 2011 -0700 Fix testDecorView for new behavior of DisplayMetrics The display metrics will now report the effective size of the display minus permanent screen decorations in the system UI. Account for this when checking the size of application window decor vs. the height reported by the display metrics. Change-Id: I98778c0d1554cf1e3db93d63d78e7e86d9fb0123 commit d188ecde401dd2bee1cb55f37b9e1e1c199cb4e7 Author: Jason Bayer Date: Mon Mar 21 16:28:04 2011 -0700 Fixes for the location manager cts tests If the gps feature isn't declared on the system, it should not be required to return a gps provider Change-Id: I1eda27e133d78a384f77b7b2bf09863631479313 commit 426ad4751416cb8df055aa1350455d38c24d27f6 Merge: 0925f70 c7f2579 Author: Jean-Baptiste Queru Date: Wed Jun 8 14:57:42 2011 -0700 am c7f25798: am 39f69167: am 394b731b: Merge from gingerbread * commit 'c7f25798d6fdb799d1c004bda89b04254c94885e': commit 489eab49dfc2c5fb6368097b2a3c73b16f73b0e1 Author: Narayan Kamath Date: Wed Jun 8 17:54:55 2011 +0100 Update CTS stub to use the new framework API. Change-Id: I4226d3b705e1554be658d01f3cd8a1c22a5f79e8 commit b53ff920ab169fa47b7656b3e3e5cbd5ef2b6942 Author: Narayan Kamath Date: Wed Jun 8 10:08:51 2011 +0100 Fix speech CTS test. Note that the function being modified is pretty flaky, but there is no requirement that the engine supports a given locale. This should ideally be fixed by using a mock engine, but that seems not possible since there is an option to force the engine to the user default. Change-Id: Id32277fd63f7f8f301e82e13a6a5bcf54785f389 commit 8eba12a4f7c520bce10b9744f7ec1c751ba60b21 Merge: 443a362 67b20a6 Author: Brian Muramatsu Date: Tue Jun 7 15:44:23 2011 -0700 am 67b20a66: am 311b547a: Merge "location provider fixes: test the provider without assuming presence of any particular provider on the device" into gingerbread * commit '67b20a6622d808b8e3528d656c82ccc1f41aa0d7': location provider fixes: test the provider without assuming presence of any particular provider on the device commit 443a36234ffbcf01db0bf3d476e2f0929c9f4d95 Merge: 433537e b9e6bc8 Author: Brian Muramatsu Date: Tue Jun 7 15:09:23 2011 -0700 am b9e6bc87: am 22fd9b67: Merge "Merge remote branch \'korg/froyo\' into manualmerge" into gingerbread * commit 'b9e6bc874d4a16924ddc6689c3ebb17436dcafd0': Revert "Check "Unknown Sources" is Enabled by Default" Increment Version to 2.2_r6 Add more CTS tests. Check "Unknown Sources" is Enabled by Default Don't fail if vold.fstab is empty Don't fail on netlink socket closing. commit 433537e31e3ff0750ce5030d4f391f23799b6d68 Merge: 2c98e31 6c92762 Author: Brian Muramatsu Date: Tue Jun 7 15:09:20 2011 -0700 am 6c927620: am 5998c47c: Merge "Make sensors optional" into gingerbread * commit '6c9276206c16af4f9ea7f025b3b82ff59368ef3e': Make sensors optional commit 2c98e31a4e255e0bcec3cee4d42a7e8e855544c9 Merge: a58b297 f0bc316 Author: Brian Muramatsu Date: Tue Jun 7 15:09:17 2011 -0700 am f0bc316f: am ff55edcd: Merge "Copy Verifier Results to Clipboard" into gingerbread * commit 'f0bc316f18a5a6bf779831824e09bbc2e8ca8baf': Copy Verifier Results to Clipboard commit a58b2973de03d4d0835a4a2389948c87c1d919d8 Merge: 225f154 e7ce5bc Author: Brian Muramatsu Date: Tue Jun 7 15:09:15 2011 -0700 am e7ce5bc3: am 5e710c7a: Merge "Audio Latency Tests" into gingerbread * commit 'e7ce5bc30d6d5b1d3cc708d919a49b0ae6dcf187': Audio Latency Tests commit 225f154e1b0299368bc58f8a875af76396dfadc6 Merge: ad11359 3cb27f1 Author: Brian Muramatsu Date: Tue Jun 7 15:09:11 2011 -0700 am 3cb27f18: am 2131922a: Merge "Skip Bluetooth tests if the device doesn\'t support Bluetooth." into gingerbread * commit '3cb27f18cd89bf0eb0faaa32ca9aeb98482f8740': Skip Bluetooth tests if the device doesn't support Bluetooth. commit ad113597ec842c6ab80e532d3c09f71d7cf6be1b Merge: c7f2579 e9ab05b Author: Brian Muramatsu Date: Tue Jun 7 15:09:07 2011 -0700 am e9ab05bf: am 567abb68: Merge "CTS Verifier Bluetooth Test" into gingerbread * commit 'e9ab05bf3c60021bbed5f9f92dae9808a2ef8e1d': CTS Verifier Bluetooth Test commit 0925f7012d2abdca78a478ad73eb1de3675fbaef Merge: c0b277f a7051b0 Author: Fabrice Di Meglio Date: Tue Jun 7 14:23:08 2011 -0700 Merge "Fix CTS tests after renaming View attribuet from horizontalDirection to layoutDirection" commit 7711dac686cb45bcdd871ce8c686afb2d053228c Author: Brian Muramatsu Date: Tue Jun 7 13:53:47 2011 -0700 Fix for NetworkInfo_DetailedStateTest Update the test to support a new enum value. Once the SignatureTest is fixed to check enums there shouldn't be any need for these enum checking tests. Change-Id: I85d75e86453c37a35f8be9e15d99dd47c690f6ea commit c0b277f12f5a4948c45706347f5ceae26d4127ec Merge: 4c618ec b33aabd Author: Eino-Ville Talvala Date: Tue Jun 7 13:32:08 2011 -0700 Merge "Fix to CameraAnalyzer JNI library build process." commit b33aabdd84b9d82b1132e332b7ed53cd648b7a9e Author: Eino-Ville Talvala Date: Tue Jun 7 13:06:55 2011 -0700 Fix to CameraAnalyzer JNI library build process. Now works from APK properly as intended. Change-Id: I8b8914a403fe028cdfddacb2c5537a5e687554c2 commit c7f25798d6fdb799d1c004bda89b04254c94885e Merge: 8b8171a 39f6916 Author: Jean-Baptiste Queru Date: Tue Jun 7 13:23:43 2011 -0700 am 39f69167: am 394b731b: Merge from gingerbread * commit '39f69167cabf5d91730dc28856999de841c6921f': commit 4a4a3f3fbad955d4a1bad537b0a8c344d01ce9cc Merge: 90ada76 d3c61f3 Author: Brian Muramatsu Date: Tue Jun 7 11:37:55 2011 -0700 Merge "Bug fix for b/4545066 CTS fail at AccessibilityEndToEndTest#testTypeWindowStateChangedAccessibilityEvent. Increase async wait time to ensure that notifications are passed thru. I was able to reproduce the error by cutting down the wait time(MAX_TIMEOUT_ASYNCHRONOUS_PROCESSING)." into honeycomb-mr1 commit 67b20a6622d808b8e3528d656c82ccc1f41aa0d7 Merge: b9e6bc8 311b547 Author: Brian Muramatsu Date: Tue Jun 7 11:32:11 2011 -0700 am 311b547a: Merge "location provider fixes: test the provider without assuming presence of any particular provider on the device" into gingerbread * commit '311b547a21b98f2026c8291ba6f000c7114191f3': location provider fixes: test the provider without assuming presence of any particular provider on the device commit 9d9641beb84693d70b888c1cd6c6e16bf34dcbab Author: Derek Sollenberger Date: Tue Jun 7 11:48:08 2011 -0400 Fix broken Paint test cases. bug: 4355524 & 4361123 Change-Id: I3b200a6a171605457e9c72c5d13fd3c360850308 commit 311b547a21b98f2026c8291ba6f000c7114191f3 Merge: 22fd9b6 599d94e Author: Brian Muramatsu Date: Tue Jun 7 10:51:38 2011 -0700 Merge "location provider fixes: test the provider without assuming presence of any particular provider on the device" into gingerbread commit 599d94e59e44e3a20b2b32582e03c361cbadd60a Author: Jason Bayer Date: Mon Mar 21 16:49:04 2011 -0700 location provider fixes: test the provider without assuming presence of any particular provider on the device Change-Id: Ibac21f9f29f8ab5583cadae8e4a6dded209ebe67 commit 90ada76c71c78be717a0acf1cf8246fe05d224ab Merge: 21b5afb a24cfb3 Author: Brian Muramatsu Date: Tue Jun 7 10:42:07 2011 -0700 Merge "location provider fixes: test the provider without assuming presence of any particular provider on the device" into honeycomb-mr1 commit d3c61f3895e102f325e855ca75ce4143e303e335 Author: Jun Peng Date: Mon Jun 6 12:14:12 2011 -0700 Bug fix for b/4545066 CTS fail at AccessibilityEndToEndTest#testTypeWindowStateChangedAccessibilityEvent. Increase async wait time to ensure that notifications are passed thru. I was able to reproduce the error by cutting down the wait time(MAX_TIMEOUT_ASYNCHRONOUS_PROCESSING). TESTS = tests on M4. Change-Id: I2b75b5c7dccb5fad484704ada1218e5450877b35 commit 4c618ecc72f0799b2e2f549756e68e758701c902 Author: Derek Sollenberger Date: Tue Jun 7 11:48:08 2011 -0400 Fix broken Paint test cases. bug: 4355524 & 4361123 Change-Id: I3b200a6a171605457e9c72c5d13fd3c360850308 commit a7051b0f252ddff0476af8f81f762d2a6c9df695 Author: Fabrice Di Meglio Date: Mon Jun 6 19:24:35 2011 -0700 Fix CTS tests after renaming View attribuet from horizontalDirection to layoutDirection Change-Id: I2a9554f237fe18dc01b304bb9c202e770c791c72 commit b9e6bc874d4a16924ddc6689c3ebb17436dcafd0 Merge: 6c92762 22fd9b6 Author: Brian Muramatsu Date: Mon Jun 6 18:08:50 2011 -0700 am 22fd9b67: Merge "Merge remote branch \'korg/froyo\' into manualmerge" into gingerbread * commit '22fd9b6795f7c9b4b950412d567ef0dca2cdd004': Revert "Check "Unknown Sources" is Enabled by Default" Increment Version to 2.2_r6 Add more CTS tests. Check "Unknown Sources" is Enabled by Default Don't fail if vold.fstab is empty Don't fail on netlink socket closing. commit 6c9276206c16af4f9ea7f025b3b82ff59368ef3e Merge: f0bc316 5998c47 Author: Brian Muramatsu Date: Mon Jun 6 18:08:48 2011 -0700 am 5998c47c: Merge "Make sensors optional" into gingerbread * commit '5998c47c526101c5fadc3b2309e16ca02a1f41be': Make sensors optional commit f0bc316f18a5a6bf779831824e09bbc2e8ca8baf Merge: e7ce5bc ff55edc Author: Brian Muramatsu Date: Mon Jun 6 18:06:55 2011 -0700 am ff55edcd: Merge "Copy Verifier Results to Clipboard" into gingerbread * commit 'ff55edcd689055c765830f7bb940fbe33a137056': Copy Verifier Results to Clipboard commit e7ce5bc30d6d5b1d3cc708d919a49b0ae6dcf187 Merge: 3cb27f1 5e710c7 Author: Brian Muramatsu Date: Mon Jun 6 18:06:53 2011 -0700 am 5e710c7a: Merge "Audio Latency Tests" into gingerbread * commit '5e710c7ae8153df80dd4040d20a931b5c2098f41': Audio Latency Tests commit 3cb27f18cd89bf0eb0faaa32ca9aeb98482f8740 Merge: e9ab05b 2131922 Author: Brian Muramatsu Date: Mon Jun 6 18:06:39 2011 -0700 am 2131922a: Merge "Skip Bluetooth tests if the device doesn\'t support Bluetooth." into gingerbread * commit '2131922a12a14fa80f3eb15ab440e0c62562969f': Skip Bluetooth tests if the device doesn't support Bluetooth. commit e9ab05bf3c60021bbed5f9f92dae9808a2ef8e1d Merge: 39f6916 567abb6 Author: Brian Muramatsu Date: Mon Jun 6 18:06:34 2011 -0700 am 567abb68: Merge "CTS Verifier Bluetooth Test" into gingerbread * commit '567abb68183482b96895055efc666069965b4317': CTS Verifier Bluetooth Test commit ffeab80c8e086e9c649cb26b7258e2d2aa42d5a4 Merge: 759a2d9 4bb7d55 Author: Fabrice Di Meglio Date: Mon Jun 6 16:51:17 2011 -0700 Merge "Rename Gravity BEFORE/AFTER to START/END" commit 4bb7d555a927c5f7a8747fdd85f7c94e1c0d2f19 Author: Fabrice Di Meglio Date: Mon Jun 6 16:44:20 2011 -0700 Rename Gravity BEFORE/AFTER to START/END - following spec proposal for having CSS3 like naming Change-Id: Iae2c0e1948c5975130ee3686bf93b06cf89508c1 commit 22fd9b6795f7c9b4b950412d567ef0dca2cdd004 Merge: 5998c47 02551c5 Author: Brian Muramatsu Date: Mon Jun 6 15:07:06 2011 -0700 Merge "Merge remote branch 'korg/froyo' into manualmerge" into gingerbread commit feeeaf9e8fc35c1334b507b48ccce3317e2acb8a Merge: ff55edc 12e21a9 Author: The Android Automerger Date: Mon Jun 6 15:00:35 2011 -0700 merge in gingerbread-release history after reset to gingerbread commit 02551c5c4bb55be5eea6b33aed5bee5a72d21f4b Merge: 5998c47 01552d1 Author: Brian Muramatsu Date: Mon Jun 6 14:59:17 2011 -0700 Merge remote branch 'korg/froyo' into manualmerge Conflicts: tools/host/src/com/android/cts/Version.java Change-Id: I742c222786c9b883c152cbb0cac1008451188106 commit 21b5afbe715b7694d106b63416ace490921eaad6 Merge: 3978b74 34317ff Author: Brian Muramatsu Date: Mon Jun 6 14:31:09 2011 -0700 Merge "Add HC MR1 Features to CTS Verifier" into honeycomb-mr1 commit 34317ff6157872061c55bfd84f2b485e41e3f45e Author: Brian Muramatsu Date: Mon Jun 6 14:22:49 2011 -0700 Add HC MR1 Features to CTS Verifier Change-Id: If651706c9ed0aaee1d714f30863fafacb894e7d7 commit 5998c47c526101c5fadc3b2309e16ca02a1f41be Merge: ff55edc 91e5244 Author: Brian Muramatsu Date: Mon Jun 6 14:11:26 2011 -0700 Merge "Make sensors optional" into gingerbread commit 91e5244260faeef0ab028810d7b4b730cc87e8cb Author: Dylan Reid Date: Thu Mar 17 15:45:10 2011 -0700 Make sensors optional Change-Id: I44526a902fa5e7ad326e82bb2eb6d4b0f6706ca3 commit 01552d10c2cb9c42c04f80db4cf4fe334d1af51e Merge: 81484bb d05a0e3 Author: Brian Muramatsu Date: Mon Jun 6 13:59:22 2011 -0700 Merge "Revert "Check "Unknown Sources" is Enabled by Default"" into froyo commit 3978b747acdfb12cd092fb59b00163ad03075313 Merge: 1c3bb36 72eeb65 Author: Brian Muramatsu Date: Mon Jun 6 12:31:47 2011 -0700 Merge "Fix WindowTest#testDecorView" into honeycomb-mr1 commit 72eeb653445b1626dac3589a58a318bfa45262ca Author: Brian Muramatsu Date: Thu May 5 13:35:51 2011 -0700 Fix WindowTest#testDecorView Bug 4367792 The decor view has the same height as the screen on phones, since there isn't a system bar. Change-Id: I56f30c3115b9a51c17b084e6882e412e632f0f0e commit d05a0e34781c6b32624ef8eef98079e99a845283 Author: Brian Muramatsu Date: Mon Jun 6 12:20:20 2011 -0700 Revert "Check "Unknown Sources" is Enabled by Default" This reverts commit 594e9852cc4d34e966f2389c8be67aebb69fdc53. commit 1c3bb368c303fc10dc98e300725d0680bcb88b4c Merge: 791f0e6 58d3a15 Author: Brian Muramatsu Date: Mon Jun 6 10:45:29 2011 -0700 Merge "Fixed bugs in test case that caused test failure." into honeycomb-mr1 commit 759a2d93a6cfbdf8c97812786e7a281915b6a70c Author: Stephen Hines Date: Sun Jun 5 19:24:55 2011 -0700 Fix off-by-one error with FieldPackerTest. BUG=4540617 Change-Id: I7cc3f977c70fe8b95b008bb9dc9e8e74da903873 commit a24cfb3a11928e720f0027205e18d9b71715e8a8 Author: Jason Bayer Date: Mon Mar 21 16:49:04 2011 -0700 location provider fixes: test the provider without assuming presence of any particular provider on the device Change-Id: Ibac21f9f29f8ab5583cadae8e4a6dded209ebe67 commit 81484bb31b4588198cbe6b01fd496d544a48f327 Merge: c8c6118 487ef9e Author: Brian Muramatsu Date: Fri Jun 3 15:18:41 2011 -0700 Merge "Increment Version to 2.2_r6" into froyo commit 487ef9edf126e91444d5a4ba5a9f8a6db16aa4e2 Author: Brian Muramatsu Date: Fri Jun 3 15:13:46 2011 -0700 Increment Version to 2.2_r6 Change-Id: I3a344fe0aa70d39b9ba2d13e4b81e21a89e50df4 commit ff55edcd689055c765830f7bb940fbe33a137056 Merge: 5e710c7 e49daa9 Author: Brian Muramatsu Date: Fri Jun 3 15:03:57 2011 -0700 Merge "Copy Verifier Results to Clipboard" into gingerbread commit e49daa9050b086ad3ffa03eadf4ba5781375c911 Author: Brian Muramatsu Date: Fri Jun 3 14:57:01 2011 -0700 Copy Verifier Results to Clipboard Bug 4478619 Change-Id: Ie8c57f03332b31be3b69d65eda091810c52b980d commit 86d93bb165aa0f1f8023e3b56f30382f1b4c2cec Merge: 3cecb98 07b38b5 Author: Fabrice Di Meglio Date: Fri Jun 3 14:37:31 2011 -0700 Merge "Fix CTS tests for TextView gravity" commit 07b38b5b3c169ba3cd6254087ae2e0f33b5ce52c Author: Fabrice Di Meglio Date: Fri Jun 3 14:31:09 2011 -0700 Fix CTS tests for TextView gravity - need also the corresponding fix for TextView Change-Id: Ib4d8b354dfc967cfad1950c5c2c8aac77bf60f38 commit 791f0e6b1a703ff8614c867d70aeb89538273aa1 Author: Mist Liao Date: Fri May 6 16:24:40 2011 +0800 Checking hardware feature when test rear camera To support the device which do not have rear camera Change-Id: I81bcaa1f4fbdf0b1fb94f5f7c82e2b0e179c629e commit 3cecb98d6f0dce1c6a0b671120738c7962c2e06b Merge: 2a856e4 0cdb44f Author: Brian Muramatsu Date: Fri Jun 3 11:33:44 2011 -0700 Merge "Improve DebuggableTest" commit 5e710c7ae8153df80dd4040d20a931b5c2098f41 Merge: 2131922 f62c022 Author: Brian Muramatsu Date: Fri Jun 3 11:05:08 2011 -0700 Merge "Audio Latency Tests" into gingerbread commit f62c0227eeddcb759786d7c252c531f88b79c70c Author: Brian Muramatsu Date: Sun Feb 13 22:10:59 2011 -0800 Audio Latency Tests Add two tests to gauge audio latency. The cold latency test measures how fast data can be read from freshly created AudioRecord. The warm latency test measures how long it takes to record a sound after creaing an AudioRecord and AudioTrack and waiting a bit. Change-Id: I06c4990d811ad6815cc1b0d185fab6c45c510f25 commit 2a856e4a28587a088789f7c181617789fffe8adb Merge: bfd5171 2880ada Author: Stephen Hines Date: Fri Jun 3 10:41:18 2011 -0700 Merge "Validate new checks in RS FieldPacker." commit 2880ada86dd9ccf9c93bcad889aa83a93b0a035a Author: Stephen Hines Date: Thu Jun 2 19:37:25 2011 -0700 Validate new checks in RS FieldPacker. Change-Id: I8b5c62c185895aaeafc255f707ba0b75e82e0fca commit bfd5171feaef5a6cb6234ea3b47379628ca81150 Merge: b1bbbd1 8b8171a Author: Brian Muramatsu Date: Thu Jun 2 18:52:32 2011 -0700 am 8b8171a0: am c3b6c003: am 84795c6e: Merge "Changed the condition to consider negative value for PID." into gingerbread * commit '8b8171a08a419b84505c392241bd385c01f03aea': Changed the condition to consider negative value for PID. commit 58d3a150823e9128a35934efd44991c7c18a9376 Author: Mark Lindner Date: Thu Jun 2 18:21:27 2011 -0700 Fixed bugs in test case that caused test failure. - reversed logic in setNewLatch() was nulling out mLatch in MockSyncAdapter immediately after setting it, so the latch never signalled. - tests that initiated a sync weren't cleaning up after themselves, leading to leftover state that affected subsequent tests b/4479894 TESTED = runs on m4 without test failures Change-Id: I038aba89a5c7a944a90ef8b6fba07fd4630d7906 commit c8c6118af75dd493b154f3f24c068e29bcc96d3c Merge: dce64ea 09a8750 Author: Brian Muramatsu Date: Thu Jun 2 17:50:29 2011 -0700 Merge "Add more CTS tests." into froyo commit 09a875085da3bf2ebb70970b22c5886eb254ada3 Author: Marco Nelissen Date: Thu Jun 2 15:07:43 2011 -0700 Add more CTS tests. These tests cover streaming mp3 over http, streaming the same file again, streaming with a redirect, streaming with unknown content length, streaming ogg vorbis, streaming ogg vorbis with redirect, and streaming ogg vorbis with unknown content length. Change-Id: I40b0dd5f7d1b44c2e27ab46bff5e0850d65e4776 commit b1bbbd19c1e33c97168d0f55e6642f8426689ea9 Merge: 2cd2958 217361d Author: Eddy Talvala Date: Thu Jun 2 16:26:13 2011 -0700 Merge "Add camera image analysis test application." commit 2cd2958f0640f9f495762e9331006cabf5c7fce9 Merge: f87b919 22e70cd Author: Dianne Hackborn Date: Thu Jun 2 16:23:42 2011 -0700 am 22e70cd0: am a410209d: am 544d272e: Fix issue #4490446: 5 failures in android.content.res.cts.ConfigTest * commit '22e70cd0332ef6c113780ab33bfb54eb889fc13c': Fix issue #4490446: 5 failures in android.content.res.cts.ConfigTest commit 0cdb44f083ed2e1eec2713c2f2200194a270619e Author: Brian Muramatsu Date: Thu Jun 2 15:26:15 2011 -0700 Improve DebuggableTest Show all the APKs that are marked as debuggable rather than just the first one that is caught. Change-Id: I1c4adeaa826fc37c6d1e2945caa24db898aca8f7 commit f87b919a5ddb4cc4037eb56364d9f64772760cf9 Merge: 19b4d8d 476bd99 Author: Stephen Hines Date: Thu Jun 2 14:23:49 2011 -0700 Merge "Make FieldPackerTest include all entry points." commit 2131922a12a14fa80f3eb15ab440e0c62562969f Merge: 567abb6 1633961 Author: Brian Muramatsu Date: Thu Jun 2 12:53:13 2011 -0700 Merge "Skip Bluetooth tests if the device doesn't support Bluetooth." into gingerbread commit 1633961bc1fdfecec6b63ce38d669d1432cba50b Author: fujimoto.kaori Date: Thu Jun 2 20:57:20 2011 +0900 Skip Bluetooth tests if the device doesn't support Bluetooth. Change-Id: Iad247a9538cdbe5ac8fc1e6a9522791cfde20262 commit 567abb68183482b96895055efc666069965b4317 Merge: 84795c6 e891acb Author: Brian Muramatsu Date: Thu Jun 2 12:44:46 2011 -0700 Merge "CTS Verifier Bluetooth Test" into gingerbread commit e891acb369004599982a11a15a1c8efa8f9c78f6 Author: Brian Muramatsu Date: Thu May 19 16:02:39 2011 -0700 CTS Verifier Bluetooth Test Add the following tests: - Toggle Bluetooth - Make sure BT can be disabled and enabled - Secure Server/Client - Make sure a secure sockets work between two devices. - Insecure Server/Client - Make sure insecure sockets work between two devices. Remove the Arduino Bluetooth helper files, since this CTS Verifier test should cover the same testing. Change-Id: Ifd8ace2b29bbfdbb120953f837e627e96c7d3f7b commit 476bd99d8a0ec86071e41af96bf6e1d0f98aefa9 Author: Stephen Hines Date: Thu Jun 2 09:46:30 2011 -0700 Make FieldPackerTest include all entry points. Change-Id: Ifa986c2d45c03178475c10a3da72d8a220b288ba commit a1aa065c9a79853e2661f585a485281ec3df28fc Merge: 87092ff 3473b8e Author: Brian Muramatsu Date: Wed Jun 1 18:04:55 2011 -0700 Merge "Make sensors optional for GoogleTV." into honeycomb-mr1 commit 196014688df4c5640a0aafd7816e504050146c30 Author: Stephen Hines Date: Wed Jun 1 14:38:35 2011 -0700 Test new vector classes for RS Element. Change-Id: Iff26b46af2440ed747f4ee5b9e1f515a0d1c55b6 commit 39f69167cabf5d91730dc28856999de841c6921f Merge: c3b6c00 394b731 Author: Jean-Baptiste Queru Date: Wed Jun 1 14:26:24 2011 -0700 am 394b731b: Merge from gingerbread * commit '394b731b0b3331fc7262121be6c5d1ea691c8eb7': commit 394b731b0b3331fc7262121be6c5d1ea691c8eb7 Merge: a2ad41e 84795c6 Author: Jean-Baptiste Queru Date: Wed Jun 1 14:10:47 2011 -0700 Merge from gingerbread Change-Id: I385c5ae10fb90d6395aff9c536eea5f9140ec801 commit 19b4d8d9f9075e06b2765ac61d2407118ea22cb5 Author: Fabrice Di Meglio Date: Tue May 31 15:23:57 2011 -0700 Add CTS tests for View horizontal direction attribute Change-Id: I9c6b6b3d555c360fa796ee36b7b2e1d0429e57dc commit 590b2fb71aef751ef45552aa053b6dcd472a5c87 Merge: 710e745 a1d7ca5 Author: Fabrice Di Meglio Date: Tue May 31 11:58:36 2011 -0700 Merge "Update CTS tests for RTL support / Callback2" commit 710e74551d22645f8ac44f8f40b3b33ff7dfc892 Merge: d9f4846 48fb631 Author: Fabrice Di Meglio Date: Tue May 31 11:58:23 2011 -0700 Merge "Update Gravity CTS tests for Gravity.BEFORE and Gravity.AFTER" commit 8b8171a08a419b84505c392241bd385c01f03aea Merge: 22e70cd c3b6c00 Author: Brian Muramatsu Date: Sun May 29 08:59:19 2011 -0700 am c3b6c003: am 84795c6e: Merge "Changed the condition to consider negative value for PID." into gingerbread * commit 'c3b6c00337f24db33cef00f744cfaf20009005a2': Changed the condition to consider negative value for PID. commit d9f4846f8eba556b85de3beaa57118ebdb926d6b Author: Brian Carlstrom Date: Sat May 28 18:47:39 2011 -0700 Make CollectAllTests tolerate runtime SecurityException git cherry-pick -e 98194f2e1274035c224d34c3dfa5f925293d2520 commit a1d7ca5e1ce92973eb82fd3aaad2a507cc092f33 Author: Fabrice Di Meglio Date: Fri May 13 16:02:02 2011 -0700 Update CTS tests for RTL support / Callback2 Change-Id: I9790d5d05a6a46a4834775575ab5edb5d62e1ee7 commit 48fb631bf69b95e95f27c395b4bd3a0d5588e176 Author: Fabrice Di Meglio Date: Fri May 27 17:16:18 2011 -0700 Update Gravity CTS tests for Gravity.BEFORE and Gravity.AFTER Change-Id: I41a2ba6ad0b4966662ff0d8bbdad349a114a05ac commit 217361dc546424aaac48db0bb773d1f01d23f393 Author: Wei Hua Date: Fri May 27 09:52:05 2011 -0700 Add camera image analysis test application. This is a start for an application to analyze camera API functioning by inspecting output images taken of a standard color checker target. Currently it uses Bitmaps produced by Camera.takePicture(). The detection routine can currently can detect a color checker from an RGBA or RGB565 Bitmap, returning the average color for each color checker patch, roughly linearized and normalized to 0-1. Also generates a debug output Bitmap for algorithm testing. Does not yet include actual camera API tests. Change-Id: I83a1f59e28051b29ae4b21ceb75fbccfdf69ccfa commit 22e70cd0332ef6c113780ab33bfb54eb889fc13c Merge: 8f7e54c a410209 Author: Dianne Hackborn Date: Fri May 27 12:46:22 2011 -0700 am a410209d: am 544d272e: Fix issue #4490446: 5 failures in android.content.res.cts.ConfigTest * commit 'a410209dec4f127e0ee0024fa26fec71fc6e8696': Fix issue #4490446: 5 failures in android.content.res.cts.ConfigTest commit a410209dec4f127e0ee0024fa26fec71fc6e8696 Merge: 2349bf1 544d272 Author: Dianne Hackborn Date: Fri May 27 12:42:54 2011 -0700 am 544d272e: Fix issue #4490446: 5 failures in android.content.res.cts.ConfigTest * commit '544d272e5901ed193dd9c55a9ef791a38ffef91e': Fix issue #4490446: 5 failures in android.content.res.cts.ConfigTest commit 544d272e5901ed193dd9c55a9ef791a38ffef91e Author: Dianne Hackborn Date: Fri May 27 12:10:34 2011 -0700 Fix issue #4490446: 5 failures in android.content.res.cts.ConfigTest Plus add tests for the new swNNdp, wNNNdp, and hNNNdp resource configs. Change-Id: Ie121bf520caf91c6915f91de01830c6d59a39a6f commit d8821ab1e7940b8e7af1a56bd2c40d11850da341 Author: Svetoslav Ganov Date: Fri May 27 12:13:06 2011 -0700 Updated AccessibilityEventTest Change-Id: Ied9d9becf6e6836e83f7fb5f6889f62500ee0d8b commit a39c49ba6e21ae5b842e93a268a29191144c72be Author: Yang Chuang Date: Wed May 25 00:36:58 2011 +0800 Fix testPreviewPictureSizesCombination Change to use setOneShotPreviewCallback after startPreview to avoid receiving odds. Change-Id: I68e9251d71e420267294ed740aa78363da65de06 commit a79e06651143db1b44b37eb9f3acb743ec45790d Merge: 405220c 022aff4 Author: Brian Carlstrom Date: Fri May 27 10:12:36 2011 -0700 Merge "Tracking merge of dalvik-dev to master" commit 405220c6759326bb0ceaa8779b6358cc2ed1968a Merge: 7c64ae6 d8b9520 Author: Tsu Chiang Chuang Date: Fri May 27 09:31:53 2011 -0700 Merge "Change in RunUtil in tf needs to be reflected here." commit d8b952016b850d6b7f0c3413095fc0fc48e6de90 Author: Tsu Chiang Chuang Date: Fri May 27 09:06:19 2011 -0700 Change in RunUtil in tf needs to be reflected here. Change-Id: Ic75c56596c19a6b32f26e741a46be92e685c4827 commit 022aff486648aa159fe990b38c1fb1968b2ca10d Author: Brian Carlstrom Date: Tue May 17 23:16:51 2011 -0700 Tracking merge of dalvik-dev to master React to move of Base64 in libcore for CTS git cherry-pick --no-commit bf4c21cfbd8d8eabd2ec9af0f315d5baff626580 Breakup android.core.tests.libcore based on top level package name git cherry-pick --no-commit 45490fa3d469f4a581ecac46ac40c7a4a9af4aaf DexFile constructor now takes an argument. git cherry-pick --no-commit 583eab2ec924dadebd45b1189929f1acec08c7c7 Change-Id: I9b8b717f13fdc9d4499fd9e7a7b488c7537d3f79 commit 7c64ae6ee797a66b2b518fbf343a853f8ccde5b7 Merge: 616d26e 8f7e54c Author: Jeff Brown Date: Thu May 26 11:38:08 2011 -0700 am 8f7e54cb: (-s ours) am 2349bf17: am cdf05985: Add a few tests for MotionEvents.PointerCoords. (DO NOT MERGE) * commit '8f7e54cb77123f1d00adb0fc3ae66e965edad8ae': Add a few tests for MotionEvents.PointerCoords. (DO NOT MERGE) commit 616d26efe82ae6432541633dcc26236e9f401196 Merge: 15d9c7f 195f8f0 Author: Jeff Brown Date: Thu May 26 11:38:05 2011 -0700 am 195f8f0f: (-s ours) am d96f4bcd: am 350b426b: Update VelocityTracker tests. (DO NOT MERGE) * commit '195f8f0f8b4c713ae7c62f1b8562e95a7b9edf9b': Update VelocityTracker tests. (DO NOT MERGE) commit 87092ff13326916986b9a147517043f4bbb00852 Merge: 70adf80 6a3a740 Author: Brian Muramatsu Date: Thu May 26 10:56:08 2011 -0700 Merge "Expect haptic feedback being performed only if it is turned on" into honeycomb-mr1 commit ad6152527baa023c3d6e07f58042d48fb7e2ea1c Author: Masanori Ogino Date: Mon May 16 16:14:13 2011 +0900 Wait for completing the initialization of WebViewCore This findAll() will fail when WebView$mNativeClass field is not updated. That field is updated after the initialization of WebViewCore. The test may execute before the completion of it. Because the test case waits for the completion of it on UI thread, the test cannot notice the completion message of it. In that case, test will fail. So the test should wait for the completion of init on non-UI thread. Change-Id: I7ad811d2d8259e58afd78cae9736dbf78df547e6 commit 12e21a9905c155176f56d33f4df5db02e7539818 Merge: 84795c6 c3d7282 Author: The Android Automerger Date: Wed May 25 16:14:20 2011 -0700 merge in gingerbread-release history after reset to gingerbread commit 6a3a7406fde890ad4085c57b06d57cfb898580a1 Author: Jason Bayer Date: Mon Mar 28 18:32:20 2011 -0700 Expect haptic feedback being performed only if it is turned on Tested on googletv and stingray Change-Id: Ia6b9dcc76321a55a18f203f7ffca21bc77be72cc commit 8f7e54cb77123f1d00adb0fc3ae66e965edad8ae Merge: 195f8f0 2349bf1 Author: Jeff Brown Date: Wed May 25 14:42:45 2011 -0700 am 2349bf17: am cdf05985: Add a few tests for MotionEvents.PointerCoords. (DO NOT MERGE) * commit '2349bf17de833427f5470f7d6322b73918c2fa1b': Add a few tests for MotionEvents.PointerCoords. (DO NOT MERGE) commit 195f8f0f8b4c713ae7c62f1b8562e95a7b9edf9b Merge: 325d75e d96f4bc Author: Jeff Brown Date: Wed May 25 14:42:41 2011 -0700 am d96f4bcd: am 350b426b: Update VelocityTracker tests. (DO NOT MERGE) * commit 'd96f4bcd1f2372ea616330847e6fdb45818422ad': Update VelocityTracker tests. (DO NOT MERGE) commit 3473b8e35d2378594504fe387245c70709d98b09 Author: Dylan Reid Date: Thu Mar 17 15:45:10 2011 -0700 Make sensors optional for GoogleTV. GoogleTV doesn't have a compass, accelerometer, or orientation sensor. Tested on googletv and stingray Change-Id: I44526a902fa5e7ad326e82bb2eb6d4b0f6706ca3 commit 2349bf17de833427f5470f7d6322b73918c2fa1b Merge: d96f4bc cdf0598 Author: Jeff Brown Date: Wed May 25 14:38:11 2011 -0700 am cdf05985: Add a few tests for MotionEvents.PointerCoords. (DO NOT MERGE) * commit 'cdf059852ab11463f14b5432bfd4a5e6daaad012': Add a few tests for MotionEvents.PointerCoords. (DO NOT MERGE) commit d96f4bcd1f2372ea616330847e6fdb45818422ad Merge: 970beed 350b426 Author: Jeff Brown Date: Wed May 25 14:38:09 2011 -0700 am 350b426b: Update VelocityTracker tests. (DO NOT MERGE) * commit '350b426b91e582580aaadad3f87ae9432304ab13': Update VelocityTracker tests. (DO NOT MERGE) commit 15d9c7f9cf5d8c5d8a7f7ca328bae9e57bd656f4 Author: Brian Muramatsu Date: Wed May 25 14:02:43 2011 -0700 Fix PopupWindowTest NPEs The NPEs no longer occur due to change with id: I5317b052236d758fd3b9055c9940fbb10ec7b123 Change-Id: I735f83ca0d962f791047e2db7947972117235f41 commit 70adf80377bdfdfc183f04eaf88608779d592a38 Author: Jason Bayer Date: Wed Mar 16 20:22:04 2011 -0700 Bypass bluetooth tests if not present Tested on gtv and stingray Change-Id: Ifda7977248bcb26617bd3fde12efde359a072227 commit cdf059852ab11463f14b5432bfd4a5e6daaad012 Author: Jeff Brown Date: Tue Mar 15 19:07:47 2011 -0700 Add a few tests for MotionEvents.PointerCoords. (DO NOT MERGE) Change-Id: I09d079d4401b73f36386db9867c2f286b708fc17 commit 350b426b91e582580aaadad3f87ae9432304ab13 Author: Jeff Brown Date: Tue Mar 15 19:04:04 2011 -0700 Update VelocityTracker tests. (DO NOT MERGE) Modified the test so that all of the samples are at least 10ms apart. This is because the new VelocityTracker does not attempt to compute the velocity when the time difference is too small to give accurate results. The computed values are also slightly different because the new VelocityTracker does not discard the most recent sample. Instead, it is more careful about how it handles pointers going down or up to ensure that the pointer's last known velocity is accurately reported. Change-Id: I78193165fbe4d610f0d6d46c5dca66c17c54984f commit dce64eabacfec9e0159053d9bcc3293397ccc8db Merge: 7d1af5a 594e985 Author: Brian Muramatsu Date: Tue May 24 11:34:26 2011 -0700 Merge "Check "Unknown Sources" is Enabled by Default" into froyo commit 594e9852cc4d34e966f2389c8be67aebb69fdc53 Author: Brian Muramatsu Date: Fri Mar 11 16:51:46 2011 -0800 Check "Unknown Sources" is Enabled by Default Bug 4080822 Change-Id: Idba3b1871650eb7dea1e96e630e8ac15f4f03ec1 commit 352c4c6505b03a34ff37cd0df3760ea19c4ed951 Merge: 1a527c3 62de00f Author: Marco Nelissen Date: Tue May 24 08:17:13 2011 -0700 Merge "Expand playlist tests" commit c3b6c00337f24db33cef00f744cfaf20009005a2 Merge: 64c0a15 84795c6 Author: Brian Muramatsu Date: Mon May 23 18:49:03 2011 -0700 am 84795c6e: Merge "Changed the condition to consider negative value for PID." into gingerbread * commit '84795c6e75a1421006344db47166d8a6e5e26bbc': Changed the condition to consider negative value for PID. commit 7d1af5ab4b0ed52f46b33204adbc5df9b07a3aba Merge: 48bfddb 206d087 Author: Brian Muramatsu Date: Mon May 23 14:20:05 2011 -0700 Merge "Don't fail if vold.fstab is empty" into froyo commit 206d087a5effe8f24fccbfa8db19f5938145d899 Author: Nick Kralevich Date: Thu May 19 15:52:01 2011 -0700 Don't fail if vold.fstab is empty This test shouldn't fail if vold.fstab is empty. Rather, short term, just ignore this case, at the expense that we may miss legitimate security holes. Long term, this needs to be properly fixed. Change-Id: I328bc0360048b5233b336c1a35f7d8a9ade3c49c commit 84795c6e75a1421006344db47166d8a6e5e26bbc Merge: e7a1868 4f21f5a Author: Brian Muramatsu Date: Mon May 23 14:07:16 2011 -0700 Merge "Changed the condition to consider negative value for PID." into gingerbread commit 86895806dabcb859ad1c16551494f9dd83603e06 Author: Brian Muramatsu Date: Mon May 23 13:49:44 2011 -0700 DO NOT MERGE Suppress testSetCamera Test Bug 4464677 This test will be fixed in the next CTS release. Change-Id: I06f02f109a3f1a33bb38229b24cc7c9d248e63e6 commit 1a527c36a8c9e47794653406ae2ff60f481f89da Author: Marco Nelissen Date: Mon May 23 10:44:28 2011 -0700 Add CTS test for filtering. Change-Id: Iafe3fee7f6072360355f93cd3b2e7b2a1d05bf5c commit bb127c8e84b9e689c3e0f8b9faf4db3025b4056a Author: Wu-cheng Li Date: Mon May 23 16:46:49 2011 +0800 Reduce the run time of some camera tests. 1. testPreviewPictureSizesCombinationByCamera 2. testLockUnlock bug:4384432 Change-Id: I7a81d72ffb2e6ab151cac8fea0dba46a48244b44 commit 4f21f5a73b72654c3bb2c35ff1694a0e563cfafe Author: m-miyahara Date: Mon May 23 15:15:04 2011 +0900 Changed the condition to consider negative value for PID. In this test case inserted PID　can be negative, causing File.exist() to become false, and thus results in error. We modified the test case so that it considers negative value of PID. commit 5806013a9780abd772f047f40a40a9ff719649f6 Merge: bc8b4a5 96de375 Author: Marco Nelissen Date: Fri May 20 14:20:39 2011 -0700 Merge "Add a -q option (for "quick") to CTS." commit 96de375c51d2e321651c4f6be74098207636523f Author: Marco Nelissen Date: Fri May 20 14:04:39 2011 -0700 Add a -q option (for "quick") to CTS. This makes the cts command skip device info gathering, reloading of previous test results, and the delays after installing and uninstalling apks, greatly reducing the time to run cts if you just need to run some local tests to make sure you didn't break anything. Change-Id: Ifee9cc7cd92275d5499f50739e9b47dcc8abf672 commit bc8b4a5f3d7a4fa8cc4c6ad964ef89214fd3c0cb Merge: a16d697 c3d7282 Author: The Android Open Source Project Date: Fri May 20 12:55:42 2011 -0700 Reconcile with gingerbread-release Change-Id: I48801e3af5b90f6207f9468d3cabe8c3f7945b82 commit a16d6975aae66aa890fbaebdca90c2fe6feea2c2 Merge: 3f42986 325d75e Author: Brian Muramatsu Date: Fri May 20 12:27:55 2011 -0700 am 325d75e7: am 970beed5: am edb4a8f9: Merge "Restore Null Device Id for PHONE_TYPE_NONE Devices." into honeycomb-mr2 * commit '325d75e735b21c39e999159cf6ea6573ce37427e': Restore Null Device Id for PHONE_TYPE_NONE Devices. commit 325d75e735b21c39e999159cf6ea6573ce37427e Merge: 189ae3f 970beed Author: Brian Muramatsu Date: Fri May 20 12:24:03 2011 -0700 am 970beed5: am edb4a8f9: Merge "Restore Null Device Id for PHONE_TYPE_NONE Devices." into honeycomb-mr2 * commit '970beed5b4a5c3e235163e02c4634e78ebd30d9a': Restore Null Device Id for PHONE_TYPE_NONE Devices. commit 970beed5b4a5c3e235163e02c4634e78ebd30d9a Merge: 7535b7e edb4a8f Author: Brian Muramatsu Date: Fri May 20 12:20:35 2011 -0700 am edb4a8f9: Merge "Restore Null Device Id for PHONE_TYPE_NONE Devices." into honeycomb-mr2 * commit 'edb4a8f93fb0af0651a83667ea70893511cf4602': Restore Null Device Id for PHONE_TYPE_NONE Devices. commit edb4a8f93fb0af0651a83667ea70893511cf4602 Merge: ed7f81c 5da49ff Author: Brian Muramatsu Date: Fri May 20 12:18:02 2011 -0700 Merge "Restore Null Device Id for PHONE_TYPE_NONE Devices." into honeycomb-mr2 commit 3f429862158dfdf5f2e999f2980d20066a9e242a Merge: 80aa334 189ae3f Author: Kristian Monsen Date: Fri May 20 10:51:25 2011 -0700 am 189ae3f0: am 7535b7eb: am ed7f81cb: Fix for bug 4442572: CookieSyncManagerTest fails when executed with other tests ...but passes by itself * commit '189ae3f03b23779a2aa816b6c9f8ffece1acfb77': Fix for bug 4442572: CookieSyncManagerTest fails when executed with other tests ...but passes by itself commit 189ae3f03b23779a2aa816b6c9f8ffece1acfb77 Merge: 7d08b13 7535b7e Author: Kristian Monsen Date: Fri May 20 10:31:18 2011 -0700 am 7535b7eb: am ed7f81cb: Fix for bug 4442572: CookieSyncManagerTest fails when executed with other tests ...but passes by itself * commit '7535b7eb6edef8faf3848aec0af321a38bec2a3a': Fix for bug 4442572: CookieSyncManagerTest fails when executed with other tests ...but passes by itself commit 7535b7eb6edef8faf3848aec0af321a38bec2a3a Merge: 516d996 ed7f81c Author: Kristian Monsen Date: Fri May 20 09:58:46 2011 -0700 am ed7f81cb: Fix for bug 4442572: CookieSyncManagerTest fails when executed with other tests ...but passes by itself * commit 'ed7f81cb2c4fbbd763e04497921817d7f41703f0': Fix for bug 4442572: CookieSyncManagerTest fails when executed with other tests ...but passes by itself commit ed7f81cb2c4fbbd763e04497921817d7f41703f0 Author: Kristian Monsen Date: Thu May 19 19:41:35 2011 +0100 Fix for bug 4442572: CookieSyncManagerTest fails when executed with other tests ...but passes by itself The test tries to set a cookie on a file url. From build HMI42 file cookies are disabled by default. It works when the test is running alone as cookies for file url's are enabled in the start of the test. It doesn't work when all tests run together as the setting only works when it is set before the cookie manager is created. When several tests run after each other the CookieManager is reused. Change-Id: If1ab3a75cc4f2f969a6f21523f3e53dd45ec5e7a commit 80aa334de731ae109d736bbba62df80192e8d1d7 Merge: b1f8c23 7d08b13 Author: Brian Muramatsu Date: Thu May 19 17:47:15 2011 -0700 am 7d08b13e: am 64c0a151: am e7a18682: Merge "Don\'t fail if vold.fstab is empty" into gingerbread * commit '7d08b13ebbff9743a14bd21d0c85613025078aff': Don't fail if vold.fstab is empty commit 7d08b13ebbff9743a14bd21d0c85613025078aff Merge: 8dbb17b 64c0a15 Author: Brian Muramatsu Date: Thu May 19 17:44:08 2011 -0700 am 64c0a151: am e7a18682: Merge "Don\'t fail if vold.fstab is empty" into gingerbread * commit '64c0a151b194e265c35225b846aea51708c888af': Don't fail if vold.fstab is empty commit 64c0a151b194e265c35225b846aea51708c888af Merge: b432961 e7a1868 Author: Brian Muramatsu Date: Thu May 19 17:33:33 2011 -0700 am e7a18682: Merge "Don\'t fail if vold.fstab is empty" into gingerbread * commit 'e7a1868261e0230d5868c81cb6710ee153d25de6': Don't fail if vold.fstab is empty commit 24d422879ac0531b9820134fb2fee1a878472502 Author: Nick Kralevich Date: Thu May 19 15:52:01 2011 -0700 Don't fail if vold.fstab is empty This test shouldn't fail if vold.fstab is empty. Rather, short term, just ignore this case, at the expense that we may miss legitimate security holes. Long term, this needs to be properly fixed. Change-Id: I328bc0360048b5233b336c1a35f7d8a9ade3c49c commit e7a1868261e0230d5868c81cb6710ee153d25de6 Merge: f5b10ee 8989a4d Author: Brian Muramatsu Date: Thu May 19 16:09:26 2011 -0700 Merge "Don't fail if vold.fstab is empty" into gingerbread commit 8989a4ddbc584b7085ccdb8a4ca91068fe32573e Author: Nick Kralevich Date: Thu May 19 15:52:01 2011 -0700 Don't fail if vold.fstab is empty This test shouldn't fail if vold.fstab is empty. Rather, short term, just ignore this case, at the expense that we may miss legitimate security holes. Long term, this needs to be properly fixed. Change-Id: I328bc0360048b5233b336c1a35f7d8a9ade3c49c commit 62de00fb267264d9d91e1f479d6456262f7c7450 Author: Marco Nelissen Date: Thu May 19 10:41:26 2011 -0700 Expand playlist tests Test that correct Uri is returned when inserting a new playlist, and that a file can belong to multiple playlists at the same time. Change-Id: I25137f0e297262aa9682a4e5980c11443332224c commit b1f8c239bca1d9230cbc325ecb59b84e42bc40bd Author: Svetoslav Ganov Date: Wed May 18 18:46:05 2011 -0700 AccessibilityEvent marshaling CTS test failing. 1. The CTS test for marshaling accessibility events was broken since I have added some new APIs on the event. Updated the test. bug:4367707 Change-Id: I11afe7a20839c432d806cb2bf9f42518a8897648 commit ebb4aba50aec74ff030922531cbe0efd82e57356 Merge: 3ea7cd3 f7fa617 Author: Marco Nelissen Date: Wed May 18 16:05:24 2011 -0700 Merge "More tests for genres" commit f7fa617b19af0d26bf60eb606992796673ccece6 Author: Marco Nelissen Date: Wed May 18 15:46:57 2011 -0700 More tests for genres Verify that genre URI has the right format, and test that inserting a file into multiple genres works. Change-Id: I098ed682845391f4a819708e6ace9e412f6e22d4 commit 3ea7cd3a9b90c6fd25c65c69a96df7188aa281c6 Merge: 4baef86 0644c53 Author: Gloria Wang Date: Wed May 18 13:44:06 2011 -0700 Merge "Do not assert when drmInfo is null, because some DRM plugins do not use acquireDrmInfo()/processDrmInfo() API. Fix for bug 4449610." commit 0644c53cc7d51a77e46e32d3cb14f7f767407e0f Author: Gloria Wang Date: Wed May 18 13:21:41 2011 -0700 Do not assert when drmInfo is null, because some DRM plugins do not use acquireDrmInfo()/processDrmInfo() API. Fix for bug 4449610. Change-Id: I5401ee7e8ac90d0c80bbb5b12c506036d29b088d commit 0d887e371199ee6fc97883708f71b7a1677d2d8c Merge: 6603f14 f5b10ee Author: Brian Muramatsu Date: Wed May 18 12:45:54 2011 -0700 Merge remote branch 'goog/gingerbread' into manualmerge Conflicts: tests/tests/webkit/src/android/webkit/cts/WebSettingsTest.java tools/host/src/com/android/cts/Version.java Change-Id: Id85601211ee77f20f8f39112bfab1d2fd8521cbb commit 4baef8638fa98182fe9baa7a774427df49bed127 Merge: 4ceb0d2 01fe35b Author: Brett Chabot Date: Wed May 18 10:00:47 2011 -0700 Merge "fix build errors." commit 4ceb0d269a9e293e46f8b50f40742a64b5f42a86 Merge: 6f494b9 8dbb17b Author: Brian Muramatsu Date: Wed May 18 09:23:17 2011 -0700 am 8dbb17b9: (-s ours) am 516d9961: am 758f50de: am 6603f144: (-s ours) Merge "DO NOT MERGE Update Test Expectations for MR1" into honeycomb-mr1 * commit '8dbb17b99d6962787a04404de32291e568b72b7f': DO NOT MERGE Update Test Expectations for MR1 commit 6f494b9be4d6cfc787b9c8518c3d3b11168f4bef Merge: 0ef8669 24f7d99 Author: Brian Muramatsu Date: Wed May 18 09:23:10 2011 -0700 am 24f7d99e: am acf65366: am 6dda8829: am 296b28fa: Update CTS Version for HC MR1 * commit '24f7d99ecdcb8e003f24df5593d90c4d0b8c0b34': Update CTS Version for HC MR1 commit 0ef8669ee0c76855e0b5b568f9f3fb640ebcd0ca Merge: a319f2d bc2ebb9 Author: Brian Muramatsu Date: Wed May 18 09:22:52 2011 -0700 am bc2ebb9f: am b432961c: am f5b10ee3: Merge "Test for DownloadManager Compliance" into gingerbread * commit 'bc2ebb9f567a72df4962f26649c8364bba961d94': Test for DownloadManager Compliance commit 01fe35bcf0431f1d3b79c515ab43689b12b826dd Author: Tsu Chiang Chuang Date: Tue May 17 18:50:13 2011 -0700 fix build errors. Change-Id: Ib44e53e679c641ebcfb7074661eac1987b83e5bc commit 8dbb17b99d6962787a04404de32291e568b72b7f Merge: 24f7d99 516d996 Author: Brian Muramatsu Date: Tue May 17 16:49:35 2011 -0700 am 516d9961: am 758f50de: am 6603f144: (-s ours) Merge "DO NOT MERGE Update Test Expectations for MR1" into honeycomb-mr1 * commit '516d9961c94253e6b5f2bfe4c22b9b2a7ed14f1d': DO NOT MERGE Update Test Expectations for MR1 commit 24f7d99ecdcb8e003f24df5593d90c4d0b8c0b34 Merge: bc2ebb9 acf6536 Author: Brian Muramatsu Date: Tue May 17 16:49:32 2011 -0700 am acf65366: am 6dda8829: am 296b28fa: Update CTS Version for HC MR1 * commit 'acf65366a19fad19c9dcb87eff3a287195bbf907': Update CTS Version for HC MR1 commit bc2ebb9f567a72df4962f26649c8364bba961d94 Merge: 9e4b33c b432961 Author: Brian Muramatsu Date: Tue May 17 16:41:58 2011 -0700 am b432961c: am f5b10ee3: Merge "Test for DownloadManager Compliance" into gingerbread * commit 'b432961caaaf1ee474ffaaa133a9ce7172f334a4': Test for DownloadManager Compliance commit 516d9961c94253e6b5f2bfe4c22b9b2a7ed14f1d Merge: acf6536 758f50d Author: Brian Muramatsu Date: Tue May 17 16:21:13 2011 -0700 am 758f50de: am 6603f144: (-s ours) Merge "DO NOT MERGE Update Test Expectations for MR1" into honeycomb-mr1 * commit '758f50de868a95f5b37c9463742d6d8ff265265e': DO NOT MERGE Update Test Expectations for MR1 commit acf65366a19fad19c9dcb87eff3a287195bbf907 Merge: 2464216 6dda882 Author: Brian Muramatsu Date: Tue May 17 16:21:10 2011 -0700 am 6dda8829: am 296b28fa: Update CTS Version for HC MR1 * commit '6dda88296a3c5f97f641398171539d284ecf5109': Update CTS Version for HC MR1 commit 758f50de868a95f5b37c9463742d6d8ff265265e Merge: 6dda882 6603f14 Author: Brian Muramatsu Date: Tue May 17 16:18:40 2011 -0700 am 6603f144: (-s ours) Merge "DO NOT MERGE Update Test Expectations for MR1" into honeycomb-mr1 * commit '6603f144bfdacc53cd2c7a71a1d8e52939db0264': DO NOT MERGE Update Test Expectations for MR1 commit 6dda88296a3c5f97f641398171539d284ecf5109 Merge: 4113511 296b28f Author: Brian Muramatsu Date: Tue May 17 16:18:32 2011 -0700 am 296b28fa: Update CTS Version for HC MR1 * commit '296b28fa15da1628a593519876582275da84442c': Update CTS Version for HC MR1 commit b432961caaaf1ee474ffaaa133a9ce7172f334a4 Merge: d1c24fc f5b10ee Author: Brian Muramatsu Date: Tue May 17 16:01:17 2011 -0700 am f5b10ee3: Merge "Test for DownloadManager Compliance" into gingerbread * commit 'f5b10ee3f573e24716b7955c6df3a3363605a889': Test for DownloadManager Compliance commit 6603f144bfdacc53cd2c7a71a1d8e52939db0264 Merge: 296b28f c80b1d0 Author: Brian Muramatsu Date: Tue May 17 15:58:11 2011 -0700 Merge "DO NOT MERGE Update Test Expectations for MR1" into honeycomb-mr1 commit f5b10ee3f573e24716b7955c6df3a3363605a889 Merge: 97fee19 b68215a Author: Brian Muramatsu Date: Tue May 17 15:01:09 2011 -0700 Merge "Test for DownloadManager Compliance" into gingerbread commit b68215ac2dfbe593a5536aa6484fed50f4d8c9fe Author: Brian Muramatsu Date: Thu May 5 16:53:25 2011 -0700 Test for DownloadManager Compliance Adds a test to enforce CDD section 7.6.1 that says the DownloadManager must be able to download individual files of 55MB. Modify the CtsTestServer to generate files of any size in response to the download queries. The test downloads a file of 55MB and checks that the file size is correct both in the database and by the parcel file descriptor returned from DownloadManager. Change-Id: I82f17bfe5937fdd63a80fc71540537463509c241 commit 296b28fa15da1628a593519876582275da84442c Author: Brian Muramatsu Date: Tue May 17 14:28:28 2011 -0700 Update CTS Version for HC MR1 Bug 4411330 Change-Id: I9f4ae7f5dec865d3abd9e25d484a1e6bfc4c6e18 commit c80b1d03f61f0932c6ab7cdfaab9f8c55f27989f Author: Brian Muramatsu Date: Thu Apr 28 11:20:32 2011 -0700 DO NOT MERGE Update Test Expectations for MR1 Change-Id: I9e41bafdb111e4b45e2b7631bc78b4f6a47734ea commit a319f2d99188c68dab7129a489ba1c01c56b626d Merge: e6e045d d9aaec6 Author: Marco Nelissen Date: Tue May 17 07:48:20 2011 -0700 Merge "CTS tests for queries across all genres." commit d9aaec648f3922384ae8a9d56965ce4fed4948e9 Author: Marco Nelissen Date: Tue May 17 07:44:43 2011 -0700 CTS tests for queries across all genres. Change-Id: I07dba5e51665ba16fba24d38433f6d5787571549 commit e6e045d40df7150bf660fab85b7b03afb425335f Author: Tsu Chiang Chuang Date: Sun May 15 14:30:35 2011 -0700 Change vm-tf to use Tradefed's device shell command and cleanup. Change-Id: Ib1b262bb14ed6badbd950963a32d6a6930aeafea commit 879076371f3a91cbb2bcb88037abc81a33b5f110 Merge: 075d6d1 b27cf56 Author: Marco Nelissen Date: Mon May 16 11:21:39 2011 -0700 Merge "Updates CTS tests for genres." commit 075d6d13718bc381064f7df1cda387a3076dde5a Merge: 3058f85 9e4b33c Author: Dianne Hackborn Date: Mon May 16 11:12:40 2011 -0700 am 9e4b33c7: (-s ours) am 24642167: am 41135110: DO NOT MERGE: From master -- Update to take care of new API. * commit '9e4b33c770b6ff530489d1945ea633b3b59664f7': DO NOT MERGE: From master -- Update to take care of new API. commit 9e4b33c770b6ff530489d1945ea633b3b59664f7 Merge: d153ba0 2464216 Author: Dianne Hackborn Date: Mon May 16 11:09:13 2011 -0700 am 24642167: am 41135110: DO NOT MERGE: From master -- Update to take care of new API. * commit '24642167d810f9bbcae9db2e61a1cfaf1ef498de': DO NOT MERGE: From master -- Update to take care of new API. commit 24642167d810f9bbcae9db2e61a1cfaf1ef498de Merge: bb956ff 4113511 Author: Dianne Hackborn Date: Mon May 16 11:06:25 2011 -0700 am 41135110: DO NOT MERGE: From master -- Update to take care of new API. * commit '411351102d1c0d179b6cab20fe91ef4f6cddc713': DO NOT MERGE: From master -- Update to take care of new API. commit 411351102d1c0d179b6cab20fe91ef4f6cddc713 Author: Dianne Hackborn Date: Thu Apr 7 18:39:04 2011 -0700 DO NOT MERGE: From master -- Update to take care of new API. Change-Id: I35ee992dc0c7747e410d36357f525530e58785c2 commit c3d72822b458712a85fc85e51bdd7b42c707676a Merge: 97fee19 81b010f Author: The Android Automerger Date: Fri May 13 14:27:42 2011 -0700 merge in gingerbread-release history after reset to gingerbread commit 3058f85795b7d01260d07888c7db1c9414a341cd Merge: 2a5c41f 91dbbb7 Author: Jeff Brown Date: Fri May 13 12:14:40 2011 -0700 Merge "Add CTS tests for MotionEvent pointer properties." commit 2a5c41ff9b027103bee02de0f32bdbe934a9ebc5 Merge: dce9d13 7364786 Author: John Reck Date: Thu May 12 17:03:53 2011 -0700 Merge "Adding tests for WebElement." commit 5da49ff25b3f1070f6fc14aed8d16f55c39cfbe3 Author: Brian Muramatsu Date: Thu May 12 14:32:41 2011 -0700 Restore Null Device Id for PHONE_TYPE_NONE Devices. Add back the check that deviceId is null for PHONE_TYPE_NONE devices. It was a mistake to have removed it in the first place. Change-Id: I5a8957f5e0c22b64cc5ff82fec4fab38647ce78a commit dce9d139daf562634be1e88678c8a4d20df3ccbc Merge: 14fcd43 d153ba0 Author: Brian Muramatsu Date: Thu May 12 14:02:00 2011 -0700 am d153ba02: am d1c24fc0: am 97fee19f: Merge "Revert "Demo of Sending Arguments to a Test"" into gingerbread * commit 'd153ba02765d8d41c13b9cb21342e286b4d12448': Revert "Demo of Sending Arguments to a Test" commit d153ba02765d8d41c13b9cb21342e286b4d12448 Merge: da81fbb d1c24fc Author: Brian Muramatsu Date: Thu May 12 13:58:28 2011 -0700 am d1c24fc0: am 97fee19f: Merge "Revert "Demo of Sending Arguments to a Test"" into gingerbread * commit 'd1c24fc067db2c37a6bb5863bacd9a1dd88bba40': Revert "Demo of Sending Arguments to a Test" commit d1c24fc067db2c37a6bb5863bacd9a1dd88bba40 Merge: 3ef0028 97fee19 Author: Brian Muramatsu Date: Thu May 12 13:52:20 2011 -0700 am 97fee19f: Merge "Revert "Demo of Sending Arguments to a Test"" into gingerbread * commit '97fee19f3a790805480bf044cb011879ffb4cf43': Revert "Demo of Sending Arguments to a Test" commit 91dbbb74b18019ea32d912145d717b187b8fb19b Author: Jeff Brown Date: Sat May 7 01:28:53 2011 -0700 Add CTS tests for MotionEvent pointer properties. Change-Id: Iccf7bcc35ab6e076aa3649077a5dd1999aaa5431 commit 14fcd4390f2e731d1ef715850bd30ad4b3896edb Merge: d4cce3b 1af9da2 Author: Brian Muramatsu Date: Thu May 12 13:39:32 2011 -0700 Merge "Revert "Demo of Sending Arguments to a Test"" commit 1af9da2b6a0826bf45126bceb34810d2f71d989e Author: Brian Muramatsu Date: Thu May 12 12:43:26 2011 -0700 Revert "Demo of Sending Arguments to a Test" This reverts commit a5d6c08226b2ffc09af39c38c7c0e2ddba27a399. Seems to prevent tests from being run! Change-Id: I8d5c227c3fd157ebe080554f146cd7a45e49f24c commit 97fee19f3a790805480bf044cb011879ffb4cf43 Merge: 49ecbb7 b405999 Author: Brian Muramatsu Date: Thu May 12 12:54:24 2011 -0700 Merge "Revert "Demo of Sending Arguments to a Test"" into gingerbread commit b4059998994c61d42d680e323397e2924299312c Author: Brian Muramatsu Date: Thu May 12 12:43:26 2011 -0700 Revert "Demo of Sending Arguments to a Test" This reverts commit a5d6c08226b2ffc09af39c38c7c0e2ddba27a399. Seems to prevent tests from being run! Change-Id: I8d5c227c3fd157ebe080554f146cd7a45e49f24c commit d4cce3b2dab3110dee38583e6dab287423d813d8 Author: Tsu Chiang Chuang Date: Thu May 12 12:19:54 2011 -0700 build a plan for cts-tf with vm that run in tf. Change-Id: Ia115739d154c53f8d1166846e9496bf18eea2553 commit 943b701032f2a0c4c3ee5fa07d015ec4ab72c44a Merge: c2fa35e f4f2beb Author: Marco Nelissen Date: Thu May 12 07:44:40 2011 -0700 Merge "Add more CTS tests for playlists." commit f4f2beb5dc693b04514e3d7c7a053be211266c7a Author: Marco Nelissen Date: Wed May 11 17:26:38 2011 -0700 Add more CTS tests for playlists. Change-Id: I35262532565da814dcffbfc3e1890528c22168c0 commit c2fa35e57d2813f4ee5d0ab159403afed7c862b2 Merge: 8d92ad1 ae2adbf Author: Brian Muramatsu Date: Wed May 11 16:19:00 2011 -0700 Merge "Remove Playlists Test from Expectations File" commit ae2adbfc81bb2f62a9facfcd0f49799b5ddd0d6b Author: Brian Muramatsu Date: Wed May 11 16:05:51 2011 -0700 Remove Playlists Test from Expectations File CTS wasn't running the playlists test, because it was blacklisted in the test expectations file. Change-Id: Ib0a62c913ba730c4df3b60c049e5ef97a68b6da0 commit 8d92ad1141ece21be2c84f7b93a86ccd616aeadf Merge: 3bff106 da81fbb Author: Dianne Hackborn Date: Wed May 11 15:13:16 2011 -0700 am da81fbb9: am bb956ffe: am f583fe9b: Remove this CTS test. * commit 'da81fbb947833a5b1b6f7deee6c4df493cd0cf76': Remove this CTS test. commit 3bff1064d0779184884e4e18aa232d4504a8ad62 Merge: 971ed38 dd3cd0c Author: Brian Muramatsu Date: Wed May 11 15:13:08 2011 -0700 am dd3cd0c8: am 3ef00282: am 49ecbb75: Merge "enlarge timeout for android.hardware.cts.CameraTest#testPreviewPictureSizesCombination. Some device will support too many counts of preview sizes to finish test in time." into gingerbread * commit 'dd3cd0c84e0922697c361cf912d930e38b5bde09': enlarge timeout for android.hardware.cts.CameraTest#testPreviewPictureSizesCombination. Some device will support too many counts of preview sizes to finish test in time. commit 971ed387ec51437894d051fd9130af33e943fdf2 Merge: f4a3178 a911ad4 Author: Brian Muramatsu Date: Wed May 11 15:13:06 2011 -0700 am a911ad43: am 3594aecd: am 5dbaee64: Merge "Checking hardware feature when test rear camera" into gingerbread * commit 'a911ad43c54c26f984cd1235ae8b0ed3a48dddfa': Checking hardware feature when test rear camera commit da81fbb947833a5b1b6f7deee6c4df493cd0cf76 Merge: dd3cd0c bb956ff Author: Dianne Hackborn Date: Wed May 11 13:46:59 2011 -0700 am bb956ffe: am f583fe9b: Remove this CTS test. * commit 'bb956ffed65be01e3067d761532a34b5ee527a99': Remove this CTS test. commit bb956ffed65be01e3067d761532a34b5ee527a99 Merge: f463261 f583fe9 Author: Dianne Hackborn Date: Wed May 11 13:33:33 2011 -0700 am f583fe9b: Remove this CTS test. * commit 'f583fe9b174699df169b4311d79499071786ee5f': Remove this CTS test. commit f4a317827a7e8722cb93f85122ac6f6dc8f55c15 Merge: 8d4bf24 6732de5 Author: Brian Muramatsu Date: Wed May 11 13:10:47 2011 -0700 am 6732de50: am a2ad41e4: am 3219d6d0: Merge "Demo of Sending Arguments to a Test" into gingerbread * commit '6732de50fecf542cf7e5bd7f79d7a079632e3325': Demo of Sending Arguments to a Test commit 8d4bf2490427514ce74c8ffc0f5ea1d5962473a5 Merge: ad6e409 6b46960 Author: Brian Muramatsu Date: Wed May 11 13:10:16 2011 -0700 am 6b469604: am 983994ce: am e142bf07: Merge "Fix OBB tests to stop caring about implementation" into gingerbread * commit '6b469604aaa0fc65b49dad9a5ca7c7df2c9ad677': Fix OBB tests to stop caring about implementation commit ad6e409e757dd17da610fa6e91e5b288f662d485 Merge: d00c9e2 57e7231 Author: Brian Muramatsu Date: Wed May 11 13:09:57 2011 -0700 am 57e72316: am da648362: am 61f4b004: Merge "Don\'t fail on netlink socket closing." into gingerbread * commit '57e723167cf014949d703b4e4d321508e376cc3f': Don't fail on netlink socket closing. commit b27cf567e83ac269f010e825f980b8b8a25accf9 Author: Marco Nelissen Date: Tue May 10 17:33:57 2011 -0700 Updates CTS tests for genres. Change-Id: I0a5922a428c17bbcf150c9b883088c6005e6dfed commit dd3cd0c84e0922697c361cf912d930e38b5bde09 Merge: a911ad4 3ef0028 Author: Brian Muramatsu Date: Wed May 11 11:59:25 2011 -0700 am 3ef00282: am 49ecbb75: Merge "enlarge timeout for android.hardware.cts.CameraTest#testPreviewPictureSizesCombination. Some device will support too many counts of preview sizes to finish test in time." into gingerbread * commit '3ef0028258930bfcefe75185b69c444b29e1f844': enlarge timeout for android.hardware.cts.CameraTest#testPreviewPictureSizesCombination. Some device will support too many counts of preview sizes to finish test in time. commit a911ad43c54c26f984cd1235ae8b0ed3a48dddfa Merge: 6732de5 3594aec Author: Brian Muramatsu Date: Wed May 11 11:57:20 2011 -0700 am 3594aecd: am 5dbaee64: Merge "Checking hardware feature when test rear camera" into gingerbread * commit '3594aecd0dea73da2e18e97095d4ae29a3a5bc8a': Checking hardware feature when test rear camera commit 3ef0028258930bfcefe75185b69c444b29e1f844 Merge: 3594aec 49ecbb7 Author: Brian Muramatsu Date: Wed May 11 11:55:01 2011 -0700 am 49ecbb75: Merge "enlarge timeout for android.hardware.cts.CameraTest#testPreviewPictureSizesCombination. Some device will support too many counts of preview sizes to finish test in time." into gingerbread * commit '49ecbb75f1cc028af93c5b8ecd3700a57bfa3faa': enlarge timeout for android.hardware.cts.CameraTest#testPreviewPictureSizesCombination. Some device will support too many counts of preview sizes to finish test in time. commit d3fcc2bb7a7c086971621b0553a1ae13148c6da4 Author: Mist Liao Date: Wed May 11 00:00:31 2011 +0800 Fix DATE_MODIFIED assertion fail in image media store test. Getting the last modified from the created test file would be more accurate than getting it from current system time. Change-Id: I3d7834c6e728f49b055666ad985930ab37729bd6 commit 3594aecd0dea73da2e18e97095d4ae29a3a5bc8a Merge: a2ad41e 5dbaee6 Author: Brian Muramatsu Date: Wed May 11 11:50:13 2011 -0700 am 5dbaee64: Merge "Checking hardware feature when test rear camera" into gingerbread * commit '5dbaee64d498766a0c261b7c820b4f134d49f42c': Checking hardware feature when test rear camera commit d00c9e2518c9edcd48ed395b7d2d10637ada63e8 Merge: 3328329 90811b0 Author: Steve Block Date: Wed May 11 11:41:32 2011 -0700 Merge changes I532fde27,I4c0fab36,I67ba9c16,I4de01abc,Iaa7e00cf,Ia873efdb,I473a34f1,I02f5f9b7,I1f14effa,If90655da,Ibd49a098,I8ebb4bfa,I93d17163,I02952e12,Iada4674a,Icc58e900,I0323215d,I6ba37b8e * changes: Fix remaining WebView test methods to call WebView methods on UI thread Fix WebView test testAccessCertificate() to call WebView methods on UI thread Fix WebView test testRequestChildRectangleOnScreen() to call WebView methods on UI thread Fix WebView test testGetHitTestResult() to call WebView methods on UI thread Fix WebView test testFlingScroll() to call WebView methods on UI thread Fix WebView test testGetContentHeight() to call WebView methods on UI thread Fix WebView test testFindNext() to call WebView methods on UI thread Fix WebView test testPageScroll() to call WebView methods on UI thread Fix WebView test testCapturePicture() to call WebView methods on UI thread Fix WebView test testRequestFocusNodeHref() to call WebView methods on UI thread Fix WebView test testRequestImageRef() to call WebView methods on UI thread Fix WebView test testSaveAndRestorePicture() to call WebView methods on UI thread Fix WebView test testSetInitialScale() to call WebView methods on UI thread Fix WebView test testDocumentHasImages() to call WebView methods on UI thread Fix WebView test testSetDownloadListener() to call WebView methods on UI thread Fix WebView test testSetPictureListener() to call WebView methods on UI thread Fix WebView test testSetWebChromeClient() to call WebView methods on UI thread Fix WebView test testSetWebViewClient() to call WebView methods on UI thread commit 49ecbb75f1cc028af93c5b8ecd3700a57bfa3faa Merge: 5dbaee6 677ddbb Author: Brian Muramatsu Date: Wed May 11 11:39:51 2011 -0700 Merge "enlarge timeout for android.hardware.cts.CameraTest#testPreviewPictureSizesCombination. Some device will support too many counts of preview sizes to finish test in time." into gingerbread commit 5dbaee64d498766a0c261b7c820b4f134d49f42c Merge: 3219d6d 9e9e658 Author: Brian Muramatsu Date: Wed May 11 11:16:29 2011 -0700 Merge "Checking hardware feature when test rear camera" into gingerbread commit 90811b0adecbb5050b649675220a8580709026d5 Author: Steve Block Date: Wed May 4 14:55:28 2011 +0100 Fix remaining WebView test methods to call WebView methods on UI thread Bug: 4340864 Change-Id: I532fde273c4314fc96c111102905629aed576709 commit a931a0cc6d3f42d47ab93f8712a7daed6bdab002 Author: Steve Block Date: Wed May 4 16:21:12 2011 +0100 Fix WebView test testAccessCertificate() to call WebView methods on UI thread Bug: 4340864 Change-Id: I4c0fab36de8b06d9638c026004b957afa70a5775 commit a108b33bd2a716ffdc687f1a8d74a4ac2786e8ae Author: Steve Block Date: Wed May 4 16:38:20 2011 +0100 Fix WebView test testRequestChildRectangleOnScreen() to call WebView methods on UI thread Bug: 4340864 Change-Id: I67ba9c16b3adc7c8d137939a078b0f68f211302f commit 56b5da224b7b3bcf4e6f7b9d37f04f11770eeb97 Author: Steve Block Date: Wed May 4 16:37:20 2011 +0100 Fix WebView test testGetHitTestResult() to call WebView methods on UI thread Bug: 4340864 Change-Id: I4de01abc0d242ab030fafc20919a56d479ef67b8 commit 6cc101adc6f0a2de1e94e026a6542e7a2aba4125 Author: Steve Block Date: Wed May 4 16:36:31 2011 +0100 Fix WebView test testFlingScroll() to call WebView methods on UI thread Bug: 4340864 Change-Id: Iaa7e00cf7e3dca90ce4e765e9467d917d8a6a97c commit 46a7a192a4c831078db858feca475509cdc6c94d Author: Steve Block Date: Wed May 4 16:35:46 2011 +0100 Fix WebView test testGetContentHeight() to call WebView methods on UI thread Bug: 4340864 Change-Id: Ia873efdb00117ca3903d1ed6bf9d78ccb5d0a219 commit e9b5c73242e7d29b5d7f386cca61eadc6166e15a Author: Steve Block Date: Wed May 4 16:31:16 2011 +0100 Fix WebView test testFindNext() to call WebView methods on UI thread Bug: 4340864 Change-Id: I473a34f1eab097a0b85d16252bd0ae9d5d35ee43 commit 3328329967ccc01e9865a01a28685fc11e40115f Merge: cdb4bad 65dc903 Author: Marco Nelissen Date: Tue May 10 16:31:18 2011 -0700 Merge "Check correct value of _id." commit 6732de50fecf542cf7e5bd7f79d7a079632e3325 Merge: 6b46960 a2ad41e Author: Brian Muramatsu Date: Tue May 10 16:21:21 2011 -0700 am a2ad41e4: am 3219d6d0: Merge "Demo of Sending Arguments to a Test" into gingerbread * commit 'a2ad41e48babfeeb8f4d50df1c7ab1d26cfb6521': Demo of Sending Arguments to a Test commit 6b469604aaa0fc65b49dad9a5ca7c7df2c9ad677 Merge: 57e7231 983994c Author: Brian Muramatsu Date: Tue May 10 16:21:17 2011 -0700 am 983994ce: am e142bf07: Merge "Fix OBB tests to stop caring about implementation" into gingerbread * commit '983994cee594b5a9ab2c45fda5d858e94e5443fb': Fix OBB tests to stop caring about implementation commit 57e723167cf014949d703b4e4d321508e376cc3f Merge: c7e2037 da64836 Author: Brian Muramatsu Date: Tue May 10 16:19:44 2011 -0700 am da648362: am 61f4b004: Merge "Don\'t fail on netlink socket closing." into gingerbread * commit 'da648362daca974af1072e6270ba2e7d7233eae9': Don't fail on netlink socket closing. commit 65dc90370bb504cff2a79f6d87ac506181c34f01 Author: Marco Nelissen Date: Tue May 10 13:04:14 2011 -0700 Check correct value of _id. Change-Id: If98ffbddf1b76f36f0f6a3d0397b38c2c3586d74 commit cdb4bad86febb65b05f4178f2019a736a4649e1d Merge: 194b4c4 879fba6 Author: Alex Sakhartchouk Date: Tue May 10 11:03:15 2011 -0700 Merge "Remove name collisions in the vertex and fragment shader" commit 677ddbba2697805979dcd1480132535af6c3a3ad Author: sam_chiu Date: Tue May 10 20:20:22 2011 +0800 enlarge timeout for android.hardware.cts.CameraTest#testPreviewPictureSizesCombination. Some device will support too many counts of preview sizes to finish test in time. Change-Id: I3e924a6ec12f2f6c994cf7e40b62d7389240f2ef commit f583fe9b174699df169b4311d79499071786ee5f Author: Dianne Hackborn Date: Mon May 9 17:08:52 2011 -0700 Remove this CTS test. It is testing an API that is not in the SDK. I want to change the API. Begone, CTS test! Change-Id: I807294b4f0b21be947a77c00836cbe2a90ae396f commit 194b4c4c8b1f5bb59969c4f51923315384c0a2d4 Author: Marco Nelissen Date: Mon May 9 15:46:59 2011 -0700 Add CTS test for querying genre with constraint on _id. Change-Id: I795f1b40f8c3094bf57add06d6532eee277f30c9 commit 7364786f7494761435be90cb2691d93bdb978502 Author: Dounia Berrada Date: Thu Apr 28 16:53:58 2011 -0700 Adding tests for WebElement. Change-Id: I666e1bd850294aeab243e3217b7b5b32f7b2180d commit 879fba6638e081761a4c20834174822f1cb75e3b Author: Alex Sakhartchouk Date: Mon May 9 15:30:33 2011 -0700 Remove name collisions in the vertex and fragment shader Change-Id: I6885f73f2a0444c21d08a4f225b8e4d74b7cf2c9 commit 6f1581a70661e3e086a9def6d56897dd63ae9606 Author: Steve Block Date: Wed May 4 16:34:17 2011 +0100 Fix WebView test testPageScroll() to call WebView methods on UI thread Bug: 4340864 Change-Id: I02f5f9b7efc8b1ec10e4d5e2e8b69cd32e92eb52 commit eb06accba2770b9f9265558b870daeebaf229a7f Author: Steve Block Date: Wed May 4 16:23:57 2011 +0100 Fix WebView test testCapturePicture() to call WebView methods on UI thread Bug: 4340864 Change-Id: I1f14effab00ec88705c8e053bda48dc74fe9459a commit 8ddfd9845e840ea0253b0e92ece19a6d2a49fe03 Author: Steve Block Date: Wed May 4 14:47:23 2011 +0100 Fix WebView test testRequestFocusNodeHref() to call WebView methods on UI thread Bug: 4340864 Change-Id: If90655da07f1a0e011cf66b683ac4a55e5c81bd2 commit 278820424a115c20eac213a22f006b0df619c215 Author: Steve Block Date: Wed May 4 14:36:25 2011 +0100 Fix WebView test testRequestImageRef() to call WebView methods on UI thread Bug: 4340864 Change-Id: Ibd49a098a1155ea50d8978cd0b94e5f473249107 commit bbb8ba91bed07fe227859a46137a961466d85444 Author: Steve Block Date: Wed May 4 14:16:29 2011 +0100 Fix WebView test testSaveAndRestorePicture() to call WebView methods on UI thread Bug: 4340864 Change-Id: I8ebb4bfa8c81db8b7b6556bf7741e22fe8a8a15c commit 9d91dab9202ecf56537c83d3446c4508ac8ed2d6 Author: Steve Block Date: Wed May 4 13:25:55 2011 +0100 Fix WebView test testSetInitialScale() to call WebView methods on UI thread Bug: 4340864 Change-Id: I93d171636d983b79b0cb504ca2aef2d1266e9406 commit 583b81600edec7178df4ece2968efba3e2a3f5c4 Author: Steve Block Date: Wed May 4 16:21:12 2011 +0100 Fix WebView test testDocumentHasImages() to call WebView methods on UI thread Bug: 4340864 Change-Id: I02952e124f7ace796b0f170595ca1b601c20beb3 commit 60dfe9f6c019b29ffaf20403832dbe95de01bdc8 Author: Steve Block Date: Wed May 4 13:03:53 2011 +0100 Fix WebView test testSetDownloadListener() to call WebView methods on UI thread Bug: 4340864 Change-Id: Iada4674af174bc5045231d32890277df8ce0ec9e commit 345b2d7088be6f2e3651c82537faafe2c681a948 Author: Steve Block Date: Wed May 4 12:15:36 2011 +0100 Fix WebView test testSetPictureListener() to call WebView methods on UI thread Bug: 4340864 Change-Id: Icc58e90032c499fd01b9585f4b3cba81bcd57f86 commit 9666de68707ac132d19f9ba896e37a05483c3e16 Author: Steve Block Date: Wed May 4 12:14:49 2011 +0100 Fix WebView test testSetWebChromeClient() to call WebView methods on UI thread Bug: 4340864 Change-Id: I0323215d22e6e83038584ab4ef408710ee2f6697 commit 54fa79b3c802e93e253b9fe5b87e4ee5205ea215 Author: Steve Block Date: Wed May 4 12:14:04 2011 +0100 Fix WebView test testSetWebViewClient() to call WebView methods on UI thread Bug: 4340864 Change-Id: I6ba37b8eefb738da1eb463fe65e35bff0a5d6d5e commit a2ad41e48babfeeb8f4d50df1c7ab1d26cfb6521 Merge: 983994c 3219d6d Author: Brian Muramatsu Date: Fri May 6 13:03:57 2011 -0700 am 3219d6d0: Merge "Demo of Sending Arguments to a Test" into gingerbread * commit '3219d6d07ab2ad7710c2b6241619f356113acc82': Demo of Sending Arguments to a Test commit 3219d6d07ab2ad7710c2b6241619f356113acc82 Merge: e142bf0 a5d6c08 Author: Brian Muramatsu Date: Fri May 6 12:43:44 2011 -0700 Merge "Demo of Sending Arguments to a Test" into gingerbread commit a5d6c08226b2ffc09af39c38c7c0e2ddba27a399 Author: Brian Muramatsu Date: Wed May 4 16:51:40 2011 -0700 Demo of Sending Arguments to a Test Related to: https://review.source.android.com/#change,22431,patchset=1 Instead of writing an argument to a file, this implementation sends arguments via the am command line and then setting the arguments via a system property to be used by a test. Change-Id: I1424cff8d726e08dc78cbcbe7bfc8483b4c823c4 commit 983994cee594b5a9ab2c45fda5d858e94e5443fb Merge: da64836 e142bf0 Author: Brian Muramatsu Date: Fri May 6 12:13:22 2011 -0700 am e142bf07: Merge "Fix OBB tests to stop caring about implementation" into gingerbread * commit 'e142bf077e83c09f1bf22fd36f87715c9c751b7a': Fix OBB tests to stop caring about implementation commit 9e9e658e92e044157eef51e2fd15768332f7b790 Author: Mist Liao Date: Fri May 6 16:24:40 2011 +0800 Checking hardware feature when test rear camera To support the device which do not have rear camera Change-Id: I81bcaa1f4fbdf0b1fb94f5f7c82e2b0e179c629e commit 8c65c60f717ad985f975b55f0745641651a9925e Author: Mist Liao Date: Fri May 6 16:24:40 2011 +0800 Checking hardware feature when test rear camera To support the device which do not have rear camera Change-Id: I81bcaa1f4fbdf0b1fb94f5f7c82e2b0e179c629e commit e142bf077e83c09f1bf22fd36f87715c9c751b7a Merge: 61f4b00 ffc7667 Author: Brian Muramatsu Date: Fri May 6 10:59:11 2011 -0700 Merge "Fix OBB tests to stop caring about implementation" into gingerbread commit ffc766759a32400947d54aff46f365f33747d9da Author: Kenny Root Date: Fri May 6 10:35:55 2011 -0700 Fix OBB tests to stop caring about implementation The OBB tests were using the OBB API in a way that the documentation doesn't recommend. Instead of assuming that we already have the canonical path to an OBB, get the canonical path that is returned in the observer instead. Bug: 4371021 Bug: 4364321 Change-Id: Ic4ccd51cc0e173ccd07223508caafc45a9d13e37 commit e29c775f845c43da9201eba49b762b633a537768 Merge: aad7117 43a434e Author: Kenny Root Date: Fri May 6 10:45:45 2011 -0700 Merge "Fix OBB tests to stop caring about implementation" commit 43a434e11053af460bf4bb3eafa3edff7c560c72 Author: Kenny Root Date: Fri May 6 10:35:55 2011 -0700 Fix OBB tests to stop caring about implementation The OBB tests were using the OBB API in a way that the documentation doesn't recommend. Instead of assuming that we already have the canonical path to an OBB, get the canonical path that is returned in the observer instead. Bug: 4371021 Bug: 4364321 Change-Id: Ic4ccd51cc0e173ccd07223508caafc45a9d13e37 commit aad7117d61f342b40a785be0495757f5e3d0f787 Merge: 5ac59af dc83de8 Author: Wu-cheng Li Date: Fri May 6 01:08:28 2011 -0700 Merge "Add camera metering areas API tests." commit dc83de84ca93e0d4d8660f345addc1dc39752208 Author: Wu-cheng Li Date: Thu May 5 15:48:39 2011 +0800 Add camera metering areas API tests. bug:3475893 Change-Id: I5b2a3e616716184d5165dbe4a2752ddb77f2110f commit 5ac59af77514990a00290d915c30503ca57b9760 Merge: a9c7874 9d519d1 Author: Brian Carlstrom Date: Thu May 5 14:55:35 2011 -0700 Merge "Fix DAsm to use CstString rather than CstUtf8." commit da648362daca974af1072e6270ba2e7d7233eae9 Merge: 7f9d13c 61f4b00 Author: Brian Muramatsu Date: Thu May 5 14:50:26 2011 -0700 am 61f4b004: Merge "Don\'t fail on netlink socket closing." into gingerbread * commit '61f4b0044319c51207d945797173f0a71e034637': Don't fail on netlink socket closing. commit 48bfddb0480b83b478cbcc057d004c8fc99e5172 Merge: 3c4f8f0 912d5e4 Author: Brian Muramatsu Date: Thu May 5 14:13:09 2011 -0700 Merge "Don't fail on netlink socket closing." into froyo commit 912d5e482a92028a5504fd09a50f4c9b8c4420e3 Author: Nick Kralevich Date: Thu May 5 13:48:10 2011 -0700 Don't fail on netlink socket closing. If the process listening on the netlink socket closes the listener socket, don't consider that a security hole. Change-Id: If7e0800011e2bf477586a80266f837a722308af1 commit 61f4b0044319c51207d945797173f0a71e034637 Merge: 403c5ee 4deed02 Author: Brian Muramatsu Date: Thu May 5 14:07:24 2011 -0700 Merge "Don't fail on netlink socket closing." into gingerbread commit 4deed02e9c732b4912cddde7f63e1c054e46ce76 Author: Nick Kralevich Date: Thu May 5 13:48:10 2011 -0700 Don't fail on netlink socket closing. If the process listening on the netlink socket closes the listener socket, don't consider that a security hole. Change-Id: I27ed7a997877e2d618a0447e4ee2dba8f6aea2ac commit a9c787445dc796866152419975c1ee86ddbe5280 Author: Brian Muramatsu Date: Thu May 5 13:35:51 2011 -0700 Fix WindowTest#testDecorView Bug 4367792 The decor view has the same height as the screen on phones, since there isn't a system bar. Change-Id: I56f30c3115b9a51c17b084e6882e412e632f0f0e commit c5c63895d44dd09cddc2919ac20eff7eae5ebc06 Author: Marco Nelissen Date: Thu May 5 08:03:01 2011 -0700 Remove tests for ALBUM_ART column in songs table. This column doesn't exist, but that's not the bug. The bug is that the column definition exists in MediaStore, and I will be removing it shortly. Change-Id: Ic3f7fba073c0d295d0362c50358bde9d23008111 commit 9d519d1f00e49cbf9ca4b77ea620c5aaf5844b9e Author: Brian Carlstrom Date: Thu May 5 00:20:05 2011 -0700 Fix DAsm to use CstString rather than CstUtf8. git cherry-pick --no-commit b8b77836143c6ac6bfbea97d692c45e1f7a21566 Change-Id: I23dfa3d8d4f3efdd5c6c0ddf255a06d65553ec4a commit 57601b61145d83281c8839b526ca20adddf8efb0 Merge: d6294a7 cc0a4f7 Author: Wu-cheng Li Date: Wed May 4 23:42:51 2011 -0700 Merge "Add camera focus areas API test." commit cc0a4f7099956068076ef45caf10aca50e72c7b7 Author: Wu-cheng Li Date: Wed May 4 14:44:23 2011 +0800 Add camera focus areas API test. bug:3475893 Change-Id: I40328da614cac59df94d05687d5194bc4b47303e commit d6294a7c3895a387d66252116d7f02e45ee309b4 Merge: 7889321 c7e2037 Author: Brian Muramatsu Date: Wed May 4 19:50:29 2011 -0700 am c7e20370: am 7f9d13c7: am 403c5ee1: Merge "Add CtsVerifier Icons" into gingerbread * commit 'c7e2037090a3cdb955ff6e6bda455b30a3c1ef61': Add CtsVerifier Icons commit c7e2037090a3cdb955ff6e6bda455b30a3c1ef61 Merge: d050fd3 7f9d13c Author: Brian Muramatsu Date: Wed May 4 19:38:19 2011 -0700 am 7f9d13c7: am 403c5ee1: Merge "Add CtsVerifier Icons" into gingerbread * commit '7f9d13c72125e926e010b561ee520928defda4ce': Add CtsVerifier Icons commit 7f9d13c72125e926e010b561ee520928defda4ce Merge: c87ce6e 403c5ee Author: Brian Muramatsu Date: Wed May 4 19:18:54 2011 -0700 am 403c5ee1: Merge "Add CtsVerifier Icons" into gingerbread * commit '403c5ee120cfabf5306403900a8dff3159b8f367': Add CtsVerifier Icons commit 403c5ee120cfabf5306403900a8dff3159b8f367 Merge: a25a7bf fec9b8e Author: Brian Muramatsu Date: Wed May 4 18:34:18 2011 -0700 Merge "Add CtsVerifier Icons" into gingerbread commit fec9b8ebc92c43fd96125dbea984b5917ffafb14 Author: Brian Muramatsu Date: Wed May 4 10:59:53 2011 -0700 Add CtsVerifier Icons Change-Id: I35d4627fb63dbb4e519faf44b564a7d9bf639b26 commit 788932186b2255cdfe00c600a2e3147718a88b8f Merge: c7be660 d050fd3 Author: Brian Muramatsu Date: Wed May 4 15:43:32 2011 -0700 am d050fd33: am c87ce6e7: (-s ours) am a25a7bf1: Merge "Merge remote branch \'korg/froyo\' into manualmerge" into gingerbread * commit 'd050fd330477ae0c31f865cffcaefd0e8b425034': Fix CtsWebkitTestCases:WebSettingsTest--testUserAgentString_default fail due to tablet device remove "Mobile" from UA string Add Security Tests to CTS Signed-off-by: Woo-seok Jang commit d050fd330477ae0c31f865cffcaefd0e8b425034 Merge: 5ce58b8 c87ce6e Author: Brian Muramatsu Date: Wed May 4 15:41:23 2011 -0700 am c87ce6e7: (-s ours) am a25a7bf1: Merge "Merge remote branch \'korg/froyo\' into manualmerge" into gingerbread * commit 'c87ce6e7cd0383b1c5bc2756590b4e0f5221c3ca': Fix CtsWebkitTestCases:WebSettingsTest--testUserAgentString_default fail due to tablet device remove "Mobile" from UA string Add Security Tests to CTS Signed-off-by: Woo-seok Jang commit c87ce6e7cd0383b1c5bc2756590b4e0f5221c3ca Merge: b486d61 a25a7bf Author: Brian Muramatsu Date: Wed May 4 13:27:02 2011 -0700 am a25a7bf1: Merge "Merge remote branch \'korg/froyo\' into manualmerge" into gingerbread * commit 'a25a7bf1702a2948bed54ffedee3bf0dee002821': Fix CtsWebkitTestCases:WebSettingsTest--testUserAgentString_default fail due to tablet device remove "Mobile" from UA string Add Security Tests to CTS Signed-off-by: Woo-seok Jang commit a25a7bf1702a2948bed54ffedee3bf0dee002821 Merge: 40f7f97 d4f52ee Author: Brian Muramatsu Date: Wed May 4 12:46:48 2011 -0700 Merge "Merge remote branch 'korg/froyo' into manualmerge" into gingerbread commit d4f52eee578e397cc3946aa3fc1ab2cfc7602a0a Merge: 40f7f97 3c4f8f0 Author: Brian Muramatsu Date: Wed May 4 12:41:55 2011 -0700 Merge remote branch 'korg/froyo' into manualmerge Conflicts: tests/tests/dpi/src/android/dpi/cts/ConfigurationTest.java Change-Id: Id2073fa347aba8227514afb1c4de602c62cd2bf7 commit 3c4f8f0426e466780a7701a66ae9cc65bf894a22 Merge: 9f9718b f0fb1e7 Author: Brian Muramatsu Date: Wed May 4 11:33:18 2011 -0700 Merge "Fix CtsWebkitTestCases:WebSettingsTest--testUserAgentString_default fail due to tablet device remove "Mobile" from UA string" into froyo commit f0fb1e7ad76111249ab29ed73369a51ced4fb16c Author: esther530 Date: Wed Apr 13 15:42:49 2011 +0800 Fix CtsWebkitTestCases:WebSettingsTest--testUserAgentString_default fail due to tablet device remove "Mobile" from UA string Change-Id: Ib1c1ee6d275ad13b64fb6f1cb667d7560a940b10 commit c7be660ca54f8a15127977b6ffc518981e2c5527 Merge: bfdab9a ac2676d Author: Steve Block Date: Wed May 4 08:22:19 2011 -0700 Merge changes I0f638aa0,I71962be8,Ie8876535,I7cd2a901 * changes: Remove superfluous logic from WebView CTS test testLoadData() Remove WebView CTS test testClearView() Clean up WebView.addJavascriptInterface() CTS test Clean up WebView CTS test commit ac2676dbbc87163b231e866ab2dbdac23ae546de Author: Steve Block Date: Tue May 3 18:14:37 2011 +0100 Remove superfluous logic from WebView CTS test testLoadData() This logic is concerned with capturing a picture and is replicated in testCapturePicture() This will simplify later refactoring to call all WebView methods on the UI thread. Bug: 4340864 Change-Id: I0f638aa0d9ab79a6b88e91a1e6f63da1955eb55b commit 96209017c2d7664ca607aedc19ba87ff322c6368 Author: Steve Block Date: Tue May 3 14:03:47 2011 +0100 Remove WebView CTS test testClearView() This test does not test anything specific to WebView.clearView() and the methods it does test are tested elsewhere. This will simplify later refactoring to call all WebView methods on the UI thread. Bug: 4340864 Change-Id: I71962be83bf742bf098db1fc2e8daa32c4c3570b commit cfc435a9f0ab0197897d7d68b9c02edd79a78083 Author: Steve Block Date: Tue May 3 12:38:43 2011 +0100 Clean up WebView.addJavascriptInterface() CTS test Cleans up unused code regarding updating the page title and uses wait/notify to avoid a busy wait. Also uses 'new Object' for the injected object where possible. This will simplify later refactoring to call all WebView methods on the UI thread. Bug: 4340864 Change-Id: Ie88765351dfc711b22a661a3677bd4c08e6b0ad4 commit 23b200141c667cb9849c594cba37ca5dbb60b8fb Author: Steve Block Date: Wed Apr 20 11:27:08 2011 +0100 Clean up WebView CTS test waitForLoadcomplete() and assertLoadUrlSuccessfully() don't need to take the WebView and timeout as parameters. The former is a member, the latter is a constant. Also, don't propagate the InterruptException that may be thrown by Thread.Sleep(), as there's nothing we can do about this and it clutters the API. This will simplify later refactoring to call all WebView methods on the UI thread. Bug: 4340864 Change-Id: I7cd2a9011023345ac8be934e13b86ff1fb10c9d3 commit bfdab9aa93a24d2f6e864149441305a9bb67f5c0 Merge: e91210e f76e4de Author: Brett Chabot Date: Tue May 3 19:28:20 2011 -0700 Merge "Make long running FileSystemPermissionTest tests LargeTests." commit f76e4de79b484c3642973800dbfd91c6527942ed Author: Brett Chabot Date: Tue May 3 16:24:09 2011 -0700 Make long running FileSystemPermissionTest tests LargeTests. testAllOtherDirectoriesNotWritable was occassionally exceeding the 10s harness limit for medium tests. Change-Id: If75d2409e2d31564a0b040316d443d0c48915da3 commit e91210e783795b1d7512ab7e24e4055efdcea429 Merge: bc6d720 5ce58b8 Author: Brian Muramatsu Date: Tue May 3 16:23:22 2011 -0700 am 5ce58b82: am b486d618: am 40f7f977: Merge "Add Security Tests to CTS" into gingerbread * commit '5ce58b82fa859ad38ea2edf449d72a0f905334f1': Add Security Tests to CTS commit bc6d720f5ffb46cafaaa0be47e2c7095841ddd33 Merge: aa93f59 6a83358 Author: Brian Muramatsu Date: Tue May 3 16:23:20 2011 -0700 am 6a833585: am e75ba5f3: (-s ours) am 3a9e0fdb: Merge "Increment CTS Version to 2.3_r3" into gingerbread * commit '6a833585e040b0b600a676c4bf45b116e455c15b': Increment CTS Version to 2.3_r3 commit 5ce58b82fa859ad38ea2edf449d72a0f905334f1 Merge: 6a83358 b486d61 Author: Brian Muramatsu Date: Tue May 3 16:19:37 2011 -0700 am b486d618: am 40f7f977: Merge "Add Security Tests to CTS" into gingerbread * commit 'b486d61815593cfdc11ce3df18adbf3ace5b2a56': Add Security Tests to CTS commit 6a833585e040b0b600a676c4bf45b116e455c15b Merge: 1eb311d e75ba5f Author: Brian Muramatsu Date: Tue May 3 16:19:35 2011 -0700 am e75ba5f3: (-s ours) am 3a9e0fdb: Merge "Increment CTS Version to 2.3_r3" into gingerbread * commit 'e75ba5f3fbaecdd9156622da11d6af2890a3060d': Increment CTS Version to 2.3_r3 commit aa93f590da7f606fcf8d9c5935b24fb3838e80ec Merge: a430b2e 1eb311d Author: Brian Muramatsu Date: Tue May 3 16:19:20 2011 -0700 am 1eb311d4: am a42ba579: am 76338e03: Merge "Merge remote branch \'korg/froyo\' into manualmerge" into gingerbread * commit '1eb311d4d24d6248b718a75d5670fa9237b788d4': Detect Android devices vulnerable to CVE-2011-1823 commit 1eb311d4d24d6248b718a75d5670fa9237b788d4 Merge: c1cd319 a42ba57 Author: Brian Muramatsu Date: Tue May 3 16:15:40 2011 -0700 am a42ba579: am 76338e03: Merge "Merge remote branch \'korg/froyo\' into manualmerge" into gingerbread * commit 'a42ba57949fb84272ee530e1a70e882ba66e2682': Detect Android devices vulnerable to CVE-2011-1823 commit 9f9718b640715dc9c7a0c4673f1bead06f9749dd Merge: e3a0843 9f70ae5 Author: Brian Muramatsu Date: Tue May 3 15:19:53 2011 -0700 Merge "Signed-off-by: Woo-seok Jang " into froyo commit a430b2e93128b403388d26a74f7d569c5f3db29b Merge: 4df117a c107295 Author: Brian Muramatsu Date: Tue May 3 15:16:55 2011 -0700 Merge "Remove --preserve-root Options" commit c1072952489c3aabfcfcbd97c7384b3e9bf1e0f2 Author: Brian Muramatsu Date: Tue May 3 14:48:04 2011 -0700 Remove --preserve-root Options These aren't supported by rm on Mac. It seems --preserve-root is just to protect / from being deleted, so I don't know why they were there in the first place... Change-Id: I6383fcbaaa0b7fcf84fb0639cc60309713c56d3d commit e3a08438edd4197649eb44955334ba2b7df15488 Merge: e30096b d8cf2cb Author: Brian Muramatsu Date: Tue May 3 14:22:40 2011 -0700 Merge "Add Security Tests to CTS" into froyo commit d8cf2cb0060a958232dbf43d30852dbf79dcd3cb Author: Brian Muramatsu Date: Tue May 3 12:49:56 2011 -0700 Add Security Tests to CTS Add the new security tests package to the CTS test case list. This is required to get the package included in the final CTS zip. Change-Id: I6f2998d5ac5a8673a2ff81ab8b13ee959dea121c commit 4df117a713ffc0769ddc4dbb839b4d1fd0fdb1be Merge: b5be5f0 94555a8 Author: Tsu Chiang Chuang Date: Tue May 3 13:41:25 2011 -0700 Merge "Fix to avoid duplicate build rule." commit b486d61815593cfdc11ce3df18adbf3ace5b2a56 Merge: e75ba5f 40f7f97 Author: Brian Muramatsu Date: Tue May 3 13:14:38 2011 -0700 am 40f7f977: Merge "Add Security Tests to CTS" into gingerbread * commit '40f7f9772ef3faa1de2041e85a5450f9054b9868': Add Security Tests to CTS commit 40f7f9772ef3faa1de2041e85a5450f9054b9868 Merge: 3a9e0fd 8c86a01 Author: Brian Muramatsu Date: Tue May 3 12:56:39 2011 -0700 Merge "Add Security Tests to CTS" into gingerbread commit 8c86a016e103acdbce88bbcee98f344625c9b78e Author: Brian Muramatsu Date: Tue May 3 12:49:56 2011 -0700 Add Security Tests to CTS Add the new security tests package to the CTS test case list. This is required to get the package included in the final CTS zip. Change-Id: Ifd13691fc68699d8fdb3020de75d164f76563158 commit e75ba5f3fbaecdd9156622da11d6af2890a3060d Merge: a42ba57 3a9e0fd Author: Brian Muramatsu Date: Tue May 3 12:46:17 2011 -0700 am 3a9e0fdb: Merge "Increment CTS Version to 2.3_r3" into gingerbread * commit '3a9e0fdbb8c4bb519ba362d2d16826271a9dd1f1': Increment CTS Version to 2.3_r3 commit a42ba57949fb84272ee530e1a70e882ba66e2682 Merge: 5e4a015 76338e0 Author: Brian Muramatsu Date: Tue May 3 12:25:12 2011 -0700 am 76338e03: Merge "Merge remote branch \'korg/froyo\' into manualmerge" into gingerbread * commit '76338e0305ebb3f9e9026074a994579ec20c7e6a': Detect Android devices vulnerable to CVE-2011-1823 commit 3a9e0fdbb8c4bb519ba362d2d16826271a9dd1f1 Merge: 76338e0 0243000 Author: Brian Muramatsu Date: Tue May 3 12:16:52 2011 -0700 Merge "Increment CTS Version to 2.3_r3" into gingerbread commit b5be5f08f14c0fb99b56ede2c5b4e067a3b5c79e Author: Brian Muramatsu Date: Tue May 3 11:58:22 2011 -0700 Fix DateFormatTest#test2038 Bug 4371662 Change-Id: I6837665726a4bb31c6f6be69392caa415db4a5ea commit 02430008a9b3618759a39bc476708705b7652c22 Author: Brian Muramatsu Date: Tue May 3 11:15:21 2011 -0700 Increment CTS Version to 2.3_r3 Bug 4375608 Change-Id: I05301aad337acb1766b5589b912386b9aea43246 commit e7dfe7f56077caed2830220f1d71a4fd4dcd9c2e Merge: 5ef3079 397d71a Author: Brian Muramatsu Date: Tue May 3 10:59:34 2011 -0700 Merge "Check Logical Density" into honeycomb commit 94555a892c6486df62d5df9815a373337941fe99 Author: Tsu Chiang Chuang Date: Tue May 3 10:41:29 2011 -0700 Fix to avoid duplicate build rule. Change-Id: I36471c52e6033fa234522c126724ca18f7f3d3d3 commit 397d71adceb32e1d6ea0bba83caaeaf37de00b0a Author: Brian Muramatsu Date: Mon May 2 15:00:35 2011 -0700 Check Logical Density Bug 4352965 Change-Id: I30fcec79bb137831e0519259a04ead5b2b73ca98 commit 76338e0305ebb3f9e9026074a994579ec20c7e6a Merge: a726f5a 328dfec Author: Brian Muramatsu Date: Mon May 2 15:15:23 2011 -0700 Merge "Merge remote branch 'korg/froyo' into manualmerge" into gingerbread commit 328dfec56876f15ea691c3bda5b4d9cd3681cd5b Merge: a726f5a e30096b Author: Brian Muramatsu Date: Mon May 2 15:13:01 2011 -0700 Merge remote branch 'korg/froyo' into manualmerge Conflicts: tests/jni/Android.mk tests/jni/CtsJniOnLoad.cpp Change-Id: I0971aa788c8f206d6ae6decb94e4a6dcc8ffe331 commit e30096be712b12018a7bfdc247a5c205728a448b Merge: ca3c1fa 80e3b90 Author: Brian Muramatsu Date: Mon May 2 14:45:50 2011 -0700 Merge "Detect Android devices vulnerable to CVE-2011-1823" into froyo commit 80e3b90867d9cd242d1a0d5c80778a2daa292333 Author: Nick Kralevich Date: Thu Apr 28 13:49:15 2011 -0700 Detect Android devices vulnerable to CVE-2011-1823 This change does two things: 1) Adds a new CTS test category called "security", to centralize test for security bugs, and 2) Adds a test for CVE-2011-1823, the vold exploit discovered by Sebastian Krahmer, available at http://c-skills.blogspot.com/2011/04/yummy-yummy-gingerbreak.html See also http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2011-1823 Bug: 4328371 Change-Id: Iab98d71c2cda24c4a017c6848fac4368a4ad2fd8 commit ad6cec9f9b29d0830ebb650062d4c2c2a86fcf34 Author: Brian Carlstrom Date: Sun May 1 21:06:29 2011 -0700 Remove setting of javax.net.ssl.trustStore property Change-Id: If1b3a4ef1c607dd8847ed01f863bc13738583075 commit e5e6d16802c4e21f318548c6d2284bfd7d12197b Merge: b52b5dc c1cd319 Author: Brian Muramatsu Date: Fri Apr 29 15:10:47 2011 -0700 am c1cd319a: am 5e4a015d: am a726f5ab: am 34701ee1: Merge "Removing CTS Verifier Tests" into gingerbread * commit 'c1cd319a91fc480a71eaa02fdbd9e05339fbf5c5': Removing CTS Verifier Tests commit b52b5dcd269cf6b6d0b8b2a09456db4c9091963d Merge: eee6648 1a1d1f0 Author: Brian Muramatsu Date: Fri Apr 29 15:10:45 2011 -0700 am 1a1d1f01: am aabb29a8: am 28ed8256: am 0c0b54c7: Merge "Fix Broken Build" into gingerbread * commit '1a1d1f0194207776a088147002152bfb997c8063': Fix Broken Build commit eee664823889ece5f20b388298222c25360f644b Merge: 5a0b430 cb9f56b Author: Brian Muramatsu Date: Fri Apr 29 15:10:42 2011 -0700 am cb9f56bb: am 6612dcc1: am 7c73ab42: am d4f867d5: Merge "Add Detective Logo to CTS Verifier" into gingerbread * commit 'cb9f56bba1042d82df7b90ee02f69fe005b703ae': Add Detective Logo to CTS Verifier commit 5a0b4304fe4a829db231d49d60032703ff8ffe95 Merge: 4118677 c076e53 Author: Brian Muramatsu Date: Fri Apr 29 15:10:30 2011 -0700 am c076e53d: am 19755fba: am 8d00b365: resolved conflicts for merge of 545e9b30 to gingerbread * commit 'c076e53dfd90461dada0b0afe4a15fca990d65cc': Update lists of Japanese network operators commit 411867753cdd00f6202590730687ab526de68737 Merge: 2e48884 3414187 Author: Xia Wang Date: Fri Apr 29 15:10:26 2011 -0700 am 34141878: am 938f93be: am 79c1d920: Backport from HC to Fix NetworkInfoTest * commit '3414187833433432c05368e4dc682545504e476c': commit c1cd319a91fc480a71eaa02fdbd9e05339fbf5c5 Merge: 1a1d1f0 5e4a015 Author: Brian Muramatsu Date: Fri Apr 29 14:55:46 2011 -0700 am 5e4a015d: am a726f5ab: am 34701ee1: Merge "Removing CTS Verifier Tests" into gingerbread * commit '5e4a015dcb012a1c4aca868eba2243d6ac318a56': Removing CTS Verifier Tests commit 1a1d1f0194207776a088147002152bfb997c8063 Merge: cb9f56b aabb29a Author: Brian Muramatsu Date: Fri Apr 29 14:54:46 2011 -0700 am aabb29a8: am 28ed8256: am 0c0b54c7: Merge "Fix Broken Build" into gingerbread * commit 'aabb29a8588692dfbf69c396986bca015a1c32e5': Fix Broken Build commit cb9f56bba1042d82df7b90ee02f69fe005b703ae Merge: c076e53 6612dcc Author: Brian Muramatsu Date: Fri Apr 29 14:54:44 2011 -0700 am 6612dcc1: am 7c73ab42: am d4f867d5: Merge "Add Detective Logo to CTS Verifier" into gingerbread * commit '6612dcc157a5ee973171003a08622b60be5a051a': Add Detective Logo to CTS Verifier commit c076e53dfd90461dada0b0afe4a15fca990d65cc Merge: 3414187 19755fb Author: Brian Muramatsu Date: Fri Apr 29 14:54:35 2011 -0700 am 19755fba: am 8d00b365: resolved conflicts for merge of 545e9b30 to gingerbread * commit '19755fba409cfa2c4517c66e58d994b63de4aefc': Update lists of Japanese network operators commit 3414187833433432c05368e4dc682545504e476c Merge: aaedbb3 938f93b Author: Xia Wang Date: Fri Apr 29 14:54:28 2011 -0700 am 938f93be: am 79c1d920: Backport from HC to Fix NetworkInfoTest * commit '938f93be399efeaa635ac2f80851f0f34ddd9863': commit 2e488840a9b2fce1672149e5c591afd96e19a0b0 Merge: d25caa6 aaedbb3 Author: Stephen Hines Date: Fri Apr 29 00:17:43 2011 -0700 am aaedbb33: (-s ours) am f463261c: am 4a66ef4a: Merge "CTS Tests" into honeycomb-mr1 * commit 'aaedbb33c09e1e4c7a514829dccaa4a8707c5f5b': CTS Tests commit aaedbb33c09e1e4c7a514829dccaa4a8707c5f5b Merge: 4bacf7d f463261 Author: Stephen Hines Date: Thu Apr 28 23:59:28 2011 -0700 am f463261c: am 4a66ef4a: Merge "CTS Tests" into honeycomb-mr1 * commit 'f463261cfb0a0a333ae3833e818427308b8108bb': CTS Tests commit f463261cfb0a0a333ae3833e818427308b8108bb Merge: 916dd59 4a66ef4 Author: Stephen Hines Date: Thu Apr 28 23:56:41 2011 -0700 am 4a66ef4a: Merge "CTS Tests" into honeycomb-mr1 * commit '4a66ef4ace3d9518b519cd5a44b0ce6e6d116930': CTS Tests commit 4a66ef4ace3d9518b519cd5a44b0ce6e6d116930 Merge: 2f7f0e9 e597378 Author: Stephen Hines Date: Thu Apr 28 16:16:13 2011 -0700 Merge "CTS Tests" into honeycomb-mr1 commit d25caa641fe18d9b328e20344322727eb91fc039 Merge: 600dccf f999343 Author: Tsu Chiang Chuang Date: Thu Apr 28 14:48:48 2011 -0700 Merge "Fixing transient build errors due to duplicate definition." commit f999343b717c023738f3c1aecf72d081794df276 Author: Tsu Chiang Chuang Date: Thu Apr 28 14:07:39 2011 -0700 Fixing transient build errors due to duplicate definition. Change-Id: Ia7fb8a1b09f0c2872a680552245b52b5820bf4fc commit 5e4a015dcb012a1c4aca868eba2243d6ac318a56 Merge: aabb29a a726f5a Author: Brian Muramatsu Date: Thu Apr 28 12:47:09 2011 -0700 am a726f5ab: am 34701ee1: Merge "Removing CTS Verifier Tests" into gingerbread * commit 'a726f5ab7f9e739b5b0f4a2c90ca5fe2083d32e7': Removing CTS Verifier Tests commit a726f5ab7f9e739b5b0f4a2c90ca5fe2083d32e7 Merge: 28ed825 34701ee Author: Brian Muramatsu Date: Thu Apr 28 12:42:14 2011 -0700 am 34701ee1: Merge "Removing CTS Verifier Tests" into gingerbread * commit '34701ee1f9b2d641597d83abc9531d42a2afa67f': Removing CTS Verifier Tests commit 34701ee1f9b2d641597d83abc9531d42a2afa67f Merge: 0c0b54c 31dffc4 Author: Brian Muramatsu Date: Thu Apr 28 12:31:17 2011 -0700 Merge "Removing CTS Verifier Tests" into gingerbread commit 31dffc44798a121cd86fe1aa9d45fa717c455405 Author: Brian Muramatsu Date: Thu Apr 28 12:15:07 2011 -0700 Removing CTS Verifier Tests Nobody runs the tests. "make cts" doesn't build them either, so these are just a build breakage waiting to happen. Change-Id: If4aaf411944253bc97376c4f6415a8c75aef4055 commit aabb29a8588692dfbf69c396986bca015a1c32e5 Merge: 6612dcc 28ed825 Author: Brian Muramatsu Date: Thu Apr 28 12:00:50 2011 -0700 am 28ed8256: am 0c0b54c7: Merge "Fix Broken Build" into gingerbread * commit '28ed8256e5894742bdb114519cc79fd882f0bec9': Fix Broken Build commit 600dccf4bac654d54766c25d93533d870b8a0a2a Merge: af6c323 f2f7955 Author: Stephen Hines Date: Thu Apr 28 11:54:43 2011 -0700 Merge "Fix RS graphics samples/tests." commit 28ed8256e5894742bdb114519cc79fd882f0bec9 Merge: 7c73ab4 0c0b54c Author: Brian Muramatsu Date: Thu Apr 28 11:54:36 2011 -0700 am 0c0b54c7: Merge "Fix Broken Build" into gingerbread * commit '0c0b54c704610067ab706ce5b7bd570ec3d1676d': Fix Broken Build commit 0c0b54c704610067ab706ce5b7bd570ec3d1676d Merge: d4f867d 8a8d876 Author: Brian Muramatsu Date: Thu Apr 28 11:51:01 2011 -0700 Merge "Fix Broken Build" into gingerbread commit 8a8d876e66335dd025a54b023b8c23b7e861606f Author: Brian Muramatsu Date: Thu Apr 28 11:49:57 2011 -0700 Fix Broken Build I need to either figure out how to build these tests as part of the cts target or delete them. Change-Id: I258425c271fff3627460238c9389bb235512c7ee commit 6612dcc157a5ee973171003a08622b60be5a051a Merge: 19755fb 7c73ab4 Author: Brian Muramatsu Date: Thu Apr 28 11:27:21 2011 -0700 am 7c73ab42: am d4f867d5: Merge "Add Detective Logo to CTS Verifier" into gingerbread * commit '7c73ab4265921c852b1742edb365d2cbb1b08216': Add Detective Logo to CTS Verifier commit 7c73ab4265921c852b1742edb365d2cbb1b08216 Merge: 8d00b36 d4f867d Author: Brian Muramatsu Date: Thu Apr 28 11:21:06 2011 -0700 am d4f867d5: Merge "Add Detective Logo to CTS Verifier" into gingerbread * commit 'd4f867d52801b9d3283bca4935b33faac00ec63e': Add Detective Logo to CTS Verifier commit d4f867d52801b9d3283bca4935b33faac00ec63e Merge: 545e9b3 cc8244a Author: Brian Muramatsu Date: Thu Apr 28 10:58:08 2011 -0700 Merge "Add Detective Logo to CTS Verifier" into gingerbread commit 19755fba409cfa2c4517c66e58d994b63de4aefc Merge: 938f93b 8d00b36 Author: Brian Muramatsu Date: Thu Apr 28 10:56:40 2011 -0700 am 8d00b365: resolved conflicts for merge of 545e9b30 to gingerbread * commit '8d00b365c5d48e4a3fd7f0d8916e41cec073f852': Update lists of Japanese network operators commit af6c323a1ea950ebe1cc6e58e5577b5f70cb1abd Merge: e6de438 9a223d7 Author: Tsu Chiang Chuang Date: Thu Apr 28 10:48:13 2011 -0700 Merge "New branch for vm-tests that use cts-tf framework." commit 9a223d79b41ec9c9fa651ff675eb0249d35569af Author: Tsu Chiang Chuang Date: Wed Apr 27 17:19:46 2011 -0700 New branch for vm-tests that use cts-tf framework. Change-Id: I9927dc09027fc2298a1b1f7ee6c918ed1d36723a commit cc8244ab0e43722cff570280658c1ddfc3c661b7 Author: Brian Muramatsu Date: Wed Apr 27 18:50:58 2011 -0700 Add Detective Logo to CTS Verifier Change-Id: I86a57b1a766d97de4b3ccc370f1d116bcc8cd2ac commit f2f7955fa4fd5f552e4c519e6bb98fbc6328e9c8 Author: Stephen Hines Date: Wed Apr 27 18:21:49 2011 -0700 Fix RS graphics samples/tests. Change-Id: I28eb3574253d87e70aba4d47da2701e81c9a3ca7 commit 4bb3a07b3f26cd9b62c7bcbb69e0e640c170d5dd Author: Brian Muramatsu Date: Wed Apr 27 16:51:07 2011 -0700 Add Tests for ClipboardManager Bug 4263929 ClipboardManagerListenerTest is an ActivityInstrumentationTestCase that is separate from ClipboardManagerTest, because testing the (add|remove)PrimanyClipChangedListeners requires a Looper to handle the clipboard dispatch messages. Change-Id: Ice86246264c47dae6fe08733556e02f26ec49352 commit e6de438a86e008382e01c863e79377269651afea Merge: 23848a6 4bacf7d Author: Brian Muramatsu Date: Wed Apr 27 15:28:58 2011 -0700 am 4bacf7d0: am 916dd596: am 2f7f0e9a: am 5ef30799: Merge remote branch \'goog/gingerbread\' into manualmerge * commit '4bacf7d002313b2da2bc8c36b800de23759584b5': Backport from HC to Fix NetworkInfoTest commit 4bacf7d002313b2da2bc8c36b800de23759584b5 Merge: 4eb16f2 916dd59 Author: Brian Muramatsu Date: Wed Apr 27 15:23:36 2011 -0700 am 916dd596: am 2f7f0e9a: am 5ef30799: Merge remote branch \'goog/gingerbread\' into manualmerge * commit '916dd5960fc0e572415e3526ac0d9029c3b7d576': Backport from HC to Fix NetworkInfoTest commit 916dd5960fc0e572415e3526ac0d9029c3b7d576 Merge: f9f15e5 2f7f0e9 Author: Brian Muramatsu Date: Wed Apr 27 15:19:09 2011 -0700 am 2f7f0e9a: am 5ef30799: Merge remote branch \'goog/gingerbread\' into manualmerge * commit '2f7f0e9a92b149d765e97788e20807d172567119': Backport from HC to Fix NetworkInfoTest Enhance the options check so that if we expect to see a null options bundle we accept a non-null but empty bundle as well. Farewell Magnetometer Test commit 2f7f0e9a92b149d765e97788e20807d172567119 Merge: a75b19d 5ef3079 Author: Brian Muramatsu Date: Wed Apr 27 14:47:17 2011 -0700 am 5ef30799: Merge remote branch \'goog/gingerbread\' into manualmerge * commit '5ef30799de8920baa38f61f27808c68efbce6de3': Backport from HC to Fix NetworkInfoTest Enhance the options check so that if we expect to see a null options bundle we accept a non-null but empty bundle as well. Farewell Magnetometer Test commit 23848a6292c4d99afc80ff439d437f57be4e49ba Merge: 3d769fa 10aac8b Author: Gilles Debunne Date: Wed Apr 27 14:19:27 2011 -0700 Merge "New WordIterator tests" commit 5ef30799de8920baa38f61f27808c68efbce6de3 Merge: 71dbe44 79c1d92 Author: Brian Muramatsu Date: Wed Apr 27 13:51:31 2011 -0700 Merge remote branch 'goog/gingerbread' into manualmerge Conflicts: tests/tests/accounts/src/android/accounts/cts/AccountManagerTest.java tests/tests/net/src/android/net/cts/ConnectivityManagerTest.java tests/tests/net/src/android/net/cts/NetworkInfoTest.java Change-Id: Ia16b95167e5c023cc977ea9d6bf2323d5c6cbf71 commit 8d00b365c5d48e4a3fd7f0d8916e41cec073f852 Merge: 79c1d92 545e9b3 Author: Brian Muramatsu Date: Wed Apr 27 12:37:34 2011 -0700 resolved conflicts for merge of 545e9b30 to gingerbread Change-Id: I7a54eb178c32f00ec2811e62fd9315a4d3c5fd9f commit 545e9b30af752b4b859c3c3d94a7b32a5887eef9 Merge: 451b947 a17c957 Author: Brian Muramatsu Date: Wed Apr 27 11:46:24 2011 -0700 Merge "Update lists of Japanese network operators" into gingerbread commit 3d769fa32914ccbee611e775bc667aeb74b49480 Merge: 70ebda4 05d7eef Author: Stephen Hines Date: Wed Apr 27 11:28:39 2011 -0700 Merge "Add simple tests for all vector types in RS API." commit 70ebda42367ada13ff1500bf7d985714055c4cdc Author: Bjorn Bringert Date: Tue Apr 19 11:16:49 2011 +0100 Add more CTS tests for TTS Change-Id: I232c8d4747c9c73fc118a25d9d330ce62fb192da commit e5973784db8a3bbe3ee64ad22f0709f63d231d48 Author: Stephen Hines Date: Tue Apr 26 17:00:20 2011 -0700 CTS Tests Change-Id: Idc7089225abda5ead251b05ab7629ab52104b562 Conflicts: tests/src/android/renderscript/cts/primitives.rs tests/tests/renderscript/src/android/renderscript/cts/AllocationTest.java tests/tests/renderscript/src/android/renderscript/cts/ComputeTest.java tests/tests/renderscript/src/android/renderscript/cts/ElementTest.java tests/tests/renderscript/src/android/renderscript/cts/ProgramRasterTest.java tests/tests/renderscript/src/android/renderscript/cts/ProgramStoreTest.java tests/tests/renderscript/src/android/renderscript/cts/RSBase.java tests/tests/renderscript/src/android/renderscript/cts/RSBaseCompute.java tests/tests/renderscript/src/android/renderscript/cts/RSBaseGraphics.java tests/tests/renderscript/src/android/renderscript/cts/RenderScriptTest.java tests/tests/renderscript/src/android/renderscript/cts/SamplerTest.java tests/tests/renderscript/src/android/renderscript/cts/TypeTest.java commit 98116f2f65e6cfbaad676baf444e74f53ab6054f Merge: c7ca6f4 53ba7ba Author: John Reck Date: Tue Apr 26 09:32:02 2011 -0700 Merge "Adding tests for looking up many elements." commit 05d7eef83c9793d7b24f53eb446a9a8a24c083af Author: Stephen Hines Date: Mon Apr 25 17:12:23 2011 -0700 Add simple tests for all vector types in RS API. Change-Id: I21e71f53f2b16d268af7e0a514eb52427f062210 commit a17c957f1357e3178d57bf2725ccd9c8cc3309d6 Author: Masanori Ogino Date: Mon Apr 25 08:56:22 2011 +0900 Update lists of Japanese network operators NTT Docomo: Support Delivery report, but not support binary and multipart SMS KDDI: Not support Delivery report for all message type SoftBank Mobile: Not support binary and multipart SMS completely Change-Id: Ib605e6a33e38e86e32b12c40db1c691dcf2da143 commit c7ca6f4dd094e274c45bb09708cc2cebadcbc167 Merge: e18f03f 72485bc Author: Svetoslav Ganov Date: Fri Apr 22 18:33:22 2011 -0700 Merge "Updated CTS tests due to API change - touch exploration." commit 72485bc6f50c678217be266e2f4a3678ec988320 Author: Svetoslav Ganov Date: Fri Apr 22 18:32:09 2011 -0700 Updated CTS tests due to API change - touch exploration. Change-Id: Ib16be89496d617c277b8062cc79e19db6cf3b14f commit e18f03f39acb7cd00be791de9b24f166ac31d428 Author: Svetoslav Ganov Date: Fri Apr 22 17:32:52 2011 -0700 Revert "Updated CTS tests due to API change - touch exploration." This reverts commit ddc877650719c47922df7b29bc9d2fad817057ee. Change-Id: If937de686f838d961be8a520af8f8795b898eb77 commit 329bcafd4de96c1d359efe3dc455cde0f876e412 Merge: 88eb24d ddc8776 Author: Svetoslav Ganov Date: Fri Apr 22 16:29:21 2011 -0700 Merge "Updated CTS tests due to API change - touch exploration." commit 81b010fe20906fd51a23e766001b29a7b50c2cb4 Author: Brian Muramatsu Date: Wed Apr 20 14:40:20 2011 -0700 Revert "CTS: Fixes a possible "out of memory" exception" This reverts commit 7eade134e4c8fdaee5b7dfb0446dc90085b0408a. This causes the test to fail on Nexus S, so I'm reverting the change for Gingerbread. However, it will be included in a future CTS release. Additional info from Wu-cheng: "The change made the test faster. If apps call setParameters right after jpeg callback is received, it will fail. This is not a regression and I believe it does not impact users." Change-Id: I14ce1235581dac5543983f60ed047ae9331a754a commit 27e1c69a94903178081662caa6251a71d594ccb7 Author: Xia Wang Date: Fri Mar 4 22:11:29 2011 -0800 Backport from HC to Fix NetworkInfoTest Bug 4322307 Fixed some other assertions that didn't check for either CONNECTING or CONNECTED. Cleaned up some code and removed some extraneous checks. Original description: "Fix cts tests for Wi-Fi only devices. For Wi-Fi only device, startUsingNetworkFeature() returns Phone.APN_TYPE_NOT_AVAILABLE stopUsingNetworkFeature() return 1; In NetworkInfoTest: cm.getAllNetworkInfo() returns an array of NetworkInfo. But the index is not based on network type." Change-Id: I0b5e3d0cfe5fac18bca0a5ca2ce4cc73bc4dfa16 commit 889c11b66c5130b30d354f1200aa9aee811a3d3f Author: Fred Quintana Date: Thu Apr 21 13:21:48 2011 -0700 Enhance the options check so that if we expect to see a null options bundle we accept a non-null but empty bundle as well. Bug: 4182396 Change-Id: Ic10dc9aa33df01565fcacb8b3aef2852e2b3535b commit 938f93be399efeaa635ac2f80851f0f34ddd9863 Merge: d797c1b 79c1d92 Author: Xia Wang Date: Fri Apr 22 12:07:55 2011 -0700 am 79c1d920: Backport from HC to Fix NetworkInfoTest * commit '79c1d920ad60b1b531b9ef0b3b05775f6176f0b9': Backport from HC to Fix NetworkInfoTest commit 10aac8b93acb1ee1cb91acd7f58403a372d0be24 Author: Gilles Debunne Date: Wed Apr 13 09:52:00 2011 -0700 New WordIterator tests Plus tests for surrogate characters in ArrowKeyMovement. Change-Id: I954900e9776d6e365db32cf7c4e436ebeca1fb35 commit 79c1d920ad60b1b531b9ef0b3b05775f6176f0b9 Author: Xia Wang Date: Fri Mar 4 22:11:29 2011 -0800 Backport from HC to Fix NetworkInfoTest Bug 4322307 Fixed some other assertions that didn't check for either CONNECTING or CONNECTED. Cleaned up some code and removed some extraneous checks. Original description: "Fix cts tests for Wi-Fi only devices. For Wi-Fi only device, startUsingNetworkFeature() returns Phone.APN_TYPE_NOT_AVAILABLE stopUsingNetworkFeature() return 1; In NetworkInfoTest: cm.getAllNetworkInfo() returns an array of NetworkInfo. But the index is not based on network type." Change-Id: I0b5e3d0cfe5fac18bca0a5ca2ce4cc73bc4dfa16 commit 88eb24dc50018b032c3485b1d1290b01b244ef73 Merge: 3896eec 4eb16f2 Author: Fred Quintana Date: Thu Apr 21 14:20:05 2011 -0700 am 4eb16f23: am d797c1b5: (-s ours) am 922fca93: Merge "Enhance the options check so that if we expect to see a null options bundle we accept a non-null but empty bundle as well." into gingerbread * commit '4eb16f23a5d4adccab0a8ca94d117f83a0a007af': Enhance the options check so that if we expect to see a null options bundle we accept a non-null but empty bundle as well. commit 4eb16f23a5d4adccab0a8ca94d117f83a0a007af Merge: fb4663a d797c1b Author: Fred Quintana Date: Thu Apr 21 14:17:31 2011 -0700 am d797c1b5: (-s ours) am 922fca93: Merge "Enhance the options check so that if we expect to see a null options bundle we accept a non-null but empty bundle as well." into gingerbread * commit 'd797c1b5d95850828ff5d20f0842549d72839bfc': Enhance the options check so that if we expect to see a null options bundle we accept a non-null but empty bundle as well. commit d797c1b5d95850828ff5d20f0842549d72839bfc Merge: f614741 922fca9 Author: Fred Quintana Date: Thu Apr 21 13:47:42 2011 -0700 am 922fca93: Merge "Enhance the options check so that if we expect to see a null options bundle we accept a non-null but empty bundle as well." into gingerbread * commit '922fca939412e1090bf8f240b51057793c9c7bb6': Enhance the options check so that if we expect to see a null options bundle we accept a non-null but empty bundle as well. commit 922fca939412e1090bf8f240b51057793c9c7bb6 Merge: 27090c9 a760f21 Author: Fred Quintana Date: Thu Apr 21 13:45:09 2011 -0700 Merge "Enhance the options check so that if we expect to see a null options bundle we accept a non-null but empty bundle as well." into gingerbread commit a760f21f3a8ce066b444f79d730a11ee86bdc1e9 Author: Fred Quintana Date: Thu Apr 21 13:21:48 2011 -0700 Enhance the options check so that if we expect to see a null options bundle we accept a non-null but empty bundle as well. Bug: 4182396 Change-Id: Ic10dc9aa33df01565fcacb8b3aef2852e2b3535b commit 53ba7ba949b94d1e008f564897749eb62534f732 Author: Dounia Berrada Date: Mon Apr 11 11:37:25 2011 -0700 Adding tests for looking up many elements. Change-Id: I1dd1e1078afaea2a96a09dd52c7c4915c0b86f2f commit 3896eec1ef4508afac2d7f86b820166fc16b80bc Merge: 438f5fe fb4663a Author: Brian Muramatsu Date: Thu Apr 21 12:25:22 2011 -0700 am fb4663a1: am f6147419: am 27090c92: am 451b9477: Merge "Farewell Magnetometer Test" into gingerbread * commit 'fb4663a10a59dd662f281514a5ce262113f8bd56': Farewell Magnetometer Test commit fb4663a10a59dd662f281514a5ce262113f8bd56 Merge: 8237a1a f614741 Author: Brian Muramatsu Date: Thu Apr 21 12:23:15 2011 -0700 am f6147419: am 27090c92: am 451b9477: Merge "Farewell Magnetometer Test" into gingerbread * commit 'f6147419f455955e219ab0cd41c677817b817ff0': Farewell Magnetometer Test commit f6147419f455955e219ab0cd41c677817b817ff0 Merge: a968f1b 27090c9 Author: Brian Muramatsu Date: Thu Apr 21 12:21:42 2011 -0700 am 27090c92: am 451b9477: Merge "Farewell Magnetometer Test" into gingerbread * commit '27090c92b75ffa7eef84fdffff81dadaffc8f668': Farewell Magnetometer Test commit 27090c92b75ffa7eef84fdffff81dadaffc8f668 Merge: 518e6f3 451b947 Author: Brian Muramatsu Date: Thu Apr 21 12:20:05 2011 -0700 am 451b9477: Merge "Farewell Magnetometer Test" into gingerbread * commit '451b94772a56112d04cf67a7ed03fe2f500a8436': Farewell Magnetometer Test commit 451b94772a56112d04cf67a7ed03fe2f500a8436 Merge: f15665a 04d93aa Author: Brian Muramatsu Date: Thu Apr 21 12:07:00 2011 -0700 Merge "Farewell Magnetometer Test" into gingerbread commit 04d93aaebefe816c879d261fe431586eaaeac749 Author: Brian Muramatsu Date: Thu Apr 21 11:41:26 2011 -0700 Farewell Magnetometer Test The test doesn't work very well. Change-Id: I22acdfdb8a65339e4bb3ccef99f0d0b50abd522e commit 438f5fec5e0bdbf1a7636a0a2196290226b0b1a1 Author: Dounia Berrada Date: Mon Feb 28 10:27:10 2011 -0800 CTS integration tests for WebDriver framework. This includes tests for WebDriver#executeScript, WebElement#getText as well as methods to lookup HTML elements on the page. Change-Id: If1b9b054f8deac26441094dc667098046481bd9b commit 7a13e1f1262b80dedb9aa05a371df525ec24e8fd Merge: d36c299 27e7a72 Author: Stephen Hines Date: Wed Apr 20 17:22:59 2011 -0700 Merge "Fix RS CTS tests." commit d36c29909ae3a08c9483ef084b89670ea8692cd4 Merge: 76a95c8 f4bec73 Author: Brett Chabot Date: Wed Apr 20 16:47:07 2011 -0700 Merge "Change other CTS sub-tests to not use fixed build location." commit 76a95c86982dbebe2f895e61bf947d50190f09ca Merge: 4f93778 8237a1a Author: Brian Muramatsu Date: Wed Apr 20 16:18:04 2011 -0700 am 8237a1a0: am f9f15e5f: am a75b19dd: am 71dbe44d: Revert "Revert "CTS: Fixes a possible "out of memory" exception"" * commit '8237a1a0675e74d79cc1a09adbf014cc45b48f46': Revert "Revert "CTS: Fixes a possible "out of memory" exception"" commit 4f93778cac95db3d41255213342d331ff9d802f0 Merge: 3141e94 c14d4c6 Author: Brian Muramatsu Date: Wed Apr 20 16:16:25 2011 -0700 am c14d4c6c: am b959cbed: am 2dfe79f2: am c22a27d0: Merge remote branch \'goog/gingerbread\' into manualmerge * commit 'c14d4c6c9386e7e1711b2caef3e53d3480a0c888': commit 8237a1a0675e74d79cc1a09adbf014cc45b48f46 Merge: c14d4c6 f9f15e5 Author: Brian Muramatsu Date: Wed Apr 20 16:15:44 2011 -0700 am f9f15e5f: am a75b19dd: am 71dbe44d: Revert "Revert "CTS: Fixes a possible "out of memory" exception"" * commit 'f9f15e5f84e8cb703a90fe2934e319d721fafb2f': Revert "Revert "CTS: Fixes a possible "out of memory" exception"" commit c14d4c6c9386e7e1711b2caef3e53d3480a0c888 Merge: 5a5c6ad b959cbe Author: Brian Muramatsu Date: Wed Apr 20 16:13:44 2011 -0700 am b959cbed: am 2dfe79f2: am c22a27d0: Merge remote branch \'goog/gingerbread\' into manualmerge * commit 'b959cbed6160127f44dd8b9fbba3df045ca0e850': commit f9f15e5f84e8cb703a90fe2934e319d721fafb2f Merge: b959cbe a75b19d Author: Brian Muramatsu Date: Wed Apr 20 16:06:45 2011 -0700 am a75b19dd: am 71dbe44d: Revert "Revert "CTS: Fixes a possible "out of memory" exception"" * commit 'a75b19dd46b1759507594da53497e74b53f4c473': Revert "Revert "CTS: Fixes a possible "out of memory" exception"" commit b959cbed6160127f44dd8b9fbba3df045ca0e850 Merge: 0b1af44 2dfe79f Author: Brian Muramatsu Date: Wed Apr 20 16:04:57 2011 -0700 am 2dfe79f2: am c22a27d0: Merge remote branch \'goog/gingerbread\' into manualmerge * commit '2dfe79f20b11b60bd8b3f2446506de6abb7c6e39': Revert "CTS: Fixes a possible "out of memory" exception" Fix for SmsManagerTest Add StorageManager Test Fix BuildVersionTest Add DownloadManager Test commit a75b19dd46b1759507594da53497e74b53f4c473 Merge: 2dfe79f 71dbe44 Author: Brian Muramatsu Date: Wed Apr 20 15:57:38 2011 -0700 am 71dbe44d: Revert "Revert "CTS: Fixes a possible "out of memory" exception"" * commit '71dbe44d5e0a1a12c620c6c81173873d786a4023': Revert "Revert "CTS: Fixes a possible "out of memory" exception"" commit 2dfe79f20b11b60bd8b3f2446506de6abb7c6e39 Merge: a2133d3 c22a27d Author: Brian Muramatsu Date: Wed Apr 20 15:53:54 2011 -0700 am c22a27d0: Merge remote branch \'goog/gingerbread\' into manualmerge * commit 'c22a27d088fab0cc7fc916a649d26633f9353439': Revert "CTS: Fixes a possible "out of memory" exception" Fix for SmsManagerTest Add StorageManager Test Fix BuildVersionTest Add DownloadManager Test commit 71dbe44d5e0a1a12c620c6c81173873d786a4023 Author: Brian Muramatsu Date: Wed Apr 20 15:44:54 2011 -0700 Revert "Revert "CTS: Fixes a possible "out of memory" exception"" Bug 4298542 This reverts commit 1a729f42c0d44f4c2a4818ffe9f4983ce2e52425. Change-Id: I36f37e0966aed13efe7443ee0e11277f8ff700a0 commit c22a27d088fab0cc7fc916a649d26633f9353439 Merge: 80d4a56 518e6f3 Author: Brian Muramatsu Date: Wed Apr 20 15:33:31 2011 -0700 Merge remote branch 'goog/gingerbread' into manualmerge Conflicts: tests/tests/os/src/android/os/cts/BuildVersionTest.java Change-Id: I831f4056d5d1332e90bae1ce69ecaddb5ece728e commit 3141e94cab4f619c786b5b5ce0cb916c6f0989e3 Merge: 2020ebd 5a5c6ad Author: Brian Muramatsu Date: Wed Apr 20 15:13:34 2011 -0700 am 5a5c6adf: am a968f1b1: am 518e6f3e: am f15665a8: Merge "Add StorageManager Test" into gingerbread * commit '5a5c6adf23ed745a6e7340c0b49226f7f3827be8': Add StorageManager Test commit 5a5c6adf23ed745a6e7340c0b49226f7f3827be8 Merge: 81b3b59 a968f1b Author: Brian Muramatsu Date: Wed Apr 20 15:11:49 2011 -0700 am a968f1b1: am 518e6f3e: am f15665a8: Merge "Add StorageManager Test" into gingerbread * commit 'a968f1b17daf75d859ab9617b8f7d4ec22327655': Add StorageManager Test commit a968f1b17daf75d859ab9617b8f7d4ec22327655 Merge: 471c308 518e6f3 Author: Brian Muramatsu Date: Wed Apr 20 15:10:02 2011 -0700 am 518e6f3e: am f15665a8: Merge "Add StorageManager Test" into gingerbread * commit '518e6f3e932563d8a3ead37d04703ca4e5b0191a': Add StorageManager Test commit 2020ebda35ff15ebd53558ab5af449616c015002 Merge: d2c5480 81b3b59 Author: Brian Muramatsu Date: Wed Apr 20 15:09:52 2011 -0700 am 81b3b597: am 471c3089: am e4c28cbd: am 82d2ffe2: Merge "Revert "CTS: Fixes a possible "out of memory" exception"" into gingerbread * commit '81b3b597f92a642a7a3a747f7b85475b8d2f0d11': Revert "CTS: Fixes a possible "out of memory" exception" commit 81b3b597f92a642a7a3a747f7b85475b8d2f0d11 Merge: 341605d 471c308 Author: Brian Muramatsu Date: Wed Apr 20 15:07:59 2011 -0700 am 471c3089: am e4c28cbd: am 82d2ffe2: Merge "Revert "CTS: Fixes a possible "out of memory" exception"" into gingerbread * commit '471c30892522f604b5b2953bbaeba7b2c4646ea8': Revert "CTS: Fixes a possible "out of memory" exception" commit 518e6f3e932563d8a3ead37d04703ca4e5b0191a Merge: e4c28cb f15665a Author: Brian Muramatsu Date: Wed Apr 20 15:07:55 2011 -0700 am f15665a8: Merge "Add StorageManager Test" into gingerbread * commit 'f15665a8079a2411cd68358a2d03fff526f72d26': Add StorageManager Test commit 471c30892522f604b5b2953bbaeba7b2c4646ea8 Merge: e079ac7 e4c28cb Author: Brian Muramatsu Date: Wed Apr 20 15:06:19 2011 -0700 am e4c28cbd: am 82d2ffe2: Merge "Revert "CTS: Fixes a possible "out of memory" exception"" into gingerbread * commit 'e4c28cbd6f8d7b6ca892e3fac17688b78eeb4ef4': Revert "CTS: Fixes a possible "out of memory" exception" commit e4c28cbd6f8d7b6ca892e3fac17688b78eeb4ef4 Merge: 7afcd82 82d2ffe Author: Brian Muramatsu Date: Wed Apr 20 15:04:21 2011 -0700 am 82d2ffe2: Merge "Revert "CTS: Fixes a possible "out of memory" exception"" into gingerbread * commit '82d2ffe29d19f8a5bd59ff215c4bd0ad558e1ca6': Revert "CTS: Fixes a possible "out of memory" exception" commit f15665a8079a2411cd68358a2d03fff526f72d26 Merge: 82d2ffe b33836e Author: Brian Muramatsu Date: Wed Apr 20 14:58:41 2011 -0700 Merge "Add StorageManager Test" into gingerbread commit d2c5480852ba6b64168fde51fa850ee6106afa52 Merge: 0de4f16 341605d Author: Brian Muramatsu Date: Wed Apr 20 14:57:21 2011 -0700 am 341605d9: am e079ac78: am 7afcd821: Merge "Fix for SmsManagerTest" into gingerbread * commit '341605d91d03c7ff88cac27070c6da309653dc13': Fix for SmsManagerTest commit 82d2ffe29d19f8a5bd59ff215c4bd0ad558e1ca6 Merge: 1e6585d 1a729f4 Author: Brian Muramatsu Date: Wed Apr 20 14:46:03 2011 -0700 Merge "Revert "CTS: Fixes a possible "out of memory" exception"" into gingerbread commit 341605d91d03c7ff88cac27070c6da309653dc13 Merge: 95fa705 e079ac7 Author: Brian Muramatsu Date: Wed Apr 20 14:44:50 2011 -0700 am e079ac78: am 7afcd821: Merge "Fix for SmsManagerTest" into gingerbread * commit 'e079ac78db52e0c85550a333b094b966a15adce8': Fix for SmsManagerTest commit 1a729f42c0d44f4c2a4818ffe9f4983ce2e52425 Author: Brian Muramatsu Date: Wed Apr 20 14:40:20 2011 -0700 Revert "CTS: Fixes a possible "out of memory" exception" This reverts commit 7eade134e4c8fdaee5b7dfb0446dc90085b0408a. This causes the test to fail on Nexus S, so I'm reverting the change for Gingerbread. However, it will be included in a future CTS release. Additional info from Wu-cheng: "The change made the test faster. If apps call setParameters right after jpeg callback is received, it will fail. This is not a regression and I believe it does not impact users." Change-Id: I14ce1235581dac5543983f60ed047ae9331a754a commit e079ac78db52e0c85550a333b094b966a15adce8 Merge: ec27e78 7afcd82 Author: Brian Muramatsu Date: Wed Apr 20 14:27:50 2011 -0700 am 7afcd821: Merge "Fix for SmsManagerTest" into gingerbread * commit '7afcd821f282702d82d75779d7dc0d9db298a384': Fix for SmsManagerTest commit 7afcd821f282702d82d75779d7dc0d9db298a384 Merge: 0cfbb02 faf334e Author: Brian Muramatsu Date: Wed Apr 20 13:55:34 2011 -0700 Merge "Fix for SmsManagerTest" into gingerbread commit faf334edbaa7958f65f8d9358cbaf2412152075c Author: Brian Muramatsu Date: Wed Apr 20 12:25:20 2011 -0700 Fix for SmsManagerTest Bug 4315963 Add Sprint to NO_DELIVERY_REPORTS list. Change-Id: Ie85b225580a0134dba30d09f23580294ca342708 commit f4bec7392d3b487ac33c4d90e2a3ba1e957abf17 Author: Brett Chabot Date: Tue Apr 19 17:31:06 2011 -0700 Change other CTS sub-tests to not use fixed build location. Change-Id: I1733e31e3eb1b03cdcd1f0c8e567517c6fb5661c commit 9f70ae5265d041055a482507081fc3ced2e69bb7 Author: Woo-seok Jang Date: Wed Apr 20 16:28:16 2011 +0900 Signed-off-by: Woo-seok Jang added a ScreenConfiguration to SUPPORTED_SCREEN_CONFIGS and fixed GridViewTest#testScroll to handle above changes added a 1024x600, NORMAL screen layout size to SUPPORTED_SCREEN_CONFIGS and enlarged testing instance of MockGridView's size to big enough to handle 1024-NORMAL layout Change-Id: I6463b3081154a2651b6ed4969ea0c3c7acd80e9c commit b33836e71dd4e961081b9e845ba4b0031f25a067 Author: Brian Muramatsu Date: Tue Apr 19 11:35:22 2011 -0700 Add StorageManager Test Bug 4268904 Adapted from frameworks/base/core/tests/coretests/ src/com/android/server/MountServiceTests.java The test used some private FileUtil APIs. CTS already has FileUtils but under the tests/permissions directory and not for com.android.cts.stub. Copy the FileUtils implementation from tests/permission and add the methods used by the test. The OBBs were copied and their signatures were updated to be owned by com.android.cts.stub. Change-Id: I67ebd52fc7e7c97c5b93609754d9c2a5d5165196 commit 0de4f16540d274d294b3b69dd291157ac3f4181d Merge: e97ca68 95fa705 Author: Brian Muramatsu Date: Tue Apr 19 15:56:28 2011 -0700 am 95fa7050: am ec27e78d: (-s ours) am 0cfbb02f: Merge "Fix BuildVersionTest" into gingerbread * commit '95fa70505030cbb17fa3292fc22eed6e30c7a00c': Fix BuildVersionTest commit 95fa70505030cbb17fa3292fc22eed6e30c7a00c Merge: 2f1a7e9 ec27e78 Author: Brian Muramatsu Date: Tue Apr 19 15:53:16 2011 -0700 am ec27e78d: (-s ours) am 0cfbb02f: Merge "Fix BuildVersionTest" into gingerbread * commit 'ec27e78ddc838d4104d0c7d478bfa0a69baeec6e': Fix BuildVersionTest commit ec27e78ddc838d4104d0c7d478bfa0a69baeec6e Merge: e0d9881 0cfbb02 Author: Brian Muramatsu Date: Tue Apr 19 15:15:05 2011 -0700 am 0cfbb02f: Merge "Fix BuildVersionTest" into gingerbread * commit '0cfbb02f2424f2425457afd0b2528dd819272364': Fix BuildVersionTest commit 27e7a72c20ba6a75d7fa0a6817bf9436156991d3 Author: Stephen Hines Date: Tue Apr 19 14:52:21 2011 -0700 Fix RS CTS tests. Change-Id: Ic9746b1abedb44c6db8f58a177635d5538b8fbd4 commit 0cfbb02f2424f2425457afd0b2528dd819272364 Merge: 5a2c4b4 93c9f4f Author: Brian Muramatsu Date: Tue Apr 19 14:36:58 2011 -0700 Merge "Fix BuildVersionTest" into gingerbread commit 93c9f4f93c3e3b34ad19635eb13f76e3e2ac2780 Author: Brian Muramatsu Date: Tue Apr 19 12:37:53 2011 -0700 Fix BuildVersionTest Add 2.3.4 to the supported list. Change-Id: I656527bae0b2037cf0edc149d5525f2bf21dcb47 commit e97ca681abae80fdc126acfcff34900999632557 Merge: 637c09d 2f1a7e9 Author: Brian Muramatsu Date: Tue Apr 19 10:48:24 2011 -0700 am 2f1a7e98: am e0d9881b: am 5a2c4b4e: am 1e6585d7: Merge "Add DownloadManager Test" into gingerbread * commit '2f1a7e987e72b830c608f2be59799ec167db2a7e': Add DownloadManager Test commit 2f1a7e987e72b830c608f2be59799ec167db2a7e Merge: b8f6bc9 e0d9881 Author: Brian Muramatsu Date: Tue Apr 19 10:43:27 2011 -0700 am e0d9881b: am 5a2c4b4e: am 1e6585d7: Merge "Add DownloadManager Test" into gingerbread * commit 'e0d9881be94a869ba00607c82a580c7acd51704c': Add DownloadManager Test commit e0d9881be94a869ba00607c82a580c7acd51704c Merge: 7ada28d 5a2c4b4 Author: Brian Muramatsu Date: Mon Apr 18 17:35:06 2011 -0700 am 5a2c4b4e: am 1e6585d7: Merge "Add DownloadManager Test" into gingerbread * commit '5a2c4b4e59f3d79c1d32d817790341cc19f03f0f': Add DownloadManager Test commit 5a2c4b4e59f3d79c1d32d817790341cc19f03f0f Merge: d45ab47 1e6585d Author: Brian Muramatsu Date: Mon Apr 18 17:33:03 2011 -0700 am 1e6585d7: Merge "Add DownloadManager Test" into gingerbread * commit '1e6585d729445cd7bf98307ed643d21fe138a4da': Add DownloadManager Test commit 1e6585d729445cd7bf98307ed643d21fe138a4da Merge: cd71a27 685d9ee Author: Brian Muramatsu Date: Mon Apr 18 17:10:47 2011 -0700 Merge "Add DownloadManager Test" into gingerbread commit 685d9ee2301a3b02987e2953accaf0be9e229842 Author: Brian Muramatsu Date: Fri Apr 8 16:41:37 2011 -0700 Add DownloadManager Test Bug 3030013 Exercise DownloadManager's enqueue, query, remove methods, and the ACTION_DOWNLOAD_COMPLETE broadcast receiver. Change-Id: I93202e99850a9225fcbe76408a59be0b97df5fcc commit ddc877650719c47922df7b29bc9d2fad817057ee Author: Svetoslav Ganov Date: Fri Apr 15 21:51:05 2011 -0700 Updated CTS tests due to API change - touch exploration. Change-Id: Ib196b0a35d5aa9d96dcda08d2f2a4168bea33220 commit 637c09def32b35c5723fad1b3aa8a35cfb0fc230 Merge: 22be140 b8f6bc9 Author: Brian Muramatsu Date: Mon Apr 18 03:26:19 2011 -0700 am b8f6bc98: am 0b1af447: am a2133d31: am 80d4a560: Increment CTS Version to 3.0_r2 * commit 'b8f6bc98e7f3caa7559e945c5c507999fdddf0b4': Increment CTS Version to 3.0_r2 commit 22be14049c9299079387e3da781811f3c00509de Merge: 5ccc455 085ab63 Author: Brian Muramatsu Date: Mon Apr 18 03:26:17 2011 -0700 am 085ab636: am d6ad59ae: am 51c66b1b: am 45ad581c: Merge remote branch \'goog/gingerbread\' into manualmerge * commit '085ab6369efcb5b99b7db0452126d2e191d69604': commit 5ccc4553ac7bde1f6249cd7e1635f26dbc3a4ac1 Merge: 05dde7f 4056c9e Author: Brian Muramatsu Date: Mon Apr 18 03:26:12 2011 -0700 am 4056c9ed: am 1fef6339: am cd49b84b: resolved conflicts for merge of a5b9e3eb to honeycomb-mr1 * commit '4056c9ed07af3098430287b3f891671b6557db5e': Suppress GestureDetectorTest commit b8f6bc98e7f3caa7559e945c5c507999fdddf0b4 Merge: 085ab63 0b1af44 Author: Brian Muramatsu Date: Mon Apr 18 03:17:52 2011 -0700 am 0b1af447: am a2133d31: am 80d4a560: Increment CTS Version to 3.0_r2 * commit '0b1af4477131820a02263083fc824c720a315e84': Increment CTS Version to 3.0_r2 commit 085ab6369efcb5b99b7db0452126d2e191d69604 Merge: 4056c9e d6ad59a Author: Brian Muramatsu Date: Mon Apr 18 03:17:47 2011 -0700 am d6ad59ae: am 51c66b1b: am 45ad581c: Merge remote branch \'goog/gingerbread\' into manualmerge * commit 'd6ad59ae43591b025a2ed7a438120aa970204a0d': commit 4056c9ed07af3098430287b3f891671b6557db5e Merge: 5fca46c 1fef633 Author: Brian Muramatsu Date: Mon Apr 18 03:17:43 2011 -0700 am 1fef6339: am cd49b84b: resolved conflicts for merge of a5b9e3eb to honeycomb-mr1 * commit '1fef6339b35c7c5e18ec4122fc3019a13cba542a': Suppress GestureDetectorTest commit 0b1af4477131820a02263083fc824c720a315e84 Merge: d6ad59a a2133d3 Author: Brian Muramatsu Date: Mon Apr 18 03:08:30 2011 -0700 am a2133d31: am 80d4a560: Increment CTS Version to 3.0_r2 * commit 'a2133d31d1a7ec057d782c02cf06c21d97d001bb': Increment CTS Version to 3.0_r2 commit d6ad59ae43591b025a2ed7a438120aa970204a0d Merge: 1fef633 51c66b1 Author: Brian Muramatsu Date: Mon Apr 18 03:08:25 2011 -0700 am 51c66b1b: am 45ad581c: Merge remote branch \'goog/gingerbread\' into manualmerge * commit '51c66b1b310d1e803da47fbe89bc9c79ec56a31b': Parallelize Test Description Generalization Remove RequiredFeatures Annotation Server thread may not update the current value immediately after request url on testAccessLoadsImagesAutomatically case. Solution: Add one second delay before assert function. EGL Config Test Allow saving log files in different directory StartPreview only after setting fps range paramters Fix for the handling of SMS Delivery Report in case of CDMA network Fix WifiInfoTest Remove Unused Spec Progress Tool Fix Build Fix CtsTelephonyTestCases:PhoneNumberUtilsTest--testCallMethods fails due to PhoneNumberUtils MIN_MATCH set to 11 for China region ship Added sleep within testGetAndSetMasterSyncAutomatically. commit 1fef6339b35c7c5e18ec4122fc3019a13cba542a Merge: 04a0d1b cd49b84 Author: Brian Muramatsu Date: Mon Apr 18 03:08:23 2011 -0700 am cd49b84b: resolved conflicts for merge of a5b9e3eb to honeycomb-mr1 * commit 'cd49b84b2cbfc105d0c97fbff81ea3c7aac4c289': Suppress GestureDetectorTest commit 05dde7f454340af20972abe1437eaf1ab97c1cef Merge: 4263db4 5fca46c Author: Brian Muramatsu Date: Fri Apr 15 17:33:22 2011 -0700 am 5fca46cb: am 7ada28d0: am d45ab47a: am cd71a272: Merge "Merge remote branch \'korg/froyo\' into manualmerge" into gingerbread * commit '5fca46cbd13aefc9c5697ad593796b3432e5a309': Fix Build Fix CtsTelephonyTestCases:PhoneNumberUtilsTest--testCallMethods fails due to PhoneNumberUtils MIN_MATCH set to 11 for China region ship Added sleep within testGetAndSetMasterSyncAutomatically. commit 5fca46cbd13aefc9c5697ad593796b3432e5a309 Merge: 602571e 7ada28d Author: Brian Muramatsu Date: Fri Apr 15 17:28:45 2011 -0700 am 7ada28d0: am d45ab47a: am cd71a272: Merge "Merge remote branch \'korg/froyo\' into manualmerge" into gingerbread * commit '7ada28d059e956664d25ca8fd699e6d03c3e1bee': Fix Build Fix CtsTelephonyTestCases:PhoneNumberUtilsTest--testCallMethods fails due to PhoneNumberUtils MIN_MATCH set to 11 for China region ship Added sleep within testGetAndSetMasterSyncAutomatically. commit a2133d31d1a7ec057d782c02cf06c21d97d001bb Merge: 51c66b1 80d4a56 Author: Brian Muramatsu Date: Fri Apr 15 15:46:55 2011 -0700 am 80d4a560: Increment CTS Version to 3.0_r2 * commit '80d4a560dd00759647842cfecca5ca40a5e2c4a4': Increment CTS Version to 3.0_r2 commit 80d4a560dd00759647842cfecca5ca40a5e2c4a4 Author: Brian Muramatsu Date: Fri Apr 15 15:42:34 2011 -0700 Increment CTS Version to 3.0_r2 Change-Id: I4994746a3fd2dcd9d41b4939f7f7c2c2cab3c821 commit 51c66b1b310d1e803da47fbe89bc9c79ec56a31b Merge: cd49b84 45ad581 Author: Brian Muramatsu Date: Fri Apr 15 15:30:13 2011 -0700 am 45ad581c: Merge remote branch \'goog/gingerbread\' into manualmerge * commit '45ad581cadd0d13b75a48dd1d2091a024aa2fe41': Parallelize Test Description Generalization Remove RequiredFeatures Annotation Server thread may not update the current value immediately after request url on testAccessLoadsImagesAutomatically case. Solution: Add one second delay before assert function. EGL Config Test Allow saving log files in different directory StartPreview only after setting fps range paramters Fix for the handling of SMS Delivery Report in case of CDMA network Fix WifiInfoTest Remove Unused Spec Progress Tool Fix Build Fix CtsTelephonyTestCases:PhoneNumberUtilsTest--testCallMethods fails due to PhoneNumberUtils MIN_MATCH set to 11 for China region ship Added sleep within testGetAndSetMasterSyncAutomatically. commit 4263db43b12c670603c1fbac33d9555fd991381b Author: Brett Chabot Date: Fri Apr 15 13:51:48 2011 -0700 Fix cts-tradefed sharding. Change test apk handling to dynamically find the path of the apk to install. Also move setting of collect tests timeout to TestPackageDef. Bug 4298643 Change-Id: I42b81e6304dfd25768636c279cbb2f3f0f9e0cce commit 7ada28d059e956664d25ca8fd699e6d03c3e1bee Merge: b37f255 d45ab47 Author: Brian Muramatsu Date: Fri Apr 15 15:14:55 2011 -0700 am d45ab47a: am cd71a272: Merge "Merge remote branch \'korg/froyo\' into manualmerge" into gingerbread * commit 'd45ab47a58e1d9a25f4632650c5319b1f7b08323': Fix Build Fix CtsTelephonyTestCases:PhoneNumberUtilsTest--testCallMethods fails due to PhoneNumberUtils MIN_MATCH set to 11 for China region ship Added sleep within testGetAndSetMasterSyncAutomatically. commit 45ad581cadd0d13b75a48dd1d2091a024aa2fe41 Merge: a5b9e3e d45ab47 Author: Brian Muramatsu Date: Fri Apr 15 14:57:34 2011 -0700 Merge remote branch 'goog/gingerbread' into manualmerge commit d45ab47a58e1d9a25f4632650c5319b1f7b08323 Merge: 2a0a525 cd71a27 Author: Brian Muramatsu Date: Fri Apr 15 14:53:04 2011 -0700 am cd71a272: Merge "Merge remote branch \'korg/froyo\' into manualmerge" into gingerbread * commit 'cd71a272fbe574349bd27337fa24130ca3734dbb': Fix Build Fix CtsTelephonyTestCases:PhoneNumberUtilsTest--testCallMethods fails due to PhoneNumberUtils MIN_MATCH set to 11 for China region ship Added sleep within testGetAndSetMasterSyncAutomatically. commit cd49b84b2cbfc105d0c97fbff81ea3c7aac4c289 Merge: bbcc4ed a5b9e3e Author: Brian Muramatsu Date: Fri Apr 15 14:36:46 2011 -0700 resolved conflicts for merge of a5b9e3eb to honeycomb-mr1 Change-Id: Ibb83d18811099872fa30c2ee6cb90a3fd5f8e163 commit cd71a272fbe574349bd27337fa24130ca3734dbb Merge: b859e6a 35f156f Author: Brian Muramatsu Date: Fri Apr 15 14:20:21 2011 -0700 Merge "Merge remote branch 'korg/froyo' into manualmerge" into gingerbread commit 35f156f19ce6ad4e2645a6c1dfccad71d98e81e7 Merge: b859e6a ca3c1fa Author: Brian Muramatsu Date: Fri Apr 15 14:08:45 2011 -0700 Merge remote branch 'korg/froyo' into manualmerge commit a5b9e3ebc2c6d800c53325df9e0ad55a6608ae94 Author: Brian Muramatsu Date: Fri Apr 15 13:54:02 2011 -0700 Suppress GestureDetectorTest It is pretty flaky. Needs investigation. Change-Id: I7486c77eeafc6d9b7cb18342ebda293cd947c6e9 commit 748455d9de384420cf0a74f1c8ca77c10ced5f76 Merge: 44e82d6 602571e Author: Brian Muramatsu Date: Thu Apr 14 16:08:21 2011 -0700 am 602571ed: am b37f255d: am 2a0a5251: am b859e6af: Merge "Parallelize Test Description Generalization" into gingerbread * commit '602571ed63897418721b782939387c185bbf1067': Parallelize Test Description Generalization commit 602571ed63897418721b782939387c185bbf1067 Merge: 5c2f95c b37f255 Author: Brian Muramatsu Date: Thu Apr 14 16:05:58 2011 -0700 am b37f255d: am 2a0a5251: am b859e6af: Merge "Parallelize Test Description Generalization" into gingerbread * commit 'b37f255d69334b3391a8fed6071568c269b26637': Parallelize Test Description Generalization commit b37f255d69334b3391a8fed6071568c269b26637 Merge: 8b77646 2a0a525 Author: Brian Muramatsu Date: Thu Apr 14 15:51:52 2011 -0700 am 2a0a5251: am b859e6af: Merge "Parallelize Test Description Generalization" into gingerbread * commit '2a0a5251a1e36fb2176c4a4c5be61a3022d0322d': Parallelize Test Description Generalization commit 2a0a5251a1e36fb2176c4a4c5be61a3022d0322d Merge: ffcd2e4 b859e6a Author: Brian Muramatsu Date: Thu Apr 14 15:28:56 2011 -0700 am b859e6af: Merge "Parallelize Test Description Generalization" into gingerbread * commit 'b859e6afb1ec3128fecbdf455ca32aca032dc187': Parallelize Test Description Generalization commit b859e6afb1ec3128fecbdf455ca32aca032dc187 Merge: d90835a 9157e0a Author: Brian Muramatsu Date: Thu Apr 14 15:07:53 2011 -0700 Merge "Parallelize Test Description Generalization" into gingerbread commit 9157e0a2dfd69d36f67fb09d43f8fa4eb809c219 Author: Brian Muramatsu Date: Tue Apr 5 18:06:15 2011 -0700 Parallelize Test Description Generalization Shaves off 1 minute from the CTS build process on my machine. Instead of serially creating an XML for each framework package create them in parallel to distribute the JavaDoc processes across the CPU's cores. Change-Id: Ie4a14d7821a7206a5b189fab46e391c99b066c51 commit 44e82d6bb01f221585ccb48b890d96770584a741 Merge: 1261372 5c2f95c Author: Brian Muramatsu Date: Thu Apr 14 14:39:17 2011 -0700 resolved conflicts for merge of 5c2f95ca to master Change-Id: I1ea30f6a47d50bdd5ce57da53fd5226d1b55bc54 commit 5c2f95cab2aaf1b7ac44b5f452c9984cb852c875 Merge: 9da61b0 8b77646 Author: Brian Muramatsu Date: Thu Apr 14 14:09:36 2011 -0700 am 8b77646f: am ffcd2e48: am d90835a4: Merge "Remove RequiredFeatures Annotation" into gingerbread * commit '8b77646ff7ac846efc59492a5d57360e2733f3a2': Remove RequiredFeatures Annotation commit 8b77646ff7ac846efc59492a5d57360e2733f3a2 Merge: 2ed27a6 ffcd2e4 Author: Brian Muramatsu Date: Thu Apr 14 14:03:31 2011 -0700 am ffcd2e48: am d90835a4: Merge "Remove RequiredFeatures Annotation" into gingerbread * commit 'ffcd2e4895b5429e7cee2ef372fc1474d8656678': Remove RequiredFeatures Annotation commit ffcd2e4895b5429e7cee2ef372fc1474d8656678 Merge: 600217b d90835a Author: Brian Muramatsu Date: Thu Apr 14 13:54:15 2011 -0700 am d90835a4: Merge "Remove RequiredFeatures Annotation" into gingerbread * commit 'd90835a42c8a487c3f992c009c975e8bc99a3c2c': Remove RequiredFeatures Annotation commit d90835a42c8a487c3f992c009c975e8bc99a3c2c Merge: 79d16de c4c8071 Author: Brian Muramatsu Date: Thu Apr 14 13:39:19 2011 -0700 Merge "Remove RequiredFeatures Annotation" into gingerbread commit 1261372e57764ac6261a5af52c747157daeeb2b9 Merge: 3adef8b 9da61b0 Author: Brian Muramatsu Date: Thu Apr 14 12:52:43 2011 -0700 am 9da61b0b: am 2ed27a60: am 600217bc: am 79d16de8: Merge "Remove Unused Spec Progress Tool" into gingerbread * commit '9da61b0b46b671322698eff558d2ce2e63a478db': Remove Unused Spec Progress Tool commit 9da61b0b46b671322698eff558d2ce2e63a478db Merge: dc1cb10 2ed27a6 Author: Brian Muramatsu Date: Thu Apr 14 12:49:53 2011 -0700 am 2ed27a60: am 600217bc: am 79d16de8: Merge "Remove Unused Spec Progress Tool" into gingerbread * commit '2ed27a606722d0f2a5febb52ce969b0d7bd065a4': Remove Unused Spec Progress Tool commit 2ed27a606722d0f2a5febb52ce969b0d7bd065a4 Merge: b72d910 600217b Author: Brian Muramatsu Date: Thu Apr 14 12:45:32 2011 -0700 am 600217bc: am 79d16de8: Merge "Remove Unused Spec Progress Tool" into gingerbread * commit '600217bccad28ee655e5d323f7d0c448b9112689': Remove Unused Spec Progress Tool commit 600217bccad28ee655e5d323f7d0c448b9112689 Merge: 0da930b 79d16de Author: Brian Muramatsu Date: Thu Apr 14 12:38:21 2011 -0700 am 79d16de8: Merge "Remove Unused Spec Progress Tool" into gingerbread * commit '79d16de81929a7dc8050b400ce9edf7eeb9265e3': Remove Unused Spec Progress Tool commit c4c8071a3eae11c53e844f51fd39aeb56ae91e0d Author: Brian Muramatsu Date: Tue Apr 5 12:31:24 2011 -0700 Remove RequiredFeatures Annotation Remove the annotation since its presence is confusing. The proper way is to just use the PackageManager#hasSystemFeature check along with any other API methods. Change-Id: I8e29b62a95c48c11939c52cf5a5270f5006d7a3a commit 79d16de81929a7dc8050b400ce9edf7eeb9265e3 Merge: 788b2a8 cde1cbd Author: Brian Muramatsu Date: Thu Apr 14 12:16:23 2011 -0700 Merge "Remove Unused Spec Progress Tool" into gingerbread commit 3adef8b6af8ec9e61e7a5d18e52c1f2ff42b9b0e Merge: fdefc34 9cdd6f0 Author: Steve Block Date: Thu Apr 14 11:07:39 2011 -0700 Merge "CTS Tests to ensure WebDriver#get is blocking." commit 9cdd6f0af6c176626cd8a5822780106ce7b74305 Author: Dounia Berrada Date: Tue Feb 15 12:13:05 2011 -0800 CTS Tests to ensure WebDriver#get is blocking. Bug: 3457555 Change-Id: I59f004ebb125a3e164530ce2358bb6eec02f22f3 commit fdefc342baaa9a47d928f983e90a6e51b12a7470 Merge: 2684fae dc1cb10 Author: Brian Muramatsu Date: Wed Apr 13 16:12:59 2011 -0700 am dc1cb109: am b72d910b: am 0da930ba: am 788b2a86: Merge "Server thread may not update the current value immediately after request url on testAccessLoadsImagesAutomatically case. Solution: Add one second delay before assert function." into gingerbread * commit 'dc1cb10906f29643380c889c135216973d7d5d40': Server thread may not update the current value immediately after request url on testAccessLoadsImagesAutomatically case. Solution: Add one second delay before assert function. commit dc1cb10906f29643380c889c135216973d7d5d40 Merge: adcaa74 b72d910 Author: Brian Muramatsu Date: Wed Apr 13 16:10:30 2011 -0700 am b72d910b: am 0da930ba: am 788b2a86: Merge "Server thread may not update the current value immediately after request url on testAccessLoadsImagesAutomatically case. Solution: Add one second delay before assert function." into gingerbread * commit 'b72d910bc86ef5bb3dfa470cfb2457bc98e1d06b': Server thread may not update the current value immediately after request url on testAccessLoadsImagesAutomatically case. Solution: Add one second delay before assert function. commit b72d910bc86ef5bb3dfa470cfb2457bc98e1d06b Merge: aefe5ba 0da930b Author: Brian Muramatsu Date: Wed Apr 13 15:52:43 2011 -0700 am 0da930ba: am 788b2a86: Merge "Server thread may not update the current value immediately after request url on testAccessLoadsImagesAutomatically case. Solution: Add one second delay before assert function." into gingerbread * commit '0da930baadb376c95dad0b9ae331ccfc110cf52e': Server thread may not update the current value immediately after request url on testAccessLoadsImagesAutomatically case. Solution: Add one second delay before assert function. commit 0da930baadb376c95dad0b9ae331ccfc110cf52e Merge: 7dfc0c5 788b2a8 Author: Brian Muramatsu Date: Wed Apr 13 14:57:01 2011 -0700 am 788b2a86: Merge "Server thread may not update the current value immediately after request url on testAccessLoadsImagesAutomatically case. Solution: Add one second delay before assert function." into gingerbread * commit '788b2a867c97df8374b55aa2469f991135036ada': Server thread may not update the current value immediately after request url on testAccessLoadsImagesAutomatically case. Solution: Add one second delay before assert function. commit 788b2a867c97df8374b55aa2469f991135036ada Merge: f539c76 5f4f0f6 Author: Brian Muramatsu Date: Wed Apr 13 14:37:55 2011 -0700 Merge "Server thread may not update the current value immediately after request url on testAccessLoadsImagesAutomatically case. Solution: Add one second delay before assert function." into gingerbread commit 5f4f0f659f6045a433f3727cde30b98c762e7576 Author: sam_chiu Date: Mon Apr 11 20:46:32 2011 +0800 Server thread may not update the current value immediately after request url on testAccessLoadsImagesAutomatically case. Solution: Add one second delay before assert function. Change-Id: I8aaf8b2f8436732ddcaf6181f8e1c5007b267269 commit ca3c1fafab0c8a214e2e6d141ba2c9077318db42 Merge: 20e63d9 6fb8aec Author: Brian Muramatsu Date: Tue Apr 12 16:39:15 2011 -0700 Merge "Fix CtsTelephonyTestCases:PhoneNumberUtilsTest--testCallMethods fails due to PhoneNumberUtils MIN_MATCH set to 11 for China region ship" into froyo commit 2684fae856d4e476936dc2198b40d03e727cd8a0 Merge: e12fe1c adcaa74 Author: Brian Muramatsu Date: Tue Apr 12 16:31:51 2011 -0700 am adcaa74c: am aefe5bac: am 7dfc0c5f: am f539c76a: Merge "EGL Config Test" into gingerbread * commit 'adcaa74c8a3e1e7be49e2e8f31fab5cdd327881c': EGL Config Test commit adcaa74c8a3e1e7be49e2e8f31fab5cdd327881c Merge: 3002430 aefe5ba Author: Brian Muramatsu Date: Tue Apr 12 16:28:55 2011 -0700 am aefe5bac: am 7dfc0c5f: am f539c76a: Merge "EGL Config Test" into gingerbread * commit 'aefe5bac3b78c25e809256fa1edf9d6b4703e53c': EGL Config Test commit aefe5bac3b78c25e809256fa1edf9d6b4703e53c Merge: ea7cc62 7dfc0c5 Author: Brian Muramatsu Date: Tue Apr 12 16:26:11 2011 -0700 am 7dfc0c5f: am f539c76a: Merge "EGL Config Test" into gingerbread * commit '7dfc0c5faa1d9bf9fca71a82917faed75ad5c6ac': EGL Config Test commit 7dfc0c5faa1d9bf9fca71a82917faed75ad5c6ac Merge: a824e5e f539c76 Author: Brian Muramatsu Date: Tue Apr 12 16:23:07 2011 -0700 am f539c76a: Merge "EGL Config Test" into gingerbread * commit 'f539c76ae4beea7f5dd6d4bd19d8e4329702e149': EGL Config Test commit f539c76ae4beea7f5dd6d4bd19d8e4329702e149 Merge: 3f9dc7a eb064ef Author: Brian Muramatsu Date: Tue Apr 12 16:07:19 2011 -0700 Merge "EGL Config Test" into gingerbread commit eb064ef496e543545026c7bdc3857d27c0ea0753 Author: Brian Muramatsu Date: Fri Dec 17 15:08:14 2010 -0800 EGL Config Test Bug 3184998 Get the EGL configurations that have the EGL_WINDOW_BIT enabled and try to create a GLSurfaceView and draw a red or blue triangle on it... if any of them crash then fail! Change-Id: I88a13b268c136b0c24bed7f761632ee5ca5c8724 commit e12fe1ca8b3f477e460b3aea513e4dd115c353ab Merge: 209367e 3002430 Author: Brian Muramatsu Date: Tue Apr 12 13:28:00 2011 -0700 am 30024304: am ea7cc620: am a824e5e4: am 3f9dc7ae: Merge "Allow saving log files in different directory" into gingerbread * commit '30024304a23729f2bd8a47659ec83ad76839ba84': Allow saving log files in different directory commit 209367e1746767e83eba2f802135f8ba55351be0 Merge: e2cf33b 7c769bb Author: Brian Muramatsu Date: Tue Apr 12 13:27:58 2011 -0700 am 7c769bbf: am 0462b64d: am de6ac8e5: am c6e249db: Merge "StartPreview only after setting fps range paramters" into gingerbread * commit '7c769bbfd7d12f9b9c046058f91e11da69833a5c': StartPreview only after setting fps range paramters commit e2cf33b4ddfcace89709dafcc7c8320d2f78d171 Merge: 724bdad b261279 Author: Brian Muramatsu Date: Tue Apr 12 13:27:55 2011 -0700 am b2612792: am 316639d1: am 9b530c95: am 104ff51a: Merge "Fix for the handling of SMS Delivery Report in case of CDMA network" into gingerbread * commit 'b26127929d900bc5a1d8c8af68e74332be4ef6e8': Fix for the handling of SMS Delivery Report in case of CDMA network commit 30024304a23729f2bd8a47659ec83ad76839ba84 Merge: 7c769bb ea7cc62 Author: Brian Muramatsu Date: Tue Apr 12 13:18:58 2011 -0700 am ea7cc620: am a824e5e4: am 3f9dc7ae: Merge "Allow saving log files in different directory" into gingerbread * commit 'ea7cc62004a6ddf17745452285566cbd246ded01': Allow saving log files in different directory commit 7c769bbfd7d12f9b9c046058f91e11da69833a5c Merge: b261279 0462b64 Author: Brian Muramatsu Date: Tue Apr 12 13:18:35 2011 -0700 am 0462b64d: am de6ac8e5: am c6e249db: Merge "StartPreview only after setting fps range paramters" into gingerbread * commit '0462b64d957c6333ef7989d62df47dc017941ce6': StartPreview only after setting fps range paramters commit b26127929d900bc5a1d8c8af68e74332be4ef6e8 Merge: 31a36bc 316639d Author: Brian Muramatsu Date: Tue Apr 12 13:18:22 2011 -0700 am 316639d1: am 9b530c95: am 104ff51a: Merge "Fix for the handling of SMS Delivery Report in case of CDMA network" into gingerbread * commit '316639d175b81c3961947dbf49a496677f0e4cf0': Fix for the handling of SMS Delivery Report in case of CDMA network commit ea7cc62004a6ddf17745452285566cbd246ded01 Merge: 0462b64 a824e5e Author: Brian Muramatsu Date: Tue Apr 12 13:06:27 2011 -0700 am a824e5e4: am 3f9dc7ae: Merge "Allow saving log files in different directory" into gingerbread * commit 'a824e5e43060de30fb13beec53d5ef1afa494533': Allow saving log files in different directory commit a824e5e43060de30fb13beec53d5ef1afa494533 Merge: de6ac8e 3f9dc7a Author: Brian Muramatsu Date: Tue Apr 12 12:59:15 2011 -0700 am 3f9dc7ae: Merge "Allow saving log files in different directory" into gingerbread * commit '3f9dc7ae87c47c76d5441e1ba39459bb45112fa3': Allow saving log files in different directory commit 0462b64d957c6333ef7989d62df47dc017941ce6 Merge: 316639d de6ac8e Author: Brian Muramatsu Date: Tue Apr 12 12:57:52 2011 -0700 am de6ac8e5: am c6e249db: Merge "StartPreview only after setting fps range paramters" into gingerbread * commit 'de6ac8e537bcf4fe9286641d91d684c83fbb9ce8': StartPreview only after setting fps range paramters commit 3f9dc7ae87c47c76d5441e1ba39459bb45112fa3 Merge: c6e249d 6a259f4 Author: Brian Muramatsu Date: Tue Apr 12 12:51:38 2011 -0700 Merge "Allow saving log files in different directory" into gingerbread commit 6a259f47ea4aa0c7ebb5fba160328b2a25f38d24 Author: Kan-Ru Chen Date: Fri Apr 8 16:35:19 2011 +0800 Allow saving log files in different directory If TestLog path is not specified, then use ConfigRoot instead to retain old behavior. Change-Id: Icf07fb8555192c8eb3722bc5fdc792000a764669 commit de6ac8e537bcf4fe9286641d91d684c83fbb9ce8 Merge: 9b530c9 c6e249d Author: Brian Muramatsu Date: Tue Apr 12 12:40:54 2011 -0700 am c6e249db: Merge "StartPreview only after setting fps range paramters" into gingerbread * commit 'c6e249dbfed02705db35838cabb7208e0f1efe59': StartPreview only after setting fps range paramters commit c6e249dbfed02705db35838cabb7208e0f1efe59 Merge: 104ff51 1c100c9 Author: Brian Muramatsu Date: Tue Apr 12 12:06:11 2011 -0700 Merge "StartPreview only after setting fps range paramters" into gingerbread commit 724bdad8e180d74e1c23479f9cd0657c7bbd44f7 Merge: c6a5c66 4db7c51 Author: Gilles Debunne Date: Tue Apr 12 11:02:54 2011 -0700 Merge "Modified word iterator tests." commit c6a5c663c9d20d1e118ce82917e85280268ca289 Merge: 6b7168f 31a36bc Author: Brian Muramatsu Date: Mon Apr 11 17:38:39 2011 -0700 am 31a36bc7: am 5a1b76b8: am 721aea44: am 1ebfc31a: Merge "Fix WifiInfoTest" into gingerbread * commit '31a36bc7bccd56b81634214c5695bf4e57773616': Fix WifiInfoTest commit 31a36bc7bccd56b81634214c5695bf4e57773616 Merge: d8eab09 5a1b76b Author: Brian Muramatsu Date: Mon Apr 11 17:32:52 2011 -0700 am 5a1b76b8: am 721aea44: am 1ebfc31a: Merge "Fix WifiInfoTest" into gingerbread * commit '5a1b76b822420df5baf69701f1da1bfecc16cae0': Fix WifiInfoTest commit 6b7168fd60fcb77a61de92661ed799c7812e3bdf Merge: e9df3d9 d8eab09 Author: Irfan Sheriff Date: Mon Apr 11 17:32:34 2011 -0700 am d8eab09d: am 681998e8: am 2a6a63e1: Merge "Fix WifiInfoTest" into gingerbread * commit 'd8eab09d173d04db554ad0078eb5e20f163fe19e': commit d8eab09d173d04db554ad0078eb5e20f163fe19e Merge: fe459fb 681998e Author: Irfan Sheriff Date: Mon Apr 11 17:25:50 2011 -0700 am 681998e8: am 2a6a63e1: Merge "Fix WifiInfoTest" into gingerbread * commit '681998e818012d305d6192c864cda766eead2d2f': commit 316639d175b81c3961947dbf49a496677f0e4cf0 Merge: 5a1b76b 9b530c9 Author: Brian Muramatsu Date: Mon Apr 11 16:48:35 2011 -0700 am 9b530c95: am 104ff51a: Merge "Fix for the handling of SMS Delivery Report in case of CDMA network" into gingerbread * commit '9b530c95a6d8b36ff4cc95af8549bd138a07388e': Fix for the handling of SMS Delivery Report in case of CDMA network commit e9df3d9b0448218f3731fa2f2931f8a10e84c10b Merge: 9a01cc3 fe459fb Author: Brian Muramatsu Date: Mon Apr 11 16:45:43 2011 -0700 am fe459fb8: am 04a0d1be: am bbcc4ed4: am ecfe69a4: Check More Build Constants * commit 'fe459fb862c4d0778e94abf05d0d845c1df4cb19': Check More Build Constants commit fe459fb862c4d0778e94abf05d0d845c1df4cb19 Merge: d7c6a7d 04a0d1b Author: Brian Muramatsu Date: Mon Apr 11 16:42:48 2011 -0700 am 04a0d1be: am bbcc4ed4: am ecfe69a4: Check More Build Constants * commit '04a0d1beaf1eab015cf47afbde3edeb2f1a3bdad': Check More Build Constants commit 04a0d1beaf1eab015cf47afbde3edeb2f1a3bdad Merge: 996d917 bbcc4ed Author: Brian Muramatsu Date: Mon Apr 11 16:25:55 2011 -0700 am bbcc4ed4: am ecfe69a4: Check More Build Constants * commit 'bbcc4ed4934a8b2faae5eabcb96fb6816de9b03c': Check More Build Constants commit bbcc4ed4934a8b2faae5eabcb96fb6816de9b03c Merge: 706b9e3 ecfe69a Author: Brian Muramatsu Date: Mon Apr 11 16:18:41 2011 -0700 am ecfe69a4: Check More Build Constants * commit 'ecfe69a475e08f13217b0de0495568912379f441': Check More Build Constants commit 9a01cc3563310681bc6ed15211debe24d15d0b76 Merge: e9061b1 61bd88c Author: Brian Muramatsu Date: Mon Apr 11 16:18:11 2011 -0700 Merge "Convert current.txt to XML for CtsApiCoverage Tool" commit 9b530c95a6d8b36ff4cc95af8549bd138a07388e Merge: 721aea4 104ff51 Author: Brian Muramatsu Date: Mon Apr 11 15:58:44 2011 -0700 am 104ff51a: Merge "Fix for the handling of SMS Delivery Report in case of CDMA network" into gingerbread * commit '104ff51a3ef98de6a6f093e7ad42240e888654f2': Fix for the handling of SMS Delivery Report in case of CDMA network commit 61bd88cae0d8f3d389942d9092d5c5da9fc72ed4 Author: Brian Muramatsu Date: Mon Apr 11 13:48:08 2011 -0700 Convert current.txt to XML for CtsApiCoverage Tool Bug 4268576 This didn't break the build, because its only built as part of the dist target and master does not have a CTS build yet. Fix variables to be lower case when possible. I'll ask for one after I check this in! Change-Id: I0c2c96db3563630bc1f700911935eea60bfe99a7 commit e9061b10259064c042b704824de432bf171c0c80 Merge: d0a3a79 d7c6a7d Author: Brian Muramatsu Date: Mon Apr 11 15:08:10 2011 -0700 am d7c6a7da: am f7101d0c: am ac020cc2: am fb81f20d: Merge "Update NO_DELIVERY_REPORTS list." into gingerbread * commit 'd7c6a7da0d7b22abc79c37f8482ce938f04716cc': commit d7c6a7da0d7b22abc79c37f8482ce938f04716cc Merge: fa8a5ad f7101d0 Author: Brian Muramatsu Date: Mon Apr 11 14:55:25 2011 -0700 am f7101d0c: am ac020cc2: am fb81f20d: Merge "Update NO_DELIVERY_REPORTS list." into gingerbread * commit 'f7101d0c26902b14fe11362d6e1e607b7faf5169': commit d0a3a79daed295c962bfd561664334cef5060045 Merge: a04332c fa8a5ad Author: Brian Muramatsu Date: Mon Apr 11 14:50:27 2011 -0700 am fa8a5adb: am e4ae870e: am ec247735: am e7584a7d: Merge "Remove Test Annotation Related Tools" into gingerbread * commit 'fa8a5adb5065c978f71a423d41bc8228d7b73a29': commit a04332ce77900ac6509a69a3a626b3e5d22e60a9 Merge: 97cdfd5 d56d347 Author: Brian Muramatsu Date: Mon Apr 11 14:50:26 2011 -0700 am d56d3479: am 13ab4e16: am 1fc4bca6: am 5c1a3034: Merge "Update Expectations File" into gingerbread * commit 'd56d3479adbfe7aa220bf224403cc6923f7dbcd8': commit 97cdfd52a73ae9715692147622c23fd6ef849138 Merge: fd4394e 766f81f Author: Brian Muramatsu Date: Mon Apr 11 14:50:23 2011 -0700 am 766f81ff: am 03a0d13f: am 46885106: am a75737b0: Merge "Clean Up VideoViewTest" into gingerbread * commit '766f81ff134070c4be8d1ffedaa760ad81cc57f4': commit fa8a5adb5065c978f71a423d41bc8228d7b73a29 Merge: d56d347 e4ae870 Author: Brian Muramatsu Date: Mon Apr 11 14:46:09 2011 -0700 am e4ae870e: am ec247735: am e7584a7d: Merge "Remove Test Annotation Related Tools" into gingerbread * commit 'e4ae870e58d4882ac0cd94b56926c451325c5af2': commit d56d3479adbfe7aa220bf224403cc6923f7dbcd8 Merge: 766f81f 13ab4e1 Author: Brian Muramatsu Date: Mon Apr 11 14:46:06 2011 -0700 am 13ab4e16: am 1fc4bca6: am 5c1a3034: Merge "Update Expectations File" into gingerbread * commit '13ab4e166ccf40536a5bdc109e9e36638d84a0d0': commit 766f81ff134070c4be8d1ffedaa760ad81cc57f4 Merge: a32c677 03a0d13 Author: Brian Muramatsu Date: Mon Apr 11 14:46:01 2011 -0700 am 03a0d13f: am 46885106: am a75737b0: Merge "Clean Up VideoViewTest" into gingerbread * commit '03a0d13f0743961e5c6052352dc8ba0b0534536a': commit 104ff51a3ef98de6a6f093e7ad42240e888654f2 Merge: 1ebfc31 7e46495 Author: Brian Muramatsu Date: Mon Apr 11 13:57:50 2011 -0700 Merge "Fix for the handling of SMS Delivery Report in case of CDMA network" into gingerbread commit ecfe69a475e08f13217b0de0495568912379f441 Author: Brian Muramatsu Date: Mon Apr 11 11:23:41 2011 -0700 Check More Build Constants Add checks for HARDWARE and MANUFACTURER. Change-Id: I0034ad6950c36b785b498b917dafcb876f120d2f commit 1c100c9a1111c5e8063c53f658f82bf3164084bf Author: Akwasi Boateng Date: Mon Apr 11 11:25:24 2011 -0500 StartPreview only after setting fps range paramters Starting the preview before setting fps range causes first supported fps range to be set while preview is running in a different(default) fps range. This can cause teh fps range for the first supported fps range to be inaccurately measured. Signed-off-by: Akwasi Boateng Change-Id: Ica6011f04dde0a5c7d801f94595916b004464d24 commit fd4394ece8df66c3852eb815209f50cfdd575637 Author: Joe Onorato Date: Fri Apr 8 16:05:12 2011 -0700 Since current.xml isn't xml anymore, run the tool to convert it back to XML for SignatureTest. Change-Id: Ie4f76a45be4881764080e637a2f05dd9370a1fb7 commit 7e4649563f634afb75e07e4cfeeb83fea7e52b4b Author: papiya Date: Fri Apr 8 14:38:14 2011 -0700 Fix for the handling of SMS Delivery Report in case of CDMA network Although the carrier MetroPCS has CDMA network,it does not support SMS Delivery report Change-Id: I42fe94627b698f18aacba46afd8d0cad270f17ad Signed-off-by: papiya commit 4db7c51ee43a690afa29384d1b1f6fe0a47af418 Author: Gilles Debunne Date: Fri Apr 8 11:48:16 2011 -0700 Modified word iterator tests. Exercise case where offset is at lenght position, with a 1-character ending word. Change-Id: Ia592451fab0631204bc1f0c5c64e876f60c74a37 commit 1e0cc91644989d3e63a1487dbab5a58c5f293518 Merge: 34ebd01 a32c677 Author: Brian Muramatsu Date: Fri Apr 8 09:29:20 2011 -0700 am a32c677f: am 83fb34ed: am 570ac7fb: am 7aa9fb78: Merge "CTS: Fixes a possible "out of memory" exception" into gingerbread * commit 'a32c677fad0f334fc571f2484a349145673255bb': commit 34ebd01a0c8cdcf2c589a42e8d1d03db6b0ca1c6 Merge: af321ea b87489c Author: Brian Muramatsu Date: Fri Apr 8 09:29:17 2011 -0700 am b87489c4: am 40d7e1e2: am 72f34187: am 49bca3aa: Merge "Adjust Tests to Work without Hinting" into gingerbread * commit 'b87489c4f49ae6b5277f9a22224af0db18e23001': commit a32c677fad0f334fc571f2484a349145673255bb Merge: b87489c 83fb34e Author: Brian Muramatsu Date: Fri Apr 8 09:26:33 2011 -0700 am 83fb34ed: am 570ac7fb: am 7aa9fb78: Merge "CTS: Fixes a possible "out of memory" exception" into gingerbread * commit '83fb34eda35195c399b7e1ea2028c48312791f19': commit b87489c4f49ae6b5277f9a22224af0db18e23001 Merge: 1abad70 40d7e1e Author: Brian Muramatsu Date: Fri Apr 8 09:26:25 2011 -0700 am 40d7e1e2: am 72f34187: am 49bca3aa: Merge "Adjust Tests to Work without Hinting" into gingerbread * commit '40d7e1e27dc8761caf4d3ba5517b51a5a9732d25': commit af321eaec75870f8d1cc1b0b9229768b088301fa Merge: fa1744b b66485b Author: Dianne Hackborn Date: Thu Apr 7 18:40:19 2011 -0700 Merge "Update to take care of new API." commit b66485b5ea99da914cf2a18df81f1c50dbafab51 Author: Dianne Hackborn Date: Thu Apr 7 18:39:04 2011 -0700 Update to take care of new API. Change-Id: I619db56ad84bde1c76f32ad9bd97ae8b1ebee990 commit fa1744be269865a1220b2e7ead80f7f4603dcdf8 Merge: 5770be4 1abad70 Author: Brian Muramatsu Date: Thu Apr 7 16:09:50 2011 -0700 am 1abad70a: (-s ours) am 996d917e: am 706b9e3b: am 82347d99: (-s ours) Merge "DO NOT MERGE Suppress testWindowVisibilityChanged" into honeycomb * commit '1abad70a797b5d9aa9efa61bfb4ddbc3404d119a': DO NOT MERGE Suppress testWindowVisibilityChanged commit 1abad70a797b5d9aa9efa61bfb4ddbc3404d119a Merge: c3e1eca 996d917 Author: Brian Muramatsu Date: Thu Apr 7 16:07:25 2011 -0700 am 996d917e: am 706b9e3b: am 82347d99: (-s ours) Merge "DO NOT MERGE Suppress testWindowVisibilityChanged" into honeycomb * commit '996d917e2404c7a3e9886b2347c21535c6055f53': DO NOT MERGE Suppress testWindowVisibilityChanged commit 996d917e2404c7a3e9886b2347c21535c6055f53 Merge: 5be3e9d 706b9e3 Author: Brian Muramatsu Date: Thu Apr 7 16:05:40 2011 -0700 am 706b9e3b: am 82347d99: (-s ours) Merge "DO NOT MERGE Suppress testWindowVisibilityChanged" into honeycomb * commit '706b9e3b44a09e0dd3ce47bc09db578c44eb6332': DO NOT MERGE Suppress testWindowVisibilityChanged commit 706b9e3b44a09e0dd3ce47bc09db578c44eb6332 Merge: 2ed06bf 82347d9 Author: Brian Muramatsu Date: Thu Apr 7 16:03:29 2011 -0700 am 82347d99: (-s ours) Merge "DO NOT MERGE Suppress testWindowVisibilityChanged" into honeycomb * commit '82347d99182e6cdaf41b622fc2f49ab2b8ccdfa7': DO NOT MERGE Suppress testWindowVisibilityChanged commit 82347d99182e6cdaf41b622fc2f49ab2b8ccdfa7 Merge: e51d644 ffdb751 Author: Brian Muramatsu Date: Thu Apr 7 16:01:23 2011 -0700 Merge "DO NOT MERGE Suppress testWindowVisibilityChanged" into honeycomb commit ffdb751394b163b5044b220bc2bfb33b203cd6af Author: Brian Muramatsu Date: Thu Apr 7 15:51:13 2011 -0700 DO NOT MERGE Suppress testWindowVisibilityChanged Often gets stuck waiting for idle sync... Change-Id: I821d4d935fd853c0774f66a09e52b62a4d1262c6 commit 5a1b76b822420df5baf69701f1da1bfecc16cae0 Merge: 681998e 721aea4 Author: Brian Muramatsu Date: Thu Apr 7 15:24:06 2011 -0700 am 721aea44: am 1ebfc31a: Merge "Fix WifiInfoTest" into gingerbread * commit '721aea44f09cee573525e9529ae7f8a2bfddc92f': Fix WifiInfoTest commit 721aea44f09cee573525e9529ae7f8a2bfddc92f Merge: 2a6a63e 1ebfc31 Author: Brian Muramatsu Date: Thu Apr 7 15:03:45 2011 -0700 am 1ebfc31a: Merge "Fix WifiInfoTest" into gingerbread * commit '1ebfc31a62d1096b5e07d23c8f50da8dc7402b00': Fix WifiInfoTest commit 5770be4b0057f35fa3353026bb45af1b3c834b13 Merge: c1c147d c3e1eca Author: madan ankapura Date: Thu Apr 7 14:51:12 2011 -0700 am c3e1ecaf: am 5be3e9d2: am 2ed06bfc: am e51d644f: fix the timeout issues for VideoViewTest * commit 'c3e1ecaf4fbdd82b47a37780c5282d420d8c762b': fix the timeout issues for VideoViewTest commit c3e1ecaf4fbdd82b47a37780c5282d420d8c762b Merge: 507e3b7 5be3e9d Author: madan ankapura Date: Thu Apr 7 14:45:19 2011 -0700 am 5be3e9d2: am 2ed06bfc: am e51d644f: fix the timeout issues for VideoViewTest * commit '5be3e9d2147cfb7c100eaab172ebc5f015b4b380': fix the timeout issues for VideoViewTest commit 5be3e9d2147cfb7c100eaab172ebc5f015b4b380 Merge: b089b07 2ed06bf Author: madan ankapura Date: Thu Apr 7 14:42:34 2011 -0700 am 2ed06bfc: am e51d644f: fix the timeout issues for VideoViewTest * commit '2ed06bfc6dedb8beda28e2d796bd35d3c3dadf59': fix the timeout issues for VideoViewTest commit 2ed06bfc6dedb8beda28e2d796bd35d3c3dadf59 Merge: 7619bd8 e51d644 Author: madan ankapura Date: Thu Apr 7 14:39:42 2011 -0700 am e51d644f: fix the timeout issues for VideoViewTest * commit 'e51d644f12cd79f414642284137bd44affd29695': fix the timeout issues for VideoViewTest commit c1c147de7db0f230e0824dc76e2ebd40c5f14a13 Merge: 8665516 cc73c38 Author: Eino-Ville Talvala Date: Thu Apr 7 14:37:48 2011 -0700 Merge "Add timestamp and setting tests into Camera+Surfacetexture CTS." commit 1ebfc31a62d1096b5e07d23c8f50da8dc7402b00 Merge: fb81f20 764a4b5 Author: Brian Muramatsu Date: Thu Apr 7 14:33:23 2011 -0700 Merge "Fix WifiInfoTest" into gingerbread commit e51d644f12cd79f414642284137bd44affd29695 Author: madan ankapura Date: Thu Apr 7 13:16:18 2011 -0700 fix the timeout issues for VideoViewTest increase the timeout as this test is flaky Change-Id: Ice33191db0be40e20a335d8466c7b2238d7c3a33 Signed-off-by: madan ankapura commit cc73c38fc645ed13720228d3b3fab333ea7d231a Author: Eino-Ville Talvala Date: Mon Mar 28 15:15:55 2011 -0700 Add timestamp and setting tests into Camera+Surfacetexture CTS. Includes tests for testing all resolutions, as well as confirming that produced timestamps concur with the camera-reported frame rate ranges. Change-Id: I000b66935e148064acf077c04ba81ef0e792f842 commit 8665516761bae9ed2980721ec94134961cf46c9f Merge: e5c22df 507e3b7 Author: Brian Muramatsu Date: Thu Apr 7 11:54:45 2011 -0700 am 507e3b78: am b089b072: am 7619bd8d: am 7cf399e7: Merge remote branch \'goog/gingerbread\' into manualmerge * commit '507e3b78fba82e71648b52b36102c5d8a0c3b40d': Fix WifiInfoTest Update NO_DELIVERY_REPORTS list. Update Expectations File Remove Test Annotation Related Tools Clean Up VideoViewTest CTS: Fixes a possible "out of memory" exception commit 507e3b78fba82e71648b52b36102c5d8a0c3b40d Merge: f1d1915 b089b07 Author: Brian Muramatsu Date: Thu Apr 7 11:52:48 2011 -0700 am b089b072: am 7619bd8d: am 7cf399e7: Merge remote branch \'goog/gingerbread\' into manualmerge * commit 'b089b072059190e3a2b9b30d2d6587f0010e1776': Fix WifiInfoTest Update NO_DELIVERY_REPORTS list. Update Expectations File Remove Test Annotation Related Tools Clean Up VideoViewTest CTS: Fixes a possible "out of memory" exception commit b089b072059190e3a2b9b30d2d6587f0010e1776 Merge: 89927a9 7619bd8 Author: Brian Muramatsu Date: Thu Apr 7 11:50:36 2011 -0700 am 7619bd8d: am 7cf399e7: Merge remote branch \'goog/gingerbread\' into manualmerge * commit '7619bd8d1434a08e5debcd278a549dba4250a842': Fix WifiInfoTest Update NO_DELIVERY_REPORTS list. Update Expectations File Remove Test Annotation Related Tools Clean Up VideoViewTest CTS: Fixes a possible "out of memory" exception commit e5c22dfc048e0b4700059a6f690b334f1a67fa14 Merge: 2566c5c f1d1915 Author: Brian Muramatsu Date: Thu Apr 7 11:47:04 2011 -0700 am f1d19156: am 89927a97: am 8c20dd03: am 29dc1657: Merge "Remove GestureDetector_SimpleOnGestureListenerTest" into honeycomb * commit 'f1d19156ecc8c92bf0511750a9635188fc0689c0': Remove GestureDetector_SimpleOnGestureListenerTest commit 7619bd8d1434a08e5debcd278a549dba4250a842 Merge: 8c20dd0 7cf399e Author: Brian Muramatsu Date: Thu Apr 7 11:46:59 2011 -0700 am 7cf399e7: Merge remote branch \'goog/gingerbread\' into manualmerge * commit '7cf399e775a7d5bd28cbbef978ab0faa0b6e88b4': Fix WifiInfoTest Update NO_DELIVERY_REPORTS list. Update Expectations File Remove Test Annotation Related Tools Clean Up VideoViewTest CTS: Fixes a possible "out of memory" exception commit f1d19156ecc8c92bf0511750a9635188fc0689c0 Merge: 4341ca8 89927a9 Author: Brian Muramatsu Date: Thu Apr 7 11:41:19 2011 -0700 am 89927a97: am 8c20dd03: am 29dc1657: Merge "Remove GestureDetector_SimpleOnGestureListenerTest" into honeycomb * commit '89927a97ae9f1cfd92d4e849c23cd4f27f50992e': Remove GestureDetector_SimpleOnGestureListenerTest commit 89927a97ae9f1cfd92d4e849c23cd4f27f50992e Merge: 6dc4c1e 8c20dd0 Author: Brian Muramatsu Date: Thu Apr 7 11:36:37 2011 -0700 am 8c20dd03: am 29dc1657: Merge "Remove GestureDetector_SimpleOnGestureListenerTest" into honeycomb * commit '8c20dd0348ee12809dfad611d2fe641abc95bd4e': Remove GestureDetector_SimpleOnGestureListenerTest commit 7cf399e775a7d5bd28cbbef978ab0faa0b6e88b4 Merge: 29dc165 2a6a63e Author: Brian Muramatsu Date: Thu Apr 7 11:30:45 2011 -0700 Merge remote branch 'goog/gingerbread' into manualmerge Conflicts: tests/expectations/knownfailures.txt Change-Id: I9db887535ef970eef0209251460c13b367f23779 commit 8c20dd0348ee12809dfad611d2fe641abc95bd4e Merge: ca49480 29dc165 Author: Brian Muramatsu Date: Thu Apr 7 11:27:52 2011 -0700 am 29dc1657: Merge "Remove GestureDetector_SimpleOnGestureListenerTest" into honeycomb * commit '29dc1657514733ebf6f76f117decc361b82fdad4': Remove GestureDetector_SimpleOnGestureListenerTest commit 29dc1657514733ebf6f76f117decc361b82fdad4 Merge: fe98f4c e94b30f Author: Brian Muramatsu Date: Thu Apr 7 11:17:25 2011 -0700 Merge "Remove GestureDetector_SimpleOnGestureListenerTest" into honeycomb commit 764a4b543dd5a8ed742bffeb5c261ad4b7135ec7 Author: Irfan Sheriff Date: Wed Apr 6 10:21:51 2011 -0700 Fix WifiInfoTest Do not listen to supplicant state change for wifi disable action, instead depend on wifi state changed action Bug: 4242273 Change-Id: Ie53ff42d5e51bbc9f28d93a435fa3315611d342e commit 681998e818012d305d6192c864cda766eead2d2f Merge: f7101d0 2a6a63e Author: Irfan Sheriff Date: Wed Apr 6 19:50:44 2011 -0700 am 2a6a63e1: Merge "Fix WifiInfoTest" into gingerbread * commit '2a6a63e178f030a993f04454e95991acb4fa0472': Fix WifiInfoTest commit 2a6a63e178f030a993f04454e95991acb4fa0472 Merge: ac020cc 9dc717f Author: Irfan Sheriff Date: Wed Apr 6 19:48:48 2011 -0700 Merge "Fix WifiInfoTest" into gingerbread commit 7e6aa18ebc7ae3ea070ef2d78c7546f3976655fc Merge: 570ac7f ac020cc Author: android-merger Date: Wed Apr 6 14:41:02 2011 -0700 keep previous history commit f7101d0c26902b14fe11362d6e1e607b7faf5169 Merge: e4ae870 ac020cc Author: Brian Muramatsu Date: Wed Apr 6 12:01:28 2011 -0700 am ac020cc2: am fb81f20d: Merge "Update NO_DELIVERY_REPORTS list." into gingerbread * commit 'ac020cc2f131f6e2431c2c3d5d5ab8766c3fe7cd': Update NO_DELIVERY_REPORTS list. commit ac020cc2f131f6e2431c2c3d5d5ab8766c3fe7cd Merge: ec24773 fb81f20 Author: Brian Muramatsu Date: Wed Apr 6 11:51:49 2011 -0700 am fb81f20d: Merge "Update NO_DELIVERY_REPORTS list." into gingerbread * commit 'fb81f20d74ae55761e1924b614ce090d655d07f9': Update NO_DELIVERY_REPORTS list. commit fb81f20d74ae55761e1924b614ce090d655d07f9 Merge: e7584a7 da4d076 Author: Brian Muramatsu Date: Wed Apr 6 11:31:24 2011 -0700 Merge "Update NO_DELIVERY_REPORTS list." into gingerbread commit 9dc717f4b0451685fde0c5a1452c0f12573e582e Author: Irfan Sheriff Date: Wed Apr 6 10:21:51 2011 -0700 Fix WifiInfoTest Do not listen to supplicant state change for wifi disable action, instead depend on wifi state changed action Bug: 4242273 Change-Id: Ie53ff42d5e51bbc9f28d93a435fa3315611d342e commit 2566c5c04019b49307138242419d4055e8d50442 Author: Brian Carlstrom Date: Tue Apr 5 21:59:49 2011 -0700 Remove unneeded jclass global variables that were not JNI global references Change-Id: I9ad93bedbb17c8c94b4ee1f2b655a3e6495eb15f commit da4d0766d7c2f8284586d135b1a56bfe4bd6322f Author: papiya Date: Tue Apr 5 15:49:27 2011 -0700 Update NO_DELIVERY_REPORTS list. Add LGT which does not support SMS delivery report Change-Id: I4928250027e5838fac932a5baa11ad3ee9bfdffc Signed-off-by: papiya commit 87aed8f6918f0953a59ccfedc8efa8e0a8b4f674 Merge: 60f8c5f b4f5a01 Author: Eino-Ville Talvala Date: Tue Apr 5 16:53:10 2011 -0700 Merge "Add multi-camera release test into CTS." commit b4f5a014c65381fa0109cc1e66609cfaa7598f2e Author: Eino-Ville Talvala Date: Mon Apr 4 12:48:14 2011 -0700 Add multi-camera release test into CTS. This test first opens and streams preview frames from 1 camera, then stops the preview. Without releasing the first camera, it then opens the second camera, and starts preview on it. Partway through this stream, the first camera is released. This should have no impact on the live second camera. Change-Id: I5f502155a57e07d31115e902790fd0e8e567b619 commit cde1cbdd82b5e5c78ec9ff2766f4ae38935ccc66 Author: Brian Muramatsu Date: Tue Apr 5 11:42:46 2011 -0700 Remove Unused Spec Progress Tool This is a tool used to report how much JavaDoc the API has. Change-Id: I0c707e9854cbd04f40ceb2ccb520c7ce993f8335 commit 60f8c5f14450017c55f3de0297f973f635499193 Merge: 14e8108 4341ca8 Author: Brian Muramatsu Date: Tue Apr 5 10:26:14 2011 -0700 am 4341ca82: am 391bdbc3: am 734e7967: am 0be75aba: Merge "CTS : modify "loadURL" method that wait until getProgress returns 100." into gingerbread * commit '4341ca8207f4278e26a1fd7f6d7c3349e1b59d9c': commit e4ae870e58d4882ac0cd94b56926c451325c5af2 Merge: 13ab4e1 ec24773 Author: Brian Muramatsu Date: Mon Apr 4 18:24:24 2011 -0700 am ec247735: am e7584a7d: Merge "Remove Test Annotation Related Tools" into gingerbread * commit 'ec247735bb2bef4faccd498ff68d79a124a46678': Remove Test Annotation Related Tools commit ec247735bb2bef4faccd498ff68d79a124a46678 Merge: 1fc4bca e7584a7 Author: Brian Muramatsu Date: Mon Apr 4 18:22:26 2011 -0700 am e7584a7d: Merge "Remove Test Annotation Related Tools" into gingerbread * commit 'e7584a7d011324395d1ea0d3ba23d261af069337': Remove Test Annotation Related Tools commit e7584a7d011324395d1ea0d3ba23d261af069337 Merge: 5c1a303 9cdd2ef Author: Brian Muramatsu Date: Mon Apr 4 18:15:02 2011 -0700 Merge "Remove Test Annotation Related Tools" into gingerbread commit 13ab4e166ccf40536a5bdc109e9e36638d84a0d0 Merge: 03a0d13 1fc4bca Author: Brian Muramatsu Date: Mon Apr 4 18:14:26 2011 -0700 am 1fc4bca6: am 5c1a3034: Merge "Update Expectations File" into gingerbread * commit '1fc4bca6d91ff5f6f5a2aa56b6619dbd07662aee': Update Expectations File commit 1fc4bca6d91ff5f6f5a2aa56b6619dbd07662aee Merge: 4688510 5c1a303 Author: Brian Muramatsu Date: Mon Apr 4 17:59:37 2011 -0700 am 5c1a3034: Merge "Update Expectations File" into gingerbread * commit '5c1a3034883fc04e0d7ed2b371416ba96d890e2d': Update Expectations File commit 5c1a3034883fc04e0d7ed2b371416ba96d890e2d Merge: a75737b 04ec5b4 Author: Brian Muramatsu Date: Mon Apr 4 17:47:10 2011 -0700 Merge "Update Expectations File" into gingerbread commit 4341ca8207f4278e26a1fd7f6d7c3349e1b59d9c Merge: 3f72ce2 391bdbc Author: Brian Muramatsu Date: Mon Apr 4 17:44:31 2011 -0700 am 391bdbc3: am 734e7967: am 0be75aba: Merge "CTS : modify "loadURL" method that wait until getProgress returns 100." into gingerbread * commit '391bdbc372bbd1ac453bb382d5e0ad34333bf1b9': commit 04ec5b4eb70d3255fbe31b316d1324d22581bac8 Author: Brian Muramatsu Date: Mon Apr 4 17:30:15 2011 -0700 Update Expectations File Some tests have been fixed and some deleted... Change-Id: Idef58337f9b47185a9b00cf84af883c39da65fe9 commit e94b30f509953a7bc868a92ea03895129d33ed3e Author: Brian Muramatsu Date: Mon Apr 4 16:20:06 2011 -0700 Remove GestureDetector_SimpleOnGestureListenerTest GestureDetector_SimpleOnGestureListenerTest fails only when run in batch mode after the GestureDetectorTest. This test just does "GestureDetectorTestUtil.testGestureDetector(this, mActivity);" with GestureDetectorStubActivity. However, GestureDetectorTest already does this same test with the same activity. Something about running it twice causes a problem. Change-Id: I1984beda26607eaa59a9df767e5f51cca90994ad commit 14e81089b787731c0159fb809f8619145b3fa7d9 Merge: a3689a8 3f72ce2 Author: Brian Muramatsu Date: Mon Apr 4 16:12:36 2011 -0700 am 3f72ce25: (-s ours) am 6dc4c1e7: am ca49480f: am fe98f4cf: (-s ours) DO NOT MERGE Suppress test_getHostName * commit '3f72ce2518f6f0e9ac34f1cb6ec3acd67f692313': DO NOT MERGE Suppress test_getHostName commit 3f72ce2518f6f0e9ac34f1cb6ec3acd67f692313 Merge: 5352345 6dc4c1e Author: Brian Muramatsu Date: Mon Apr 4 16:09:32 2011 -0700 am 6dc4c1e7: am ca49480f: am fe98f4cf: (-s ours) DO NOT MERGE Suppress test_getHostName * commit '6dc4c1e7ecc225527f5ab6e7dfd14b085e4a41d3': DO NOT MERGE Suppress test_getHostName commit 6dc4c1e7ecc225527f5ab6e7dfd14b085e4a41d3 Merge: d9c88f7 ca49480 Author: Brian Muramatsu Date: Mon Apr 4 16:05:53 2011 -0700 am ca49480f: am fe98f4cf: (-s ours) DO NOT MERGE Suppress test_getHostName * commit 'ca49480f4a64667a6443f3e38eb429d60fcb8776': DO NOT MERGE Suppress test_getHostName commit ca49480f4a64667a6443f3e38eb429d60fcb8776 Merge: 7a7b669 fe98f4c Author: Brian Muramatsu Date: Mon Apr 4 15:57:18 2011 -0700 am fe98f4cf: (-s ours) DO NOT MERGE Suppress test_getHostName * commit 'fe98f4cf532b4a5f343f0e8569f171a196ab9342': DO NOT MERGE Suppress test_getHostName commit fe98f4cf532b4a5f343f0e8569f171a196ab9342 Author: Brian Muramatsu Date: Mon Apr 4 15:36:13 2011 -0700 DO NOT MERGE Suppress test_getHostName Don't merge since I believe this works fine on MR1. Change-Id: I69be2aa3feabffe367938ec6fe87b95880a315d6 commit 03a0d13f0743961e5c6052352dc8ba0b0534536a Merge: 83fb34e 4688510 Author: Brian Muramatsu Date: Mon Apr 4 15:04:48 2011 -0700 am 46885106: am a75737b0: Merge "Clean Up VideoViewTest" into gingerbread * commit '46885106817e4a23e63188d49dba7838200ea48a': Clean Up VideoViewTest commit 46885106817e4a23e63188d49dba7838200ea48a Merge: 570ac7f a75737b Author: Brian Muramatsu Date: Mon Apr 4 14:43:11 2011 -0700 am a75737b0: Merge "Clean Up VideoViewTest" into gingerbread * commit 'a75737b0ae56dddefc5915f81c14a92b785b42d0': Clean Up VideoViewTest commit 83fb34eda35195c399b7e1ea2028c48312791f19 Merge: 40d7e1e 570ac7f Author: Brian Muramatsu Date: Mon Apr 4 14:42:11 2011 -0700 am 570ac7fb: am 7aa9fb78: Merge "CTS: Fixes a possible "out of memory" exception" into gingerbread * commit '570ac7fbe97b022afe01b6bf5287ff7015f64687': CTS: Fixes a possible "out of memory" exception commit 40d7e1e27dc8761caf4d3ba5517b51a5a9732d25 Merge: 391bdbc 72f3418 Author: Brian Muramatsu Date: Mon Apr 4 14:42:08 2011 -0700 am 72f34187: am 49bca3aa: Merge "Adjust Tests to Work without Hinting" into gingerbread * commit '72f3418743fd2e920d42727440d1cf7f66a0da4f': Adjust Tests to Work without Hinting commit 9cdd2ef81a52aac44660e10c97bf8d9d7e713a7e Author: Brian Muramatsu Date: Mon Apr 4 14:41:49 2011 -0700 Remove Test Annotation Related Tools Removes some unused tools used to process the annotations on test methods. Change-Id: I2820d9c9b2a6b1474ba66243370cc061b3939559 commit a75737b0ae56dddefc5915f81c14a92b785b42d0 Merge: 7aa9fb7 014b13b Author: Brian Muramatsu Date: Mon Apr 4 14:29:37 2011 -0700 Merge "Clean Up VideoViewTest" into gingerbread commit 014b13b2ddaf10beff931ee38c4396b1c06df3bd Author: Brian Muramatsu Date: Mon Apr 4 14:20:24 2011 -0700 Clean Up VideoViewTest Remove testOnKeyDown since it fails in batch mode. Remove empty tests that were cluttering up the file. Change-Id: I11b1b2e518194d0732732c013acfadeae10a8f07 commit 391bdbc372bbd1ac453bb382d5e0ad34333bf1b9 Merge: d6710b2 734e796 Author: Brian Muramatsu Date: Mon Apr 4 12:25:55 2011 -0700 am 734e7967: am 0be75aba: Merge "CTS : modify "loadURL" method that wait until getProgress returns 100." into gingerbread * commit '734e7967859697fc26f8cb0ec127bd3b64395ff0': CTS : modify "loadURL" method that wait until getProgress returns 100. commit a3689a8ba075865b3f7b8b7ddabb21622dae08f9 Merge: 1d89e68 9f2dab8 Author: Brian Carlstrom Date: Sat Apr 2 20:39:16 2011 -0700 Merge "Tracking merge of dalvik-dev to master" commit 9f2dab87c54f904a2bfc6d8cbcfc0d248c4e24a9 Author: Brian Carlstrom Date: Fri Apr 1 15:47:17 2011 -0700 Tracking merge of dalvik-dev to master git cherry-pick --no-commit 4ba5d9c906047ae96045390e8e2e67b8bf64c7fb git cherry-pick --no-commit d6cf903af4c5b3f6bb107d4c1a6c34713ee1ff46 git cherry-pick --no-commit 47cbcfe2e49420bcd59499cdd4cfb32fbf062e68 git cherry-pick --no-commit a83d47ae665bccf94dc7720b0b05bf4215af6863 git cherry-pick --no-commit c51299d2e2f43c13fa7514c1fb9c0089ed9a9ad8 git cherry-pick --no-commit 523fa6ab3943e18979bc9df99787a77b15177f5d git cherry-pick --no-commit bf0712aba9e7b1114ff224fa30da159067868ef1 Change-Id: I7c0d213126b6dd8981b912b588803fd7ac382396 commit 1d89e683f71fda69310e726e80455efc18a31e47 Merge: 85b694c 22dede3 Author: Stephen Hines Date: Fri Apr 1 14:26:17 2011 -0700 Merge "Added appropriate test for RS BaseObj." commit 85b694c87ec66a483dcb4a865908bda6de949ec0 Merge: a073ebf 5352345 Author: Mist Liao Date: Fri Apr 1 13:29:13 2011 -0700 am 53523453: am d9c88f7a: am 7a7b669c: am 5491f045: Wait for receiving the remove account broadcast from the last testcase * commit '53523453b373870159f01c599953d327611558a1': Wait for receiving the remove account broadcast from the last testcase commit 53523453b373870159f01c599953d327611558a1 Merge: 0b31bc4 d9c88f7 Author: Mist Liao Date: Fri Apr 1 13:22:58 2011 -0700 am d9c88f7a: am 7a7b669c: am 5491f045: Wait for receiving the remove account broadcast from the last testcase * commit 'd9c88f7aca50f2beb156f46a92814421c5638c71': Wait for receiving the remove account broadcast from the last testcase commit d9c88f7aca50f2beb156f46a92814421c5638c71 Merge: 83e0f20 7a7b669 Author: Mist Liao Date: Fri Apr 1 13:17:26 2011 -0700 am 7a7b669c: am 5491f045: Wait for receiving the remove account broadcast from the last testcase * commit '7a7b669ca14dfe5c9c7f1524aad855a836645ce1': Wait for receiving the remove account broadcast from the last testcase commit 7a7b669ca14dfe5c9c7f1524aad855a836645ce1 Merge: 3e29396 5491f04 Author: Mist Liao Date: Fri Apr 1 13:11:45 2011 -0700 am 5491f045: Wait for receiving the remove account broadcast from the last testcase * commit '5491f0455b209e5fd9cc9f037b614a02dc2ddb5d': Wait for receiving the remove account broadcast from the last testcase commit 5491f0455b209e5fd9cc9f037b614a02dc2ddb5d Author: Mist Liao Date: Fri Apr 1 18:53:12 2011 +0800 Wait for receiving the remove account broadcast from the last testcase Wait for receiving the remove account broadcast from the last testcase to avoid testGetAndSetSyncAutomatically testcase fail. Change-Id: I132df328114f5bbce01081ea9c84d6aa9f54b8af commit 20e63d9f265a48694ba71b7a40f9b2caed9c3213 Merge: 6317b9c 37aeb96 Author: Brian Muramatsu Date: Fri Apr 1 12:34:10 2011 -0700 Merge "Fix Build" into froyo commit 37aeb967bfe488a2df7ab36e68336311549ad7f8 Author: Brian Muramatsu Date: Fri Apr 1 12:33:29 2011 -0700 Fix Build Change-Id: I75baa20cc1520054ffab005366d9783caf2156fa commit 6317b9cee75a29637c59e1eadfbef33a4ff4c86a Merge: 0a739d5 7c4ad1c Author: Brian Muramatsu Date: Fri Apr 1 12:24:29 2011 -0700 Merge "Added sleep within testGetAndSetMasterSyncAutomatically." into froyo commit 22dede3eacb990aa1055c4171a0e814b287bf2db Author: Stephen Hines Date: Thu Mar 31 18:33:43 2011 -0700 Added appropriate test for RS BaseObj. Change-Id: I25e144692219c050a42b7de71f1e0ca9d56722ae commit a073ebfc85198ee721cd94c8e6dbd2418e617e8a Merge: f9e49ea 0b31bc4 Author: Brian Muramatsu Date: Thu Mar 31 18:12:17 2011 -0700 am 0b31bc4c: am d6710b24: am e78b2737: am d27e53b6: Merge "The accuracy of WebView scale is less than density scale\'s one" into gingerbread * commit '0b31bc4cfe86d00a39de00bec6f08ee24899b7d4': commit f9e49eabc545679397466b94f59277cc21dd30fd Merge: f39b779 814033d Author: Brian Muramatsu Date: Thu Mar 31 18:12:15 2011 -0700 am 814033df: am 5587d5d6: am 78c49212: am 4a797b5a: Merge "Fix Paint#measureText Tests" into gingerbread * commit '814033df13ab358ccd0673d9b91d8064d4dfd488': commit f39b7798ec8e01b85c9d30c448ca04ec26e341f1 Merge: 29f1c6d e8a5be5 Author: Brian Muramatsu Date: Thu Mar 31 18:12:13 2011 -0700 am e8a5be5c: am ad1196b6: am b13f2bbd: am 88f05039: Merge "Remove Some Broken Paint Tests" into gingerbread * commit 'e8a5be5c9c40a92921c3165637fcda3868c473f3': commit 29f1c6d6298056472509a65d3e2b124576716a66 Merge: 7b5ef01 aa3c5fe Author: Brian Muramatsu Date: Thu Mar 31 18:12:10 2011 -0700 am aa3c5fec: am 4882ff03: am a7d9f1c0: am d4602c0e: Merge "Remove Broken WebKit Tests" into gingerbread * commit 'aa3c5fecbf613d95cc077a6addc9258173200657': commit 7b5ef0142d0263fe41fda2816fa9202adbf5931c Merge: b1b7c8d 104ea62 Author: Brian Muramatsu Date: Thu Mar 31 18:12:08 2011 -0700 am 104ea629: am 145b9d7f: am c3062b43: am c90067a5: Merge "Remove Broken Widget Tests" into gingerbread * commit '104ea62902a92340e5df634742c7d2570d0a1602': commit 0b31bc4cfe86d00a39de00bec6f08ee24899b7d4 Merge: 814033d d6710b2 Author: Brian Muramatsu Date: Thu Mar 31 18:09:48 2011 -0700 am d6710b24: am e78b2737: am d27e53b6: Merge "The accuracy of WebView scale is less than density scale\'s one" into gingerbread * commit 'd6710b24e9be690ad6c353ff762df3fb66cfad4d': commit 814033df13ab358ccd0673d9b91d8064d4dfd488 Merge: e8a5be5 5587d5d Author: Brian Muramatsu Date: Thu Mar 31 18:09:46 2011 -0700 am 5587d5d6: am 78c49212: am 4a797b5a: Merge "Fix Paint#measureText Tests" into gingerbread * commit '5587d5d64141b1fe1c0aa0ea30f1181e54c55bb2': commit e8a5be5c9c40a92921c3165637fcda3868c473f3 Merge: aa3c5fe ad1196b Author: Brian Muramatsu Date: Thu Mar 31 18:09:44 2011 -0700 am ad1196b6: am b13f2bbd: am 88f05039: Merge "Remove Some Broken Paint Tests" into gingerbread * commit 'ad1196b6fdb93eef4c88db6f3b538580188bd2c6': commit aa3c5fecbf613d95cc077a6addc9258173200657 Merge: 104ea62 4882ff0 Author: Brian Muramatsu Date: Thu Mar 31 18:09:41 2011 -0700 am 4882ff03: am a7d9f1c0: am d4602c0e: Merge "Remove Broken WebKit Tests" into gingerbread * commit '4882ff0360f227d9962f4a5d4819d95cf1c2f8a3': commit 104ea62902a92340e5df634742c7d2570d0a1602 Merge: 7758e2e 145b9d7 Author: Brian Muramatsu Date: Thu Mar 31 18:09:37 2011 -0700 am 145b9d7f: am c3062b43: am c90067a5: Merge "Remove Broken Widget Tests" into gingerbread * commit '145b9d7f2171e474b79e74adca2bea7d67f22c27': commit b1b7c8d0f0d06ffa963192eaba2a102c8b7de3e1 Merge: aa4450f 7758e2e Author: Brian Muramatsu Date: Thu Mar 31 17:50:35 2011 -0700 am 7758e2ee: am 83e0f20f: am 3e29396d: am bc3f0d70: Merge "Fix for ContactsTest#testGroupMembershipTable" into honeycomb * commit '7758e2ee2c7096c91ba12469eaccbdd5781d712b': Fix for ContactsTest#testGroupMembershipTable commit 7758e2ee2c7096c91ba12469eaccbdd5781d712b Merge: c69e499 83e0f20 Author: Brian Muramatsu Date: Thu Mar 31 17:47:08 2011 -0700 am 83e0f20f: am 3e29396d: am bc3f0d70: Merge "Fix for ContactsTest#testGroupMembershipTable" into honeycomb * commit '83e0f20f98f66e1e79a3a37f709bf79f9a91e956': Fix for ContactsTest#testGroupMembershipTable commit 83e0f20f98f66e1e79a3a37f709bf79f9a91e956 Merge: 35bcdef 3e29396 Author: Brian Muramatsu Date: Thu Mar 31 17:41:25 2011 -0700 am 3e29396d: am bc3f0d70: Merge "Fix for ContactsTest#testGroupMembershipTable" into honeycomb * commit '3e29396d6a0663238c773356563293fac0df1de0': Fix for ContactsTest#testGroupMembershipTable commit 3e29396d6a0663238c773356563293fac0df1de0 Merge: d6fe0e1 bc3f0d7 Author: Brian Muramatsu Date: Thu Mar 31 17:29:08 2011 -0700 am bc3f0d70: Merge "Fix for ContactsTest#testGroupMembershipTable" into honeycomb * commit 'bc3f0d70eb64d09f975e8173950fb5e08f49ffc3': Fix for ContactsTest#testGroupMembershipTable commit d6710b24e9be690ad6c353ff762df3fb66cfad4d Merge: 5587d5d e78b273 Author: Brian Muramatsu Date: Thu Mar 31 17:24:09 2011 -0700 am e78b2737: am d27e53b6: Merge "The accuracy of WebView scale is less than density scale\'s one" into gingerbread * commit 'e78b2737b91e5f01b846fd140bd8bb46975d3b3b': The accuracy of WebView scale is less than density scale's one commit 5587d5d64141b1fe1c0aa0ea30f1181e54c55bb2 Merge: ad1196b 78c4921 Author: Brian Muramatsu Date: Thu Mar 31 17:24:04 2011 -0700 am 78c49212: am 4a797b5a: Merge "Fix Paint#measureText Tests" into gingerbread * commit '78c492126ec627f79d393fd6e38296f3a31b41ab': Fix Paint#measureText Tests commit ad1196b6fdb93eef4c88db6f3b538580188bd2c6 Merge: 4882ff0 b13f2bb Author: Brian Muramatsu Date: Thu Mar 31 17:23:13 2011 -0700 am b13f2bbd: am 88f05039: Merge "Remove Some Broken Paint Tests" into gingerbread * commit 'b13f2bbd7160ab36dcf66d98b35981de0de2c5cf': Remove Some Broken Paint Tests commit 4882ff0360f227d9962f4a5d4819d95cf1c2f8a3 Merge: 145b9d7 a7d9f1c Author: Brian Muramatsu Date: Thu Mar 31 17:22:43 2011 -0700 am a7d9f1c0: am d4602c0e: Merge "Remove Broken WebKit Tests" into gingerbread * commit 'a7d9f1c0ae3f629af6baaa35623c044721964e62': Remove Broken WebKit Tests commit 145b9d7f2171e474b79e74adca2bea7d67f22c27 Merge: f018004 c3062b4 Author: Brian Muramatsu Date: Thu Mar 31 17:22:35 2011 -0700 am c3062b43: am c90067a5: Merge "Remove Broken Widget Tests" into gingerbread * commit 'c3062b4384324f4a9e841b3aad5450b3209b4539': Remove Broken Widget Tests commit bc3f0d70eb64d09f975e8173950fb5e08f49ffc3 Merge: a3712c0 074a62f Author: Brian Muramatsu Date: Thu Mar 31 17:04:50 2011 -0700 Merge "Fix for ContactsTest#testGroupMembershipTable" into honeycomb commit 570ac7fbe97b022afe01b6bf5287ff7015f64687 Merge: 72f3418 7aa9fb7 Author: Brian Muramatsu Date: Thu Mar 31 16:26:07 2011 -0700 am 7aa9fb78: Merge "CTS: Fixes a possible "out of memory" exception" into gingerbread * commit '7aa9fb78e6636c301bb6c75c5e6e020e51552ba3': CTS: Fixes a possible "out of memory" exception commit aa4450fe054db197da703bf9eedccc8a56006249 Merge: 4434ced c69e499 Author: Brian Muramatsu Date: Thu Mar 31 16:09:17 2011 -0700 am c69e499f: am 35bcdeff: am d6fe0e1e: resolved conflicts for merge of a3712c06 to honeycomb-mr1 * commit 'c69e499f16baad795d697d2153555b2999873fb6': Adjust Tests to Work without Hinting CTS : modify "loadURL" method that wait until getProgress returns 100. The accuracy of WebView scale is less than density scale's one Fix Paint#measureText Tests Remove Some Broken Paint Tests Remove Broken Widget Tests Remove Broken WebKit Tests commit c69e499f16baad795d697d2153555b2999873fb6 Merge: 23843ef 35bcdef Author: Brian Muramatsu Date: Thu Mar 31 16:07:06 2011 -0700 am 35bcdeff: am d6fe0e1e: resolved conflicts for merge of a3712c06 to honeycomb-mr1 * commit '35bcdeffe9ba7bb68eef5eb297cccdad2f4b26d2': Adjust Tests to Work without Hinting CTS : modify "loadURL" method that wait until getProgress returns 100. The accuracy of WebView scale is less than density scale's one Fix Paint#measureText Tests Remove Some Broken Paint Tests Remove Broken Widget Tests Remove Broken WebKit Tests commit 35bcdeffe9ba7bb68eef5eb297cccdad2f4b26d2 Merge: 21cc480 d6fe0e1 Author: Brian Muramatsu Date: Thu Mar 31 16:05:07 2011 -0700 am d6fe0e1e: resolved conflicts for merge of a3712c06 to honeycomb-mr1 * commit 'd6fe0e1e78a921aae7ba0c50a46e27dee932f5a6': (34 commits) Adjust Tests to Work without Hinting CTS : modify "loadURL" method that wait until getProgress returns 100. The accuracy of WebView scale is less than density scale's one Fix Paint#measureText Tests Remove Some Broken Paint Tests Remove Broken Widget Tests Remove Broken WebKit Tests CTS: Fixes for android.hardware.cts.CameraTest#testCancelAutofocus Change max/min level range to allow the equalizer to be replaced Ignore Tests with Side Effects Added view.invalidate() in testComputeScroll. Increase time interval in points provided to VelocityTracker update the NO_DELIVERY_REPORTS list Add a network operator into the not support list of delivery report Froyo-specific startcts Fixes Remove Broken MediaControllerTests Remove Broken TouchDelegateTest#testOn Fix More Paint#breakText Tests Revert "Allow 2.2.3 for Build.VERSION" Increment CTS Version to 2.2_r5 ... commit 7aa9fb78e6636c301bb6c75c5e6e020e51552ba3 Merge: 49bca3a 7eade13 Author: Brian Muramatsu Date: Thu Mar 31 16:03:59 2011 -0700 Merge "CTS: Fixes a possible "out of memory" exception" into gingerbread commit d6fe0e1e78a921aae7ba0c50a46e27dee932f5a6 Merge: bb44772 a3712c0 Author: Brian Muramatsu Date: Thu Mar 31 15:53:16 2011 -0700 resolved conflicts for merge of a3712c06 to honeycomb-mr1 Change-Id: I099148d3d9006dc3dbd78f3397ea186ef568ceeb commit a3712c065dd0ae4893aa9e9b715903f9ce353da3 Merge: 2e9193f 72f3418 Author: Brian Muramatsu Date: Thu Mar 31 14:18:43 2011 -0700 Merge remote branch 'goog/gingerbread' into manualmerge Conflicts: tests/tests/app/src/android/app/cts/InstrumentationTest.java tests/tests/content/src/android/content/cts/ContextTest.java tests/tests/net/src/android/net/cts/ConnectivityManagerTest.java tests/tests/os/src/android/os/cts/BuildVersionTest.java tests/tests/telephony/src/android/telephony/cts/SmsManagerTest.java tests/tests/util/src/android/util/cts/EventLogTest.java tests/tests/view/src/android/view/cts/WindowTest.java tests/tests/view/src/android/view/inputmethod/cts/BaseInputConnectionTest.java tests/tests/widget/src/android/widget/cts/AutoCompleteTextViewTest.java tools/device-setup/TestDeviceSetup/src/android/tests/getinfo/DeviceInfoInstrument.java tools/host/src/com/android/cts/TestDevice.java Change-Id: Ic4ee072b6c82f97ba256b25a71db153195c958b9 commit 72f3418743fd2e920d42727440d1cf7f66a0da4f Merge: 734e796 49bca3a Author: Brian Muramatsu Date: Thu Mar 31 12:11:52 2011 -0700 am 49bca3aa: Merge "Adjust Tests to Work without Hinting" into gingerbread * commit '49bca3aafbcc877e4ea06bcdfab8dab060ef7244': Adjust Tests to Work without Hinting commit 49bca3aafbcc877e4ea06bcdfab8dab060ef7244 Merge: 0be75ab 62c3e10 Author: Brian Muramatsu Date: Thu Mar 31 11:55:21 2011 -0700 Merge "Adjust Tests to Work without Hinting" into gingerbread commit 074a62f705e463779e92741a71c7b6325351706b Author: Brian Muramatsu Date: Thu Mar 31 11:29:02 2011 -0700 Fix for ContactsTest#testGroupMembershipTable Check that one of the groups matches the group membership for the person. There may be multiple groups for the person due to auto adding groups. Change-Id: Iee96435c6ce59015f9b82e8b44f747865bb745ce commit 734e7967859697fc26f8cb0ec127bd3b64395ff0 Merge: e78b273 0be75ab Author: Brian Muramatsu Date: Wed Mar 30 17:30:31 2011 -0700 am 0be75aba: Merge "CTS : modify "loadURL" method that wait until getProgress returns 100." into gingerbread * commit '0be75abaaf529d912d0153cf302dd597bf866e5c': CTS : modify "loadURL" method that wait until getProgress returns 100. commit 62c3e10261c06ab08dcf442421cfb37b5cef76bb Author: Norio Nasu Date: Thu Mar 17 16:46:16 2011 +0900 Adjust Tests to Work without Hinting Change-Id: I650b6bcefb430f0638a4d621f75f54267ff33b23 commit 0be75abaaf529d912d0153cf302dd597bf866e5c Merge: d27e53b b7b54fd Author: Brian Muramatsu Date: Wed Mar 30 16:23:31 2011 -0700 Merge "CTS : modify "loadURL" method that wait until getProgress returns 100." into gingerbread commit b7b54fd3c34a2fd216654f04e13e34848dbeb144 Author: lge-aosp Date: Wed Mar 30 15:25:16 2011 +0900 CTS : modify "loadURL" method that wait until getProgress returns 100. - It appears that the updates returned by getProgress are not accurate unless there is a WebChromeClient set on the WebView as seen in the code of CallbackProxy#onProgressChanged. Change-Id: Ibc5e87743f915490bc875303d933d013fe3b042b commit 4434ced6df46454444b09105f01850228f438c5e Merge: 36bfad1 74972a7 Author: Eino-Ville Talvala Date: Wed Mar 30 09:04:57 2011 -0700 Merge "Add Camera + SurfaceTexture tests into CTS." commit 7eade134e4c8fdaee5b7dfb0446dc90085b0408a Author: Emilian Peev Date: Mon Mar 28 17:30:05 2011 +0300 CTS: Fixes a possible "out of memory" exception - Image sizes can vary quite a bit. Some cameras might support up to 12MP picture sizes, which can result in very large bitmaps. Dalvik's VM stack size might not be able to handle arrays of this size. In these cases an "out of memory" exception is possible. - Related to test cases #testPreviewPictureSizesCombination, #testTakePicture and #testJpegThumbnailSizeByCamera. Change-Id: I15406f73bb72c897b04876f312019dc68f0f726f Signed-off-by: Emilian Peev commit 36bfad19085eebd09f5b90d56f8b793d2a8f2a9c Merge: b68e10d 23843ef Author: Brian Muramatsu Date: Tue Mar 29 16:43:25 2011 -0700 resolved conflicts for merge of 23843efb to master Change-Id: I9b5b1141e1ad47eace03cdeafa4b92ebbfa58a2b commit 74972a79609c9d46bf303a69d2c97f423101f345 Author: Eino-Ville Talvala Date: Fri Mar 25 13:52:50 2011 -0700 Add Camera + SurfaceTexture tests into CTS. Tests basic functionality for setting a SurfaceTexture as the camera preview destination. Change-Id: I42181ce2955a438a22967e849409d24d4e9ed9d1 commit b68e10d79c2c188dfcbabc40fb4a125ce53cb8fe Merge: d9f0c74 f031290 Author: Brian Muramatsu Date: Tue Mar 29 15:48:47 2011 -0700 am f0312904: am 76879423: am f0a26e83: am 82bc1287: Merge "CTS: Fixes for android.hardware.cts.CameraTest#testCancelAutofocus" into gingerbread * commit 'f03129041db02e71f9bf49f8e7241af0d004d137': CTS: Fixes for android.hardware.cts.CameraTest#testCancelAutofocus commit 23843efbe9aea213e840887cc40a0966d505ec3d Merge: f031290 f018004 Author: Brian Muramatsu Date: Tue Mar 29 14:02:29 2011 -0700 am f0180049: am 22934f4c: am 8fcbb1ce: Merge "Merge remote branch \'korg/froyo\' into froyomerge" into gingerbread * commit 'f018004925dc80f2a6474548df4598df89ff42f6': Ignore Tests with Side Effects Added view.invalidate() in testComputeScroll. Increase time interval in points provided to VelocityTracker Froyo-specific startcts Fixes Revert "Allow 2.2.3 for Build.VERSION" Increment CTS Version to 2.2_r5 Allow 2.2.3 for Build.VERSION CTS AudioTrackTest: Changing audiotrack buffer size from minBuffSize to 2*minBuffSize Adding DelayedCheck() in testHasWindowFocus. Adding DelayedCheck() in testInputConnection. Add test to verify an uninstall of app wipes its data. Modified so that if network does not support multipart / data SMS, it skips this test. Add wait in testOnWindowFocusChanged. commit f03129041db02e71f9bf49f8e7241af0d004d137 Merge: 6ddc35e 7687942 Author: Brian Muramatsu Date: Tue Mar 29 14:02:11 2011 -0700 am 76879423: am f0a26e83: am 82bc1287: Merge "CTS: Fixes for android.hardware.cts.CameraTest#testCancelAutofocus" into gingerbread * commit '7687942310f2ec4a217ffcc5807925086bdeb8b6': CTS: Fixes for android.hardware.cts.CameraTest#testCancelAutofocus commit d9f0c742badcb46136f079b929073dabba958e23 Merge: a569a1c 6ddc35e Author: Brian Muramatsu Date: Tue Mar 29 13:21:38 2011 -0700 am 6ddc35e4: am 4a570397: am 9b14e829: am 6fb34673: Merge "Change max/min level range to allow the equalizer to be replaced" into gingerbread * commit '6ddc35e4ee7846891413834aa0d7b5881a97a323': Change max/min level range to allow the equalizer to be replaced commit 6ddc35e4ee7846891413834aa0d7b5881a97a323 Merge: 6737bf0 4a57039 Author: Brian Muramatsu Date: Tue Mar 29 13:18:47 2011 -0700 am 4a570397: am 9b14e829: am 6fb34673: Merge "Change max/min level range to allow the equalizer to be replaced" into gingerbread * commit '4a570397ba675a8818e93f2e889afd616608780d': Change max/min level range to allow the equalizer to be replaced commit e78b2737b91e5f01b846fd140bd8bb46975d3b3b Merge: 78c4921 d27e53b Author: Brian Muramatsu Date: Tue Mar 29 12:03:35 2011 -0700 am d27e53b6: Merge "The accuracy of WebView scale is less than density scale\'s one" into gingerbread * commit 'd27e53b61267c82a647f6b87c752fcaea85be87b': The accuracy of WebView scale is less than density scale's one commit 78c492126ec627f79d393fd6e38296f3a31b41ab Merge: b13f2bb 4a797b5 Author: Brian Muramatsu Date: Tue Mar 29 12:03:33 2011 -0700 am 4a797b5a: Merge "Fix Paint#measureText Tests" into gingerbread * commit '4a797b5a99e09b51961b95601b721fcd01634e43': Fix Paint#measureText Tests commit d27e53b61267c82a647f6b87c752fcaea85be87b Merge: 4a797b5 1cb5635 Author: Brian Muramatsu Date: Tue Mar 29 11:49:28 2011 -0700 Merge "The accuracy of WebView scale is less than density scale's one" into gingerbread commit 1cb56354ee5d29376d30c7cf425ce3843a3a6a08 Author: Masanori Ogino Date: Fri Mar 18 13:22:04 2011 +0900 The accuracy of WebView scale is less than density scale's one The scale returned by getScale() is calculated as below; - scale = (int)(100 * density) - scale = scale/100.0f So the scale is reduced its accuracy less than second decimal. Therefore assertion should has delta 0.01f. Change-Id: Ic5511e66a75d6e5dbc7dccec392b4a7e1b98e59b commit 4a797b5a99e09b51961b95601b721fcd01634e43 Merge: 88f0503 ad3337d Author: Brian Muramatsu Date: Tue Mar 29 11:39:16 2011 -0700 Merge "Fix Paint#measureText Tests" into gingerbread commit a569a1c835f101faaa0ef4b5824e3b39faeb821c Merge: 2902214 97e9503 Author: Jeff Sharkey Date: Mon Mar 28 19:57:23 2011 -0700 Merge "Tests to verify new Ctrl-based EditText movement." commit ad3337dad5c632e8eb55b7ac4b27f0cace622966 Author: Brian Muramatsu Date: Mon Mar 28 16:31:02 2011 -0700 Fix Paint#measureText Tests Bug 3188260 Instead of hardcoding values just check that the returned values of the overloaded methods make some sense. Change-Id: Ia8d97300d5b12a6528b445e0fbfc0b745665a2af commit b13f2bbd7160ab36dcf66d98b35981de0de2c5cf Merge: a7d9f1c 88f0503 Author: Brian Muramatsu Date: Mon Mar 28 15:58:13 2011 -0700 am 88f05039: Merge "Remove Some Broken Paint Tests" into gingerbread * commit '88f05039c6b25935a7c6be796a7072df3821bc8f': Remove Some Broken Paint Tests commit 88f05039c6b25935a7c6be796a7072df3821bc8f Merge: d4602c0 40e62a6 Author: Brian Muramatsu Date: Mon Mar 28 15:45:17 2011 -0700 Merge "Remove Some Broken Paint Tests" into gingerbread commit 40e62a6c4143d6312e2bf2e01d39c2bdf704949b Author: Brian Muramatsu Date: Mon Mar 28 15:28:48 2011 -0700 Remove Some Broken Paint Tests Bug 3188260 Change-Id: I7e6b4fc06f2f771b3a96f764518ee3b3cb624f50 commit a7d9f1c0ae3f629af6baaa35623c044721964e62 Merge: c3062b4 d4602c0 Author: Brian Muramatsu Date: Mon Mar 28 15:36:22 2011 -0700 am d4602c0e: Merge "Remove Broken WebKit Tests" into gingerbread * commit 'd4602c0e8646a51e9cdce770c2d6a750ea980de2': Remove Broken WebKit Tests commit c3062b4384324f4a9e841b3aad5450b3209b4539 Merge: 22934f4 c90067a Author: Brian Muramatsu Date: Mon Mar 28 15:36:18 2011 -0700 am c90067a5: Merge "Remove Broken Widget Tests" into gingerbread * commit 'c90067a540590d5e27b4e886d57e34d2c2ca3fff': Remove Broken Widget Tests commit d4602c0e8646a51e9cdce770c2d6a750ea980de2 Merge: c90067a ba6ba57 Author: Brian Muramatsu Date: Mon Mar 28 15:12:03 2011 -0700 Merge "Remove Broken WebKit Tests" into gingerbread commit c90067a540590d5e27b4e886d57e34d2c2ca3fff Merge: 8fcbb1c 82c0994 Author: Brian Muramatsu Date: Mon Mar 28 15:11:22 2011 -0700 Merge "Remove Broken Widget Tests" into gingerbread commit 82c09945e8d6d7acdd65f505a3c0edcfa201537f Author: Brian Muramatsu Date: Mon Mar 28 13:55:24 2011 -0700 Remove Broken Widget Tests Bug 3188260 Change-Id: Icbc5700430d1575d601efa0013eabcc7969da267 commit ba6ba576280c6f9d0d8531be17a666415bdec5d9 Author: Brian Muramatsu Date: Mon Mar 28 13:36:18 2011 -0700 Remove Broken WebKit Tests Bug 3188260 Change-Id: I0c57a1035b7286a69198173a971de67808b0e46f commit 2902214370d38152d48e70673f60be2969e756d3 Merge: 0c2ddec 6737bf0 Author: Tsu Chiang Chuang Date: Mon Mar 28 09:50:22 2011 -0700 am 6737bf09: am 21cc4803: am bb447725: Extending cts test creation timeout and fix compile error. * commit '6737bf09bddb4404a9294a1c11621ff17cd7104a': Extending cts test creation timeout and fix compile error. commit 6737bf09bddb4404a9294a1c11621ff17cd7104a Merge: b9ca09d 21cc480 Author: Tsu Chiang Chuang Date: Mon Mar 28 09:48:18 2011 -0700 am 21cc4803: am bb447725: Extending cts test creation timeout and fix compile error. * commit '21cc480363d2b08b7d46f2ed8bc08bdf115f5539': Extending cts test creation timeout and fix compile error. commit 21cc480363d2b08b7d46f2ed8bc08bdf115f5539 Merge: 89f21b7 bb44772 Author: Tsu Chiang Chuang Date: Mon Mar 28 09:46:47 2011 -0700 am bb447725: Extending cts test creation timeout and fix compile error. * commit 'bb4477250c01c8bc9268ca2de09d947aa24dab96': Extending cts test creation timeout and fix compile error. commit 0c2ddec42fc55af088bc50d97d8dce3ccfc5bbfb Merge: 88867d8 d088736 Author: Wu-cheng Li Date: Fri Mar 25 16:01:41 2011 -0700 Merge "Register error callback in every camera test." commit 88867d8fc0858dcdd26b37cb61cb1044fb0c7ae6 Author: satok Date: Sat Mar 26 05:59:19 2011 +0900 Remove the cts for setCorrectionSpan Change-Id: Ic72f16c6e97aaa24521b671c0bb731b6c1f8667c commit bb4477250c01c8bc9268ca2de09d947aa24dab96 Author: Tsu Chiang Chuang Date: Wed Mar 23 16:02:38 2011 +0800 Extending cts test creation timeout and fix compile error. Change-Id: Id0ad2a770b643128e8d961d15c39cad9c1aecf63 commit f018004925dc80f2a6474548df4598df89ff42f6 Merge: 7687942 22934f4 Author: Brian Muramatsu Date: Thu Mar 24 13:14:10 2011 -0700 am 22934f4c: am 8fcbb1ce: Merge "Merge remote branch \'korg/froyo\' into froyomerge" into gingerbread * commit '22934f4c9858e527bb7d0a5d4cd330e84c532761': Ignore Tests with Side Effects Added view.invalidate() in testComputeScroll. Increase time interval in points provided to VelocityTracker Froyo-specific startcts Fixes Revert "Allow 2.2.3 for Build.VERSION" Increment CTS Version to 2.2_r5 Allow 2.2.3 for Build.VERSION CTS AudioTrackTest: Changing audiotrack buffer size from minBuffSize to 2*minBuffSize Adding DelayedCheck() in testHasWindowFocus. Adding DelayedCheck() in testInputConnection. Add test to verify an uninstall of app wipes its data. Modified so that if network does not support multipart / data SMS, it skips this test. Add wait in testOnWindowFocusChanged. commit 22934f4c9858e527bb7d0a5d4cd330e84c532761 Merge: f0a26e8 8fcbb1c Author: Brian Muramatsu Date: Thu Mar 24 13:10:34 2011 -0700 am 8fcbb1ce: Merge "Merge remote branch \'korg/froyo\' into froyomerge" into gingerbread * commit '8fcbb1cee83ffa9b0c9146f59a5f265f086ef452': Ignore Tests with Side Effects Added view.invalidate() in testComputeScroll. Increase time interval in points provided to VelocityTracker Froyo-specific startcts Fixes Revert "Allow 2.2.3 for Build.VERSION" Increment CTS Version to 2.2_r5 Allow 2.2.3 for Build.VERSION CTS AudioTrackTest: Changing audiotrack buffer size from minBuffSize to 2*minBuffSize Adding DelayedCheck() in testHasWindowFocus. Adding DelayedCheck() in testInputConnection. Add test to verify an uninstall of app wipes its data. Modified so that if network does not support multipart / data SMS, it skips this test. Add wait in testOnWindowFocusChanged. commit 8fcbb1cee83ffa9b0c9146f59a5f265f086ef452 Merge: 82bc128 5d25d43 Author: Brian Muramatsu Date: Thu Mar 24 12:57:42 2011 -0700 Merge "Merge remote branch 'korg/froyo' into froyomerge" into gingerbread commit 5d25d43cb2e984c7af6757075df4669b2e46da55 Merge: 82bc128 0a739d5 Author: Brian Muramatsu Date: Thu Mar 24 12:09:31 2011 -0700 Merge remote branch 'korg/froyo' into froyomerge Conflicts: tests/appsecurity-tests/src/com/android/cts/appsecurity/AppSecurityTests.java tests/tests/telephony/src/android/telephony/cts/SmsManagerTest.java tests/tests/view/src/android/view/cts/ViewTest.java tools/host/src/com/android/cts/Version.java tools/utils/CollectAllTests.java Change-Id: I32c04ce6a2eba4c1f30fe80afb9bf2adcf269e73 commit 7687942310f2ec4a217ffcc5807925086bdeb8b6 Merge: 4a57039 f0a26e8 Author: Brian Muramatsu Date: Thu Mar 24 11:49:14 2011 -0700 am f0a26e83: am 82bc1287: Merge "CTS: Fixes for android.hardware.cts.CameraTest#testCancelAutofocus" into gingerbread * commit 'f0a26e83f602058de8b993223dd9d81ed754b580': CTS: Fixes for android.hardware.cts.CameraTest#testCancelAutofocus commit f0a26e83f602058de8b993223dd9d81ed754b580 Merge: 9b14e82 82bc128 Author: Brian Muramatsu Date: Thu Mar 24 11:44:51 2011 -0700 am 82bc1287: Merge "CTS: Fixes for android.hardware.cts.CameraTest#testCancelAutofocus" into gingerbread * commit '82bc1287714ca38e529e8f184bbe445febd60214': CTS: Fixes for android.hardware.cts.CameraTest#testCancelAutofocus commit 82bc1287714ca38e529e8f184bbe445febd60214 Merge: 6fb3467 629f0a3 Author: Brian Muramatsu Date: Thu Mar 24 11:29:50 2011 -0700 Merge "CTS: Fixes for android.hardware.cts.CameraTest#testCancelAutofocus" into gingerbread commit 629f0a3285988617c717396d01aac7a217c8eb08 Author: Julian Shandorov Date: Thu Mar 24 16:23:01 2011 +0200 CTS: Fixes for android.hardware.cts.CameraTest#testCancelAutofocus - setPreviewDisplay() was omitted after release(). release() disconnects and releases the Camera object resources. If a camera uses an overlay for preview, the overlay object is also destroyed when release() is used. At the same time, the camera documentation states that a call to either setPreviewDisplay() or setPreviewTexture() is necessary in order to start the preview. Change-Id: Ic77e8a5ea952414c610850241be9e09018b02b20 Signed-off-by: Julian Shandorov commit 4a570397ba675a8818e93f2e889afd616608780d Merge: 85900f1 9b14e82 Author: Brian Muramatsu Date: Thu Mar 24 03:36:27 2011 -0700 am 9b14e829: am 6fb34673: Merge "Change max/min level range to allow the equalizer to be replaced" into gingerbread * commit '9b14e8292627270e9d5aa34d5d17cf2b018d1aed': Change max/min level range to allow the equalizer to be replaced commit 9b14e8292627270e9d5aa34d5d17cf2b018d1aed Merge: a97591d 6fb3467 Author: Brian Muramatsu Date: Wed Mar 23 16:14:58 2011 -0700 am 6fb34673: Merge "Change max/min level range to allow the equalizer to be replaced" into gingerbread * commit '6fb3467300170d4b9e9c5fc97e20764934a73849': Change max/min level range to allow the equalizer to be replaced commit 6fb3467300170d4b9e9c5fc97e20764934a73849 Merge: 25c0028 5df7d55 Author: Brian Muramatsu Date: Wed Mar 23 15:50:53 2011 -0700 Merge "Change max/min level range to allow the equalizer to be replaced" into gingerbread commit 1462c320cb676a3e9161e4e18e4729e25fbf3759 Merge: 586d909 b9ca09d Author: Brian Muramatsu Date: Wed Mar 23 14:11:29 2011 -0700 am b9ca09de: am 85900f18: am a97591d1: am 25c00287: Merge "update the NO_DELIVERY_REPORTS list" into gingerbread * commit 'b9ca09de7f80fa2e4321524e546f4e56377d178e': update the NO_DELIVERY_REPORTS list commit 586d9093bfd793ecb74789a8dd7cc95940a4d919 Merge: 22a3c9a 969aec3 Author: Brian Muramatsu Date: Wed Mar 23 14:11:26 2011 -0700 am 969aec30: am 577e6835: am c061a10a: am d8e7d285: Merge "Add a network operator into the not support list of delivery report" into gingerbread * commit '969aec301b8509f1069cf777227ca9f820dd8b08': Add a network operator into the not support list of delivery report commit b9ca09de7f80fa2e4321524e546f4e56377d178e Merge: 969aec3 85900f1 Author: Brian Muramatsu Date: Wed Mar 23 14:05:35 2011 -0700 am 85900f18: am a97591d1: am 25c00287: Merge "update the NO_DELIVERY_REPORTS list" into gingerbread * commit '85900f185471afa5ebaed3193cfc7e45c03ea23c': update the NO_DELIVERY_REPORTS list commit 969aec301b8509f1069cf777227ca9f820dd8b08 Merge: fad21ef 577e683 Author: Brian Muramatsu Date: Wed Mar 23 14:05:30 2011 -0700 am 577e6835: am c061a10a: am d8e7d285: Merge "Add a network operator into the not support list of delivery report" into gingerbread * commit '577e6835992407abb9f94694319fe4d95cb9f150': Add a network operator into the not support list of delivery report commit 5df7d5552c2dacd2efdf080dc0a1ecf3dd2cbf2a Author: Tomoharu Kasahara Date: Wed Mar 23 14:35:41 2011 +0100 Change max/min level range to allow the equalizer to be replaced Audioeffect framework has a mechanism to replace the effect with the enhanced version. Some equalizer can have a solid equalizing implementation with appropriate band gains. Max/min level range should not be limited with a fixed value. According to the OpenSL ES 1.0.1 specification(http://www.khronos.org/opensles/), the range returned by GetBandLevelRange must at least include 0mB. So this fix changes to check if the maximum level range is not negative and minimum level range is not positive. Change-Id: I0145545bddc35db119c82817882ea26a35268645 commit 22a3c9a83833a6f0eab978ca037cd5be920a4809 Merge: ba183ee fad21ef Author: Mac_Wang Date: Tue Mar 22 15:03:23 2011 -0700 am fad21efa: am 89f21b71: am 3c768898: am 2e9193f0: Add faketouch checking for HC devices * commit 'fad21efaec49203791d01c9fe9b01b7e2667ccbf': Add faketouch checking for HC devices commit fad21efaec49203791d01c9fe9b01b7e2667ccbf Merge: 0cbd8c3 89f21b7 Author: Mac_Wang Date: Tue Mar 22 15:01:16 2011 -0700 am 89f21b71: am 3c768898: am 2e9193f0: Add faketouch checking for HC devices * commit '89f21b717e88ea80f8078f8917c0d2124e856b90': Add faketouch checking for HC devices commit 89f21b717e88ea80f8078f8917c0d2124e856b90 Merge: ce9a99a 3c76889 Author: Mac_Wang Date: Tue Mar 22 14:58:24 2011 -0700 am 3c768898: am 2e9193f0: Add faketouch checking for HC devices * commit '3c768898f288f07e1ec0571639ed91b34062d8c2': Add faketouch checking for HC devices commit 3c768898f288f07e1ec0571639ed91b34062d8c2 Merge: 03ef0ee 2e9193f Author: Mac_Wang Date: Tue Mar 22 14:55:49 2011 -0700 am 2e9193f0: Add faketouch checking for HC devices * commit '2e9193f09e94348d24364bbe0f1644bad0cecf23': Add faketouch checking for HC devices commit 0a739d578424267e24eda88d259449ffcc4fe6d8 Merge: 927f6d3 7eb8745 Author: Brian Muramatsu Date: Tue Mar 22 12:28:53 2011 -0700 Merge "Ignore Tests with Side Effects" into froyo commit 7eb8745f3564b35ff73f04e4c23d9e2f173e37be Author: Brian Muramatsu Date: Tue Mar 22 12:22:27 2011 -0700 Ignore Tests with Side Effects It looks like a ContentHandlerFactoryTest marked with @SideEffect is causing subsequent luni net tests to fail even though those tests pass on their own. Change-Id: I60a65d4debe2484624c83ea4709dc6231b0dcb10 Conflicts: tools/utils/CollectAllTests.java commit 927f6d319e5c27b6bc5d39bb15230f8ea8f214b0 Merge: 37c5bc2 39ee0f4 Author: Brian Muramatsu Date: Tue Mar 22 12:00:16 2011 -0700 Merge "Added view.invalidate() in testComputeScroll." into froyo commit 39ee0f4c25cf178456ae90c5099cca55390b22e3 Author: m-miyahara Date: Thu Feb 24 15:41:51 2011 +0900 Added view.invalidate() in testComputeScroll. This test examines the value of flag set in computeScroll() is true or not. The process of computeScroll() is done asynchronously form different process when scroll information needs to be updated after requestLayout(). However, computeScroll() is only called when scroll information needs updated. If it does not require updated information this test fails. To avoid this, I called view.invalidate() to modify to redraw the view. Change-Id: I66ea1a4200b8ed2be8f142a11a9a23f4b4fb65f3 commit 2e9193f09e94348d24364bbe0f1644bad0cecf23 Author: Mac_Wang Date: Thu Mar 10 14:06:58 2011 +0800 Add faketouch checking for HC devices According to Dan's description, all HC touchscreen devices should also report faketouch commit ed11f117ffdac3262253487ab6116211bd2c5bbd in framework/base Change-Id: I39eb0fc05ae9358f94260def3e634d6fa8ddbc76 commit 97e9503f4f27e9add35287f7857a7265933533fc Author: Jeff Sharkey Date: Mon Mar 21 16:44:39 2011 -0700 Tests to verify new Ctrl-based EditText movement. Also changes assertSelection() to provide detailed information around test failures. Bug: 4081964 Change-Id: I1c847a2acff6b6c6b4cf7f3ecdb69f87e7b2707b commit ba183eea868560dd9ea379d60fc5f2ee65ddda23 Merge: fc4e38d b22136a Author: Eric Laurent Date: Mon Mar 21 17:59:04 2011 -0700 Merge "Fix issue 3509396: AudioEffect.getParameter JAVA." commit fc4e38d296f107ee09581a847463983696cde452 Merge: 819da90 0cbd8c3 Author: Mist Liao Date: Mon Mar 21 17:48:49 2011 -0700 am 0cbd8c3a: am ce9a99a3: am 03ef0ee8: am 07b9d340: Fix testAccessGravity created mock activity not being destroyed * commit '0cbd8c3ad89e80e1b7f7245e69f4c19dc36c4680': Fix testAccessGravity created mock activity not being destroyed commit 0cbd8c3ad89e80e1b7f7245e69f4c19dc36c4680 Merge: bd38681 ce9a99a Author: Mist Liao Date: Mon Mar 21 16:27:49 2011 -0700 am ce9a99a3: am 03ef0ee8: am 07b9d340: Fix testAccessGravity created mock activity not being destroyed * commit 'ce9a99a3d0b934dff6dbca2c054e1571bbf0af50': Fix testAccessGravity created mock activity not being destroyed commit b22136a36b3d88a97a98d402f48a58095b888479 Author: Eric Laurent Date: Mon Mar 21 10:34:33 2011 -0700 Fix issue 3509396: AudioEffect.getParameter JAVA. Modified AudioEffect tests to reflect new usage of getParameter() method return status. Change-Id: If885437bc7b2aafba0da52faa88e80dd24b273d4 commit ce9a99a3d0b934dff6dbca2c054e1571bbf0af50 Merge: 35d78b7 03ef0ee Author: Mist Liao Date: Mon Mar 21 14:18:38 2011 -0700 am 03ef0ee8: am 07b9d340: Fix testAccessGravity created mock activity not being destroyed * commit '03ef0ee8c8d9e3de5a2c439e0f565ef3e635b873': Fix testAccessGravity created mock activity not being destroyed commit 03ef0ee8c8d9e3de5a2c439e0f565ef3e635b873 Merge: 39be5b7 07b9d34 Author: Mist Liao Date: Mon Mar 21 12:57:24 2011 -0700 am 07b9d340: Fix testAccessGravity created mock activity not being destroyed * commit '07b9d3406e116f2f6b92932925783eed79503de0': Fix testAccessGravity created mock activity not being destroyed commit 37c5bc298b9f0922a6bcc0a8d99cf311b19b102e Merge: 8c7b1d2 af04b25 Author: Brian Muramatsu Date: Mon Mar 21 12:56:24 2011 -0700 Merge "Modified so that if network does not support multipart / data SMS, it skips this test." into froyo commit 07b9d3406e116f2f6b92932925783eed79503de0 Author: Mist Liao Date: Wed Mar 16 13:55:56 2011 +0800 Fix testAccessGravity created mock activity not being destroyed The case android.widget.cts.TextViewTest#testAccessFreezesText will create and destroy MockURLSpanTestActivity twice during its test. However, due to the timing of ActivityMonitor.waitForActivityWithTimeout(), the second MockURLSpanTestActivity would not be destroyed with the message “Duplicate finish request for ActivityRecord{40af0798 com.android.cts.stub/android.text.style.cts.MockURLSpanTestActivity}” Hence the remained MockURLSpanTestActivity on screen will affect followed test case such as testAccessGravity commit 85900f185471afa5ebaed3193cfc7e45c03ea23c Merge: 577e683 a97591d Author: Brian Muramatsu Date: Mon Mar 21 12:03:52 2011 -0700 am a97591d1: am 25c00287: Merge "update the NO_DELIVERY_REPORTS list" into gingerbread * commit 'a97591d1409117f16b3556df6efff25cabbb0e7c': update the NO_DELIVERY_REPORTS list commit 8c7b1d2a9c6d1dcbf91ac07c4dc81b9e7bb184f2 Merge: d16ccf6 9514954 Author: Brian Muramatsu Date: Mon Mar 21 12:02:32 2011 -0700 Merge "Increase time interval in points provided to VelocityTracker" into froyo commit a97591d1409117f16b3556df6efff25cabbb0e7c Merge: c061a10 25c0028 Author: Brian Muramatsu Date: Mon Mar 21 12:02:16 2011 -0700 am 25c00287: Merge "update the NO_DELIVERY_REPORTS list" into gingerbread * commit '25c002871fd02117d229ce7bc2d9e57488ccfe88': update the NO_DELIVERY_REPORTS list commit 9514954aec1ccfdd56e50682e936a332f66938c9 Author: David Krause Date: Tue Feb 22 12:51:41 2011 -0600 Increase time interval in points provided to VelocityTracker There are cases where motion events arrive at VelocityTracker very close together in time (~1 ms), even though they are generated by hardware with much more time between then (~10 ms). In these cases, VelocityTracker can be tweaked to treat these points with more time between them, to prevent wildly incorrect velocities from being calculated. Tweak the CTS test case to validate VelocityTracker with more realistic time deltas between points. Change-Id: I35137ad4ca6223aee0cbba5650672a04f7cea831 commit 577e6835992407abb9f94694319fe4d95cb9f150 Merge: 5070368 c061a10 Author: Brian Muramatsu Date: Mon Mar 21 12:01:11 2011 -0700 am c061a10a: am d8e7d285: Merge "Add a network operator into the not support list of delivery report" into gingerbread * commit 'c061a10a8d9d313c118b12096f7f04b2949d42b3': Add a network operator into the not support list of delivery report commit c061a10a8d9d313c118b12096f7f04b2949d42b3 Merge: 42020b2 d8e7d28 Author: Brian Muramatsu Date: Mon Mar 21 11:57:38 2011 -0700 am d8e7d285: Merge "Add a network operator into the not support list of delivery report" into gingerbread * commit 'd8e7d2854bb834732510c79a46ae85b9120d77ab': Add a network operator into the not support list of delivery report commit 25c002871fd02117d229ce7bc2d9e57488ccfe88 Merge: d8e7d28 0ac085e Author: Brian Muramatsu Date: Mon Mar 21 11:50:35 2011 -0700 Merge "update the NO_DELIVERY_REPORTS list" into gingerbread commit 0ac085e0d935e97c42401ca20dcd6be062b14b7e Author: madan ankapura Date: Sun Mar 20 19:23:30 2011 -0700 update the NO_DELIVERY_REPORTS list add additional carriers that don;t support sms delivery support Change-Id: Ib77dad1f1405fbba2033e161317df22462e9f216 commit d8e7d2854bb834732510c79a46ae85b9120d77ab Merge: 4e71a9d 94696d2 Author: Brian Muramatsu Date: Mon Mar 21 11:44:25 2011 -0700 Merge "Add a network operator into the not support list of delivery report" into gingerbread commit 94696d2309d4b2913ed4cbb28f8015deffd5bd24 Author: Masanori Ogino Date: Fri Mar 18 13:48:02 2011 +0900 Add a network operator into the not support list of delivery report Change-Id: I5b24e88e82cc404a0fa26a08507ec7405ff9320d commit 819da904bfd18707057dc7c72b7bf3b6b23a2e58 Merge: a2f753b bd38681 Author: Brian Muramatsu Date: Mon Mar 21 11:30:11 2011 -0700 am bd386811: am 35d78b73: am 39be5b78: Update BuildVersionTest * commit 'bd386811a296cdb69670a27e7dcb271626a1ceac': Update BuildVersionTest commit bd386811a296cdb69670a27e7dcb271626a1ceac Merge: 2056e4e 35d78b7 Author: Brian Muramatsu Date: Mon Mar 21 11:26:29 2011 -0700 am 35d78b73: am 39be5b78: Update BuildVersionTest * commit '35d78b73a1d920340210685234ddd55fd836c901': Update BuildVersionTest commit 35d78b73a1d920340210685234ddd55fd836c901 Merge: 29a7c94 39be5b7 Author: Brian Muramatsu Date: Mon Mar 21 11:23:50 2011 -0700 am 39be5b78: Update BuildVersionTest * commit '39be5b78542c3030332564023c3c43a469900c1f': Update BuildVersionTest commit a2f753b3ee5e455f1b6bd0476c9f8ba7e256ad2e Merge: 99e0adb 2056e4e Author: Brian Muramatsu Date: Fri Mar 18 17:08:14 2011 -0700 am 2056e4ec: am 5070368d: am 42020b2d: am 4e71a9db: Merge "Fix More Paint#breakText Tests" into gingerbread * commit '2056e4ec12cd5d90a42de696cf5cdb4e4306e4b8': Fix More Paint#breakText Tests commit 99e0adb91e76483a2ce193830c39e2bb40a5b405 Merge: f843a51 6cd8ee7 Author: Brian Muramatsu Date: Fri Mar 18 17:05:34 2011 -0700 am 6cd8ee75: am 155ccafc: am 9b0418a7: am 0f7347dc: Merge "Remove Broken MediaControllerTests" into gingerbread * commit '6cd8ee75d226f1605b942664b4aac5205f9be650': Remove Broken MediaControllerTests commit f843a51341ecf0eb4439d0ffacf836943f301dfe Merge: ff199b6 c0192ba Author: Brian Muramatsu Date: Fri Mar 18 17:05:32 2011 -0700 am c0192ba3: am 23c95642: am a339a671: am 9a589980: Merge "Remove Broken TouchDelegateTest#testOn" into gingerbread * commit 'c0192ba34c0874e1d8e9a0bc2e36a69fb7eab17c': Remove Broken TouchDelegateTest#testOn commit 2056e4ec12cd5d90a42de696cf5cdb4e4306e4b8 Merge: 6cd8ee7 5070368 Author: Brian Muramatsu Date: Fri Mar 18 17:05:08 2011 -0700 am 5070368d: am 42020b2d: am 4e71a9db: Merge "Fix More Paint#breakText Tests" into gingerbread * commit '5070368d4ded24038e2d679f794e6ce31d8931fa': Fix More Paint#breakText Tests commit 6cd8ee75d226f1605b942664b4aac5205f9be650 Merge: c0192ba 155ccaf Author: Brian Muramatsu Date: Fri Mar 18 17:02:16 2011 -0700 am 155ccafc: am 9b0418a7: am 0f7347dc: Merge "Remove Broken MediaControllerTests" into gingerbread * commit '155ccafc8b5e99744787a94e4d8c8f3294cd85aa': Remove Broken MediaControllerTests commit c0192ba34c0874e1d8e9a0bc2e36a69fb7eab17c Merge: 0b80447 23c9564 Author: Brian Muramatsu Date: Fri Mar 18 17:02:14 2011 -0700 am 23c95642: am a339a671: am 9a589980: Merge "Remove Broken TouchDelegateTest#testOn" into gingerbread * commit '23c956424db917d0b306cc6a6a18b21c7c1233c5': Remove Broken TouchDelegateTest#testOn commit 5070368d4ded24038e2d679f794e6ce31d8931fa Merge: 155ccaf 42020b2 Author: Brian Muramatsu Date: Fri Mar 18 17:02:13 2011 -0700 am 42020b2d: am 4e71a9db: Merge "Fix More Paint#breakText Tests" into gingerbread * commit '42020b2d94ab67c57a5675068dea542eea3c6cae': Fix More Paint#breakText Tests commit 155ccafc8b5e99744787a94e4d8c8f3294cd85aa Merge: 23c9564 9b0418a Author: Brian Muramatsu Date: Fri Mar 18 16:54:37 2011 -0700 am 9b0418a7: am 0f7347dc: Merge "Remove Broken MediaControllerTests" into gingerbread * commit '9b0418a7d74f845fdfd5ee3c0fe602b2d9617107': Remove Broken MediaControllerTests commit 23c956424db917d0b306cc6a6a18b21c7c1233c5 Merge: c1150f6 a339a67 Author: Brian Muramatsu Date: Fri Mar 18 16:54:31 2011 -0700 am a339a671: am 9a589980: Merge "Remove Broken TouchDelegateTest#testOn" into gingerbread * commit 'a339a671d18fad024765503e745b4221f5528eb7': Remove Broken TouchDelegateTest#testOn commit ff199b63553453bb2f5cde085496afd666442e49 Merge: fc292a9 0b80447 Author: Brian Muramatsu Date: Fri Mar 18 16:46:52 2011 -0700 am 0b804478: am c1150f6e: am 6799bf53: am 20d83054: Merge "Fix LocationTest to Support More Locales" into gingerbread * commit '0b80447820e3e57b6dada6d3c2f391eeb98ea49e': Fix LocationTest to Support More Locales commit 39be5b78542c3030332564023c3c43a469900c1f Author: Brian Muramatsu Date: Thu Mar 17 15:01:27 2011 -0700 Update BuildVersionTest Change-Id: I810b1e79c2a8f298b6fae1d39c01779debc2f8a8 commit 42020b2d94ab67c57a5675068dea542eea3c6cae Merge: 9b0418a 4e71a9d Author: Brian Muramatsu Date: Fri Mar 18 16:33:49 2011 -0700 am 4e71a9db: Merge "Fix More Paint#breakText Tests" into gingerbread * commit '4e71a9dbcd06315ad57b6871840f2b309a47d663': Fix More Paint#breakText Tests commit 0b80447820e3e57b6dada6d3c2f391eeb98ea49e Merge: 518b9d9 c1150f6 Author: Brian Muramatsu Date: Fri Mar 18 16:08:58 2011 -0700 am c1150f6e: am 6799bf53: am 20d83054: Merge "Fix LocationTest to Support More Locales" into gingerbread * commit 'c1150f6e3e149240d5d8f8742539865e0de8dff1': Fix LocationTest to Support More Locales commit 4e71a9dbcd06315ad57b6871840f2b309a47d663 Merge: 0f7347d 02e6f82 Author: Brian Muramatsu Date: Fri Mar 18 15:42:02 2011 -0700 Merge "Fix More Paint#breakText Tests" into gingerbread commit 9b0418a7d74f845fdfd5ee3c0fe602b2d9617107 Merge: a339a67 0f7347d Author: Brian Muramatsu Date: Fri Mar 18 15:34:48 2011 -0700 am 0f7347dc: Merge "Remove Broken MediaControllerTests" into gingerbread * commit '0f7347dcc5fc5c5094afccaf7141d921d742c474': Remove Broken MediaControllerTests commit a339a671d18fad024765503e745b4221f5528eb7 Merge: 6799bf5 9a58998 Author: Brian Muramatsu Date: Fri Mar 18 15:34:45 2011 -0700 am 9a589980: Merge "Remove Broken TouchDelegateTest#testOn" into gingerbread * commit '9a589980b74f2976e72c273969b027a0fa694492': Remove Broken TouchDelegateTest#testOn commit c1150f6e3e149240d5d8f8742539865e0de8dff1 Merge: 5e2e348 6799bf5 Author: Brian Muramatsu Date: Fri Mar 18 15:33:18 2011 -0700 am 6799bf53: am 20d83054: Merge "Fix LocationTest to Support More Locales" into gingerbread * commit '6799bf53ab5391277d1a4d75b7977c8c8a197301': Fix LocationTest to Support More Locales commit 0f7347dcc5fc5c5094afccaf7141d921d742c474 Merge: 9a58998 9971855 Author: Brian Muramatsu Date: Fri Mar 18 15:29:02 2011 -0700 Merge "Remove Broken MediaControllerTests" into gingerbread commit fc292a9caacfecc553d2a9e25e56120048004397 Merge: 68ae62b 518b9d9 Author: Brian Muramatsu Date: Fri Mar 18 15:28:18 2011 -0700 am 518b9d97: am 5e2e3484: am d99982b1: am dc423ca3: Merge "Fix Some Tests to Support Different Kcms" into gingerbread * commit '518b9d97ec3b585a0c725ac8ad81ab240aaf5eab': Fix Some Tests to Support Different Kcms commit 518b9d97ec3b585a0c725ac8ad81ab240aaf5eab Merge: d8bed3c 5e2e348 Author: Brian Muramatsu Date: Fri Mar 18 15:22:10 2011 -0700 am 5e2e3484: am d99982b1: am dc423ca3: Merge "Fix Some Tests to Support Different Kcms" into gingerbread * commit '5e2e3484d4271c24dba0ffad03a05f0470363e7e': Fix Some Tests to Support Different Kcms commit 6799bf53ab5391277d1a4d75b7977c8c8a197301 Merge: d99982b 20d8305 Author: Brian Muramatsu Date: Fri Mar 18 15:19:44 2011 -0700 am 20d83054: Merge "Fix LocationTest to Support More Locales" into gingerbread * commit '20d83054c23791ec72292c6c10d2593e575359d5': Fix LocationTest to Support More Locales commit 9a589980b74f2976e72c273969b027a0fa694492 Merge: 20d8305 e14b296 Author: Brian Muramatsu Date: Fri Mar 18 15:19:44 2011 -0700 Merge "Remove Broken TouchDelegateTest#testOn" into gingerbread commit 5e2e3484d4271c24dba0ffad03a05f0470363e7e Merge: b38e39c d99982b Author: Brian Muramatsu Date: Fri Mar 18 15:19:13 2011 -0700 am d99982b1: am dc423ca3: Merge "Fix Some Tests to Support Different Kcms" into gingerbread * commit 'd99982b17e0d779971c19a1392920cc766be9496': Fix Some Tests to Support Different Kcms commit d99982b17e0d779971c19a1392920cc766be9496 Merge: 153b7e1 dc423ca Author: Brian Muramatsu Date: Fri Mar 18 15:15:08 2011 -0700 am dc423ca3: Merge "Fix Some Tests to Support Different Kcms" into gingerbread * commit 'dc423ca386b442845548dbce4991c927e47d0b55': Fix Some Tests to Support Different Kcms commit 20d83054c23791ec72292c6c10d2593e575359d5 Merge: dc423ca fce2ccf Author: Brian Muramatsu Date: Fri Mar 18 15:05:25 2011 -0700 Merge "Fix LocationTest to Support More Locales" into gingerbread commit dc423ca386b442845548dbce4991c927e47d0b55 Merge: d1fed24 300d755f Author: Brian Muramatsu Date: Fri Mar 18 14:55:01 2011 -0700 Merge "Fix Some Tests to Support Different Kcms" into gingerbread commit 68ae62b60106bdf7174e3d69297c0c949aea0036 Author: Alex Sakhartchouk Date: Fri Mar 18 13:38:50 2011 -0700 More tests Change-Id: Ie5a32b225e10e4336e6a60c4a82597e1ae20d27f commit d16ccf68fdef2895ea5645d905ab711dea52366d Merge: de73cd0 26e9b9c Author: Brian Muramatsu Date: Fri Mar 18 12:54:35 2011 -0700 Merge "Froyo-specific startcts Fixes" into froyo commit 26e9b9cf23406fe27030984f84acacd36ad15918 Author: Brian Muramatsu Date: Fri Mar 18 12:50:01 2011 -0700 Froyo-specific startcts Fixes Bug 4128048 Froyo doesn't include a prebuild ddmlib, so add back the statements to require the SDK_ROOT variable to be set. However, keep the code that checked SDK_ROOT/tools and SDK_ROOT/platform-tools that was patched in. Change-Id: Ie1eedcb66d4004df2d9011688c29febf0b13446f commit 08a6c0f9913238a4a803110dd9656d63cba1016f Merge: ab4cc98 d8bed3c Author: Brian Muramatsu Date: Thu Mar 17 18:09:21 2011 -0700 am d8bed3c6: am 29a7c946: am 84ce4257: am 21d22568: Close InputStream in HostUtils * commit 'd8bed3c63b490b002e2e3a57c6a71a2780602f01': Close InputStream in HostUtils commit d8bed3c63b490b002e2e3a57c6a71a2780602f01 Merge: ae8a8d1 29a7c94 Author: Brian Muramatsu Date: Thu Mar 17 18:06:50 2011 -0700 am 29a7c946: am 84ce4257: am 21d22568: Close InputStream in HostUtils * commit '29a7c94609d542ef52190ef44d153ea261694db0': Close InputStream in HostUtils commit ab4cc98cb2f5cc72f35cd1afa0b9330343dc6329 Merge: b991cc8 ae8a8d1 Author: Brian Muramatsu Date: Thu Mar 17 18:06:48 2011 -0700 am ae8a8d19: am 1e588a70: am 6e82117e: am 84f2627e: Update BuildVersionTest * commit 'ae8a8d190402bb795b36f25de65a7fccdab15f97': Update BuildVersionTest commit 29a7c94609d542ef52190ef44d153ea261694db0 Merge: 1e588a7 84ce425 Author: Brian Muramatsu Date: Thu Mar 17 18:05:10 2011 -0700 am 84ce4257: am 21d22568: Close InputStream in HostUtils * commit '84ce42571d21b7417a0ffb85c7b8ccb5d664f208': Close InputStream in HostUtils commit 84ce42571d21b7417a0ffb85c7b8ccb5d664f208 Merge: 6e82117 21d2256 Author: Brian Muramatsu Date: Thu Mar 17 18:03:02 2011 -0700 am 21d22568: Close InputStream in HostUtils * commit '21d2256849fea762782d589e604394f0edea212e': Close InputStream in HostUtils commit ae8a8d190402bb795b36f25de65a7fccdab15f97 Merge: 6ef6a7e 1e588a7 Author: Brian Muramatsu Date: Thu Mar 17 18:00:15 2011 -0700 am 1e588a70: am 6e82117e: am 84f2627e: Update BuildVersionTest * commit '1e588a70de1754cae848e4aed2235cb5c01083a6': Update BuildVersionTest commit 1e588a70de1754cae848e4aed2235cb5c01083a6 Merge: d12cf36 6e82117 Author: Brian Muramatsu Date: Thu Mar 17 17:56:07 2011 -0700 am 6e82117e: am 84f2627e: Update BuildVersionTest * commit '6e82117eee7790888fedaa9b2f0cae7813f812a6': Update BuildVersionTest commit 21d2256849fea762782d589e604394f0edea212e Author: Brian Muramatsu Date: Fri Mar 4 16:26:31 2011 -0800 Close InputStream in HostUtils Issue 15126 visitFile was opening FileInputStreams but not closing them. Change-Id: I4d57b51b3debc03ff9be4e244d251db9b5257584 commit 99718555204b181fdefc1af1fa5fbe7bb435d710 Author: Brian Muramatsu Date: Thu Mar 17 17:08:30 2011 -0700 Remove Broken MediaControllerTests Bug 3188260 These don't seem like they will be reliable even if they are fixed. Change-Id: Ib2c077a0a98afd7247df7641d33781c2c32d0be6 commit 6e82117eee7790888fedaa9b2f0cae7813f812a6 Merge: fde621e 84f2627 Author: Brian Muramatsu Date: Thu Mar 17 17:07:57 2011 -0700 am 84f2627e: Update BuildVersionTest * commit '84f2627ec688c53fd0e18b21c5122f819149ccfc': Update BuildVersionTest commit 84f2627ec688c53fd0e18b21c5122f819149ccfc Author: Brian Muramatsu Date: Thu Mar 17 16:27:54 2011 -0700 Update BuildVersionTest Add 3.0.1 to the possibilities. Change-Id: I21e3eb800c2a0b87749caf38d97debee465cc06b commit e14b2966aa778de618898eb9cedc92b883868d91 Author: Brian Muramatsu Date: Thu Mar 17 16:42:37 2011 -0700 Remove Broken TouchDelegateTest#testOn Bug 3188260 Change-Id: Ibcc74111be172b7afe668bbb016f2fce9745e4dc commit b991cc82b4667a15818a793e04e0d098475e03b2 Merge: 760763e 6ef6a7e Author: Brian Muramatsu Date: Thu Mar 17 16:31:19 2011 -0700 am 6ef6a7ef: am b38e39c2: am 153b7e1d: am d1fed244: Merge "CTS: Fixes for android.hardware.cts.CameraTest#testPreviewFpsRangeByCamera" into gingerbread * commit '6ef6a7ef1a4544f371629cc0c8c94e08cff1d9c1': CTS: Fixes for android.hardware.cts.CameraTest#testPreviewFpsRangeByCamera commit 6ef6a7ef1a4544f371629cc0c8c94e08cff1d9c1 Merge: 01ace03 b38e39c Author: Brian Muramatsu Date: Thu Mar 17 16:27:21 2011 -0700 am b38e39c2: am 153b7e1d: am d1fed244: Merge "CTS: Fixes for android.hardware.cts.CameraTest#testPreviewFpsRangeByCamera" into gingerbread * commit 'b38e39c2950a86abdb12479f20ff6a21b2268d76': CTS: Fixes for android.hardware.cts.CameraTest#testPreviewFpsRangeByCamera commit 02e6f82ac5d07e52ef3a314eefb0b62dadcf4b4d Author: Brian Muramatsu Date: Thu Mar 17 16:06:58 2011 -0700 Fix More Paint#breakText Tests Bug 3188260 Accidentally uncommented 2 broken tests earlier although they do pass. Remove those tests and consolidate the testing of the different breakText functions into a single test. Change-Id: Iec1b3d9f40d63a647d752b7341b29d06fd3793e9 commit b38e39c2950a86abdb12479f20ff6a21b2268d76 Merge: c4b0161 153b7e1 Author: Brian Muramatsu Date: Thu Mar 17 16:21:14 2011 -0700 am 153b7e1d: am d1fed244: Merge "CTS: Fixes for android.hardware.cts.CameraTest#testPreviewFpsRangeByCamera" into gingerbread * commit '153b7e1d576ba9abc80c40b8a9d61bbb84bea02c': CTS: Fixes for android.hardware.cts.CameraTest#testPreviewFpsRangeByCamera commit 760763efb54c1f2638eb488a176be9bdb4292c91 Merge: b35062a c9c0e89 Author: Alex Sakhartchouk Date: Thu Mar 17 13:51:32 2011 -0700 Merge "Matrix, fixed function, surface config tests." commit c9c0e8950413336892ebc1b8533e01fba1c981e8 Author: Alex Sakhartchouk Date: Thu Mar 17 13:05:42 2011 -0700 Matrix, fixed function, surface config tests. Change-Id: I3f1f6a1d527b252fa9daf92e58f22001252676c1 commit 153b7e1d576ba9abc80c40b8a9d61bbb84bea02c Merge: 3efea84 d1fed24 Author: Brian Muramatsu Date: Thu Mar 17 12:44:08 2011 -0700 am d1fed244: Merge "CTS: Fixes for android.hardware.cts.CameraTest#testPreviewFpsRangeByCamera" into gingerbread * commit 'd1fed2449d20ca276f52599725afe0a9e1b78fbd': CTS: Fixes for android.hardware.cts.CameraTest#testPreviewFpsRangeByCamera commit b35062a613431df4da65de43ccd028e01b859f9f Merge: a611aaa 01ace03 Author: Yu Shan Emily Lau Date: Thu Mar 17 12:41:57 2011 -0700 am 01ace031: am d12cf36d: am fde621e6: Merge "Remove the proprietary WV plugin info." into honeycomb-mr1 * commit '01ace0314af074050217e048152d64cb16746629': Remove the proprietary WV plugin info. commit a611aaaea97b81d37e975357210d75066c48226f Merge: 096a33c d740e03 Author: Gloria Wang Date: Thu Mar 17 12:38:37 2011 -0700 am d740e030: am 4808555d: am 840c4640: Some modification on the API call of the Drm framework. * commit 'd740e030af740c6a49eea8903e4125bea8c50e9c': Some modification on the API call of the Drm framework. commit 096a33ce648f96f3e0e2883c4e169311cfead7ee Merge: 2867fa5 94008fb Author: Brian Muramatsu Date: Thu Mar 17 12:38:23 2011 -0700 am 94008fbd: am 84c8e60e: am 2ab311c1: Test for ActivityManager#getMemoryClass * commit '94008fbd30f83829e68a3a338426011269249b06': Test for ActivityManager#getMemoryClass commit 01ace0314af074050217e048152d64cb16746629 Merge: d740e03 d12cf36 Author: Yu Shan Emily Lau Date: Thu Mar 17 12:33:28 2011 -0700 am d12cf36d: am fde621e6: Merge "Remove the proprietary WV plugin info." into honeycomb-mr1 * commit 'd12cf36d81cfa4cf0aa7ab77b15c0cfdb392cc73': Remove the proprietary WV plugin info. commit d740e030af740c6a49eea8903e4125bea8c50e9c Merge: 94008fb 4808555 Author: Gloria Wang Date: Thu Mar 17 12:30:48 2011 -0700 am 4808555d: am 840c4640: Some modification on the API call of the Drm framework. * commit '4808555dfffb8d3f30ac813ffea00b0c39a19144': Some modification on the API call of the Drm framework. commit 94008fbd30f83829e68a3a338426011269249b06 Merge: 9115de6 84c8e60 Author: Brian Muramatsu Date: Thu Mar 17 12:30:39 2011 -0700 am 84c8e60e: am 2ab311c1: Test for ActivityManager#getMemoryClass * commit '84c8e60e66d5f177a39f3eb47c28d6317c372dc8': Test for ActivityManager#getMemoryClass commit d12cf36d81cfa4cf0aa7ab77b15c0cfdb392cc73 Merge: 4808555 fde621e Author: Yu Shan Emily Lau Date: Thu Mar 17 12:25:44 2011 -0700 am fde621e6: Merge "Remove the proprietary WV plugin info." into honeycomb-mr1 * commit 'fde621e61f9ecc20774ef669a6c2f6c0da38f84b': Remove the proprietary WV plugin info. commit de73cd084d661ae1e5a3952b2fea3d189955b02d Merge: 9bff59a 353d6cc Author: Brian Muramatsu Date: Thu Mar 17 12:23:23 2011 -0700 Merge "Revert "Allow 2.2.3 for Build.VERSION"" into froyo commit 353d6ccd452083dcb64d1545bb1c917f0d1d10d0 Author: Brian Muramatsu Date: Thu Mar 17 12:19:54 2011 -0700 Revert "Allow 2.2.3 for Build.VERSION" This reverts commit 520d02bd49ab943071e7cec70ef9173185f6f845. commit 9bff59a3f8c182448d4f0e71c37d7889b2a36a95 Merge: 9d3f2b7 520d02b Author: Brian Muramatsu Date: Thu Mar 17 12:06:18 2011 -0700 Merge "Allow 2.2.3 for Build.VERSION" into froyo commit fde621e61f9ecc20774ef669a6c2f6c0da38f84b Merge: 840c464 7996f43 Author: Yu Shan Emily Lau Date: Thu Mar 17 11:58:39 2011 -0700 Merge "Remove the proprietary WV plugin info." into honeycomb-mr1 commit 9d3f2b707c2659543644cfeeff53e7ab35311455 Merge: 3953187 e298e6f Author: Brian Muramatsu Date: Thu Mar 17 11:54:01 2011 -0700 Merge "Increment CTS Version to 2.2_r5" into froyo commit e298e6f57eee928c98e0ebd9726711c4f72927f2 Author: Brian Muramatsu Date: Thu Mar 17 11:48:39 2011 -0700 Increment CTS Version to 2.2_r5 Bug 4128048 Change-Id: I7429e8e0b0d18427fc7dcd1629e28131a8a92ca3 commit 7996f437df18a2eb986ce9083f1b70e33fa8e1e9 Author: Yu Shan Emily Lau Date: Thu Mar 17 11:47:03 2011 -0700 Remove the proprietary WV plugin info. Change-Id: I4bb388a7c6f5f59b803c7d371086a8bb1ab77036 commit 520d02bd49ab943071e7cec70ef9173185f6f845 Author: Brian Muramatsu Date: Thu Mar 17 11:35:08 2011 -0700 Allow 2.2.3 for Build.VERSION Bug 4128048 Change-Id: I6a8bddc8cc0eae4a6a08573163f03ab147539c37 commit d1fed2449d20ca276f52599725afe0a9e1b78fbd Merge: d764b34 60feb59 Author: Brian Muramatsu Date: Thu Mar 17 11:29:01 2011 -0700 Merge "CTS: Fixes for android.hardware.cts.CameraTest#testPreviewFpsRangeByCamera" into gingerbread commit 4808555dfffb8d3f30ac813ffea00b0c39a19144 Merge: 84c8e60 840c464 Author: Gloria Wang Date: Thu Mar 17 10:53:57 2011 -0700 am 840c4640: Some modification on the API call of the Drm framework. * commit '840c464032f558cafb363f35c0aafc55d620ede8': Some modification on the API call of the Drm framework. commit d088736da5fc73d761fe344970c9df21c521b115 Author: Wu-cheng Li Date: Thu Mar 17 18:16:18 2011 +0800 Register error callback in every camera test. Change-Id: I1124f73b174c66079647675e56ee3a3b90213c9b commit 2867fa55a3ec52b7ab96a01e5e967492d77770c6 Merge: 079769f cff77fb Author: Stephen Hines Date: Wed Mar 16 17:28:16 2011 -0700 Merge "Test Priority and inherited setName()/destroy()." commit 3953187ee55446be6393f1e25d14c023f9e72f1d Merge: 20bf6fb bef1015 Author: Brian Muramatsu Date: Wed Mar 16 17:15:12 2011 -0700 Merge "Add wait in testOnWindowFocusChanged." into froyo commit 20bf6fb1328e40d9dec931070a6bdb346d229ccb Merge: 0a56b41 4d12521 Author: Brian Muramatsu Date: Wed Mar 16 17:03:12 2011 -0700 Merge "CTS AudioTrackTest: Changing audiotrack buffer size from minBuffSize to 2*minBuffSize" into froyo commit 4d12521c5885d6a76bde16f464756bfbdbe22b40 Author: karimuddin sayed Date: Wed Mar 16 06:26:20 2011 -0500 CTS AudioTrackTest: Changing audiotrack buffer size from minBuffSize to 2*minBuffSize This patch modifies the audio track buffer size for some test cases. If the buffer size is not multiple of framesize in track.write, the audio track write function hangs as frame count * framesize doesn't match the buffer size sent. eg: if minbuffersize = 7524, buffersizesent = minbuffersize/2 = 3762 framecount = 3762/4(frame_size) = 940.5 (as it is fractional number considers as 940) framecount*frame_size = 940*4=3760 and the write function hangs to get the remaining 2 bytes. As buffersize is always multiple of frame_size, it is good to sent the entire buffer to track.write function to avoid this kind of issues. Change-Id: I6fda86ad12dc3b1e1735caa3bb527de87c7b3586 Signed-off-by: karimuddin sayed commit 0a56b414a87a046148336d1ba4df8207900f7989 Merge: 7dbe9da 41db90d Author: Brian Muramatsu Date: Wed Mar 16 16:00:52 2011 -0700 Merge "Adding DelayedCheck() in testHasWindowFocus." into froyo commit 41db90d18ce2721c22dbd3602a6f8402c53cd182 Author: m-miyahara Date: Thu Feb 24 17:11:34 2011 +0900 Adding DelayedCheck() in testHasWindowFocus. After executing findViewById(), there are some cases where test case is failed since flags that are set asynchronously are checked only once immediately after that event. To avoid this, I changed the code to monitor the change of flag. Change-Id: Iaf30f18144a5ef1887334bc65cbef59ea5de70ac commit fce2ccf15c5df10da7ac3cabe0c10719875725ac Author: Brian Muramatsu Date: Wed Mar 16 15:07:38 2011 -0700 Fix LocationTest to Support More Locales Some locales use a comma rather than a period for decimal numbers. Make sure the test uses localized decimal strings. Change-Id: I254513ffa623c01aa57dbde1db0c63b21fdd89a0 commit 300d755fcaa7274f1570f53d34c7a657bc420ab6 Author: Brian Muramatsu Date: Tue Mar 15 17:33:24 2011 -0700 Fix Some Tests to Support Different Kcms - DateTimeKeyListenerTest/TimeKeyListenerTest Check that the letters like 'a' and 'p' can be produced by the KeyCharacterMap, because DateTimeKeyListener will return '1' if A is mapped to 1. This is because '1' appears first in the array of acceptable characters first. This is likely a bug in DateTimeKeyListener. - NumberKeyListenerTest Check that the implementation of lookUp somewhat works by having getAcceptableChars return nothing to test that that lookUp does reject characters when configured to do so. - TextViewTest Remove the sending of key events in the set/getKeyListener tests since that is covered by other tests. Make the test that checks that errors are not cleared when entering an unacceptable character by using a listener that rejects all characters. Change-Id: I4e73f0616b9e602f9b883a82be5fbd7b2dc5ca9a commit 840c464032f558cafb363f35c0aafc55d620ede8 Author: Gloria Wang Date: Wed Mar 16 13:18:44 2011 -0700 Some modification on the API call of the Drm framework. Change-Id: Ifde6081afb61b5007003455000487dd266ccc9dd commit 079769fe91d28a588f49eb72247aec16199c669d Author: satok Date: Wed Mar 16 17:21:55 2011 +0900 Fix build breakage in CTS Change-Id: I0fce1fde5ae0db6daacdb00297404861ac3178e6 commit cff77fb0318a11fc87e819a26adbcf70984f4f19 Author: Stephen Hines Date: Tue Mar 15 21:34:18 2011 -0700 Test Priority and inherited setName()/destroy(). This change also trims down imports. Change-Id: I1bb8bc045ad488c7f1fd3b4f943cb8ea31d0cd65 commit 30d217b594efaa857eb12552591dca4e4c71042a Merge: f21f669 9e24ab6 Author: Jeff Brown Date: Tue Mar 15 20:01:35 2011 -0700 Merge "Add a few tests for MotionEvents.PointerCoords." commit f21f6699089439371e049d5fd385e83a51f99754 Merge: 9bd34ef e299c83 Author: Jeff Brown Date: Tue Mar 15 20:01:21 2011 -0700 Merge "Update VelocityTracker tests." commit 9e24ab6e4092d2760296f8a23d194bc26b577173 Author: Jeff Brown Date: Tue Mar 15 19:07:47 2011 -0700 Add a few tests for MotionEvents.PointerCoords. Change-Id: Ib8c1ef62a41b23007e5ee06ff2c3a824c797c911 commit e299c83a78451b49de2ccb28119ad470c80e3eba Author: Jeff Brown Date: Tue Mar 15 19:04:04 2011 -0700 Update VelocityTracker tests. Modified the test so that all of the samples are at least 10ms apart. This is because the new VelocityTracker does not attempt to compute the velocity when the time difference is too small to give accurate results. The computed values are also slightly different because the new VelocityTracker does not discard the most recent sample. Instead, it is more careful about how it handles pointers going down or up to ensure that the pointer's last known velocity is accurately reported. Change-Id: Ie551d343ed0be22cb5b87d5a16bf4bb74210c44a commit 9bd34eff5fa1bf6674f0fd6a1374d7db167bf23b Author: Stephen Hines Date: Tue Mar 15 17:57:41 2011 -0700 Add a test for all RS exceptions. Change-Id: Ie695ab615437371ce9e050ae51ab5f75962c2905 commit 74993ecf6010a967ab332af205e095e20502079e Merge: 54b7c65 37243bf Author: Stephen Hines Date: Tue Mar 15 14:34:22 2011 -0700 Merge "Improve Allocation test coverage." commit 37243bf8556257b5a4baa89fa954a8630231cb28 Author: Stephen Hines Date: Mon Mar 14 17:00:47 2011 -0700 Improve Allocation test coverage. This change also includes "chmod -x ComputeTest.java". Change-Id: I9119a2aadb461f930a2313cc387ce99f451ff2b7 commit 60feb598eb1f0b18e77dee93981f2d1aaeff504a Author: Emilian Peev Date: Tue Mar 15 12:38:31 2011 +0200 CTS: Fixes for android.hardware.cts.CameraTest#testPreviewFpsRangeByCamera - When variable framerate is active and depending on the light conditions, the framerate can get very low. This should be taken in to account during the process of discarding the measurements and leave just enough data. This way the checks and calculations that follow can proceed without any issues. Change-Id: I156760d893778f7db0b876d943b67acb99754bbc Signed-off-by: Emilian Peev commit 54b7c65852ee172d5da763d2943496bf66924889 Merge: 5d4b828 9115de6 Author: Brian Muramatsu Date: Mon Mar 14 18:31:14 2011 -0700 am 9115de61: am c4b0161b: am 3efea84b: am d764b34d: Merge "Add Test to Verify NX is Enabled" into gingerbread * commit '9115de613bb0734561c3dd28f7686d6b8c311b53': Add Test to Verify NX is Enabled commit 9115de613bb0734561c3dd28f7686d6b8c311b53 Merge: a64f1c9 c4b0161 Author: Brian Muramatsu Date: Mon Mar 14 18:29:45 2011 -0700 am c4b0161b: am 3efea84b: am d764b34d: Merge "Add Test to Verify NX is Enabled" into gingerbread * commit 'c4b0161b9f4e5ce415045485a7ad3d708d001440': Add Test to Verify NX is Enabled commit 5d4b828d4c297ba5281fa31e6f4cdb38deb72efc Merge: 1f7c46b a64f1c9 Author: Brian Muramatsu Date: Mon Mar 14 17:51:57 2011 -0700 am a64f1c93: am 28eb25b3: am 0aa7238d: am a4bb0c50: Merge "The center aligned test has to have 1 pixel margin" into gingerbread * commit 'a64f1c932ef02b99fb6268ca2c546dd4e845c11c': The center aligned test has to have 1 pixel margin commit 1f7c46bac694cbe9ae513cc1e07245e0b74505c9 Merge: 22a79ea 9fc279c Author: Brian Muramatsu Date: Mon Mar 14 17:51:55 2011 -0700 am 9fc279cb: am c9a6c2d1: am 34e5e8ca: am 3280e89e: Merge "Fix for CTS testScreenConfiguration" into gingerbread * commit '9fc279cb570a63aeda2306183a79ad17317ac6d4': Fix for CTS testScreenConfiguration commit 22a79ea31697bb481d16fcb6077a309e5d3cf867 Merge: f4a0b49 fc2d4be Author: Brian Muramatsu Date: Mon Mar 14 17:51:53 2011 -0700 am fc2d4be7: am 67f3e593: am 4bc236c8: am 73524561: Merge "CTS: Fixes for android.hardware.cts.CameraTest#testPreviewCallback" into gingerbread * commit 'fc2d4be7f652f26fb931cb48813428042f27c0a1': CTS: Fixes for android.hardware.cts.CameraTest#testPreviewCallback commit a64f1c932ef02b99fb6268ca2c546dd4e845c11c Merge: 9fc279c 28eb25b Author: Brian Muramatsu Date: Mon Mar 14 17:48:50 2011 -0700 am 28eb25b3: am 0aa7238d: am a4bb0c50: Merge "The center aligned test has to have 1 pixel margin" into gingerbread * commit '28eb25b38507e4d8b055c43475a68b80a6b8a59f': The center aligned test has to have 1 pixel margin commit 9fc279cb570a63aeda2306183a79ad17317ac6d4 Merge: fc2d4be c9a6c2d Author: Brian Muramatsu Date: Mon Mar 14 17:48:47 2011 -0700 am c9a6c2d1: am 34e5e8ca: am 3280e89e: Merge "Fix for CTS testScreenConfiguration" into gingerbread * commit 'c9a6c2d11672c4bd3ed06de85904cc08a150df1e': Fix for CTS testScreenConfiguration commit fc2d4be7f652f26fb931cb48813428042f27c0a1 Merge: ff2361b 67f3e59 Author: Brian Muramatsu Date: Mon Mar 14 17:48:40 2011 -0700 am 67f3e593: am 4bc236c8: am 73524561: Merge "CTS: Fixes for android.hardware.cts.CameraTest#testPreviewCallback" into gingerbread * commit '67f3e5939ca845780dc9e82bc825d373248ca6ae': CTS: Fixes for android.hardware.cts.CameraTest#testPreviewCallback commit 7dbe9da63384ae86642a8fca5f83a08eb436b025 Merge: 6611750 e4c0b9e Author: Brian Muramatsu Date: Mon Mar 14 17:41:31 2011 -0700 Merge "Adding DelayedCheck() in testInputConnection." into froyo commit e4c0b9ef0339415c3cd36a1a2f7ef40efd5dfa76 Author: Brian Muramatsu Date: Thu Feb 24 16:11:27 2011 +0900 Adding DelayedCheck() in testInputConnection. After executing requestFocus(), there are some cases where test case is failed since showSoftInput() is called before EditText gets focus. To avoid this, I changed the code to add wait until EditText has focus. Change-Id: If1ebacf244c5c019dbdee09b9098d877c0ddd7fc commit c4b0161b9f4e5ce415045485a7ad3d708d001440 Merge: 28eb25b 3efea84 Author: Brian Muramatsu Date: Mon Mar 14 17:15:31 2011 -0700 am 3efea84b: am d764b34d: Merge "Add Test to Verify NX is Enabled" into gingerbread * commit '3efea84b61996c0f555c62f0f1ef5a9b9e0f46fc': Add Test to Verify NX is Enabled commit 3efea84b61996c0f555c62f0f1ef5a9b9e0f46fc Merge: 0aa7238 d764b34 Author: Brian Muramatsu Date: Mon Mar 14 17:11:44 2011 -0700 am d764b34d: Merge "Add Test to Verify NX is Enabled" into gingerbread * commit 'd764b34d21f8d88421741d61bbe47c726dab089e': Add Test to Verify NX is Enabled commit d764b34d21f8d88421741d61bbe47c726dab089e Merge: a4bb0c5 38e6292 Author: Brian Muramatsu Date: Mon Mar 14 16:53:25 2011 -0700 Merge "Add Test to Verify NX is Enabled" into gingerbread commit 38e629204b3b324fc515a05639e43a771981dea6 Author: Brian Muramatsu Date: Mon Mar 14 16:40:30 2011 -0700 Add Test to Verify NX is Enabled Bug 4083207 Change-Id: I246fca2b86c6ec6c8348c6590f0188c9eefe7a7a commit f4a0b49bb6d869005e6b4f42273b4e1bb666c35f Merge: 2d071af 03b5b39 Author: Alex Sakhartchouk Date: Mon Mar 14 16:39:38 2011 -0700 Merge "More improvements to renderscript CTS tests. Now coverage is at 57%" commit 84c8e60e66d5f177a39f3eb47c28d6317c372dc8 Merge: ff2361b 2ab311c Author: Brian Muramatsu Date: Mon Mar 14 16:03:10 2011 -0700 am 2ab311c1: Test for ActivityManager#getMemoryClass * commit '2ab311c1eead4ad5774992ee74d6d045382343ea': Test for ActivityManager#getMemoryClass commit 2ab311c1eead4ad5774992ee74d6d045382343ea Author: Brian Muramatsu Date: Thu Dec 23 16:01:00 2010 -0800 Test for ActivityManager#getMemoryClass Bug 3111822 Check the requirements specified in the "Virtual Machine Compatibility" section in the CDD. Check that the right memory class is specified for the device's screen density and then try to allocate up to 75% of the returned memory class to see if it actually works. Change-Id: I06b50381977c5751fe4dcb64efd7345deb2991d2 commit 03b5b3969ad30306d539e6fc6fd1c992099b1a3b Author: Alex Sakhartchouk Date: Mon Mar 14 15:13:28 2011 -0700 More improvements to renderscript CTS tests. Now coverage is at 57% Change-Id: Icf7be9a660a9572efd3722391ffea21886caab0a commit 2d071af73fdae30bc33ccd84f9e6f247112fe5a8 Author: Iliyan Malchev Date: Mon Mar 14 14:02:05 2011 -0700 cts: remove LOCAL_PRELINK_MODULE Change-Id: I2e94dc0e3268929b6cd4db52627f5954706a1853 Signed-off-by: Iliyan Malchev commit 28eb25b38507e4d8b055c43475a68b80a6b8a59f Merge: c9a6c2d 0aa7238 Author: Brian Muramatsu Date: Mon Mar 14 13:34:47 2011 -0700 am 0aa7238d: am a4bb0c50: Merge "The center aligned test has to have 1 pixel margin" into gingerbread * commit '0aa7238d4672ac8a8da4680e00eae1805e871679': The center aligned test has to have 1 pixel margin commit c9a6c2d11672c4bd3ed06de85904cc08a150df1e Merge: 67f3e59 34e5e8c Author: Brian Muramatsu Date: Mon Mar 14 13:34:45 2011 -0700 am 34e5e8ca: am 3280e89e: Merge "Fix for CTS testScreenConfiguration" into gingerbread * commit '34e5e8ca05f04ef8b19f5d7e5fd6bf676f85d214': Fix for CTS testScreenConfiguration commit 67f3e5939ca845780dc9e82bc825d373248ca6ae Merge: f761000 4bc236c Author: Brian Muramatsu Date: Mon Mar 14 13:34:41 2011 -0700 am 4bc236c8: am 73524561: Merge "CTS: Fixes for android.hardware.cts.CameraTest#testPreviewCallback" into gingerbread * commit '4bc236c8143d28cf047e9717d4e9747683023d02': CTS: Fixes for android.hardware.cts.CameraTest#testPreviewCallback commit 0aa7238d4672ac8a8da4680e00eae1805e871679 Merge: 34e5e8c a4bb0c5 Author: Brian Muramatsu Date: Mon Mar 14 12:59:27 2011 -0700 am a4bb0c50: Merge "The center aligned test has to have 1 pixel margin" into gingerbread * commit 'a4bb0c50c8325b8d62202d1760f0d7706a862c9a': The center aligned test has to have 1 pixel margin commit a4bb0c50c8325b8d62202d1760f0d7706a862c9a Merge: 3280e89 e9d100f Author: Brian Muramatsu Date: Mon Mar 14 12:44:25 2011 -0700 Merge "The center aligned test has to have 1 pixel margin" into gingerbread commit 34e5e8ca05f04ef8b19f5d7e5fd6bf676f85d214 Merge: 4bc236c 3280e89 Author: Brian Muramatsu Date: Mon Mar 14 12:33:32 2011 -0700 am 3280e89e: Merge "Fix for CTS testScreenConfiguration" into gingerbread * commit '3280e89e3c8a327cf119a339412bef22512ca550': Fix for CTS testScreenConfiguration commit 4bc236c8143d28cf047e9717d4e9747683023d02 Merge: 5903490 7352456 Author: Brian Muramatsu Date: Mon Mar 14 12:29:09 2011 -0700 am 73524561: Merge "CTS: Fixes for android.hardware.cts.CameraTest#testPreviewCallback" into gingerbread * commit '7352456161866d781f74af633c97bf8bf166ead1': CTS: Fixes for android.hardware.cts.CameraTest#testPreviewCallback commit 3280e89e3c8a327cf119a339412bef22512ca550 Merge: 7352456 5cc4d40 Author: Brian Muramatsu Date: Mon Mar 14 12:23:29 2011 -0700 Merge "Fix for CTS testScreenConfiguration" into gingerbread commit 18a50fc7f6412a6332dbfebc64a1127f0f5ab62b Merge: 84d1033 ff2361b Author: Nick Kralevich Date: Mon Mar 14 12:09:11 2011 -0700 am ff2361b7: am f7610002: am 59034903: am e13ad570: Merge "Check "Unknown Sources" is Enabled by Default" into gingerbread * commit 'ff2361b7d2150b33185f2552f686a664fb484889': Check "Unknown Sources" is Enabled by Default commit 84d1033723ddc6f88a6640973e2f2a3459d76622 Merge: fffe3ec a924d96 Author: Brian Muramatsu Date: Mon Mar 14 12:09:09 2011 -0700 am a924d96e: am 28ccf7ae: am fdaf2505: am 7b71a7b1: Merge "Rounds up scaled width/height" into gingerbread * commit 'a924d96e353fcb2cc97731cb228f0221c0b610cb': Rounds up scaled width/height commit fffe3ec4146bec375e647cb11466d2c7e75157c8 Merge: 1ed8317 39a416c Author: Brian Muramatsu Date: Mon Mar 14 12:09:06 2011 -0700 am 39a416c2: resolved conflicts for merge of 88c1ac14 to honeycomb-plus-aosp * commit '39a416c2678620c246ff71b13ea52dd240c16fef': Show Partition Info in Report Header commit 7352456161866d781f74af633c97bf8bf166ead1 Merge: e13ad57 6c15dab Author: Brian Muramatsu Date: Mon Mar 14 11:52:32 2011 -0700 Merge "CTS: Fixes for android.hardware.cts.CameraTest#testPreviewCallback" into gingerbread commit ff2361b7d2150b33185f2552f686a664fb484889 Merge: a924d96 f761000 Author: Nick Kralevich Date: Mon Mar 14 11:50:02 2011 -0700 am f7610002: am 59034903: am e13ad570: Merge "Check "Unknown Sources" is Enabled by Default" into gingerbread * commit 'f76100023b21e72854f0be4929bf3024f481a9f0': Check "Unknown Sources" is Enabled by Default commit a924d96e353fcb2cc97731cb228f0221c0b610cb Merge: 39a416c 28ccf7a Author: Brian Muramatsu Date: Mon Mar 14 11:49:49 2011 -0700 am 28ccf7ae: am fdaf2505: am 7b71a7b1: Merge "Rounds up scaled width/height" into gingerbread * commit '28ccf7ae386048965545277dab8ae6ddaadb0921': Rounds up scaled width/height commit 6611750c3c256e3e1743fafe737f7d401e3165b3 Merge: 1a023c1 ffec930 Author: Brett Chabot Date: Mon Mar 14 11:44:03 2011 -0700 Merge "Add test to verify an uninstall of app wipes its data." into froyo commit 39a416c2678620c246ff71b13ea52dd240c16fef Merge: 60bd9bf 88c1ac1 Author: Brian Muramatsu Date: Mon Mar 14 11:42:53 2011 -0700 resolved conflicts for merge of 88c1ac14 to honeycomb-plus-aosp Change-Id: If97309a24b0e5f7631600aa732b06e521e25cb39 commit 5cc4d40b4a7c444530dfbe3c19bf424c451f3350 Author: Mattias Petersson Date: Mon Mar 14 10:53:11 2011 +0100 Fix for CTS testScreenConfiguration The previous implementation of testScreenConfiguration() failed to pass some acceptable aspect ratios. Example: A screen in 16:9 screen ratio that is 480 pixels wide, would have to be 853,333 pixels high to be exactly 16:9. This is of course not possible, so we must allow both 853 and 854 pixels in this example. The previous implementation would only accept 853. Change-Id: Ic5e7fa523869d1036821bb29c602ee82ec750238 commit 6c15dab79a0536622304cc69fcb7a3b03fa29bf1 Author: Emilian Peev Date: Fri Mar 11 09:56:36 2011 +0200 CTS: Fixes for android.hardware.cts.CameraTest#testPreviewCallback - setPreviewDisplay() was omitted during the individual preview resolution tests. The camera documentation states that a call to either setPreviewDisplay() or setPreviewTexture() is necessary in order to start the preview. Apart from that setPreviewDisplay() is mandatory on platforms, which utilize an overlay for camera preview. Change-Id: Ifd2ce8d787a8c1d6790701b9d04f13f4158227d0 commit e9d100f7af613ce998897d66640573560d4d7cbf Author: Masanori Ogino Date: Mon Mar 14 13:43:39 2011 +0900 The center aligned test has to have 1 pixel margin If either a container size or drawable size is odd then left(top) and right(bottom) delta would not be equal, there would be 1 pixel difference. So the test should allow 1 pixel difference. Change-Id: I7e0d06f144a50560b60a4635383d9bed513b9ec9 commit f76100023b21e72854f0be4929bf3024f481a9f0 Merge: 28ccf7a 5903490 Author: Nick Kralevich Date: Fri Mar 11 23:16:47 2011 -0800 am 59034903: am e13ad570: Merge "Check "Unknown Sources" is Enabled by Default" into gingerbread * commit '59034903186b5cea0ff044d730057a2b3c6a80a1': Check "Unknown Sources" is Enabled by Default commit 59034903186b5cea0ff044d730057a2b3c6a80a1 Merge: fdaf250 e13ad57 Author: Nick Kralevich Date: Fri Mar 11 17:20:50 2011 -0800 am e13ad570: Merge "Check "Unknown Sources" is Enabled by Default" into gingerbread * commit 'e13ad570c3dfb9de3fa0da156141276d36f7116a': Check "Unknown Sources" is Enabled by Default commit e13ad570c3dfb9de3fa0da156141276d36f7116a Merge: 7b71a7b 67c248c Author: Nick Kralevich Date: Fri Mar 11 17:13:59 2011 -0800 Merge "Check "Unknown Sources" is Enabled by Default" into gingerbread commit 67c248c42f22213448f818853af716f4788545a8 Author: Brian Muramatsu Date: Fri Mar 11 16:51:46 2011 -0800 Check "Unknown Sources" is Enabled by Default Bug 4080822 Change-Id: Idba3b1871650eb7dea1e96e630e8ac15f4f03ec1 commit 1ed8317fc635fc5209736a5f0c3ac5816a05fb21 Merge: f4b7752 60bd9bf Author: Brian Muramatsu Date: Fri Mar 11 16:08:36 2011 -0800 am 60bd9bfd: am 57259c8e: (-s ours) am f61ced67: am d1f97191: Merge "Suppress MediaStore_Audio_Playlists_MembersTest" into gingerbread * commit '60bd9bfddfc3bcd3113b0669a78454699c1a9d35': Suppress MediaStore_Audio_Playlists_MembersTest commit 60bd9bfddfc3bcd3113b0669a78454699c1a9d35 Merge: 0ec0eb9 57259c8 Author: Brian Muramatsu Date: Fri Mar 11 16:05:51 2011 -0800 am 57259c8e: (-s ours) am f61ced67: am d1f97191: Merge "Suppress MediaStore_Audio_Playlists_MembersTest" into gingerbread * commit '57259c8efe0126f153426eddd0fa07348528e84d': Suppress MediaStore_Audio_Playlists_MembersTest commit f4b77526efde4258639ea72d8d32f9be6df7357d Merge: f776e7d 0ec0eb9 Author: Brian Muramatsu Date: Fri Mar 11 16:02:38 2011 -0800 am 0ec0eb95: resolved conflicts for merge of 3966803c to honeycomb-plus-aosp * commit '0ec0eb95efc11fbdc01e45c5ea3f5e4d68c06593': Fix NPE in SmsManagerTest Setup Method commit 0ec0eb95efc11fbdc01e45c5ea3f5e4d68c06593 Merge: 713b304 3966803 Author: Brian Muramatsu Date: Fri Mar 11 15:50:30 2011 -0800 resolved conflicts for merge of 3966803c to honeycomb-plus-aosp Change-Id: I12a33efab6d3ac079a5c136749c070811ad24165 commit 28ccf7ae386048965545277dab8ae6ddaadb0921 Merge: 88c1ac1 fdaf250 Author: Brian Muramatsu Date: Fri Mar 11 15:32:52 2011 -0800 am fdaf2505: am 7b71a7b1: Merge "Rounds up scaled width/height" into gingerbread * commit 'fdaf25057ea975941f5147d34d855723c2cee83d': Rounds up scaled width/height commit 88c1ac140076ac34d15ffae8a18ba433f70d2655 Merge: 57259c8 ba698f4 Author: Brian Muramatsu Date: Fri Mar 11 15:32:48 2011 -0800 am ba698f43: am b38a2a9e: Merge "Show Partition Info in Report Header" into gingerbread * commit 'ba698f43ed2a069e34dc758c5f94b127ca752a95': Show Partition Info in Report Header commit fdaf25057ea975941f5147d34d855723c2cee83d Merge: ba698f4 7b71a7b Author: Brian Muramatsu Date: Fri Mar 11 15:30:09 2011 -0800 am 7b71a7b1: Merge "Rounds up scaled width/height" into gingerbread * commit '7b71a7b1d6748278ba72b72a7647cbf3ea32da0c': Rounds up scaled width/height commit ba698f43ed2a069e34dc758c5f94b127ca752a95 Merge: f61ced6 b38a2a9 Author: Brian Muramatsu Date: Fri Mar 11 15:28:20 2011 -0800 am b38a2a9e: Merge "Show Partition Info in Report Header" into gingerbread * commit 'b38a2a9e2c3768d5d8eaab0aad7a85dcf6c6d82d': Show Partition Info in Report Header commit 7b71a7b1d6748278ba72b72a7647cbf3ea32da0c Merge: b38a2a9 661b568 Author: Brian Muramatsu Date: Fri Mar 11 15:09:52 2011 -0800 Merge "Rounds up scaled width/height" into gingerbread commit b38a2a9e2c3768d5d8eaab0aad7a85dcf6c6d82d Merge: d1f9719 570acf7 Author: Brian Muramatsu Date: Fri Mar 11 14:26:50 2011 -0800 Merge "Show Partition Info in Report Header" into gingerbread commit 570acf751faa2dbc2efd41d8d529f5810d3b4983 Author: Brian Muramatsu Date: Thu Mar 10 17:21:07 2011 -0800 Show Partition Info in Report Header Bug 3400973 Show output of the 'df' command in the report header. See the bug for a picture of what it looks like. Change-Id: Ida450185ed8c0ead7c7d05e7326cc86346e05794 commit f776e7d14dd531a0b27baf6c3f8cdaebdd7820dd Author: Alex Sakhartchouk Date: Fri Mar 11 12:52:30 2011 -0800 Vector type tests. Change-Id: Ib7d2fa7e200ab24929e30e9d428f49d253d7d6f8 commit 661b568dbc5286c86963b9feb7da23cb638fddc5 Author: Masanori Ogino Date: Fri Mar 11 15:11:21 2011 +0900 Rounds up scaled width/height In framework, the scaled value is calculated by rounding up. (e.x. android.util.TypedValue#complexToDimensionPixelSize()) This test should be calculated same that framework does do. Change-Id: I1f60f0446e79cc75fb85a7b45cfe79229838721e commit ffec93012689b3aafdaa3e47efb0b52ddd02cc4e Author: Brett Chabot Date: Thu Mar 10 16:24:02 2011 -0800 Add test to verify an uninstall of app wipes its data. Change-Id: Icf574f786c655e004adac738135fe49da5a5489f commit 95ea0cb2634ea07b491e1ccbecbc60d754097efa Author: Alex Sakhartchouk Date: Thu Mar 10 16:03:10 2011 -0800 cts for ProgramFragment Change-Id: Ifc1633c7bdfe13c9c1dadda524d17b2b5452f18f commit 7fd329a69425df7084024c78cafca04c4999d1f1 Merge: 15cf6b2 4d3668e Author: Alex Sakhartchouk Date: Thu Mar 10 14:23:03 2011 -0800 Merge "renderscript tests that touch graphics apis" commit 4d3668edeeab5f4c3f13db6e26f760678d84ef33 Author: Alex Sakhartchouk Date: Thu Mar 10 12:40:01 2011 -0800 renderscript tests that touch graphics apis Change-Id: Ic5093290fd1fa499dd7223f57a97064f01b54c08 commit 57259c8efe0126f153426eddd0fa07348528e84d Merge: 3966803 f61ced6 Author: Brian Muramatsu Date: Thu Mar 10 12:29:18 2011 -0800 am f61ced67: am d1f97191: Merge "Suppress MediaStore_Audio_Playlists_MembersTest" into gingerbread * commit 'f61ced676cbaa1dba8293de6f64210f418e926d7': Suppress MediaStore_Audio_Playlists_MembersTest commit 3966803cb107cc9299ea85e99ff22f783fd68667 Merge: d5964ed d6bd7b6 Author: Brian Muramatsu Date: Thu Mar 10 12:29:14 2011 -0800 am d6bd7b6d: am 46831e9d: Merge "Fix NPE in SmsManagerTest Setup Method" into gingerbread * commit 'd6bd7b6db844092797b40b20f1ace1cf25e3a372': Fix NPE in SmsManagerTest Setup Method commit f61ced676cbaa1dba8293de6f64210f418e926d7 Merge: d6bd7b6 d1f9719 Author: Brian Muramatsu Date: Thu Mar 10 12:21:51 2011 -0800 am d1f97191: Merge "Suppress MediaStore_Audio_Playlists_MembersTest" into gingerbread * commit 'd1f971918e7fe8c9090409d41c14478158916a58': Suppress MediaStore_Audio_Playlists_MembersTest commit d6bd7b6db844092797b40b20f1ace1cf25e3a372 Merge: bfbc68c 46831e9 Author: Brian Muramatsu Date: Thu Mar 10 12:21:40 2011 -0800 am 46831e9d: Merge "Fix NPE in SmsManagerTest Setup Method" into gingerbread * commit '46831e9dea184c0888819aa31f4aea20fb58b81f': Fix NPE in SmsManagerTest Setup Method commit d1f971918e7fe8c9090409d41c14478158916a58 Merge: 46831e9 2c524c1 Author: Brian Muramatsu Date: Thu Mar 10 11:45:46 2011 -0800 Merge "Suppress MediaStore_Audio_Playlists_MembersTest" into gingerbread commit 46831e9dea184c0888819aa31f4aea20fb58b81f Merge: 54576c2 d3e5216 Author: Brian Muramatsu Date: Thu Mar 10 11:44:43 2011 -0800 Merge "Fix NPE in SmsManagerTest Setup Method" into gingerbread commit d3e5216c0d26e17c3a8cb2aeaa28b75ddb5d5b5a Author: Brian Muramatsu Date: Fri Mar 4 14:49:38 2011 -0800 Fix NPE in SmsManagerTest Setup Method getDeviceId can return null, so check for the telephony feature. Remove the emulator check since we don't use the emulator to test CTS at all anymore. Change-Id: I1611abc36d52424f77c54be8e003cb0066c7aad6 commit 15cf6b2f0612179adc1cbe95bdbd658b21c00ee1 Merge: 407519b 713b304 Author: James Dong Date: Wed Mar 9 18:39:38 2011 -0800 am 713b3040: am cbe4ab21: am 9dcd2c26: Allow 1080p to be either 1920x1088 or 1920x1080 * commit '713b3040661cab7d5b045ed7807428851ff79239': Allow 1080p to be either 1920x1088 or 1920x1080 commit 713b3040661cab7d5b045ed7807428851ff79239 Merge: a113c6b cbe4ab2 Author: James Dong Date: Wed Mar 9 18:36:55 2011 -0800 am cbe4ab21: am 9dcd2c26: Allow 1080p to be either 1920x1088 or 1920x1080 * commit 'cbe4ab21f71527a19212d37e1c53748c93653f8c': Allow 1080p to be either 1920x1088 or 1920x1080 commit cbe4ab21f71527a19212d37e1c53748c93653f8c Merge: 8861188 9dcd2c2 Author: James Dong Date: Wed Mar 9 18:34:06 2011 -0800 am 9dcd2c26: Allow 1080p to be either 1920x1088 or 1920x1080 * commit '9dcd2c265c37271419f4422d218ab7dea8fc505e': Allow 1080p to be either 1920x1088 or 1920x1080 commit 9dcd2c265c37271419f4422d218ab7dea8fc505e Author: James Dong Date: Wed Mar 9 18:08:31 2011 -0800 Allow 1080p to be either 1920x1088 or 1920x1080 bug - 4075831 Change-Id: I1fc11fd3963bf0da46510eacfd4a5270cc13b7ba commit 407519ba4a27f33c55cc0d7bb71daaa1add8d10c Merge: 2e08e27 a113c6b Author: Brian Muramatsu Date: Wed Mar 9 17:55:44 2011 -0800 am a113c6be: resolved conflicts for merge of d5964ed3 to honeycomb-plus-aosp * commit 'a113c6be09e4b2b81cd189c27c682c5bd72dad4b': Fix EventLogTest Flakiness commit a113c6be09e4b2b81cd189c27c682c5bd72dad4b Merge: a9e426e d5964ed Author: Brian Muramatsu Date: Wed Mar 9 17:52:33 2011 -0800 resolved conflicts for merge of d5964ed3 to honeycomb-plus-aosp Change-Id: I172a1a065404c40b4a36eea2d83133421a96a083 commit d5964ed3749274609776291fe37477b34fb07532 Merge: 77d7c8b bfbc68c Author: Brian Muramatsu Date: Wed Mar 9 17:18:04 2011 -0800 am bfbc68c8: am 54576c29: Merge "Fix EventLogTest Flakiness" into gingerbread * commit 'bfbc68c8fe915d9fb5eb99c9a155a584480d9d71': Fix EventLogTest Flakiness commit bfbc68c8fe915d9fb5eb99c9a155a584480d9d71 Merge: 1d15c13 54576c2 Author: Brian Muramatsu Date: Wed Mar 9 17:16:34 2011 -0800 am 54576c29: Merge "Fix EventLogTest Flakiness" into gingerbread * commit '54576c297555e8b04e4af46ff840e20597a3e3ae': Fix EventLogTest Flakiness commit 54576c297555e8b04e4af46ff840e20597a3e3ae Merge: d042586 65ab7bf Author: Brian Muramatsu Date: Wed Mar 9 17:07:36 2011 -0800 Merge "Fix EventLogTest Flakiness" into gingerbread commit 2e08e277264406ca67fb25971310db74da4b13d3 Merge: f0baf7b a9e426e Author: Brian Muramatsu Date: Wed Mar 9 16:59:46 2011 -0800 am a9e426e6: am 8861188a: Merge "Removing Some Pixel Comparison Tests" into honeycomb-mr1 * commit 'a9e426e6f2e4d591e4f13e4cd1f8a2b932edb857': Removing Some Pixel Comparison Tests commit a9e426e6f2e4d591e4f13e4cd1f8a2b932edb857 Merge: 9041e3a 8861188 Author: Brian Muramatsu Date: Wed Mar 9 16:56:52 2011 -0800 am 8861188a: Merge "Removing Some Pixel Comparison Tests" into honeycomb-mr1 * commit '8861188a38f5ab0c17b88d45c15d5c10393e444f': Removing Some Pixel Comparison Tests commit 8861188a38f5ab0c17b88d45c15d5c10393e444f Merge: 6f36386 a8cd4da Author: Brian Muramatsu Date: Wed Mar 9 16:54:29 2011 -0800 Merge "Removing Some Pixel Comparison Tests" into honeycomb-mr1 commit f0baf7b0bb1db75fe8c339405ceb6d5c97833cdf Merge: 5306fbc 9041e3a Author: Brian Muramatsu Date: Wed Mar 9 16:46:15 2011 -0800 am 9041e3a9: (-s ours) am 6f363864: Merge "DO NOT MERGE More renderscript tests." into honeycomb-mr1 * commit '9041e3a970d63ab64c4aa8e452b0b0bfedddea7c': DO NOT MERGE More renderscript tests. commit 9041e3a970d63ab64c4aa8e452b0b0bfedddea7c Merge: dc0b007 6f36386 Author: Brian Muramatsu Date: Wed Mar 9 16:41:55 2011 -0800 am 6f363864: Merge "DO NOT MERGE More renderscript tests." into honeycomb-mr1 * commit '6f3638645a251ff6be49dc1e8ca9ef5e471ad7d0': DO NOT MERGE More renderscript tests. commit 6f3638645a251ff6be49dc1e8ca9ef5e471ad7d0 Merge: aa6a3fa 4519ef0 Author: Brian Muramatsu Date: Wed Mar 9 16:37:58 2011 -0800 Merge "DO NOT MERGE More renderscript tests." into honeycomb-mr1 commit 4519ef0233588ce9ec811c98b079f8968123ea3e Author: Alex Sakhartchouk Date: Mon Mar 7 16:19:17 2011 -0800 DO NOT MERGE More renderscript tests. Change-Id: Icb160dad547bfd6f5fbda23727b5d9ee0895d02d commit 5306fbcd260594b92f0f6d235aa30e25b3b61880 Merge: 4a13ce2 dc0b007 Author: Brian Muramatsu Date: Wed Mar 9 15:53:39 2011 -0800 am dc0b0076: am 77d7c8b6: am 1d15c13e: am d0425868: Merge "Fix CtsVerifier Proguard Issues" into gingerbread * commit 'dc0b007684e40a64d2d93356c9c6075c5bf851c0': Fix CtsVerifier Proguard Issues commit dc0b007684e40a64d2d93356c9c6075c5bf851c0 Merge: dd9f9a8 77d7c8b Author: Brian Muramatsu Date: Wed Mar 9 15:50:20 2011 -0800 am 77d7c8b6: am 1d15c13e: am d0425868: Merge "Fix CtsVerifier Proguard Issues" into gingerbread * commit '77d7c8b6bfcc1f543357a69e6e3d64cc5136458d': Fix CtsVerifier Proguard Issues commit 77d7c8b6bfcc1f543357a69e6e3d64cc5136458d Merge: 5ee7af6 1d15c13 Author: Brian Muramatsu Date: Wed Mar 9 15:47:39 2011 -0800 am 1d15c13e: am d0425868: Merge "Fix CtsVerifier Proguard Issues" into gingerbread * commit '1d15c13e1c5970245136f9cee0dc5290262cb901': Fix CtsVerifier Proguard Issues commit 1d15c13e1c5970245136f9cee0dc5290262cb901 Merge: c431a92 d042586 Author: Brian Muramatsu Date: Wed Mar 9 15:43:36 2011 -0800 am d0425868: Merge "Fix CtsVerifier Proguard Issues" into gingerbread * commit 'd0425868c8f4dca76ff195fd775368db6400c237': Fix CtsVerifier Proguard Issues commit d0425868c8f4dca76ff195fd775368db6400c237 Merge: ba5af1f de69444 Author: Brian Muramatsu Date: Wed Mar 9 15:36:23 2011 -0800 Merge "Fix CtsVerifier Proguard Issues" into gingerbread commit de694442d37ac4f10d990c71c24d737056c38552 Author: Brian Muramatsu Date: Wed Mar 9 14:13:01 2011 -0800 Fix CtsVerifier Proguard Issues Remove the specification of click handlers via XML, since that technique doesn't work when Proguard is enabled. Change-Id: Ia16c4683d7d3399aab13bff3c223d7069daf00f7 commit 4a13ce2ba367ff3a972293d7627ebb3f4ad379d6 Merge: 4f9157b dd9f9a8 Author: Brian Muramatsu Date: Wed Mar 9 15:27:03 2011 -0800 am dd9f9a88: am aa6a3faf: Add Renderscript Package to Eclipse Classpath * commit 'dd9f9a884c544e88766f75d76878051e560aa235': Add Renderscript Package to Eclipse Classpath commit dd9f9a884c544e88766f75d76878051e560aa235 Merge: c13555b aa6a3fa Author: Brian Muramatsu Date: Wed Mar 9 15:24:16 2011 -0800 am aa6a3faf: Add Renderscript Package to Eclipse Classpath * commit 'aa6a3faf6de7930e3dba49f3c220b293a55b9100': Add Renderscript Package to Eclipse Classpath commit aa6a3faf6de7930e3dba49f3c220b293a55b9100 Author: Brian Muramatsu Date: Tue Mar 8 12:19:25 2011 -0800 Add Renderscript Package to Eclipse Classpath Change-Id: I9110db0532ca283959bb52cde432fd9dfed5bb68 commit 4f9157ba7a4be8741096159707fdc7136408fffb Merge: c587dec c13555b Author: Brian Muramatsu Date: Wed Mar 9 15:16:56 2011 -0800 am c13555b1: am 5ee7af6a: am 17d7a547: Merge "Fix CtsVerifier Proguard Issues" * commit 'c13555b19984b9b04730e9fd22ff379e3df82a77': Fix CtsVerifier Proguard Issues commit c13555b19984b9b04730e9fd22ff379e3df82a77 Merge: 39ca351 5ee7af6 Author: Brian Muramatsu Date: Wed Mar 9 15:14:15 2011 -0800 am 5ee7af6a: am 17d7a547: Merge "Fix CtsVerifier Proguard Issues" * commit '5ee7af6aff49de16c5d126e87e50cbdc3f0b5d07': Fix CtsVerifier Proguard Issues commit 5ee7af6aff49de16c5d126e87e50cbdc3f0b5d07 Merge: 8457422 17d7a54 Author: Brian Muramatsu Date: Wed Mar 9 15:04:09 2011 -0800 am 17d7a547: Merge "Fix CtsVerifier Proguard Issues" * commit '17d7a547d38fd28d8838543b5dbd15c251b3f815': Fix CtsVerifier Proguard Issues commit 2c524c1919e9c5524d864d232e18cbbd909a204e Author: Brian Muramatsu Date: Wed Mar 9 14:59:45 2011 -0800 Suppress MediaStore_Audio_Playlists_MembersTest It's broken but is fixed in a future release. Change-Id: I9718a86adea17d39ea94fe9c26630a96aded9550 commit 17d7a547d38fd28d8838543b5dbd15c251b3f815 Merge: a3779fa 52b5221 Author: Brian Muramatsu Date: Wed Mar 9 14:25:30 2011 -0800 Merge "Fix CtsVerifier Proguard Issues" commit 52b5221c1bd7cf0da30bc5be7112adbac3eea0b1 Author: Brian Muramatsu Date: Wed Mar 9 14:13:01 2011 -0800 Fix CtsVerifier Proguard Issues Remove the specification of click handlers via XML, since that technique doesn't work when Proguard is enabled. Change-Id: Ia0ede6026173d4c07aa558d3bd3029e5c130beeb commit c587dec4da4de9cca80950581b5dfb1cf4be8891 Merge: 342f828 39ca351 Author: Brian Muramatsu Date: Wed Mar 9 14:11:41 2011 -0800 am 39ca3517: am 8457422f: am c431a929: am ba5af1f1: Merge "The original timeout (4 mins) is too rigorous in live network." into gingerbread * commit '39ca3517f6a4e017165ddf47acdf22ba175f9003': The original timeout (4 mins) is too rigorous in live network. commit 342f82859916602b73fb5cae22e864e87f691855 Merge: 68e36e0 58cca45 Author: Brian Muramatsu Date: Wed Mar 9 14:11:38 2011 -0800 am 58cca456: am a63b71cc: am c63b2f7b: am 622a5dd6: Merge "Fixing race in android.hardware.cts.CameraTest#testZoom" into gingerbread * commit '58cca45664c676b703d0efd018a8fed7ca5e9529': Fixing race in android.hardware.cts.CameraTest#testZoom commit 39ca3517f6a4e017165ddf47acdf22ba175f9003 Merge: 58cca45 8457422 Author: Brian Muramatsu Date: Wed Mar 9 14:09:19 2011 -0800 am 8457422f: am c431a929: am ba5af1f1: Merge "The original timeout (4 mins) is too rigorous in live network." into gingerbread * commit '8457422f566c3748ce6bcac5f9f102c83af02734': The original timeout (4 mins) is too rigorous in live network. commit 58cca45664c676b703d0efd018a8fed7ca5e9529 Merge: c3906ab a63b71c Author: Brian Muramatsu Date: Wed Mar 9 14:09:15 2011 -0800 am a63b71cc: am c63b2f7b: am 622a5dd6: Merge "Fixing race in android.hardware.cts.CameraTest#testZoom" into gingerbread * commit 'a63b71cc90d95463638639a52069150b935cc03c': Fixing race in android.hardware.cts.CameraTest#testZoom commit 8457422f566c3748ce6bcac5f9f102c83af02734 Merge: a63b71c c431a92 Author: Brian Muramatsu Date: Wed Mar 9 14:06:16 2011 -0800 am c431a929: am ba5af1f1: Merge "The original timeout (4 mins) is too rigorous in live network." into gingerbread * commit 'c431a929c7879b5d15160ba56c156e2a6865dfc9': The original timeout (4 mins) is too rigorous in live network. commit a63b71cc90d95463638639a52069150b935cc03c Merge: 2d28337 c63b2f7 Author: Brian Muramatsu Date: Wed Mar 9 14:06:13 2011 -0800 am c63b2f7b: am 622a5dd6: Merge "Fixing race in android.hardware.cts.CameraTest#testZoom" into gingerbread * commit 'c63b2f7bcf0e10e023515c86b5052f88653fec35': Fixing race in android.hardware.cts.CameraTest#testZoom commit c431a929c7879b5d15160ba56c156e2a6865dfc9 Merge: c63b2f7 ba5af1f Author: Brian Muramatsu Date: Wed Mar 9 13:19:03 2011 -0800 am ba5af1f1: Merge "The original timeout (4 mins) is too rigorous in live network." into gingerbread * commit 'ba5af1f1f09ed6cfee1f7f7ab368747f9b81e86d': The original timeout (4 mins) is too rigorous in live network. commit c63b2f7bcf0e10e023515c86b5052f88653fec35 Merge: f4ac28d 622a5dd Author: Brian Muramatsu Date: Wed Mar 9 13:18:59 2011 -0800 am 622a5dd6: Merge "Fixing race in android.hardware.cts.CameraTest#testZoom" into gingerbread * commit '622a5dd642cb734bae6ff78d3084c08939791e9d': Fixing race in android.hardware.cts.CameraTest#testZoom commit ba5af1f1f09ed6cfee1f7f7ab368747f9b81e86d Merge: 622a5dd c77c194 Author: Brian Muramatsu Date: Wed Mar 9 12:56:23 2011 -0800 Merge "The original timeout (4 mins) is too rigorous in live network." into gingerbread commit 622a5dd642cb734bae6ff78d3084c08939791e9d Merge: 385da29 b400b37 Author: Brian Muramatsu Date: Wed Mar 9 12:46:59 2011 -0800 Merge "Fixing race in android.hardware.cts.CameraTest#testZoom" into gingerbread commit 68e36e0ed5f8fcbbd4f81753d4c369e822c351d5 Merge: e4921c8 c3906ab Author: Marco Nelissen Date: Wed Mar 9 08:22:18 2011 -0800 am c3906ab8: am 7ffa4574: Merge "Fix CTS test for playlist member insertion." into honeycomb-mr1 * commit 'c3906ab833e9d25f4b7602daf53fe5272f2a08a3': Fix CTS test for playlist member insertion. commit c3906ab833e9d25f4b7602daf53fe5272f2a08a3 Merge: 516f951 7ffa457 Author: Marco Nelissen Date: Wed Mar 9 08:12:05 2011 -0800 am 7ffa4574: Merge "Fix CTS test for playlist member insertion." into honeycomb-mr1 * commit '7ffa45749ba89deb64d607440319d217b352aaeb': Fix CTS test for playlist member insertion. commit 7ffa45749ba89deb64d607440319d217b352aaeb Merge: b1ea98e 39d38a5 Author: Marco Nelissen Date: Wed Mar 9 08:06:49 2011 -0800 Merge "Fix CTS test for playlist member insertion." into honeycomb-mr1 commit c77c19441e46d70707096ed25e00c8f909fd69b6 Author: sam_chiu Date: Wed Mar 9 21:34:40 2011 +0800 The original timeout (4 mins) is too rigorous in live network. Change-Id: I3699a0f3bc7d0b62d7e9235efb9132d4a1a7d58e commit e4921c83a0215cac0ffa30fb5221044ca29d0cfc Merge: 61a9c6e 516f951 Author: Brian Muramatsu Date: Tue Mar 8 23:53:01 2011 -0800 am 516f9516: am 2d28337f: am f4ac28dd: am 385da290: Merge "Check More Build Constants" into gingerbread * commit '516f9516d43d5b79d7c8011d091e96b0967e33e3': Check More Build Constants commit 61a9c6ed6828e0287a1ae36f21bd5ab2feb0c153 Merge: 2c5e172 674abb6 Author: Xia Wang Date: Tue Mar 8 18:43:54 2011 -0800 am 674abb61: am b1ea98eb: resolved conflicts for merge of 978cc18d to honeycomb-mr1 * commit '674abb617af3c3b0ea996eeafbb831dabf4d9aa3': Fix cts tests for Wi-Fi only devices. commit 516f9516d43d5b79d7c8011d091e96b0967e33e3 Merge: 674abb6 2d28337 Author: Brian Muramatsu Date: Tue Mar 8 18:28:33 2011 -0800 am 2d28337f: am f4ac28dd: am 385da290: Merge "Check More Build Constants" into gingerbread * commit '2d28337f32bad06251f9cafd8a5ba9f2bbcffe91': Check More Build Constants commit 2d28337f32bad06251f9cafd8a5ba9f2bbcffe91 Merge: 51839bf f4ac28d Author: Brian Muramatsu Date: Tue Mar 8 18:24:54 2011 -0800 am f4ac28dd: am 385da290: Merge "Check More Build Constants" into gingerbread * commit 'f4ac28ddf620d04bb8403757a0e6f21f1b734948': Check More Build Constants commit f4ac28ddf620d04bb8403757a0e6f21f1b734948 Merge: 7bada0d 385da29 Author: Brian Muramatsu Date: Tue Mar 8 18:20:47 2011 -0800 am 385da290: Merge "Check More Build Constants" into gingerbread * commit '385da290cf6dce20bfebf690dcd314537123aaba': Check More Build Constants commit 385da290cf6dce20bfebf690dcd314537123aaba Merge: ccf180c 6259d61 Author: Brian Muramatsu Date: Tue Mar 8 18:04:08 2011 -0800 Merge "Check More Build Constants" into gingerbread commit 674abb617af3c3b0ea996eeafbb831dabf4d9aa3 Merge: 686a8ed b1ea98e Author: Xia Wang Date: Tue Mar 8 17:16:30 2011 -0800 am b1ea98eb: resolved conflicts for merge of 978cc18d to honeycomb-mr1 * commit 'b1ea98ebb0a6985d68190c2d79fcf028fb8277ee': Fix cts tests for Wi-Fi only devices. commit a8cd4da434335a265bfb4bca1f96fa44d65ab109 Author: Brian Muramatsu Date: Tue Mar 8 16:43:55 2011 -0800 Removing Some Pixel Comparison Tests Bug 4064073 These tests break when the underlying drawing libraries are updated and don't have much to do with testing the framework. Change-Id: Ibfcad8c5fbc9184e635b84ea6d906b2826cad837 commit 39d38a57b10d3d34020f53088d3e8bc49e4987e3 Author: Marco Nelissen Date: Tue Mar 8 16:39:47 2011 -0800 Fix CTS test for playlist member insertion. b/4026284 Change-Id: Id06d64c33571a7def3b48976b93d060d71a70d00 commit b1ea98ebb0a6985d68190c2d79fcf028fb8277ee Merge: 394154b 978cc18 Author: Xia Wang Date: Tue Mar 8 16:02:14 2011 -0800 resolved conflicts for merge of 978cc18d to honeycomb-mr1 Change-Id: Ic571fe4fda9d299b6b5d5e100b43fa8cc46e2ce6 commit 978cc18d37f874e654629aa6a0f549c350052383 Merge: 760b803 f93284c Author: Xia Wang Date: Tue Mar 8 15:20:57 2011 -0800 Merge "Fix cts tests for Wi-Fi only devices." into honeycomb commit 2c5e17223e31ad508aff307a7e3326fdf758ba9d Merge: 059f659 686a8ed Author: Kristian Monsen Date: Tue Mar 8 10:31:53 2011 -0800 am 686a8edd: am 394154b7: Fix for bug 3485585 android.webkit.cts.CookieSyncManagerTest#testCookieSyncManager...(fail) * commit '686a8eddd39d27dc4150cd81d12e004063c085b7': Fix for bug 3485585 android.webkit.cts.CookieSyncManagerTest#testCookieSyncManager...(fail) commit 686a8eddd39d27dc4150cd81d12e004063c085b7 Merge: dc21cbb 394154b Author: Kristian Monsen Date: Tue Mar 8 10:28:43 2011 -0800 am 394154b7: Fix for bug 3485585 android.webkit.cts.CookieSyncManagerTest#testCookieSyncManager...(fail) * commit '394154b7ffa923facf69969c84b7425f56d4f005': Fix for bug 3485585 android.webkit.cts.CookieSyncManagerTest#testCookieSyncManager...(fail) commit 059f6590fad5ea9d7a85d68ea9c99349312ac0a3 Merge: b54395a 8551312 Author: Alex Sakhartchouk Date: Tue Mar 8 09:31:44 2011 -0800 Merge "More renderscript tests." commit b400b37244483beebd4ca92b11623de044174aaf Author: Rieko Hosokawa Date: Tue Mar 8 16:31:15 2011 +0100 Fixing race in android.hardware.cts.CameraTest#testZoom Remove the checking process that compares "given zoom value from callback" and "gotten zoom value via getZoom()". Because there is a race condition in that the callback happens and before the call to getZoom the zoom has already been updated. When "onZoomChange()" is executed during smooth zoom, the return value of "getZoom()" in checking process won't correspond to the argument "value" in case that the zoom has been already updated before the call to it. Change-Id: Ie9c277c09efb1510d1314b26652815d04a79be4f commit 394154b7ffa923facf69969c84b7425f56d4f005 Author: Kristian Monsen Date: Mon Mar 7 19:50:36 2011 +0000 Fix for bug 3485585 android.webkit.cts.CookieSyncManagerTest#testCookieSyncManager...(fail) The WebView does not let you set/get cookies on file url's without enabling it anymore. CL's that disabled default use of file cookies: https://android-git.corp.google.com/g/#change,83647 https://android-git.corp.google.com/g/#change,83648 Change-Id: I19f92cc84e75de8e5dc668ceef77dc9581f51ab1 commit 6fb8aec242de44ced92325c2fd012c21840bbb70 Author: esther530 Date: Tue Mar 8 14:36:47 2011 +0800 Fix CtsTelephonyTestCases:PhoneNumberUtilsTest--testCallMethods fails due to PhoneNumberUtils MIN_MATCH set to 11 for China region ship Change-Id: I291fd19d2204655d2306a289b523dc4051e8f7b7 commit 6259d617d48c7bb0532dd5daa02f92c8255ccae1 Author: Brian Muramatsu Date: Mon Mar 7 17:47:22 2011 -0800 Check More Build Constants Bug 4018016 Check that the Build constants meet the guidelines in CDD section 3.2.2. Change-Id: Idd6ec1a48b2a232772bf84e6d21595a20cebdbb9 commit b54395a7bf9ca8bbb2505a6943356ea3b678ea0d Merge: ee3f0bd dc21cbb Author: Kenny Root Date: Mon Mar 7 17:35:04 2011 -0800 am dc21cbbd: am 959f8420: am 760b8031: Merge "Add tests for ComponentInfo#isEnabled" into honeycomb * commit 'dc21cbbdb39090426fa6a65f52c68a2a7c57cc41': Add tests for ComponentInfo#isEnabled commit dc21cbbdb39090426fa6a65f52c68a2a7c57cc41 Merge: 8a89fcf 959f842 Author: Kenny Root Date: Mon Mar 7 17:29:59 2011 -0800 am 959f8420: am 760b8031: Merge "Add tests for ComponentInfo#isEnabled" into honeycomb * commit '959f8420b4f63e0520b6931912a64c23a3246816': Add tests for ComponentInfo#isEnabled commit 959f8420b4f63e0520b6931912a64c23a3246816 Merge: bd12cba 760b803 Author: Kenny Root Date: Mon Mar 7 17:28:38 2011 -0800 am 760b8031: Merge "Add tests for ComponentInfo#isEnabled" into honeycomb * commit '760b8031a96d13fbad7b677dd9a0435ff49cc820': Add tests for ComponentInfo#isEnabled commit 760b8031a96d13fbad7b677dd9a0435ff49cc820 Merge: 7c43847 887ac7c Author: Kenny Root Date: Mon Mar 7 17:24:45 2011 -0800 Merge "Add tests for ComponentInfo#isEnabled" into honeycomb commit ee3f0bdc858978405bd7234c38aa557e0c24397c Merge: 5772d64 8a89fcf Author: Wu-cheng Li Date: Mon Mar 7 17:17:22 2011 -0800 am 8a89fcf3: am bd12cbaf: Merge "Add camera CTS to test every preview format." into honeycomb-mr1 * commit '8a89fcf36df11aea592ac9e7775ac6d635de8403': Add camera CTS to test every preview format. commit 8a89fcf36df11aea592ac9e7775ac6d635de8403 Merge: 8568706 bd12cba Author: Wu-cheng Li Date: Mon Mar 7 17:15:18 2011 -0800 am bd12cbaf: Merge "Add camera CTS to test every preview format." into honeycomb-mr1 * commit 'bd12cbaf599f2351a100ceb95237d6e8418a2617': Add camera CTS to test every preview format. commit bd12cbaf599f2351a100ceb95237d6e8418a2617 Merge: d117aa2 645006e Author: Wu-cheng Li Date: Mon Mar 7 17:13:19 2011 -0800 Merge "Add camera CTS to test every preview format." into honeycomb-mr1 commit 887ac7c4aa54b70a938cf67fab6c1ddb4fe4b0ae Author: Kenny Root Date: Mon Mar 7 16:52:34 2011 -0800 Add tests for ComponentInfo#isEnabled Change-Id: I026c1e452f854b4aef065a0e4de1bf040912cbb4 commit 8551312fef8e50d13f23000de94796817b79e433 Author: Alex Sakhartchouk Date: Mon Mar 7 16:19:17 2011 -0800 More renderscript tests. Change-Id: I4f6336a6c86d9a2df675c6e16b0411c8f77682c4 commit 5772d64fac7f2303b47dac1127cf9372d8950f5a Merge: 330f1fd 8568706 Author: Gloria Wang Date: Mon Mar 7 15:09:44 2011 -0800 am 85687066: am d117aa2a: Add test config for the Widevine plug-in Fix for bug 3329779 * commit '85687066cfff2c83f7ab2dfc425121c077d4cde8': Add test config for the Widevine plug-in Fix for bug 3329779 commit 85687066cfff2c83f7ab2dfc425121c077d4cde8 Merge: 17ad55f d117aa2 Author: Gloria Wang Date: Mon Mar 7 15:07:28 2011 -0800 am d117aa2a: Add test config for the Widevine plug-in Fix for bug 3329779 * commit 'd117aa2acb8d71c60224defa293ced6fd478572d': Add test config for the Widevine plug-in Fix for bug 3329779 commit 330f1fd8dd9f6f4afb6940d6a54b75e8496448f3 Merge: 6db0247 17ad55f Author: Brian Muramatsu Date: Mon Mar 7 13:47:52 2011 -0800 am 17ad55fc: am 51839bf8: am 7bada0db: am ccf180cf: Merge "Close InputStream in HostUtils" into gingerbread * commit '17ad55fc8faa67b4dfabc6011f63b8f05e110b20': Close InputStream in HostUtils commit 17ad55fc8faa67b4dfabc6011f63b8f05e110b20 Merge: 24e3599 51839bf Author: Brian Muramatsu Date: Mon Mar 7 13:45:55 2011 -0800 am 51839bf8: am 7bada0db: am ccf180cf: Merge "Close InputStream in HostUtils" into gingerbread * commit '51839bf8fc781e0806c6aa0a0df7c911f770950f': Close InputStream in HostUtils commit 51839bf8fc781e0806c6aa0a0df7c911f770950f Merge: 41a88f1 7bada0d Author: Brian Muramatsu Date: Mon Mar 7 13:30:30 2011 -0800 am 7bada0db: am ccf180cf: Merge "Close InputStream in HostUtils" into gingerbread * commit '7bada0dbc008cfd541a311c09e2dfcc441d5872d': Close InputStream in HostUtils commit 7bada0dbc008cfd541a311c09e2dfcc441d5872d Merge: 2f895f3 ccf180c Author: Brian Muramatsu Date: Mon Mar 7 12:59:18 2011 -0800 am ccf180cf: Merge "Close InputStream in HostUtils" into gingerbread * commit 'ccf180cf023f16390eabdc543cc4ed0204637be8': Close InputStream in HostUtils commit f93284c1a04091f292eb6b048dbcb0b028bc7f2a Author: Xia Wang Date: Fri Mar 4 22:11:29 2011 -0800 Fix cts tests for Wi-Fi only devices. For Wi-Fi only device, startUsingNetworkFeature() returns Phone.APN_TYPE_NOT_AVAILABLE stopUsingNetworkFeature() return 1; In NetworkInfoTest: cm.getAllNetworkInfo() returns an array of NetworkInfo. But the index is not based on network type. bug#: 3513630 Change-Id: Ied0684a9fe2152dae242d779efe3dffd6c9c0609 commit d117aa2acb8d71c60224defa293ced6fd478572d Author: Gloria Wang Date: Mon Mar 7 11:29:23 2011 -0800 Add test config for the Widevine plug-in Fix for bug 3329779 Change-Id: I357c8400a0ff663d3ee5675558cfa9361650c0f8 commit 6db0247dbdbb5075254078201ea6092b0f6e4736 Merge: 8e3c0fd 24e3599 Author: Tsu Chiang Chuang Date: Mon Mar 7 10:54:38 2011 -0800 am 24e3599a: am d7bc2bae: am 7c438472: Merge "Cleaning up files from host after test is done." into honeycomb * commit '24e3599a4e56dd055ff603edb3269f0d93f2bacf': Cleaning up files from host after test is done. commit 24e3599a4e56dd055ff603edb3269f0d93f2bacf Merge: d1352b8 d7bc2ba Author: Tsu Chiang Chuang Date: Mon Mar 7 10:53:03 2011 -0800 am d7bc2bae: am 7c438472: Merge "Cleaning up files from host after test is done." into honeycomb * commit 'd7bc2bae9d8ef839d7187eae56f5713ed8aa2d27': Cleaning up files from host after test is done. commit 8e3c0fd3a1575131d2f117826b1de016d74b92c0 Merge: d2434e0 d1352b8 Author: Brian Muramatsu Date: Mon Mar 7 10:52:22 2011 -0800 am d1352b82: am 41a88f1b: am 2f895f36: am d455608f: Merge "update requirements for TelephonyManager.getDeviceId" into gingerbread * commit 'd1352b82ea5beb74a3102c0c3f796c828b3ec40e': update requirements for TelephonyManager.getDeviceId commit d2434e010541af7d38a4934faae8418b796fe60d Merge: d4b8550 e223d82 Author: Doug Zongker Date: Mon Mar 7 10:52:20 2011 -0800 am e223d82a: am b22870b9: am 72a7540a: update requirements for TelephonyManager.getDeviceId * commit 'e223d82ab4d1c769b023860238605771a2d7118e': update requirements for TelephonyManager.getDeviceId commit d7bc2bae9d8ef839d7187eae56f5713ed8aa2d27 Merge: 42a9756 7c43847 Author: Tsu Chiang Chuang Date: Mon Mar 7 10:49:37 2011 -0800 am 7c438472: Merge "Cleaning up files from host after test is done." into honeycomb * commit '7c4384726fe2067a44559c06f5dda959d0be96e5': Cleaning up files from host after test is done. commit d1352b82ea5beb74a3102c0c3f796c828b3ec40e Merge: e223d82 41a88f1 Author: Brian Muramatsu Date: Mon Mar 7 10:46:51 2011 -0800 am 41a88f1b: am 2f895f36: am d455608f: Merge "update requirements for TelephonyManager.getDeviceId" into gingerbread * commit '41a88f1b57b08d954ed43e55c15f58daf8e2efb3': update requirements for TelephonyManager.getDeviceId commit e223d82ab4d1c769b023860238605771a2d7118e Merge: 0f39016 b22870b Author: Doug Zongker Date: Mon Mar 7 10:46:07 2011 -0800 am b22870b9: am 72a7540a: update requirements for TelephonyManager.getDeviceId * commit 'b22870b94b1b077fdfc6d3edf6231a10e3c7a316': update requirements for TelephonyManager.getDeviceId commit 7c4384726fe2067a44559c06f5dda959d0be96e5 Merge: 14304f6 b0b4ce4 Author: Tsu Chiang Chuang Date: Mon Mar 7 10:40:57 2011 -0800 Merge "Cleaning up files from host after test is done." into honeycomb commit 645006ef3143ca4d111ea657b5b2371b514888de Author: Wu-cheng Li Date: Mon Mar 7 14:07:46 2011 +0800 Add camera CTS to test every preview format. bug:3488365 Change-Id: Ica2b020d4ff3fc1c4def8a789bf92be1f3a871b9 commit d4b8550d8b6d06e300193098b784355eed0626b2 Merge: caf353d 0f39016 Author: Doug Zongker Date: Sat Mar 5 09:31:51 2011 -0800 am 0f390162: am 42a97568: am 14304f65: Merge "update requirements for TelephonyManager.getDeviceId" into honeycomb * commit '0f39016231618ad712e4771abecba08495193ade': update requirements for TelephonyManager.getDeviceId commit caf353dd1d3a977e847366e531cb0d5c799116ba Merge: cecf849 28ab8f6 Author: Brian Muramatsu Date: Sat Mar 5 09:31:48 2011 -0800 am 28ab8f62: am 6cabdf96: am 843605b9: Fix Some Tests for Wifi-only Devices * commit '28ab8f62b166c082e9c4ed598c904263b32b0872': Fix Some Tests for Wifi-only Devices commit 0f39016231618ad712e4771abecba08495193ade Merge: 28ab8f6 42a9756 Author: Doug Zongker Date: Sat Mar 5 09:27:45 2011 -0800 am 42a97568: am 14304f65: Merge "update requirements for TelephonyManager.getDeviceId" into honeycomb * commit '42a97568104ffbfaf39dee9ef219346fc0518934': update requirements for TelephonyManager.getDeviceId commit 28ab8f62b166c082e9c4ed598c904263b32b0872 Merge: ce9c50a 6cabdf9 Author: Brian Muramatsu Date: Sat Mar 5 09:27:43 2011 -0800 am 6cabdf96: am 843605b9: Fix Some Tests for Wifi-only Devices * commit '6cabdf96893167cda7e72d94107b07956aee789a': Fix Some Tests for Wifi-only Devices commit 42a97568104ffbfaf39dee9ef219346fc0518934 Merge: 6cabdf9 14304f6 Author: Doug Zongker Date: Sat Mar 5 09:25:18 2011 -0800 am 14304f65: Merge "update requirements for TelephonyManager.getDeviceId" into honeycomb * commit '14304f65e8049f4b53d14a1b0ac3a9c7a4c5cb2d': update requirements for TelephonyManager.getDeviceId commit 6cabdf96893167cda7e72d94107b07956aee789a Merge: c92a621 843605b Author: Brian Muramatsu Date: Sat Mar 5 09:24:50 2011 -0800 am 843605b9: Fix Some Tests for Wifi-only Devices * commit '843605b9b2141e41c6af07cfd2e79d1abc68a9da': Fix Some Tests for Wifi-only Devices commit b0b4ce4e26b6a4aee595109ec597e909a9c48f3d Author: Tsu Chiang Chuang Date: Fri Mar 4 14:31:32 2011 -0800 Cleaning up files from host after test is done. Change-Id: I16ea99a3c151eac865cb63d4c7bd0c452146fca0 commit ccf180cf023f16390eabdc543cc4ed0204637be8 Merge: d455608 3bdee36 Author: Brian Muramatsu Date: Fri Mar 4 16:56:07 2011 -0800 Merge "Close InputStream in HostUtils" into gingerbread commit 3bdee369c270b6e5e45d43d9b84e5c559297fb07 Author: Brian Muramatsu Date: Fri Mar 4 16:26:31 2011 -0800 Close InputStream in HostUtils Issue 15126 visitFile was opening FileInputStreams but not closing them. Change-Id: I4d57b51b3debc03ff9be4e244d251db9b5257584 commit 14304f65e8049f4b53d14a1b0ac3a9c7a4c5cb2d Merge: 843605b d966f9e Author: Doug Zongker Date: Fri Mar 4 14:56:42 2011 -0800 Merge "update requirements for TelephonyManager.getDeviceId" into honeycomb commit 41a88f1b57b08d954ed43e55c15f58daf8e2efb3 Merge: b22870b 2f895f3 Author: Brian Muramatsu Date: Fri Mar 4 14:48:03 2011 -0800 am 2f895f36: am d455608f: Merge "update requirements for TelephonyManager.getDeviceId" into gingerbread * commit '2f895f3678a8abcb0c8e5e1c01df8f7fff412b14': update requirements for TelephonyManager.getDeviceId commit 2f895f3678a8abcb0c8e5e1c01df8f7fff412b14 Merge: 72a7540 d455608 Author: Brian Muramatsu Date: Fri Mar 4 14:43:09 2011 -0800 am d455608f: Merge "update requirements for TelephonyManager.getDeviceId" into gingerbread * commit 'd455608f055a5ad735bc0b57934804de503334c4': update requirements for TelephonyManager.getDeviceId commit d455608f055a5ad735bc0b57934804de503334c4 Merge: acf618e b0483b7 Author: Brian Muramatsu Date: Fri Mar 4 14:22:18 2011 -0800 Merge "update requirements for TelephonyManager.getDeviceId" into gingerbread commit b0483b742a27252e3f04b1374551b4f2816c5efa Author: Doug Zongker Date: Thu Mar 3 16:59:02 2011 -0800 update requirements for TelephonyManager.getDeviceId We allow all-decimal MEIDs (for LTE devices). Change-Id: Ib9ae3ca1aacb34b2f2279ded0e6fb38ce602c40a commit d966f9ef5ae8c3887c5a6aa676d607b92c9cb624 Author: Doug Zongker Date: Thu Mar 3 16:59:02 2011 -0800 update requirements for TelephonyManager.getDeviceId We allow all-decimal MEIDs (for LTE devices). Change-Id: Iff6f6b80518b12923ec09d952f6a4d2794a70c58 commit 843605b9b2141e41c6af07cfd2e79d1abc68a9da Author: Brian Muramatsu Date: Fri Mar 4 13:47:11 2011 -0800 Fix Some Tests for Wifi-only Devices Change-Id: I8b110226b962b7df6a9a90b3fa4bcfcf5bd1429a commit b22870b94b1b077fdfc6d3edf6231a10e3c7a316 Merge: a1caa86 72a7540 Author: Doug Zongker Date: Fri Mar 4 13:35:44 2011 -0800 am 72a7540a: update requirements for TelephonyManager.getDeviceId * commit '72a7540a4a25027e3e90212b2c9b258414e2e352': update requirements for TelephonyManager.getDeviceId commit cecf849c7434b574858600a29b7f70996837d46c Merge: 70c207b ce9c50a Author: Stephen Hines Date: Fri Mar 4 11:42:14 2011 -0800 am ce9c50a4: am c92a6213: Add a base test class for RenderScript compute. * commit 'ce9c50a422f0e8beec09104d28ed9a64e61c9a4c': Add a base test class for RenderScript compute. commit ce9c50a422f0e8beec09104d28ed9a64e61c9a4c Merge: 29c4a97 c92a621 Author: Stephen Hines Date: Fri Mar 4 11:20:40 2011 -0800 am c92a6213: Add a base test class for RenderScript compute. * commit 'c92a621352331ad786b340370670b40b44f18086': Add a base test class for RenderScript compute. commit c92a621352331ad786b340370670b40b44f18086 Author: Stephen Hines Date: Thu Mar 3 17:31:08 2011 -0800 Add a base test class for RenderScript compute. Change-Id: Ic42157df01e94c82177aa35ce020975dab6a076a commit 70c207be13f36f17eeb055a53e935236bbd0b0e6 Merge: 29c4a97 2bde615 Author: Ed Heyl Date: Thu Mar 3 22:26:03 2011 -0800 Merge branch 'master' of ssh://android-git:29418/platform/cts commit 29c4a9718af3b10b81a9f788382eab6610fc3242 Merge: 2d3c879 f9a74e1 Author: Ed Heyl Date: Thu Mar 3 21:48:47 2011 -0800 Merge branch 'master' into honeycomb-plus-aosp commit 72a7540a4a25027e3e90212b2c9b258414e2e352 Author: Doug Zongker Date: Thu Mar 3 16:59:02 2011 -0800 update requirements for TelephonyManager.getDeviceId We allow all-decimal MEIDs (for LTE devices). Change-Id: Ib9ae3ca1aacb34b2f2279ded0e6fb38ce602c40a commit 2bde615d67fcab09713872567becf2fc72260fb0 Merge: f9a74e1 2d3c879 Author: Brian Muramatsu Date: Thu Mar 3 11:46:31 2011 -0800 am 2d3c8797: am a1caa865: (-s ours) am 4fcc6189: am acf618ec: Merge "Suppress More Flaky Tests" into gingerbread * commit '2d3c8797fbc3e21bfb4b5d4dbe81a05d83171baa': Suppress More Flaky Tests commit 2d3c8797fbc3e21bfb4b5d4dbe81a05d83171baa Merge: 4cd2a55 a1caa86 Author: Brian Muramatsu Date: Thu Mar 3 11:41:17 2011 -0800 am a1caa865: (-s ours) am 4fcc6189: am acf618ec: Merge "Suppress More Flaky Tests" into gingerbread * commit 'a1caa865388d3a82fdc3769eb4e9526bdfadc0af': Suppress More Flaky Tests commit f9a74e1e3a5b25e8932fc98214c0c9b702707630 Merge: 0c68efd 4cd2a55 Author: Brian Muramatsu Date: Wed Mar 2 21:07:04 2011 -0800 am 4cd2a55c: am a9de6434: am 506d0906: am 3ff554be: Merge "Fix Contacts_PeopleTest#testAddToGroup" into gingerbread * commit '4cd2a55c42262f7d58fa2b2e7df9bb0102495636': Fix Contacts_PeopleTest#testAddToGroup commit a1caa865388d3a82fdc3769eb4e9526bdfadc0af Merge: a9de643 4fcc618 Author: Brian Muramatsu Date: Wed Mar 2 18:17:20 2011 -0800 am 4fcc6189: am acf618ec: Merge "Suppress More Flaky Tests" into gingerbread * commit '4fcc61892d2098d53bd06a14006f88b3b20e54b8': Suppress More Flaky Tests commit 4fcc61892d2098d53bd06a14006f88b3b20e54b8 Merge: 506d090 acf618e Author: Brian Muramatsu Date: Wed Mar 2 18:13:54 2011 -0800 am acf618ec: Merge "Suppress More Flaky Tests" into gingerbread * commit 'acf618ec54173f7acdaaeb4e501ee057f76dcc86': Suppress More Flaky Tests commit acf618ec54173f7acdaaeb4e501ee057f76dcc86 Merge: 3ff554b 676a3dd Author: Brian Muramatsu Date: Wed Mar 2 18:04:55 2011 -0800 Merge "Suppress More Flaky Tests" into gingerbread commit 65ab7bfed1779e248bd279aea4de72601b4d1703 Author: Brian Muramatsu Date: Wed Mar 2 17:20:04 2011 -0800 Fix EventLogTest Flakiness Issue 14896 The test was getting the current time and collecting events since that time. However, the times in the event logs are usually recorded faster, so events could get dropped. As a result, there were sleep calls that needed to be increased and adjusted for various devices. Fix these tests to gather events by looking for an event with a certain payload instead. This should be more reliable, since the payload is the current time from the test. This doesn't test the event times as much though. Change-Id: I4f6c9ad3ced39f2aa03c8c01b01b27f59948f8d0 commit 0c68efdce0a8f1009a4ae5bd49d9d6bb31a1d292 Merge: e532aec b48ce32 Author: Alex Sakhartchouk Date: Wed Mar 2 15:47:10 2011 -0800 Merge "Some more renderscript tests." commit e532aeca727436296868b928f6e02f1321f466df Merge: 8aeacca 4ec52ed Author: Brian Muramatsu Date: Wed Mar 2 15:33:08 2011 -0800 am 4ec52ed7: resolved conflicts for merge of 562d9560 to honeycomb-plus-aosp * commit '4ec52ed7bcd0ba86abdec4b0f69c56e72451be74': Fix ContextTest and ContextWrapperTest Interaction commit 8aeaccab8c78a05caf68eb9d1e74eccc7583f9d1 Merge: 565f854 609d9a0 Author: Brian Muramatsu Date: Wed Mar 2 15:33:06 2011 -0800 am 609d9a05: am 6e913609: (-s ours) am d9c701f6: am def2be5b: Merge "Suppress VideoVideoTest#testOnKeyDown" into gingerbread * commit '609d9a058daa0571247d7e7944d389c50e1cb272': Suppress VideoVideoTest#testOnKeyDown commit 565f854e33383b4883e1b7e43b88a7da609ee487 Merge: 701120e 2926bf8 Author: Brian Muramatsu Date: Wed Mar 2 12:53:08 2011 -0800 am 2926bf82: resolved conflicts for merge of 6959c90f to honeycomb-plus-aosp * commit '2926bf82cbdd0ff89870d1001c0e4a7831a99f20': (33 commits) Using different filenames for testRecorderVideo and testRecorderCamera. Remove Reference to Internal Phone Constant Change test string without a space character The test branches to alphabetic or numeric one Add key strokes in case of using 12-key keyboad Appends a space instead of using POUND key Update startcts Script Add QHD to the supported ScreenConfiguration list Add wait to testCacheFile. Adding waitForIdleSync in testTouchMode. Fix OpenGlEsVersionTest Fix OpenGlEsVersionTest Stop WifiManagerTest from disabling current network. Verify preinstalled apps don't have debuggable set. Remove isWatchingCursor Assertion Backport TelephonyManagerTest Enhancements FileSystemPermissionTest Eclair Backport Eclair CTS Version Increment to 2.1_r5 Fix Eclair ARMEABI Test Read Log Permission Test Fixes ... commit 701120e8cc035cc67abca165ba964da93672f3f0 Merge: f885e6a 80cd4cf Author: Brian Muramatsu Date: Wed Mar 2 12:52:35 2011 -0800 am 80cd4cfe: am 17380b87: am ab085b90: am b35ad952: Merge "Fix PaintTest#testGetTextWidths Methods" into gingerbread * commit '80cd4cfe322efd7caa3ebc084b3712b3b452990b': Fix PaintTest#testGetTextWidths Methods commit f885e6a25ff796fc53c52a8102a04d63b5ea76f9 Merge: 8bf8d54 82df037 Author: Brian Muramatsu Date: Wed Mar 2 12:52:32 2011 -0800 am 82df037d: am 4c6938eb: am 582d3043: am 01ff7c1e: Merge "Bump Version Number to 2.3_r2" into gingerbread * commit '82df037dbb7563a8c86384d18c0c706ceacc6637': Bump Version Number to 2.3_r2 commit 8bf8d54d6b33c428bfb90d52464809a5692ad180 Merge: bf69172 e375df8 Author: Brian Muramatsu Date: Wed Mar 2 12:52:28 2011 -0800 am e375df81: am 6a8d24cc: am d1096b5a: am 005d2056: Merge "Add NFC Permission to Stubs Manifest" into gingerbread * commit 'e375df8186b3ad317c3b4b2b094623d76f870364': Add NFC Permission to Stubs Manifest commit 676a3dd45c35c7364714bbbdf196b51e5cf5a0d2 Author: Brian Muramatsu Date: Wed Mar 2 12:37:10 2011 -0800 Suppress More Flaky Tests Bug 3486016 Most of these have always been flaky and need to be rewritten. Change-Id: I8159c717ad9b3e64773aa44c461e2bdf3679fdaf commit b48ce322bbba93c34e81f48f9f21fc0a171ae0e1 Author: Alex Sakhartchouk Date: Wed Mar 2 12:34:31 2011 -0800 Some more renderscript tests. Change-Id: I2bf220995af4315d8e91845d6ade561b33416084 commit 4cd2a55c42262f7d58fa2b2e7df9bb0102495636 Merge: 4ec52ed a9de643 Author: Brian Muramatsu Date: Wed Mar 2 11:38:31 2011 -0800 am a9de6434: am 506d0906: am 3ff554be: Merge "Fix Contacts_PeopleTest#testAddToGroup" into gingerbread * commit 'a9de64340abe4384d45d14f2ab7ea09d811a3df5': Fix Contacts_PeopleTest#testAddToGroup commit 4ec52ed7bcd0ba86abdec4b0f69c56e72451be74 Merge: 609d9a0 562d956 Author: Brian Muramatsu Date: Tue Mar 1 18:26:25 2011 -0800 resolved conflicts for merge of 562d9560 to honeycomb-plus-aosp Change-Id: I4e5a525ac2e8edf021bbfcd996b54da714594bf1 commit 609d9a058daa0571247d7e7944d389c50e1cb272 Merge: 2926bf8 6e91360 Author: Brian Muramatsu Date: Tue Mar 1 18:08:46 2011 -0800 am 6e913609: (-s ours) am d9c701f6: am def2be5b: Merge "Suppress VideoVideoTest#testOnKeyDown" into gingerbread * commit '6e9136098ed81ece055963c42488a75c6a5b4d40': Suppress VideoVideoTest#testOnKeyDown commit a9de64340abe4384d45d14f2ab7ea09d811a3df5 Merge: 562d956 506d090 Author: Brian Muramatsu Date: Tue Mar 1 17:41:41 2011 -0800 am 506d0906: am 3ff554be: Merge "Fix Contacts_PeopleTest#testAddToGroup" into gingerbread * commit '506d09069e2e010f6d591b21eabc38bab070b693': Fix Contacts_PeopleTest#testAddToGroup commit 562d9560cc653bb588c1cb6dc06fcc36c98504cc Merge: 6e91360 e4d20a9 Author: Brian Muramatsu Date: Tue Mar 1 17:41:39 2011 -0800 am e4d20a90: am 4414e30a: Merge "Fix ContextTest and ContextWrapperTest Interaction" into gingerbread * commit 'e4d20a90713592d01bc2c639de25fcca790b604e': Fix ContextTest and ContextWrapperTest Interaction commit 6e9136098ed81ece055963c42488a75c6a5b4d40 Merge: 6959c90 d9c701f Author: Brian Muramatsu Date: Tue Mar 1 17:38:19 2011 -0800 am d9c701f6: am def2be5b: Merge "Suppress VideoVideoTest#testOnKeyDown" into gingerbread * commit 'd9c701f6c50880f3b9567473278c497cffc44c58': Suppress VideoVideoTest#testOnKeyDown commit 506d09069e2e010f6d591b21eabc38bab070b693 Merge: e4d20a9 3ff554b Author: Brian Muramatsu Date: Tue Mar 1 17:29:38 2011 -0800 am 3ff554be: Merge "Fix Contacts_PeopleTest#testAddToGroup" into gingerbread * commit '3ff554be1120be2a0f9d309abb1c31ef94e02e35': Fix Contacts_PeopleTest#testAddToGroup commit e4d20a90713592d01bc2c639de25fcca790b604e Merge: d9c701f 4414e30 Author: Brian Muramatsu Date: Tue Mar 1 17:27:40 2011 -0800 am 4414e30a: Merge "Fix ContextTest and ContextWrapperTest Interaction" into gingerbread * commit '4414e30a6e6c7be32bde09ac96dac3f20df3617d': Fix ContextTest and ContextWrapperTest Interaction commit 3ff554be1120be2a0f9d309abb1c31ef94e02e35 Merge: 4414e30 05abe27 Author: Brian Muramatsu Date: Tue Mar 1 17:21:10 2011 -0800 Merge "Fix Contacts_PeopleTest#testAddToGroup" into gingerbread commit d9c701f6c50880f3b9567473278c497cffc44c58 Merge: 1aab710 def2be5 Author: Brian Muramatsu Date: Tue Mar 1 17:18:54 2011 -0800 am def2be5b: Merge "Suppress VideoVideoTest#testOnKeyDown" into gingerbread * commit 'def2be5bf63616a2f4ff689a62937875c2949f09': Suppress VideoVideoTest#testOnKeyDown commit 4414e30a6e6c7be32bde09ac96dac3f20df3617d Merge: def2be5 192df10 Author: Brian Muramatsu Date: Tue Mar 1 17:15:46 2011 -0800 Merge "Fix ContextTest and ContextWrapperTest Interaction" into gingerbread commit def2be5bf63616a2f4ff689a62937875c2949f09 Merge: b5f49f1 707ec1a Author: Brian Muramatsu Date: Tue Mar 1 17:09:03 2011 -0800 Merge "Suppress VideoVideoTest#testOnKeyDown" into gingerbread commit 707ec1a30e890b2f6f5e0079be9e2716673f19e5 Author: Brian Muramatsu Date: Tue Mar 1 16:43:18 2011 -0800 Suppress VideoVideoTest#testOnKeyDown Bug 3486016 The test fails when it is run with testGetDuration. Even though the test tears down the activity there seems to be some state within VideoView that causes testOnKeyDown to fail. Update the expectations for now and rename the expectations file. Change-Id: Ifce6e83813d3f3abdb555e88a8361af7d6225e7a commit bf69172d3eebb220a710c4f4d95a1bebcef9bcf7 Merge: 58551e4 4aeee06 Author: Stephen Hines Date: Tue Mar 1 16:03:20 2011 -0800 Merge "Simple addition of a Renderscript test to cts." commit 192df10e3524fd90097c0386d24d89f58f510029 Author: Brian Muramatsu Date: Tue Mar 1 15:01:30 2011 -0800 Fix ContextTest and ContextWrapperTest Interaction Bug 3188260 ContextWrapperTest#testAccessTheme passed when run on its own but failed when executed in batch mode. ContextTest was interfering by calling obtainedStyleAttributes which was calling getTheme. getTheme sets the theme to the default if there is no theme. You can only set the theme once in the context, so future calls like those in testAccessTheme no longer worked and broke the test. These ContextWrapperTests are somewhat silly since the implementation of ContextWrapper is to just call the same methods in the context it wraps...so I moved the test into ContextTest and made sure to set the theme to the test theme at the beginning. These ContextTests are also funny, because there are multiple implementations of Context and this one just happens to work with the Context given back by AndroidTestCase... Change-Id: I710439ea09b8c048178faacb269157d4ba4341cb commit 4aeee069257e63c4bfd133b49dc01fbfca737935 Author: Stephen Hines Date: Thu Feb 24 18:30:30 2011 -0800 Simple addition of a Renderscript test to cts. Change-Id: I34cd7df44cbf8e51cda5eb5f39e2a2c9c13770bc commit 05abe27328b0611d896d2b36b5e5c0f77cff6ae0 Author: Brian Muramatsu Date: Tue Mar 1 12:37:53 2011 -0800 Fix Contacts_PeopleTest#testAddToGroup Bug 3188260 The My Contacts group used in the test is not created automatically, so add the group before starting the test. Change-Id: I3a84f5234ae97241ef17bf821c72bbc60607674c commit 2926bf82cbdd0ff89870d1001c0e4a7831a99f20 Merge: 80cd4cf 6959c90 Author: Brian Muramatsu Date: Tue Mar 1 11:41:23 2011 -0800 resolved conflicts for merge of 6959c90f to honeycomb-plus-aosp Change-Id: I57e50f27d820383a53696782730ef502b3d28989 commit 80cd4cfe322efd7caa3ebc084b3712b3b452990b Merge: 82df037 17380b8 Author: Brian Muramatsu Date: Tue Mar 1 11:13:03 2011 -0800 am 17380b87: am ab085b90: am b35ad952: Merge "Fix PaintTest#testGetTextWidths Methods" into gingerbread * commit '17380b87bc9449e28b0ea9a2ae85bc0b8a5889e0': Fix PaintTest#testGetTextWidths Methods commit 82df037dbb7563a8c86384d18c0c706ceacc6637 Merge: e375df8 4c6938e Author: Brian Muramatsu Date: Tue Mar 1 11:13:01 2011 -0800 am 4c6938eb: am 582d3043: am 01ff7c1e: Merge "Bump Version Number to 2.3_r2" into gingerbread * commit '4c6938eb9681587af2bb84aefa49a30ded5fafa2': Bump Version Number to 2.3_r2 commit e375df8186b3ad317c3b4b2b094623d76f870364 Merge: 81b0383 6a8d24c Author: Brian Muramatsu Date: Tue Mar 1 11:12:49 2011 -0800 am 6a8d24cc: am d1096b5a: am 005d2056: Merge "Add NFC Permission to Stubs Manifest" into gingerbread * commit '6a8d24cc0d3d7fe8af5c8baba642d142f92295a9': Add NFC Permission to Stubs Manifest commit 58551e46574bcc2111976ef5ff323dc540fc590f Merge: f26aabe 81b0383 Author: Brian Muramatsu Date: Tue Mar 1 11:10:25 2011 -0800 am 81b03839: resolved conflicts for merge of ad7dcc64 to honeycomb-plus-aosp * commit '81b03839238563986ff9110950f770f3e76e56ce': Update BuildVersionTest for 2.3.3 commit 81b03839238563986ff9110950f770f3e76e56ce Merge: 0533048 ad7dcc6 Author: Brian Muramatsu Date: Tue Mar 1 11:06:55 2011 -0800 resolved conflicts for merge of ad7dcc64 to honeycomb-plus-aosp Change-Id: I45b5124db2dd80671cac986412f16fbd703b029e commit f26aabee8ebdbec38da0cb74a08f7721df1c97ce Merge: f57b9cb 0533048 Author: Jean-Baptiste Queru Date: Tue Mar 1 10:59:54 2011 -0800 am 05330482: am 83735514: am 94e4024f: am cc475551: Reconcile gingerbread variants * commit '0533048276a3dd8897bc1290ad350a52fc61b611': commit 0533048276a3dd8897bc1290ad350a52fc61b611 Merge: cf7c2d8 8373551 Author: Jean-Baptiste Queru Date: Tue Mar 1 09:12:55 2011 -0800 am 83735514: am 94e4024f: am cc475551: Reconcile gingerbread variants * commit '837355145e1e2bdd1baf21f502cb265c2953900b': commit 6959c90f1b004c9e074b3d924803d95e0232fa8b Merge: 17380b8 1aab710 Author: Brian Muramatsu Date: Mon Feb 28 19:04:29 2011 -0800 am 1aab710b: am b5f49f11: Merge "Merge remote branch \'korg/froyo\' into froyomerge" into gingerbread * commit '1aab710b5a73ef5d2361e35a817f47e0e722ed50': (33 commits) Using different filenames for testRecorderVideo and testRecorderCamera. Remove Reference to Internal Phone Constant Change test string without a space character The test branches to alphabetic or numeric one Add key strokes in case of using 12-key keyboad Appends a space instead of using POUND key Update startcts Script Add QHD to the supported ScreenConfiguration list Add wait to testCacheFile. Adding waitForIdleSync in testTouchMode. Fix OpenGlEsVersionTest Fix OpenGlEsVersionTest Stop WifiManagerTest from disabling current network. Verify preinstalled apps don't have debuggable set. Remove isWatchingCursor Assertion Backport TelephonyManagerTest Enhancements FileSystemPermissionTest Eclair Backport Eclair CTS Version Increment to 2.1_r5 Fix Eclair ARMEABI Test Read Log Permission Test Fixes ... commit 1aab710b5a73ef5d2361e35a817f47e0e722ed50 Merge: ab085b9 b5f49f1 Author: Brian Muramatsu Date: Mon Feb 28 18:55:52 2011 -0800 am b5f49f11: Merge "Merge remote branch \'korg/froyo\' into froyomerge" into gingerbread * commit 'b5f49f11e36fda07b3db2088d6cfd78dc73d87fe': (33 commits) Using different filenames for testRecorderVideo and testRecorderCamera. Remove Reference to Internal Phone Constant Change test string without a space character The test branches to alphabetic or numeric one Add key strokes in case of using 12-key keyboad Appends a space instead of using POUND key Update startcts Script Add QHD to the supported ScreenConfiguration list Add wait to testCacheFile. Adding waitForIdleSync in testTouchMode. Fix OpenGlEsVersionTest Fix OpenGlEsVersionTest Stop WifiManagerTest from disabling current network. Verify preinstalled apps don't have debuggable set. Remove isWatchingCursor Assertion Backport TelephonyManagerTest Enhancements FileSystemPermissionTest Eclair Backport Eclair CTS Version Increment to 2.1_r5 Fix Eclair ARMEABI Test Read Log Permission Test Fixes ... commit b5f49f11e36fda07b3db2088d6cfd78dc73d87fe Merge: b35ad95 db5bb6a Author: Brian Muramatsu Date: Mon Feb 28 18:39:01 2011 -0800 Merge "Merge remote branch 'korg/froyo' into froyomerge" into gingerbread commit db5bb6a8fa101d3eebb2db6b41b246436a2cb6aa Merge: b35ad95 1a023c1 Author: Brian Muramatsu Date: Mon Feb 28 18:25:14 2011 -0800 Merge remote branch 'korg/froyo' into froyomerge Conflicts: tests/tests/dpi/src/android/dpi/cts/ConfigurationTest.java tests/tests/view/src/android/view/cts/WindowTest.java Change-Id: Ibf7651011e4e594d0173c90f6341f75a9e71d45b commit 1a023c1d3280e4818a98e5bbe846833e96c45cb5 Merge: d9e30a1 fe2e2a2 Author: Brian Muramatsu Date: Mon Feb 28 18:00:59 2011 -0800 Merge "Merge remote branch 'korg/eclair' into eclairmerge" into froyo commit fe2e2a2382ca488c6b17f2d8ff27499b50a05261 Merge: d9e30a1 dbf9d6b Author: Brian Muramatsu Date: Mon Feb 28 17:33:44 2011 -0800 Merge remote branch 'korg/eclair' into eclairmerge Conflicts: tests/AndroidManifest.xml tests/jni/Android.mk tests/res/layout/focus_finder_layout.xml tests/res/values/strings.xml tests/src/android/opengl/cts/OpenGlEsVersionStubActivity.java tests/src/android/os/cts/CpuFeatures.java tests/src/android/view/cts/FocusFinderStubActivity.java tests/tests/app/src/android/app/cts/SystemFeaturesTest.java tests/tests/os/src/android/os/cts/BuildTest.java tests/tests/permission/src/android/permission/cts/DebuggableTest.java tools/device-setup/TestDeviceSetup/src/android/tests/getinfo/DeviceInfoInstrument.java tools/host/src/com/android/cts/TestDevice.java tools/host/src/com/android/cts/TestSessionLog.java tools/host/src/com/android/cts/Version.java tools/host/src/res/cts_result.xsl Change-Id: If7cd43b18be79a062d23d5536a3ff3a91c635f0b commit d9e30a1c9d97af9b9ea28fe20daf39a94d985914 Merge: 07b92b3 eb111d9 Author: Brian Muramatsu Date: Mon Feb 28 16:57:29 2011 -0800 Merge "Change test string without a space character" into froyo commit 07b92b3333c621b1726aafae83af295933c5a21b Merge: 2e0666b 5a8b276 Author: Brian Muramatsu Date: Mon Feb 28 16:46:05 2011 -0800 Merge "Using different filenames for testRecorderVideo and testRecorderCamera." into froyo commit 5a8b2768f2556b390e44bde852ef8e4e9091ddb1 Author: m-miyahara Date: Fri Feb 18 13:20:02 2011 +0900 Using different filenames for testRecorderVideo and testRecorderCamera. There are some cases where these failures will be caused due to same filename being used in these test cases. To avoid this, I changed so that different filenames will be used for testRecorderVideo and testRecorderCamera. Change-Id: I6bf84aff1034c246cf7bfecf0d8692fc00919b95 commit 17380b87bc9449e28b0ea9a2ae85bc0b8a5889e0 Merge: 4c6938e ab085b9 Author: Brian Muramatsu Date: Mon Feb 28 16:29:59 2011 -0800 am ab085b90: am b35ad952: Merge "Fix PaintTest#testGetTextWidths Methods" into gingerbread * commit 'ab085b90adaf96545fb1914fc39143553bc9239a': Fix PaintTest#testGetTextWidths Methods commit 4c6938eb9681587af2bb84aefa49a30ded5fafa2 Merge: 6a8d24c 582d304 Author: Brian Muramatsu Date: Mon Feb 28 16:29:57 2011 -0800 am 582d3043: am 01ff7c1e: Merge "Bump Version Number to 2.3_r2" into gingerbread * commit '582d3043e6a84a7539a66e6804eedefcf55aff94': Bump Version Number to 2.3_r2 commit 6a8d24cc0d3d7fe8af5c8baba642d142f92295a9 Merge: ad7dcc6 d1096b5 Author: Brian Muramatsu Date: Mon Feb 28 16:25:14 2011 -0800 am d1096b5a: am 005d2056: Merge "Add NFC Permission to Stubs Manifest" into gingerbread * commit 'd1096b5ac5fd0cdb41457a22e346ad787efc6659': Add NFC Permission to Stubs Manifest commit ad7dcc646b8425e0c99da093f3561f5e2ed99797 Merge: 8373551 c58b8bc Author: Brian Muramatsu Date: Mon Feb 28 16:25:10 2011 -0800 am c58b8bc4: am 462a3dc0: Merge "Update BuildVersionTest for 2.3.3" into gingerbread * commit 'c58b8bc48600a6d6c2330e6fdb6e2b688ba6548b': Update BuildVersionTest for 2.3.3 commit ab085b90adaf96545fb1914fc39143553bc9239a Merge: 582d304 b35ad95 Author: Brian Muramatsu Date: Mon Feb 28 16:23:59 2011 -0800 am b35ad952: Merge "Fix PaintTest#testGetTextWidths Methods" into gingerbread * commit 'b35ad9523bdb132710c5f28df7d79a30f75a57b6': Fix PaintTest#testGetTextWidths Methods commit b35ad9523bdb132710c5f28df7d79a30f75a57b6 Merge: 01ff7c1 7254f1e Author: Brian Muramatsu Date: Mon Feb 28 16:17:26 2011 -0800 Merge "Fix PaintTest#testGetTextWidths Methods" into gingerbread commit 7254f1e86a40d67adda0bda99ef8457c40e09a80 Author: Brian Muramatsu Date: Fri Feb 25 15:42:16 2011 -0800 Fix PaintTest#testGetTextWidths Methods Bug 3188260 Instead of testing hard-coded values check that the various overloads return the same widths. Change-Id: I60ed15eacb2c1a5bc39885b8ce1bb8288caab4a6 commit 582d3043e6a84a7539a66e6804eedefcf55aff94 Merge: d1096b5 01ff7c1 Author: Brian Muramatsu Date: Mon Feb 28 15:43:47 2011 -0800 am 01ff7c1e: Merge "Bump Version Number to 2.3_r2" into gingerbread * commit '01ff7c1e7c5a0c91ee81ab1fc1f8e659b3e3fe6d': Bump Version Number to 2.3_r2 commit 01ff7c1e7c5a0c91ee81ab1fc1f8e659b3e3fe6d Merge: 005d205 b102242 Author: Brian Muramatsu Date: Mon Feb 28 15:38:22 2011 -0800 Merge "Bump Version Number to 2.3_r2" into gingerbread commit d1096b5ac5fd0cdb41457a22e346ad787efc6659 Merge: c58b8bc 005d205 Author: Brian Muramatsu Date: Mon Feb 28 15:34:21 2011 -0800 am 005d2056: Merge "Add NFC Permission to Stubs Manifest" into gingerbread * commit '005d2056a2293d39e4c67413dec4bdaa71303a1a': Add NFC Permission to Stubs Manifest commit c58b8bc48600a6d6c2330e6fdb6e2b688ba6548b Merge: 94e4024 462a3dc Author: Brian Muramatsu Date: Mon Feb 28 15:34:17 2011 -0800 am 462a3dc0: Merge "Update BuildVersionTest for 2.3.3" into gingerbread * commit '462a3dc0fa774d3a04c8e824129cfd5c4005be81': Update BuildVersionTest for 2.3.3 commit f57b9cb88fcc6777d2c259c3c1e8411cadf2f2b8 Merge: a68caf2 bd17d5d Author: Elliott Hughes Date: Mon Feb 28 15:30:05 2011 -0800 Merge "Fix ParcelTest now that Parcel.writeNative doesn't ignore 'offset'." commit 2e0666b8e9c6af0c3300dfedc2db821a4e1043ea Merge: b6605ea 8ccaa18 Author: Brian Muramatsu Date: Mon Feb 28 15:26:40 2011 -0800 Merge "Remove Reference to Internal Phone Constant" into froyo commit 8ccaa184ecc19a8cd93d8b6af657093ba65be8d5 Author: Brian Muramatsu Date: Mon Feb 28 15:21:42 2011 -0800 Remove Reference to Internal Phone Constant Use the constant defined in the test instead. Change-Id: Ia4c85a56663df0c79910395aaae534407952aaf6 commit 005d2056a2293d39e4c67413dec4bdaa71303a1a Merge: 462a3dc 6d783fe Author: Brian Muramatsu Date: Mon Feb 28 15:19:55 2011 -0800 Merge "Add NFC Permission to Stubs Manifest" into gingerbread commit 462a3dc0fa774d3a04c8e824129cfd5c4005be81 Merge: cc47555 c1ef0ff Author: Brian Muramatsu Date: Mon Feb 28 15:12:48 2011 -0800 Merge "Update BuildVersionTest for 2.3.3" into gingerbread commit 6d783fe99d75f8b4a4cc24b6c22cdb7f0c394a1c Author: Brian Muramatsu Date: Mon Feb 28 15:03:09 2011 -0800 Add NFC Permission to Stubs Manifest Bug 3486016 CTS needs android.permission.NFC to call NfcAdapter#getDefaultAdapter(Context) Change-Id: I78c33cfe7f34a242346640cf712127ea796a2964 commit bd17d5d390a9703b5b2606d4ac2ac7fd6c4c0d7b Author: Elliott Hughes Date: Mon Feb 28 14:27:48 2011 -0800 Fix ParcelTest now that Parcel.writeNative doesn't ignore 'offset'. Add tests of the array bounds checking too. Bug: http://code.google.com/p/android/issues/detail?id=15075 Change-Id: I5a3bfab2ace02efab996ef6d35d5d7b7c77df19d commit 837355145e1e2bdd1baf21f502cb265c2953900b Merge: 1a31c29 94e4024 Author: Jean-Baptiste Queru Date: Mon Feb 28 13:44:26 2011 -0800 am 94e4024f: am cc475551: Reconcile gingerbread variants * commit '94e4024f4917ceaac72e94ce6329479e6a235441': commit 94e4024f4917ceaac72e94ce6329479e6a235441 Merge: afafe00 cc47555 Author: Jean-Baptiste Queru Date: Mon Feb 28 13:41:43 2011 -0800 am cc475551: Reconcile gingerbread variants * commit 'cc475551e4b72cf5d653bb29ba286ec1de171689': commit cc475551e4b72cf5d653bb29ba286ec1de171689 Merge: 0f06476 a1b866e Author: Jean-Baptiste Queru Date: Mon Feb 28 13:17:27 2011 -0800 Reconcile gingerbread variants Change-Id: I5e68fbe90331f2d9278196a62b97d3ccd2fb7cfa commit a68caf2d115d3dc47549328d2e504dcee968cbbb Merge: 5a0335b 61c229f Author: Brian Muramatsu Date: Mon Feb 28 11:48:16 2011 -0800 Merge "Remove StaticLayoutTest from Expectations" commit 5a0335b4105f0c2408f7428ebc5c0d92998c1380 Merge: 28b86b9 cf7c2d8 Author: Brian Muramatsu Date: Mon Feb 28 11:08:47 2011 -0800 am cf7c2d8e: am 1a31c297: am afafe00d: am a1b866e8: Merge "Fix Broken VideoViewTest" into gingerbread * commit 'cf7c2d8ec7ce21dfda4beb1d38b3cf8bf6518722': Fix Broken VideoViewTest commit 28b86b928fd36fea1362a1f6cc7c17da604a127e Merge: 04f5531 e4bd303 Author: Brian Muramatsu Date: Mon Feb 28 11:08:45 2011 -0800 am e4bd3035: am 02594a58: am 998c36f2: am a7f4dec3: Merge "Fix Broken LauncherActivityTest" into gingerbread * commit 'e4bd3035e17801437132f70c5d8a853da0c18304': Fix Broken LauncherActivityTest commit 04f5531e8e2d912a159f82d8b72cce3e638cf96d Merge: acfe756 8e643c1 Author: Brian Muramatsu Date: Mon Feb 28 11:08:42 2011 -0800 am 8e643c18: am 74af6ead: am d4d91bb8: am 29b5e9d2: Merge "Fix Broken PathMeasureTest#testIsClosed" into gingerbread * commit '8e643c18349dde9e1492354850da9e3a6bc00055': Fix Broken PathMeasureTest#testIsClosed commit acfe756ae395ac835a53d960f67b1fddecc9a545 Merge: 4c387fe 24fa9d7 Author: Brian Muramatsu Date: Mon Feb 28 11:08:40 2011 -0800 am 24fa9d71: am d2ec024b: am ae34f576: am 931d4adc: Merge "Remove Broken ListActivityTest" into gingerbread * commit '24fa9d71cbb479794088417fb6c5baae22c64d6e': Remove Broken ListActivityTest commit cf7c2d8ec7ce21dfda4beb1d38b3cf8bf6518722 Merge: e4bd303 1a31c29 Author: Brian Muramatsu Date: Mon Feb 28 11:05:51 2011 -0800 am 1a31c297: am afafe00d: am a1b866e8: Merge "Fix Broken VideoViewTest" into gingerbread * commit '1a31c297e76903713bbbfd5fc4bbf389bde60c38': Fix Broken VideoViewTest commit e4bd3035e17801437132f70c5d8a853da0c18304 Merge: 8e643c1 02594a5 Author: Brian Muramatsu Date: Mon Feb 28 11:05:49 2011 -0800 am 02594a58: am 998c36f2: am a7f4dec3: Merge "Fix Broken LauncherActivityTest" into gingerbread * commit '02594a589c2952712b2128f948fa4bfe868272af': Fix Broken LauncherActivityTest commit 8e643c18349dde9e1492354850da9e3a6bc00055 Merge: 24fa9d7 74af6ea Author: Brian Muramatsu Date: Mon Feb 28 11:05:47 2011 -0800 am 74af6ead: am d4d91bb8: am 29b5e9d2: Merge "Fix Broken PathMeasureTest#testIsClosed" into gingerbread * commit '74af6ead2769954d15bd46434fd6723274866220': Fix Broken PathMeasureTest#testIsClosed commit 24fa9d71cbb479794088417fb6c5baae22c64d6e Merge: 4f2743d d2ec024 Author: Brian Muramatsu Date: Mon Feb 28 11:05:43 2011 -0800 am d2ec024b: am ae34f576: am 931d4adc: Merge "Remove Broken ListActivityTest" into gingerbread * commit 'd2ec024bf4da8ff92eda2c9c1995f3b50dacf800': Remove Broken ListActivityTest commit 4c387fedfa6709fa1a86f75f7fdf13d9a7762581 Merge: dc2bee0 4f2743d Author: Brian Muramatsu Date: Mon Feb 28 11:05:10 2011 -0800 am 4f2743dd: resolved conflicts for merge of 05fe4d37 to honeycomb-plus-aosp * commit '4f2743dd2ec1e8ddb219c601a7496d7b37e6a4b2': Add NDEF smoke tests. Fix Broken PaintTest#testBreakText1 Test startUsingNetworkFeature TYPE_MOBILE_HIPRI Increase height and width of the status bar to accommodate higher resolution devices Update BuildVersionTest for 2.2.2 Update BuildVersionTest for 2.2 and 2.2.1 Fix DX Tests Compilation Script Changing the delay time from 250ms to 3000ms, because avoiding a race condition in testOnReceivedIcon. CTS test is not considering the case when the devcie get into SILENT mode by volume down key. Revert "fix keytests for azerty keyboard" commit 4f2743dd2ec1e8ddb219c601a7496d7b37e6a4b2 Merge: fe297ac 05fe4d3 Author: Brian Muramatsu Date: Mon Feb 28 10:49:11 2011 -0800 resolved conflicts for merge of 05fe4d37 to honeycomb-plus-aosp Change-Id: I396cb1ddc27a1da3d5bf416474d5f63bdd434409 commit 1a31c297e76903713bbbfd5fc4bbf389bde60c38 Merge: 02594a5 afafe00 Author: Brian Muramatsu Date: Mon Feb 28 10:15:00 2011 -0800 am afafe00d: am a1b866e8: Merge "Fix Broken VideoViewTest" into gingerbread * commit 'afafe00dc26a991937816ebcd47789e34d2fa278': Fix Broken VideoViewTest commit 02594a589c2952712b2128f948fa4bfe868272af Merge: 74af6ea 998c36f Author: Brian Muramatsu Date: Mon Feb 28 10:14:57 2011 -0800 am 998c36f2: am a7f4dec3: Merge "Fix Broken LauncherActivityTest" into gingerbread * commit '998c36f2a2534914079dbced47007e9f9af2889d': Fix Broken LauncherActivityTest commit 74af6ead2769954d15bd46434fd6723274866220 Merge: d2ec024 d4d91bb Author: Brian Muramatsu Date: Mon Feb 28 10:14:55 2011 -0800 am d4d91bb8: am 29b5e9d2: Merge "Fix Broken PathMeasureTest#testIsClosed" into gingerbread * commit 'd4d91bb8b00c9573aeb2ce39c91970f74ee8f491': Fix Broken PathMeasureTest#testIsClosed commit d2ec024bf4da8ff92eda2c9c1995f3b50dacf800 Merge: 05fe4d3 ae34f57 Author: Brian Muramatsu Date: Mon Feb 28 10:14:52 2011 -0800 am ae34f576: am 931d4adc: Merge "Remove Broken ListActivityTest" into gingerbread * commit 'ae34f576598d997384a2f188ed3c1df94c332f37': Remove Broken ListActivityTest commit 05fe4d37d12f6f9e2e6934405392e7b0185a5d62 Merge: 41de143 ddc7b8f Author: Brian Muramatsu Date: Mon Feb 28 10:14:47 2011 -0800 am ddc7b8f2: am 006494e5: Merge "Fix Broken PaintTest#testBreakText1" into gingerbread * commit 'ddc7b8f2eeaa9de8225288761057d7b0f49d41b3': Add NDEF smoke tests. Fix Broken PaintTest#testBreakText1 Test startUsingNetworkFeature TYPE_MOBILE_HIPRI Increase height and width of the status bar to accommodate higher resolution devices Update BuildVersionTest for 2.2.2 Update BuildVersionTest for 2.2 and 2.2.1 Fix DX Tests Compilation Script Changing the delay time from 250ms to 3000ms, because avoiding a race condition in testOnReceivedIcon. CTS test is not considering the case when the devcie get into SILENT mode by volume down key. Revert "fix keytests for azerty keyboard" commit afafe00dc26a991937816ebcd47789e34d2fa278 Merge: 998c36f a1b866e Author: Brian Muramatsu Date: Mon Feb 28 09:39:01 2011 -0800 am a1b866e8: Merge "Fix Broken VideoViewTest" into gingerbread * commit 'a1b866e8a68db74082d672ec467605f3263fb5df': Fix Broken VideoViewTest commit 998c36f2a2534914079dbced47007e9f9af2889d Merge: d4d91bb a7f4dec Author: Brian Muramatsu Date: Mon Feb 28 09:38:19 2011 -0800 am a7f4dec3: Merge "Fix Broken LauncherActivityTest" into gingerbread * commit 'a7f4dec31fcc664210ebb3bbf241ddc65032e028': Fix Broken LauncherActivityTest commit d4d91bb8b00c9573aeb2ce39c91970f74ee8f491 Merge: ae34f57 29b5e9d Author: Brian Muramatsu Date: Mon Feb 28 09:38:17 2011 -0800 am 29b5e9d2: Merge "Fix Broken PathMeasureTest#testIsClosed" into gingerbread * commit '29b5e9d28d21805a353c8866bbce8d15ad3c46f8': Fix Broken PathMeasureTest#testIsClosed commit ae34f576598d997384a2f188ed3c1df94c332f37 Merge: ddc7b8f 931d4ad Author: Brian Muramatsu Date: Mon Feb 28 09:38:14 2011 -0800 am 931d4adc: Merge "Remove Broken ListActivityTest" into gingerbread * commit '931d4adc481e6731fd76c83d376bcbf3d3d8bbf1': Remove Broken ListActivityTest commit ddc7b8f2eeaa9de8225288761057d7b0f49d41b3 Merge: 4265965 006494e Author: Brian Muramatsu Date: Mon Feb 28 09:38:04 2011 -0800 am 006494e5: Merge "Fix Broken PaintTest#testBreakText1" into gingerbread * commit '006494e5183fa3fef09b6fa463a4bdaca677e059': Fix Broken PaintTest#testBreakText1 Test startUsingNetworkFeature TYPE_MOBILE_HIPRI Increase height and width of the status bar to accommodate higher resolution devices Update BuildVersionTest for 2.2.2 Update BuildVersionTest for 2.2 and 2.2.1 Fix DX Tests Compilation Script Changing the delay time from 250ms to 3000ms, because avoiding a race condition in testOnReceivedIcon. CTS test is not considering the case when the devcie get into SILENT mode by volume down key. Revert "fix keytests for azerty keyboard" commit af04b2544956838095c0cbb5dbc1bfe49c84fceb Author: m-miyahara Date: Mon Feb 28 15:27:22 2011 +0900 Modified so that if network does not support multipart / data SMS, it skips this test. If the network is "NTT DOCOMO" (MCC+MNC = 44010), test on sending SMS of SendDataMessage and SendMultipartTextMessage always gives timeouts since NTT DOCOMO does not support Multipart / Data SMS. I modified so that if the network was NTT DOCOMO it will skip this test. commit a1b866e8a68db74082d672ec467605f3263fb5df Merge: a7f4dec 6e10488 Author: Brian Muramatsu Date: Fri Feb 25 15:13:31 2011 -0800 Merge "Fix Broken VideoViewTest" into gingerbread commit a7f4dec31fcc664210ebb3bbf241ddc65032e028 Merge: 29b5e9d 07bec6f Author: Brian Muramatsu Date: Fri Feb 25 15:08:44 2011 -0800 Merge "Fix Broken LauncherActivityTest" into gingerbread commit 29b5e9d28d21805a353c8866bbce8d15ad3c46f8 Merge: 931d4ad da018d3 Author: Brian Muramatsu Date: Fri Feb 25 14:58:34 2011 -0800 Merge "Fix Broken PathMeasureTest#testIsClosed" into gingerbread commit 931d4adc481e6731fd76c83d376bcbf3d3d8bbf1 Merge: 006494e 4a6fd72 Author: Brian Muramatsu Date: Fri Feb 25 14:50:44 2011 -0800 Merge "Remove Broken ListActivityTest" into gingerbread commit 006494e5183fa3fef09b6fa463a4bdaca677e059 Merge: 5063019 c2fcc33 Author: Brian Muramatsu Date: Fri Feb 25 14:41:05 2011 -0800 Merge "Fix Broken PaintTest#testBreakText1" into gingerbread commit dc2bee0f29a2d49ffd0b5e6f26860b102136d5ab Merge: e5ff8e7 2a4fa0a Author: Wu-cheng Li Date: Thu Feb 24 21:36:45 2011 -0800 Merge "Add CTS to ensure camera supports YV12 preview format." commit eb111d9bce3c58f1f57e33105fb0068ba52c880c Author: Masanori Ogino Date: Fri Feb 25 09:27:02 2011 +0900 Change test string without a space character The test string should not include any space character in case of a numeric keyboard. Because the key which represents a space character is different for each countries. Change-Id: I8a7a3cd5fffa644441be94916d8fa9321fde7360 commit e5ff8e716987797442cabd33253521203d806fd3 Merge: 6813421 40c6f20 Author: Brian Muramatsu Date: Thu Feb 24 15:50:36 2011 -0800 Merge "Remove Null addCategory Test" commit 61c229f24c66e1ca588d24473d6bd633bd3b04fa Author: Brian Muramatsu Date: Thu Feb 24 15:49:15 2011 -0800 Remove StaticLayoutTest from Expectations Bug 3422121 StaticLayout has been fixed for MR-1! Change-Id: Iccfd1127666a2730eba96528122089080ea44214 commit b1022429c24a64f78747b2de978751cc31a52af1 Author: Brian Muramatsu Date: Thu Feb 24 14:38:21 2011 -0800 Bump Version Number to 2.3_r2 Bug 3486016 Change-Id: I7586719f27aabf99e2761aa2c206694dcf725580 commit c1ef0ffa45a37ad88d7d09eea3ed4d32df397eca Author: Brian Muramatsu Date: Thu Feb 24 12:27:02 2011 -0800 Update BuildVersionTest for 2.3.3 Bug 3486016 Change-Id: I682b74b6730bfae682391ffed5382248a2d98895 commit 6813421968327a38dca7b2f50996ce8b7c424630 Merge: b430e9b fe297ac Author: Brett Chabot Date: Wed Feb 23 19:07:57 2011 -0800 am fe297aca: am 8a616b96: Add CTS specific console for cts-tradefed. * commit 'fe297acacf62cc5c105b722d3fa181620f59a321': Add CTS specific console for cts-tradefed. commit fe297acacf62cc5c105b722d3fa181620f59a321 Merge: bbead09 8a616b9 Author: Brett Chabot Date: Wed Feb 23 19:05:58 2011 -0800 am 8a616b96: Add CTS specific console for cts-tradefed. * commit '8a616b967717d189aa884e06ff581ec6e4ceb427': Add CTS specific console for cts-tradefed. commit 8a616b967717d189aa884e06ff581ec6e4ceb427 Author: Brett Chabot Date: Wed Feb 23 18:12:54 2011 -0800 Add CTS specific console for cts-tradefed. Change-Id: Ibe4e454e645067ccbb465ff6ccc339fd783829c0 commit b6605ea3687863d9c2d6ec75a71dbcc32aae002f Merge: 672f73a 4db5e01 Author: Brian Muramatsu Date: Wed Feb 23 17:58:39 2011 -0800 Merge "The test branches to alphabetic or numeric one" into froyo commit 4db5e01518cb83185f459628b92be6b6c51741fb Author: Masanori Ogino Date: Thu Feb 24 09:16:25 2011 +0900 The test branches to alphabetic or numeric one he test branches to alphabetic or numeric one In case of using 12-key keyboard it cannot enter alphabet key directly. So the shortcut key test branches to alphabetic or numeric one according to keyboard type. This is a new patch instead of 21400/1 Change-Id: Ia49940d8caf1c88346d80d8f50de6070510b91cd commit 40c6f20ee2a986609f907015832ce06c59922409 Author: Brian Muramatsu Date: Wed Feb 23 15:39:08 2011 -0800 Remove Null addCategory Test Change-Id: I328e07838390e542a45360ba395e295f33a10699 commit 672f73aa27a247afcc0eb057c9070e6543a0efed Merge: 70f2fde 9e96feb Author: Brian Muramatsu Date: Wed Feb 23 13:29:13 2011 -0800 Merge "Add key strokes in case of using 12-key keyboad" into froyo commit 70f2fde558be1931d85db03577b5bf8aa3651551 Merge: ded2045 7216f9b Author: Brian Muramatsu Date: Wed Feb 23 12:01:07 2011 -0800 Merge "Appends a space instead of using POUND key" into froyo commit 9e96feb030462f028d6f5b5596cea1f1c770116e Author: Masanori Ogino Date: Wed Feb 23 17:47:58 2011 +0900 Add key strokes in case of using 12-key keyboad This is a new patch instead of 21311/1. Change-Id: I4f784e92282f239aeb339944a36cb4f60604ebbf commit 7216f9b38a699e0de8e1120c0d0152c5fb1ff917 Author: Masanori Ogino Date: Mon Feb 21 11:50:38 2011 +0900 Appends a space instead of using POUND key A POUND key doesn't represent a space charactor in some countries. So it appends a space to the text object instead of sending key event. Change-Id: Ied72bd3b32a73d355916746e0b118a59969e6f92 commit dbf9d6b4c090b632e0f6608de8d01e7508435bdd Merge: f1cdaa2 9087239 Author: Brian Muramatsu Date: Tue Feb 22 16:07:33 2011 -0800 Merge "Adding waitForIdleSync in testTouchMode." into eclair commit ded204526ec8c95d53216401ac8b2b26b9a7e401 Merge: 10241a3 44a1eb7 Author: Brian Muramatsu Date: Tue Feb 22 15:32:48 2011 -0800 Merge "Add wait to testCacheFile." into froyo commit 10241a3e247f8a4f8ef8f50f9fb5f7325c88f2e0 Merge: d8e19a7 f358414 Author: Brian Muramatsu Date: Tue Feb 22 14:15:38 2011 -0800 Merge "Update startcts Script" into froyo commit f358414b359a278b500ebed2d4c953e95ed2f190 Author: Brian Muramatsu Date: Mon Dec 20 15:43:09 2010 -0800 Update startcts Script Update the startcts script to be compatible with the latest SDK which puts adb under the "platform-tools" directory. Also do not require that SDK_ROOT to be set. Just search the PATH for adb instead since the SDK is no longer needed for ddmlib. Change-Id: Ife65e793c3dc7b21aa2e9e955f789b9adb369c65 commit d8e19a7e00c664d9394accb396c6cd1da4feb173 Merge: 13e08a7 04d3b73 Author: Brian Muramatsu Date: Tue Feb 22 13:59:21 2011 -0800 Merge "Add QHD to the supported ScreenConfiguration list" into froyo commit 04d3b73e546c8317b1d099cb66e6ffa91eec50bb Author: David Krause Date: Fri Feb 18 00:08:09 2011 -0600 Add QHD to the supported ScreenConfiguration list Change-Id: I29f35994b722ff35a0913212f295dc51ca80152d commit bef10150280c0a4062167514d1ba03bf0584cfd5 Author: m-miyahara Date: Tue Feb 22 21:03:48 2011 +0900 Add wait in testOnWindowFocusChanged. This test case sometimes fails when isOnWindowFocusChangedCalled is done before asynchronous callback of onWindowFocusChanged is done, which is called by showDialog(). To avoid this, I added wait so that asynchronous process of onWindowFocusChanged is finished completely. commit 2a4fa0a5337b5e96255dbcc955e844f70a477b70 Author: Wu-cheng Li Date: Tue Feb 22 16:34:38 2011 +0800 Add CTS to ensure camera supports YV12 preview format. YV12 is mandatory now. bug:3463624 Change-Id: I3ad4f7a5715cea624420934307e0a9d6abd14acc commit 44a1eb7db95d33bc8cb323874b6d900f5cf83309 Author: m-miyahara Date: Tue Feb 22 17:27:58 2011 +0900 Add wait to testCacheFile. I found that sometimes NullPointerException is given off in the situation where CacheManager.getCacheFile() is executed before CacheManager finishes the preparation. To avoid this, I added wait for maximum of 5000ms so that preparation of CacheManager finishes completely. commit 90872394e2a3fbce9bfab0bc7e9aa4dba3c4c715 Author: m-miyahara Date: Mon Feb 21 16:08:00 2011 +0900 Adding waitForIdleSync in testTouchMode. There are cases where checking of the status change of main thread is done before setting the focus on UI thread. In this case, test case fails. To avoid this, I added waitForIdleSync after UI thread is created to wait for focus setting to be completed. commit b430e9b566fe7d6b1450bc6e918e0015867731c2 Author: Wu-cheng Li Date: Sun Feb 20 16:54:52 2011 +0800 Add camera cts to check gps timestamp correctness. bug:3190247 Change-Id: I2e4fb0474034669b4ecbad1594df4664fdfed2a0 commit 42659656eb5832c9341c6d44dd2c4d604276e1dd Author: Nick Pelly Date: Fri Feb 18 16:06:30 2011 -0800 Add NDEF smoke tests. Change-Id: I00009c29fb297f7fe6c9d290ac295078ce67ece5 commit 6b89033e8436f5bc086ce9a86d0ca025d4446b32 Merge: 97f2156 bbead09 Author: Brett Chabot Date: Fri Feb 18 15:52:15 2011 -0800 am bbead09c: am 5f1288dd: Merge "Add README for cts-tradefed." into honeycomb * commit 'bbead09cfc39ae61b2d1fa4a99e84704a0e02dae': Add README for cts-tradefed. commit bbead09cfc39ae61b2d1fa4a99e84704a0e02dae Merge: 3666a2e 5f1288d Author: Brett Chabot Date: Fri Feb 18 15:48:15 2011 -0800 am 5f1288dd: Merge "Add README for cts-tradefed." into honeycomb * commit '5f1288dd3c6bbaf8aba63ad41dfb2a3c1573753d': Add README for cts-tradefed. commit 5f1288dd3c6bbaf8aba63ad41dfb2a3c1573753d Merge: d5ff969 1589b60 Author: Brett Chabot Date: Fri Feb 18 15:42:27 2011 -0800 Merge "Add README for cts-tradefed." into honeycomb commit 97f2156b3df77e710251b696b42ea3886c3ecb1e Merge: b073695 3666a2e Author: Brian Muramatsu Date: Fri Feb 18 14:42:59 2011 -0800 am 3666a2e7: am d5ff969f: Updated Expectations for HC CTS * commit '3666a2e7cdc4da7c04f0cb180bf1777faf431ac9': Updated Expectations for HC CTS commit 3666a2e7cdc4da7c04f0cb180bf1777faf431ac9 Merge: 6ec6418 d5ff969 Author: Brian Muramatsu Date: Fri Feb 18 14:40:40 2011 -0800 am d5ff969f: Updated Expectations for HC CTS * commit 'd5ff969f0917a9dc75b0ccc5927ef0b7293c9b11': Updated Expectations for HC CTS commit b073695ed700d0c601a0641e0bd9b5f80359be72 Merge: 7f9df39 a1c545d Author: Brian Muramatsu Date: Fri Feb 18 14:35:07 2011 -0800 Merge "Add the DRM Tests to CTS" commit 1589b60f7eaa784f82d9cadf9cc54a510cfe82a2 Author: Brett Chabot Date: Thu Feb 17 17:32:25 2011 -0800 Add README for cts-tradefed. Change-Id: Ib47f54edaeb484d0936470522a9ee987d0d65eec commit 13e08a7bbf95d3530f8d064ac3c2e6878370468a Merge: 98787bf 736e911 Author: Brian Muramatsu Date: Fri Feb 18 12:50:57 2011 -0800 Merge "Fix OpenGlEsVersionTest" into froyo commit 736e9110305334688202f2f4f3e8699a68c5763f Author: Brian Muramatsu Date: Tue Jan 18 14:32:21 2011 -0800 Fix OpenGlEsVersionTest Bug 3307156 Put the EGL calls between eglInitialize and eglTerminate. Change-Id: I97dfe124251107b80151d6f14cde79b232be9771 commit f1cdaa256a89f9b9806989b52607deb365fa0fcd Merge: f0d2bf3 64d81ac Author: Brian Muramatsu Date: Fri Feb 18 11:51:18 2011 -0800 Merge "Fix OpenGlEsVersionTest" into eclair commit 64d81accd221671b42635109bb7a19960b06e7f6 Author: Brian Muramatsu Date: Tue Jan 18 14:32:21 2011 -0800 Fix OpenGlEsVersionTest Bug 3307156 Put the EGL calls between eglInitialize and eglTerminate. Change-Id: I29e117e29d2f945a6bf97555c81280c78f093863 commit d5ff969f0917a9dc75b0ccc5927ef0b7293c9b11 Author: Brian Muramatsu Date: Thu Feb 17 17:58:36 2011 -0800 Updated Expectations for HC CTS Change-Id: I9c85d0c8fb0d2df60fe55e72e5cb04a243c07474 commit 7f9df390c5a0aad111bb4a7fc44b12a85c51f709 Merge: 2f047d1 6ec6418 Author: Brian Muramatsu Date: Thu Feb 17 20:23:40 2011 -0800 am 6ec64186: (-s ours) am 1499f93d: DO NOT MERGE Merge remote branch \'goog/honeycomb-plus-aosp\' into manualmerge * commit '6ec641861029f73798cf003791144100c87136d4': commit 2f047d1fc6bbf247b1ab7a20ff3a2821efbd4d4a Merge: 787264a 8db9139 Author: Brian Muramatsu Date: Thu Feb 17 20:23:35 2011 -0800 am 8db91391: am 5f0b6efd: Merge "Fix AudioManagerTest#testVolume Yet Again" into honeycomb * commit '8db9139101ff89d4a42787adbf5dd7ea15c344bc': Fix AudioManagerTest#testVolume Yet Again commit 787264ae24a608347279067b55a790d5fdf92bef Merge: 37d1679 7f64e85 Author: Brian Muramatsu Date: Thu Feb 17 20:21:20 2011 -0800 am 7f64e85e: Include Missing Commits from gingerbread-plus-aosp * commit '7f64e85ec7c67eabecac377357fad2c63424d1df': Include Missing Commits from gingerbread-plus-aosp commit 6ec641861029f73798cf003791144100c87136d4 Merge: 8db9139 1499f93 Author: Brian Muramatsu Date: Thu Feb 17 20:21:01 2011 -0800 am 1499f93d: DO NOT MERGE Merge remote branch \'goog/honeycomb-plus-aosp\' into manualmerge * commit '1499f93d2a9c271053800b66059b3047a5b984fb': commit 8db9139101ff89d4a42787adbf5dd7ea15c344bc Merge: 7f64e85 5f0b6ef Author: Brian Muramatsu Date: Thu Feb 17 20:20:55 2011 -0800 am 5f0b6efd: Merge "Fix AudioManagerTest#testVolume Yet Again" into honeycomb * commit '5f0b6efd28d97d3e12ebb262b25ca8bda68be1d8': Fix AudioManagerTest#testVolume Yet Again commit 37d167937fe729a08404f711fcf16b684613d1f7 Author: Vasu Nori Date: Thu Feb 17 18:00:18 2011 -0800 Revert "bug:3443154 fix database tests after disabling sqlite wal" because WAL is back in! so we need these tests. This reverts commit 1eaa9f8a6eb529dedddfda2ce35c12f4e263fb13. Change-Id: I4791ad257fa608bf093d9c45765c6441ff16535e commit 1499f93d2a9c271053800b66059b3047a5b984fb Merge: 5f0b6ef 7f64e85 Author: Brian Muramatsu Date: Thu Feb 17 17:10:40 2011 -0800 DO NOT MERGE Merge remote branch 'goog/honeycomb-plus-aosp' into manualmerge This adds all the commits contributed to the open-source Froyo and Gingerbread branches that didn't make it into Honeycomb due to the automerger setup. Change-Id: Ic160b0f7232bc654ae53536b2c100005694038e8 commit 5f0b6efd28d97d3e12ebb262b25ca8bda68be1d8 Merge: 9e4dca5 2bfa5eb Author: Brian Muramatsu Date: Thu Feb 17 16:54:51 2011 -0800 Merge "Fix AudioManagerTest#testVolume Yet Again" into honeycomb commit 7f64e85ec7c67eabecac377357fad2c63424d1df Author: Brian Muramatsu Date: Thu Feb 17 16:52:16 2011 -0800 Include Missing Commits from gingerbread-plus-aosp These somewhat got ignored as part of (HOW!?): Merge remote branch 'korg/froyo' into manualmerge C-Id: Ie74c678a6ae142d9861b6965a8ca89ff58ebfa83 A lot has changed, so its not an exact cherry-pick. Change-Id: I5347f2c15eadf59511de11cf08e16be5f66e5b0e commit ae222b7d6fa67b83b029897c2bac9b47a2fa71cd Author: Ying Wang Date: Thu Feb 17 15:19:57 2011 -0800 Fix "acp: command not found" Change-Id: Id32098241107860c5d2b3079cf77bcbf43abb661 commit 2bfa5eb29cf5c718e0731911030374968736553d Author: Brian Muramatsu Date: Thu Feb 17 15:04:13 2011 -0800 Fix AudioManagerTest#testVolume Yet Again The test was passing a 100 into the flags (why?) and this matched the FLAG_FORCE_STREAM (32) flag which tried to then adjust the volume of the USE_DEFAULT_STREAM (Integer.MIN_VALUE) and then crashed. "Fix issues 3425035 and 3423785." was the cause, but I don't think the test was testing anything useful by passing in a 100... Change-Id: I60a088167083e12099830bd75c4f9a09d1039f35 commit c0de548b8e01084177a356f015ff2ed787fd70a3 Merge: 09ac1b6 7541d1c Author: Brett Chabot Date: Thu Feb 17 13:36:31 2011 -0800 am 7541d1c0: am 9e4dca52: Merge "Switch cts-tradefed to use the tf console." into honeycomb * commit '7541d1c0d8de90cf47d4c01fc317a206b2224bc2': Switch cts-tradefed to use the tf console. commit 09ac1b6ba4e4b027b19263321e9f7ddf5be72842 Merge: d523448 f8fcafe Author: Brett Chabot Date: Thu Feb 17 13:36:28 2011 -0800 am f8fcafe4: am 54323595: Merge "Support sharding cts runs across multiple devices." into honeycomb * commit 'f8fcafe4f8ab642920dbd6d775ce779fecea0625': Support sharding cts runs across multiple devices. commit 7541d1c0d8de90cf47d4c01fc317a206b2224bc2 Merge: f8fcafe 9e4dca5 Author: Brett Chabot Date: Thu Feb 17 13:34:40 2011 -0800 am 9e4dca52: Merge "Switch cts-tradefed to use the tf console." into honeycomb * commit '9e4dca528d2c90591b6a3690edceac29d3628dc9': Switch cts-tradefed to use the tf console. commit f8fcafe4f8ab642920dbd6d775ce779fecea0625 Merge: bb1bc34 5432359 Author: Brett Chabot Date: Thu Feb 17 13:34:38 2011 -0800 am 54323595: Merge "Support sharding cts runs across multiple devices." into honeycomb * commit '54323595b1253ebbf3506d5ee67bf373608e8193': Support sharding cts runs across multiple devices. commit 9e4dca528d2c90591b6a3690edceac29d3628dc9 Merge: 5432359 7d80a6c Author: Brett Chabot Date: Thu Feb 17 13:32:28 2011 -0800 Merge "Switch cts-tradefed to use the tf console." into honeycomb commit 54323595b1253ebbf3506d5ee67bf373608e8193 Merge: 2f4bfbf 3fc406b Author: Brett Chabot Date: Thu Feb 17 13:32:22 2011 -0800 Merge "Support sharding cts runs across multiple devices." into honeycomb commit d523448a41d5b257624c5af0fa3abe75d70bf208 Merge: 48fa661 bb1bc34 Author: Fred Quintana Date: Thu Feb 17 13:26:54 2011 -0800 am bb1bc34e: am 2f4bfbf5: Enhance the options check so that if we expect to see a null options bundle we accept a non-null but empty bundle as well. * commit 'bb1bc34e4513d4f09ece48ccc608c8a16878de30': Enhance the options check so that if we expect to see a null options bundle we accept a non-null but empty bundle as well. commit bb1bc34e4513d4f09ece48ccc608c8a16878de30 Merge: e9d1dda 2f4bfbf Author: Fred Quintana Date: Thu Feb 17 13:10:10 2011 -0800 am 2f4bfbf5: Enhance the options check so that if we expect to see a null options bundle we accept a non-null but empty bundle as well. * commit '2f4bfbf51aa6044196f5a2e9767589aeb8324c51': Enhance the options check so that if we expect to see a null options bundle we accept a non-null but empty bundle as well. commit 2f4bfbf51aa6044196f5a2e9767589aeb8324c51 Author: Fred Quintana Date: Mon Feb 14 11:23:37 2011 -0800 Enhance the options check so that if we expect to see a null options bundle we accept a non-null but empty bundle as well. Bug: 3412989 Change-Id: I8967b1cd23510cd1b78ac55aef8780f579ed98d3 commit 48fa661338f65714a83ce4028a4b58a21fd08aa4 Merge: 116ae90 0e27e40 Author: Wu-cheng Li Date: Thu Feb 17 02:00:43 2011 -0800 Merge "Add the test that calls getParameters during autofocus." commit 0e27e40955ffe40dbe2678d52c5791bf0fbcef80 Author: Wu-cheng Li Date: Thu Feb 17 17:18:24 2011 +0800 Add the test that calls getParameters during autofocus. During autofocus, calling getParameters should not crash or throw exception. bug:3220352 Change-Id: I5e85806759803400ca711f465faffaa6d8bee25a commit 7d80a6ceb158372f91902b5d19054865db98ec2f Author: Brett Chabot Date: Wed Feb 16 20:02:50 2011 -0800 Switch cts-tradefed to use the tf console. Change-Id: I4c3c7fdc2bcf6931b23834926aa78c51d4943a0e commit 6e10488b99988b873f907fe421c2c20a655fbc87 Author: Brian Muramatsu Date: Wed Feb 16 18:02:52 2011 -0800 Fix Broken VideoViewTest Bug 3188260 Fixed a couple conditions that were incorrect after inspecting the VideoView code...but strangely the comments were correct...weird... Change-Id: I2eace736b17d0b3dca6b054981eb0da1c6b8800a commit 07bec6f1a521c820329ef23493ba847ea679f7cb Author: Brian Muramatsu Date: Wed Feb 16 17:25:25 2011 -0800 Fix Broken LauncherActivityTest Bug 3188260 Hit the down key a couple times before trying to select an item. Change-Id: I8dc491730d3524f2e6a97e853093f9ed6c3398db commit da018d3afd7e6f0bf2981c2b25f3f0248c93b133 Author: Brian Muramatsu Date: Wed Feb 16 16:38:13 2011 -0800 Fix Broken PathMeasureTest#testIsClosed Bug 3188260 It wasn't broken, but it said it was flakey. I didn't see anything really flakey except the test was somewhat confusing so replace it with some easy examples like testing a line segment and a circle. Change-Id: I483cb363e495f97664a55e2d8c05f435a15aba8f commit 4a6fd724e96fea039184fd74bde97d7f840f32d8 Author: Brian Muramatsu Date: Wed Feb 16 16:02:55 2011 -0800 Remove Broken ListActivityTest Bug 3188260 It looks like there were efforts to fix this one in bug 2334738. Change-Id: I590f92a9ea43cad2b1e7c9eba40bdea62e24410d commit 50630192bffb0805316df520d3bbe4a99ffeb8f4 Merge: 60d8659 d523e02 Author: Brian Muramatsu Date: Wed Feb 16 15:31:46 2011 -0800 Merge "Merge remote branch 'korg/froyo' into manualmerge" into gingerbread commit d523e02177e5cbd2b0eb09b94a81862f3b24693e Merge: 60d8659 98787bf Author: Brian Muramatsu Date: Wed Feb 16 14:28:49 2011 -0800 Merge remote branch 'korg/froyo' into manualmerge Conflicts: tests/tests/os/src/android/os/cts/BuildVersionTest.java tests/tests/webkit/src/android/webkit/cts/WebChromeClientTest.java Change-Id: I1befa31b0cce0a72a6d71760d18cae1bb97ca937 commit c2fcc332aa2b84e9aeb95a1819b92df67449ca3c Author: Brian Muramatsu Date: Wed Feb 16 13:09:13 2011 -0800 Fix Broken PaintTest#testBreakText1 Bug 3188260 Use getTextWidths to get the widths of the individual characters of the strings rather than hard coding them. Change-Id: I17c58f991fa2901e072c69fbcf0885bf85728872 commit 3fc406b283b622a22fff58666e0a8d7936434fd9 Author: Brett Chabot Date: Mon Feb 14 15:55:00 2011 -0800 Support sharding cts runs across multiple devices. Change-Id: I958a3cafdd48c0d619c934620aeed85abc7c0608 commit 98787bf28b9845311f38ae1a08a562e111c43c36 Merge: 8f8f1e9 ce42046 Author: Brian Muramatsu Date: Tue Feb 15 13:05:28 2011 -0800 Merge "Test startUsingNetworkFeature TYPE_MOBILE_HIPRI" into froyo commit ce420468c3a1dad4c54cf3ff741a9157c285e171 Author: Brian Muramatsu Date: Fri Jan 14 17:38:16 2011 -0800 Test startUsingNetworkFeature TYPE_MOBILE_HIPRI Bug 3307293 Change-Id: I03b3e11e1de20333ece772e3448937c61ca0fe91 commit a1c545d28496babee80e7077a3fa9ffdf79fbed7 Author: Brian Muramatsu Date: Tue Feb 15 11:47:16 2011 -0800 Add the DRM Tests to CTS Add the DRM test packages to the test case list, so that they can run via the cts command. Add the source path to the Eclipse classpath. Change-Id: Ieb5e9572b0f08ed77c5f7f0bcf39469ad4b96645 commit 116ae9002c28339978fff430f87e37e70594aafe Merge: 0b31b30 3018840 Author: Gloria Wang Date: Tue Feb 15 11:26:43 2011 -0800 Merge "Add test config for DRM FwdLock plugin" commit 3018840a63e78ec65d30cca0d4adf8cc42219afd Author: Gloria Wang Date: Tue Feb 15 11:05:44 2011 -0800 Add test config for DRM FwdLock plugin Change-Id: I21b564f0a048bd17196fbbbacc3568600f05138f commit 0b31b30a687137bedb9e17357c89777e3a1a4bf6 Merge: 11446c3 e9d1dda Author: Brian Muramatsu Date: Tue Feb 15 11:06:03 2011 -0800 am e9d1ddac: am 41de1430: am 27301cec: am 60d86596: Merge "Bypass testFormatMethods if device is not using en_US resource." into gingerbread * commit 'e9d1ddac91debdcdfe308190eae3fdb457a77365': Bypass testFormatMethods if device is not using en_US resource. commit e9d1ddac91debdcdfe308190eae3fdb457a77365 Merge: 7e829f0 41de143 Author: Brian Muramatsu Date: Tue Feb 15 11:02:19 2011 -0800 am 41de1430: am 27301cec: am 60d86596: Merge "Bypass testFormatMethods if device is not using en_US resource." into gingerbread * commit '41de14304bab597eb0aa75711978a05cad1268a5': Bypass testFormatMethods if device is not using en_US resource. commit 41de14304bab597eb0aa75711978a05cad1268a5 Merge: a3779fa 27301ce Author: Brian Muramatsu Date: Tue Feb 15 10:59:59 2011 -0800 am 27301cec: am 60d86596: Merge "Bypass testFormatMethods if device is not using en_US resource." into gingerbread * commit '27301cec822fe89715eb4260cd046b14b8edee2c': Bypass testFormatMethods if device is not using en_US resource. commit 27301cec822fe89715eb4260cd046b14b8edee2c Merge: 0f06476 60d8659 Author: Brian Muramatsu Date: Tue Feb 15 10:26:25 2011 -0800 am 60d86596: Merge "Bypass testFormatMethods if device is not using en_US resource." into gingerbread * commit '60d865967ce492e25840458045a0f23f68e41aa7': Bypass testFormatMethods if device is not using en_US resource. commit 7c4ad1c419f934f67251b354fd2077707391b8f7 Author: m-miyahara Date: Tue Feb 15 20:34:23 2011 +0900 Added sleep within testGetAndSetMasterSyncAutomatically. In this test case, after testGetAndSetMasterSyncAutomatically is done, testGetAndSetSyncAutomatically is executed. However, I think that doDatabaseCleanup within testGetAndSetMasterSyncAutomatically is sometimes called immediately after setSyncAutomatically(ACCOUNT, AUTHORITY, true) within testGetAndSetSyncAutomatically (I understand that doDatabaseCleanup is triggered by setSyncAutomatically(ACCOUNT, AUTHORITY, true) within testGetAndSetMasterSyncAutomatically). If this has occurred, account.name and account.authority are cleared, which cause getSyncAutomatically(ACCOUNT, AUTHORITY) to be false, resulting the test case to be failed. The solution to this is to add sleep within testGetAndSetMasterSyncAutomatically so that doDatabaseCleanup is finished before calling testGetAndSetSyncAutomatically. commit 11446c301174ecc35af98547a3ccc0c1187c4122 Merge: ceaec8c 7e829f0 Author: Brett Chabot Date: Mon Feb 14 15:30:17 2011 -0800 am 7e829f0d: am 653f4c3d: Merge "Make CtsTest resumable." into honeycomb * commit '7e829f0d44e42e6dc2d60d9fe99476533c49a6e2': Make CtsTest resumable. commit 7e829f0d44e42e6dc2d60d9fe99476533c49a6e2 Merge: 11a6d99 653f4c3 Author: Brett Chabot Date: Mon Feb 14 15:28:47 2011 -0800 am 653f4c3d: Merge "Make CtsTest resumable." into honeycomb * commit '653f4c3d61b58419d10d15f88f0a7b47d25b50d3': Make CtsTest resumable. commit 653f4c3d61b58419d10d15f88f0a7b47d25b50d3 Merge: c46c397 1dcb9a5 Author: Brett Chabot Date: Mon Feb 14 15:27:02 2011 -0800 Merge "Make CtsTest resumable." into honeycomb commit 1dcb9a5898c92185ccf04bda7403f8fc849c62f7 Author: Brett Chabot Date: Thu Feb 10 20:26:57 2011 -0800 Make CtsTest resumable. Change-Id: I5552ba3a5633a193a4cdc1b54918de985e548912 commit 60d865967ce492e25840458045a0f23f68e41aa7 Merge: a7660a2 dec8311 Author: Brian Muramatsu Date: Mon Feb 14 13:26:16 2011 -0800 Merge "Bypass testFormatMethods if device is not using en_US resource." into gingerbread commit ceaec8c2a8531176301faea7f88de909e5f44a8b Merge: cb17abe 40548ea Author: Fred Quintana Date: Mon Feb 14 13:14:23 2011 -0800 Merge "Enhance the options check so that if we expect to see a null options bundle we accept a non-null but empty bundle as well." commit dec8311e842ef41c8cdb3f5f394d60183ce9e612 Author: sam_chiu Date: Mon Feb 14 12:25:28 2011 -0800 Bypass testFormatMethods if device is not using en_US resource. Change-Id: I915e80cbca27eef563a7242b71a164be9ed90401 commit 40548eaeb8751a6e7c3faaf4dfbc0e276f9c6075 Author: Fred Quintana Date: Mon Feb 14 11:23:37 2011 -0800 Enhance the options check so that if we expect to see a null options bundle we accept a non-null but empty bundle as well. Bug: 3412989 Change-Id: Idd0c6ad17960a24dbb69aa0eae35791ffb66f539 commit cb17abebbd90f49007a58618fd74eeeec71705cb Merge: 8ae4433 602cb16 Author: John Reck Date: Fri Feb 11 15:15:19 2011 -0800 Merge "Fix running CTS tests with Chrome Sync enabled" commit 602cb1600f2ad95165d1ae8a32178e6f9db95786 Author: John Reck Date: Fri Feb 11 14:21:19 2011 -0800 Fix running CTS tests with Chrome Sync enabled Bug: 3329593 Change-Id: I8c8fe31251e56d993d6e3b97b9a3ac9da72a3bd9 commit 8ae44339af19c38a79617a7382bc65210ba24a75 Merge: 1164891 11a6d99 Author: Brian Muramatsu Date: Fri Feb 11 13:19:32 2011 -0800 am 11a6d99c: am a3779fa3: am 0f06476c: am a7660a22: Merge "Some Audio Quality Verifier Fixes" into gingerbread * commit '11a6d99c53909e0244b726cca9913c9b27a051cc': Some Audio Quality Verifier Fixes commit 11a6d99c53909e0244b726cca9913c9b27a051cc Merge: c3daa35 a3779fa Author: Brian Muramatsu Date: Fri Feb 11 13:17:04 2011 -0800 am a3779fa3: am 0f06476c: am a7660a22: Merge "Some Audio Quality Verifier Fixes" into gingerbread * commit 'a3779fa378345bfd8699e91de46b29563be4beb2': Some Audio Quality Verifier Fixes commit a3779fa378345bfd8699e91de46b29563be4beb2 Merge: c3bce69 0f06476 Author: Brian Muramatsu Date: Fri Feb 11 13:14:15 2011 -0800 am 0f06476c: am a7660a22: Merge "Some Audio Quality Verifier Fixes" into gingerbread * commit '0f06476ca11ddb9abfbc0556baa0bf4d3d4bc7c7': Some Audio Quality Verifier Fixes commit 0f06476ca11ddb9abfbc0556baa0bf4d3d4bc7c7 Merge: 0854919 a7660a2 Author: Brian Muramatsu Date: Fri Feb 11 13:11:18 2011 -0800 am a7660a22: Merge "Some Audio Quality Verifier Fixes" into gingerbread * commit 'a7660a22dfc7bdcbae336367efc31cdbca1d308e': Some Audio Quality Verifier Fixes commit a7660a22dfc7bdcbae336367efc31cdbca1d308e Merge: db03bd4 759dbe3 Author: Brian Muramatsu Date: Fri Feb 11 13:09:20 2011 -0800 Merge "Some Audio Quality Verifier Fixes" into gingerbread commit 759dbe3048af8bab9c5bc4fb979f62bd325ddf81 Author: Brian Muramatsu Date: Fri Feb 11 12:59:24 2011 -0800 Some Audio Quality Verifier Fixes - Add WRITE_EXTERNAL_STORAGE permissions to be able to store the samples onto the SD card - Fixed a wrong path to the pink noise samples - Center the buttons of the Audio Quality Verifier Change-Id: I366c2a811da6bc8faa753cc23ff7d60050cc3459 commit 8f8f1e9e6ecef9c2b25bcd8a32105a97ff0f4c19 Merge: 4e82081 8a3b483 Author: Brian Muramatsu Date: Fri Feb 11 12:06:57 2011 -0800 Merge "Increase height and width of the status bar to accommodate higher resolution devices" into froyo commit 8a3b483b51e6825c52fd4cedb899b5ff682d8a8a Author: Adam Zajac Date: Thu Feb 10 14:38:27 2011 -0800 Increase height and width of the status bar to accommodate higher resolution devices Change-Id: Iecbfff3fdf9c17da01f6e7cd9e300c1692314887 commit 1164891decdf49868672acf0447e723eea0ea67b Merge: e7a3301 c3daa35 Author: Brian Muramatsu Date: Fri Feb 11 12:02:23 2011 -0800 am c3daa352: am c3bce69e: am 08549196: am db03bd4d: Merge "Camera: Fix unstable test result on testpreviewcallback" into gingerbread * commit 'c3daa352f157b9e5cd873080eafbc972e1b3d0da': Camera: Fix unstable test result on testpreviewcallback commit c3daa352f157b9e5cd873080eafbc972e1b3d0da Merge: 47aa31e c3bce69 Author: Brian Muramatsu Date: Fri Feb 11 12:00:35 2011 -0800 am c3bce69e: am 08549196: am db03bd4d: Merge "Camera: Fix unstable test result on testpreviewcallback" into gingerbread * commit 'c3bce69ed0ad2a83494e35d93e8b14c7dc0fe467': Camera: Fix unstable test result on testpreviewcallback commit c3bce69ed0ad2a83494e35d93e8b14c7dc0fe467 Merge: 1848576 0854919 Author: Brian Muramatsu Date: Fri Feb 11 11:57:40 2011 -0800 am 08549196: am db03bd4d: Merge "Camera: Fix unstable test result on testpreviewcallback" into gingerbread * commit '0854919638c62f9f8c0d7bb4619c8e355c5a8e79': Camera: Fix unstable test result on testpreviewcallback commit 0854919638c62f9f8c0d7bb4619c8e355c5a8e79 Merge: 54db99d db03bd4 Author: Brian Muramatsu Date: Fri Feb 11 11:52:17 2011 -0800 am db03bd4d: Merge "Camera: Fix unstable test result on testpreviewcallback" into gingerbread * commit 'db03bd4d8fe400292cd4d0ea56de2fe1ed0fac28': Camera: Fix unstable test result on testpreviewcallback commit db03bd4d8fe400292cd4d0ea56de2fe1ed0fac28 Merge: e3d0c34 0fa6ce7 Author: Brian Muramatsu Date: Fri Feb 11 11:31:35 2011 -0800 Merge "Camera: Fix unstable test result on testpreviewcallback" into gingerbread commit e7a33014bbbaeebb9a09014f28e73860b853615c Merge: ed1e884 47aa31e Author: Brett Chabot Date: Fri Feb 11 10:36:19 2011 -0800 am 47aa31e6: am c46c3972: Merge "Adjust cts-tradefed to the latest tradefed API." into honeycomb * commit '47aa31e649a0cc8248ac641a3def4a9cb8e0531d': Adjust cts-tradefed to the latest tradefed API. commit 47aa31e649a0cc8248ac641a3def4a9cb8e0531d Merge: e5ce515 c46c397 Author: Brett Chabot Date: Fri Feb 11 10:30:33 2011 -0800 am c46c3972: Merge "Adjust cts-tradefed to the latest tradefed API." into honeycomb * commit 'c46c39729cad351c9c80dd9abcabf1e8eac52956': Adjust cts-tradefed to the latest tradefed API. commit c46c39729cad351c9c80dd9abcabf1e8eac52956 Merge: 8c87252 7cc0e25 Author: Brett Chabot Date: Fri Feb 11 10:12:39 2011 -0800 Merge "Adjust cts-tradefed to the latest tradefed API." into honeycomb commit ed1e884c9e6b15c2b3ff5c1c043672a0509ba8c8 Merge: 2480147 e5ce515 Author: Brian Muramatsu Date: Thu Feb 10 16:18:51 2011 -0800 am e5ce515f: am 8c872523: Revert "Fix AccountManagerTest#testGetAuthTokenByFeatures" * commit 'e5ce515f3dadf83515e17cdf72d92e95363a719a': Revert "Fix AccountManagerTest#testGetAuthTokenByFeatures" commit e5ce515f3dadf83515e17cdf72d92e95363a719a Merge: fb5c5aa 8c87252 Author: Brian Muramatsu Date: Thu Feb 10 16:16:39 2011 -0800 am 8c872523: Revert "Fix AccountManagerTest#testGetAuthTokenByFeatures" * commit '8c8725239c51599933805af0227c0cdf52b28ccc': Revert "Fix AccountManagerTest#testGetAuthTokenByFeatures" commit 8c8725239c51599933805af0227c0cdf52b28ccc Author: Brian Muramatsu Date: Thu Feb 10 16:12:54 2011 -0800 Revert "Fix AccountManagerTest#testGetAuthTokenByFeatures" This reverts commit 7a4daf2e9dfdc4d2061166a747aafc1f16ae67c8. commit 24801477b13bd0869c95a049a31a127a4ef7a72a Merge: e9e65e4 fb5c5aa Author: Brian Muramatsu Date: Thu Feb 10 16:07:24 2011 -0800 am fb5c5aa8: am 1848576b: am 54db99d9: am e3d0c34c: Merge "Change SSLCertificateSocketFactoryTest.testCreateSocket host" into gingerbread * commit 'fb5c5aa8bfa40205d0c7a4d0c64bd3e675126f85': Change SSLCertificateSocketFactoryTest.testCreateSocket host commit fb5c5aa8bfa40205d0c7a4d0c64bd3e675126f85 Merge: 75535a2 1848576 Author: Brian Muramatsu Date: Thu Feb 10 16:05:30 2011 -0800 am 1848576b: am 54db99d9: am e3d0c34c: Merge "Change SSLCertificateSocketFactoryTest.testCreateSocket host" into gingerbread * commit '1848576b9e30bc92f0704251962b2fd3acd195b6': Change SSLCertificateSocketFactoryTest.testCreateSocket host commit 1848576b9e30bc92f0704251962b2fd3acd195b6 Merge: 6e87cc1 54db99d Author: Brian Muramatsu Date: Thu Feb 10 16:02:11 2011 -0800 am 54db99d9: am e3d0c34c: Merge "Change SSLCertificateSocketFactoryTest.testCreateSocket host" into gingerbread * commit '54db99d9c71c6989e0c41940c28bd438d29ebf39': Change SSLCertificateSocketFactoryTest.testCreateSocket host commit 54db99d9c71c6989e0c41940c28bd438d29ebf39 Merge: a2ab587 e3d0c34 Author: Brian Muramatsu Date: Thu Feb 10 15:57:31 2011 -0800 am e3d0c34c: Merge "Change SSLCertificateSocketFactoryTest.testCreateSocket host" into gingerbread * commit 'e3d0c34cbcd29814492878e54b1c16ea6412f072': Change SSLCertificateSocketFactoryTest.testCreateSocket host commit e3d0c34cbcd29814492878e54b1c16ea6412f072 Merge: 9f0a386 77ad6d4 Author: Brian Muramatsu Date: Thu Feb 10 15:46:52 2011 -0800 Merge "Change SSLCertificateSocketFactoryTest.testCreateSocket host" into gingerbread commit e9e65e4a0727af520cc9b66284e21087f4929828 Merge: 1b4e728 75535a2 Author: Brian Muramatsu Date: Thu Feb 10 15:46:42 2011 -0800 am 75535a24: am 6229c08f: Merge "Fix AccountManagerTest#testGetAuthTokenByFeatures" into honeycomb * commit '75535a24e95e86d8482d813eaaa167da03e3b505': Fix AccountManagerTest#testGetAuthTokenByFeatures commit 77ad6d4e226855f9a660f09d71dad6c060948a8b Author: Brian Carlstrom Date: Wed Feb 9 16:07:14 2011 -0800 Change SSLCertificateSocketFactoryTest.testCreateSocket host The test may be flaky because it depends on a live server. Switch to a different server that may be more reliable. Bug: 3188260 Change-Id: Ibba872489650914db8ddd9a117529556787f66ec commit 75535a24e95e86d8482d813eaaa167da03e3b505 Merge: 24a6177 6229c08 Author: Brian Muramatsu Date: Thu Feb 10 15:36:14 2011 -0800 am 6229c08f: Merge "Fix AccountManagerTest#testGetAuthTokenByFeatures" into honeycomb * commit '6229c08f7a58072305a2deaa85832350aa314f45': Fix AccountManagerTest#testGetAuthTokenByFeatures commit 6229c08f7a58072305a2deaa85832350aa314f45 Merge: a154856 7a4daf2 Author: Brian Muramatsu Date: Thu Feb 10 15:34:10 2011 -0800 Merge "Fix AccountManagerTest#testGetAuthTokenByFeatures" into honeycomb commit 1b4e7286b61ef334f3d5c7f0ecab256a45f4081d Merge: 162a915 24a6177 Author: Brian Muramatsu Date: Thu Feb 10 15:04:04 2011 -0800 am 24a61773: am 6e87cc11: am a2ab5875: am 9f0a386e: Merge "Salvage Broken ContactsTests" into gingerbread * commit '24a617736ec9e65960de1fbf7d96c4b8dfb40178': Salvage Broken ContactsTests commit 162a915a3a287b9eeb5289aabb15a31bf43e92f1 Merge: ebdf9ed b980261 Author: Brian Muramatsu Date: Thu Feb 10 15:04:01 2011 -0800 am b980261e: am 95fcc727: am 7d1fc75d: am f8693fe8: Merge "Fix Contacts_PeopleTest" into gingerbread * commit 'b980261ee306ba7c82911a3b1d44ba723b66b39d': Fix Contacts_PeopleTest commit ebdf9ed09abf0631d6b4848916ef6e4c3cf654ad Merge: a98dd79 211b06c Author: Brian Muramatsu Date: Thu Feb 10 15:03:58 2011 -0800 am 211b06c4: am fcf3949b: am 303d95ec: am 41cc3ff0: Merge "Fix MediaStore_Audio_Playlists_MembersTest" into gingerbread * commit '211b06c46e687de16ccce1a38b7fddb6adc4affb': Fix MediaStore_Audio_Playlists_MembersTest commit a98dd7982dce68931d399527812628995e8dff34 Merge: 2fd36e0 32dec5a Author: Brian Muramatsu Date: Thu Feb 10 15:03:52 2011 -0800 am 32dec5a7: am 62dc53fa: am 7bffaa65: am dc677aa6: Merge "Delete Broken AudioManagerTest#testMuteSolo" into gingerbread * commit '32dec5a77fe53c865be7b3ae4f76793605365046': Delete Broken AudioManagerTest#testMuteSolo commit 7a4daf2e9dfdc4d2061166a747aafc1f16ae67c8 Author: Brian Muramatsu Date: Mon Feb 7 15:03:41 2011 -0800 Fix AccountManagerTest#testGetAuthTokenByFeatures Bug 3412989 Change I5f2624 "Fix previous quick fix, LoginOptions is final." and Change Ifb6a8b "Fix NPE, caller may not pass loginOptions" changed whether or not the bundle passed was passed back to getAuthToken. The test has four main tests: The first test tries calls getAuthTokenByFeature using a null activity. The AccountManager doesn't have any accounts (although theres a call to addAccountExplicitly at the beginning of the test), so it calls addAccount instead of getAuthToken (no idea why). As a result, there is no auth token returned, so the test passes. The second test was failing because it expected the auth token options returned to be null. The AccountManager has an account this time around, so it calls getAuthToken instead. AccountManager#getAuthToken passed null for the options to AccountManagerServices#getAuthToken which has the new NPE check cited above so that causes an options bundle to be passed to the MockAuthenticator which records having received a bundle! This causes the failure. Thus, the test now checks that the options bundle returned is non-null. The final test returns a null options. This is because now the AccountManager has put the account in its cache. As a result, it returns without calling the MockAuthenticator and returns a custom bundle using data from the cache. As a result, the test passes, because the MockAuthenticator wasn't called. Change-Id: I2d71fe30f6e1cabcf673bfb362dc9dc61a9cc1f9 commit 24a617736ec9e65960de1fbf7d96c4b8dfb40178 Merge: b980261 6e87cc1 Author: Brian Muramatsu Date: Thu Feb 10 14:48:32 2011 -0800 am 6e87cc11: am a2ab5875: am 9f0a386e: Merge "Salvage Broken ContactsTests" into gingerbread * commit '6e87cc1143ff684611f75a22fd03f7721b10b8fa': Salvage Broken ContactsTests commit b980261ee306ba7c82911a3b1d44ba723b66b39d Merge: 211b06c 95fcc72 Author: Brian Muramatsu Date: Thu Feb 10 14:48:30 2011 -0800 am 95fcc727: am 7d1fc75d: am f8693fe8: Merge "Fix Contacts_PeopleTest" into gingerbread * commit '95fcc72729be0339f37ddf23c5a4e1cd48f59d72': Fix Contacts_PeopleTest commit 211b06c46e687de16ccce1a38b7fddb6adc4affb Merge: 32dec5a fcf3949 Author: Brian Muramatsu Date: Thu Feb 10 14:48:28 2011 -0800 am fcf3949b: am 303d95ec: am 41cc3ff0: Merge "Fix MediaStore_Audio_Playlists_MembersTest" into gingerbread * commit 'fcf3949b994cb3f34598d177c9df2590661acb56': Fix MediaStore_Audio_Playlists_MembersTest commit 32dec5a77fe53c865be7b3ae4f76793605365046 Merge: 1196db2 62dc53f Author: Brian Muramatsu Date: Thu Feb 10 14:48:16 2011 -0800 am 62dc53fa: am 7bffaa65: am dc677aa6: Merge "Delete Broken AudioManagerTest#testMuteSolo" into gingerbread * commit '62dc53fae591c4d56d4776c5f5fde382522c18ee': Delete Broken AudioManagerTest#testMuteSolo commit 2fd36e08b4f209f0eb9db0d736aa115862586e81 Merge: 1eaa9f8 1196db2 Author: Brian Muramatsu Date: Thu Feb 10 14:43:44 2011 -0800 am 1196db2e: am 77c594a1: am ef3f73f5: am 5a2cfdc6: Merge "Timing issue in CTS tc "testPermissionDiffCert"" into gingerbread * commit '1196db2e29dec0e8216dd9f0febef123277657a7': Timing issue in CTS tc "testPermissionDiffCert" commit 1196db2e29dec0e8216dd9f0febef123277657a7 Merge: 716950a 77c594a Author: Brian Muramatsu Date: Thu Feb 10 13:53:05 2011 -0800 am 77c594a1: am ef3f73f5: am 5a2cfdc6: Merge "Timing issue in CTS tc "testPermissionDiffCert"" into gingerbread * commit '77c594a1b897d86a90bf0b17daa522350e4730a6': Timing issue in CTS tc "testPermissionDiffCert" commit 1eaa9f8a6eb529dedddfda2ce35c12f4e263fb13 Author: Vasu Nori Date: Thu Feb 10 13:20:20 2011 -0800 bug:3443154 fix database tests after disabling sqlite wal sqlite wal is disabled in Change-Id: I283ad26ba7e1793772a372aa8e24df0cb96ce2ef Change-Id: I6b5f65a97cf7a886028a87a7b1280eea278c3810 commit 6e87cc1143ff684611f75a22fd03f7721b10b8fa Merge: 95fcc72 a2ab587 Author: Brian Muramatsu Date: Thu Feb 10 13:01:05 2011 -0800 am a2ab5875: am 9f0a386e: Merge "Salvage Broken ContactsTests" into gingerbread * commit 'a2ab587545523e22420311f11e77d468bde9a92f': Salvage Broken ContactsTests commit a2ab587545523e22420311f11e77d468bde9a92f Merge: 7d1fc75 9f0a386 Author: Brian Muramatsu Date: Thu Feb 10 12:56:48 2011 -0800 am 9f0a386e: Merge "Salvage Broken ContactsTests" into gingerbread * commit '9f0a386e99785c092b90e0b40fe6bfcff3b74c8e': Salvage Broken ContactsTests commit 95fcc72729be0339f37ddf23c5a4e1cd48f59d72 Merge: fcf3949 7d1fc75 Author: Brian Muramatsu Date: Thu Feb 10 12:36:04 2011 -0800 am 7d1fc75d: am f8693fe8: Merge "Fix Contacts_PeopleTest" into gingerbread * commit '7d1fc75dfe7de96b2c13bb5215e1eeb7e4a7bea8': Fix Contacts_PeopleTest commit fcf3949b994cb3f34598d177c9df2590661acb56 Merge: 62dc53f 303d95e Author: Brian Muramatsu Date: Thu Feb 10 12:35:59 2011 -0800 am 303d95ec: am 41cc3ff0: Merge "Fix MediaStore_Audio_Playlists_MembersTest" into gingerbread * commit '303d95ec846bb28b6cc655d2dc0e2b0bd7a62147': Fix MediaStore_Audio_Playlists_MembersTest commit 9f0a386e99785c092b90e0b40fe6bfcff3b74c8e Merge: f8693fe 654e3c6 Author: Brian Muramatsu Date: Thu Feb 10 12:34:02 2011 -0800 Merge "Salvage Broken ContactsTests" into gingerbread commit 7d1fc75dfe7de96b2c13bb5215e1eeb7e4a7bea8 Merge: 303d95e f8693fe Author: Brian Muramatsu Date: Thu Feb 10 12:33:15 2011 -0800 am f8693fe8: Merge "Fix Contacts_PeopleTest" into gingerbread * commit 'f8693fe812e4ae6206c484d622bfae2670894963': Fix Contacts_PeopleTest commit 303d95ec846bb28b6cc655d2dc0e2b0bd7a62147 Merge: 7bffaa6 41cc3ff Author: Brian Muramatsu Date: Thu Feb 10 12:33:13 2011 -0800 am 41cc3ff0: Merge "Fix MediaStore_Audio_Playlists_MembersTest" into gingerbread * commit '41cc3ff0c3f5ce7adf6c6e0141df3a1535a71fce': Fix MediaStore_Audio_Playlists_MembersTest commit f8693fe812e4ae6206c484d622bfae2670894963 Merge: 41cc3ff e49bbc1 Author: Brian Muramatsu Date: Thu Feb 10 12:24:32 2011 -0800 Merge "Fix Contacts_PeopleTest" into gingerbread commit 62dc53fae591c4d56d4776c5f5fde382522c18ee Merge: 77c594a 7bffaa6 Author: Brian Muramatsu Date: Thu Feb 10 12:23:46 2011 -0800 am 7bffaa65: am dc677aa6: Merge "Delete Broken AudioManagerTest#testMuteSolo" into gingerbread * commit '7bffaa65c282bee5c4984f256ed6e820ca071664': Delete Broken AudioManagerTest#testMuteSolo commit 7bffaa65c282bee5c4984f256ed6e820ca071664 Merge: ef3f73f dc677aa Author: Brian Muramatsu Date: Thu Feb 10 12:20:15 2011 -0800 am dc677aa6: Merge "Delete Broken AudioManagerTest#testMuteSolo" into gingerbread * commit 'dc677aa667a749c30b3495d82e76db09dd850c7a': Delete Broken AudioManagerTest#testMuteSolo commit 41cc3ff0c3f5ce7adf6c6e0141df3a1535a71fce Merge: dc677aa 82d4993 Author: Brian Muramatsu Date: Thu Feb 10 12:16:14 2011 -0800 Merge "Fix MediaStore_Audio_Playlists_MembersTest" into gingerbread commit dc677aa667a749c30b3495d82e76db09dd850c7a Merge: 5a2cfdc bf0a74c Author: Brian Muramatsu Date: Thu Feb 10 12:02:40 2011 -0800 Merge "Delete Broken AudioManagerTest#testMuteSolo" into gingerbread commit 7cc0e25c71a73993738ba290ca74a620ee1f10f2 Author: Brett Chabot Date: Thu Feb 10 09:56:45 2011 -0800 Adjust cts-tradefed to the latest tradefed API. Bug 3403768 Change-Id: Ia6c41117b7ce1f9431c86a312e1d5ae5a6ffa18a commit 0fa6ce76af1ea731facda37c407eb386f5b6fe78 Author: Tatsuya Matsukawa Date: Thu Feb 10 10:53:17 2011 +0100 Camera: Fix unstable test result on testpreviewcallback The callback is called at unexpected timing. To avoid this issue, we need to wait for a while before going to the next test. Change-Id: I1d17cbd4c6678eca399829828119c85ba805b243 commit cd4abacdda88a4f226a2d48281eebaa8a09fd139 Merge: 629c7f7 716950a Author: Brian Muramatsu Date: Wed Feb 9 16:40:31 2011 -0800 am 716950a0: am a154856e: Merge "Fix MediaStore_Video_MediaTest Again" into honeycomb * commit '716950a0c4d3fb65cf15bc85ed2dc6d4a275957b': Fix MediaStore_Video_MediaTest Again commit 716950a0c4d3fb65cf15bc85ed2dc6d4a275957b Merge: 521f336 a154856 Author: Brian Muramatsu Date: Wed Feb 9 16:38:53 2011 -0800 am a154856e: Merge "Fix MediaStore_Video_MediaTest Again" into honeycomb * commit 'a154856e0bc5ddeb8070737bb2f7464bbb79d3f0': Fix MediaStore_Video_MediaTest Again commit a154856e0bc5ddeb8070737bb2f7464bbb79d3f0 Merge: ddc2612 9ffe4a3 Author: Brian Muramatsu Date: Wed Feb 9 16:37:32 2011 -0800 Merge "Fix MediaStore_Video_MediaTest Again" into honeycomb commit 629c7f7b0716184296b1efe3aeb7a3711ea2da9b Merge: 1fa153b 535cf5a Author: Steve Block Date: Wed Feb 9 15:31:14 2011 -0800 Merge "Fix a bug in WebSettingsTest.testAccessBlockNetworkImage()" commit 77c594a1b897d86a90bf0b17daa522350e4730a6 Merge: a35104a ef3f73f Author: Brian Muramatsu Date: Wed Feb 9 13:40:50 2011 -0800 am ef3f73f5: am 5a2cfdc6: Merge "Timing issue in CTS tc "testPermissionDiffCert"" into gingerbread * commit 'ef3f73f5cdc2ee6b49cfbe9e43252fc4b4c6870e': Timing issue in CTS tc "testPermissionDiffCert" commit ef3f73f5cdc2ee6b49cfbe9e43252fc4b4c6870e Merge: 8aec820 5a2cfdc Author: Brian Muramatsu Date: Wed Feb 9 13:36:41 2011 -0800 am 5a2cfdc6: Merge "Timing issue in CTS tc "testPermissionDiffCert"" into gingerbread * commit '5a2cfdc601e3660df5ae57e164b10203457ce99e': Timing issue in CTS tc "testPermissionDiffCert" commit 5a2cfdc601e3660df5ae57e164b10203457ce99e Merge: 1586a05 0848369 Author: Brian Muramatsu Date: Wed Feb 9 13:07:13 2011 -0800 Merge "Timing issue in CTS tc "testPermissionDiffCert"" into gingerbread commit 4e8208126369ae8297fac93dc9a3bfae5149e91e Merge: efdd81c 8853c96 Author: Brian Muramatsu Date: Wed Feb 9 13:00:25 2011 -0800 Merge "Update BuildVersionTest for 2.2.2" into froyo commit efdd81c27561663b141534b65a9a6916a5eab425 Merge: f675faf fb7c371 Author: Brian Muramatsu Date: Wed Feb 9 12:46:47 2011 -0800 Merge "Update BuildVersionTest for 2.2 and 2.2.1" into froyo commit 1fa153bf601f84527c79ec1b75413f8c2f98a064 Merge: 7c8d335 521f336 Author: Brian Muramatsu Date: Wed Feb 9 12:19:15 2011 -0800 am 521f3362: resolved conflicts for merge of a35104a8 to honeycomb-plus-aosp * commit '521f3362c9e72abcb3bafd8525de5a438bc8a52d': CTS : remove testCallVoicemail commit 521f3362c9e72abcb3bafd8525de5a438bc8a52d Merge: 29737cb a35104a Author: Brian Muramatsu Date: Wed Feb 9 10:42:13 2011 -0800 resolved conflicts for merge of a35104a8 to honeycomb-plus-aosp Change-Id: Ia275d434bc55de48d4204f42b8b77e71396bef34 commit 084836982c222866a5b75ea57efaa7bccdff32ec Author: Daniel Mladenovic Date: Tue Feb 8 14:54:26 2011 +0100 Timing issue in CTS tc "testPermissionDiffCert" The test case kills an activity that holds some URI permissions and then immediately after tests that it's no longer possible to access the URI. Sometimes the change of access isn't able to reach through the system in time before the test case checks that the access has been removed and the test case fail. A delay of 20 ms in the test case seems to be sufficient for the change of access to pass through properly. I set it to 1 second to have some margin. Change-Id: Ide52b47cae57cc5a0c44412d1c480ac0deca5f5a commit 8853c96f65dce8db4e529ee77fa590cb0be6f121 Author: Mac Wang Date: Wed Feb 9 16:54:13 2011 +0800 Update BuildVersionTest for 2.2.2 Change-Id: I3aaa9f0927031d4c1905e96d50c41efed6a0a659 commit fb7c371f92a545c280102b90557a7a0a3d61d7aa Author: Brian Muramatsu Date: Tue Dec 28 12:36:54 2010 -0800 Update BuildVersionTest for 2.2 and 2.2.1 Issue 12692 Change-Id: I4f349b58c9765fad77211d5770f04f2b999b3b25 commit 535cf5ac29b50a5c128da1f955a65e29a1ddb6d5 Author: Steve Block Date: Tue Feb 8 22:44:09 2011 -0800 Fix a bug in WebSettingsTest.testAccessBlockNetworkImage() Also enables test now that it is fixed. Bug: 3414502 Change-Id: I9be0bbe51af5ddbe129bfc2f2236667543566986 commit a35104a859faff8fa55806152efa80f48fb45bf5 Merge: 396b9f6 8aec820 Author: Brian Muramatsu Date: Tue Feb 8 17:31:48 2011 -0800 am 8aec820a: am 1586a05e: Merge "CTS : remove testCallVoicemail" into gingerbread * commit '8aec820a5b866ddf82e032317036399e6ec133ab': CTS : remove testCallVoicemail commit bf0a74c6616cec161cd2820c4de2e3f2b43d8c03 Author: Brian Muramatsu Date: Tue Feb 8 16:48:19 2011 -0800 Delete Broken AudioManagerTest#testMuteSolo Bug 3188260 There is not a way using the public API to determine what streams can be muted, so remove the broken test. Change-Id: I5ed6c5eb65ca988fbc467d3586a434a2e3924846 commit 82d499309d248514eb09a07d4e06424365ffd2fa Author: Brian Muramatsu Date: Tue Feb 8 16:16:17 2011 -0800 Fix MediaStore_Audio_Playlists_MembersTest Bug 3188260 Replaced brittle test of the getContentUri with tests that check the format of the uri. The test marked with "needs investigation" seems to work fine now...so remove the annotation for it... Change-Id: I649289571b1bedb146425b1cbd09272cf24382ae commit e49bbc1d046f6062fdda3769d69e328f1711f723 Author: Brian Muramatsu Date: Tue Feb 8 15:40:53 2011 -0800 Fix Contacts_PeopleTest Bug 3188260 Fixed some incorrect column indices and queries. Change-Id: Ief0b6cbdbd1f433bb5421b1bd291436d4ac36925 commit 7c8d335d2ce7be17c2bb289dd1483611d7cfda29 Author: Gloria Wang Date: Tue Feb 8 15:28:41 2011 -0800 To remove the config file for Marlin plugin since Marlin will not in the HC release Change-Id: Ie503539a14b390c6a022db1f1329a3f81863ca37 commit 269b148aab26ae2c3b8793cb37b2aa5a936fa5a5 Merge: 05d8098 29737cb Author: Brian Muramatsu Date: Tue Feb 8 15:06:32 2011 -0800 am 29737cb4: am ddc2612f: Merge "Fix AudioManagerTest#testVolume" into honeycomb * commit '29737cb49e084785cb0e10057c7e0657bcb8ad50': Fix AudioManagerTest#testVolume commit 654e3c69cdb9c36e399e8dd216463ffc4573438a Author: Brian Muramatsu Date: Tue Feb 8 14:09:02 2011 -0800 Salvage Broken ContactsTests Bug 3188260 testGroupsTable was failing for a number of reasons. It was querying for a column called "should_sync" that while shown as part of the API as Groups.SHOULD_SYNC isn't returned. LegacyApiSupport doesn't include this column in its sGroupProjectionMap. It also doesn't seem to include all the columns inherited from SyncConstValue... Next, it was failing on the update call, because LegacyApiSupport doesn't update the NAME column. Finally, the delete doesn't seem to work because the row is marked as deleted (but not actually deleted), and the query method doesn't seems to check for that flag... testPhotosTable has similar issues of querying the _SYNC_* columns. Remove the code that tries to update the peoples table which supposedly causes the photos table to be updated. LegacyApiSupport doesn't have code to update the photos table after updating peoples table. Change-Id: I2399f8cfac900fe83736e2c832a2d677c29593ae commit 29737cb49e084785cb0e10057c7e0657bcb8ad50 Merge: 638cd40 ddc2612 Author: Brian Muramatsu Date: Tue Feb 8 12:10:07 2011 -0800 am ddc2612f: Merge "Fix AudioManagerTest#testVolume" into honeycomb * commit 'ddc2612f561c3cdfcb2fc94a2de151259680d29b': Fix AudioManagerTest#testVolume commit ddc2612f561c3cdfcb2fc94a2de151259680d29b Merge: 72264cf 18d0b35 Author: Brian Muramatsu Date: Tue Feb 8 12:07:32 2011 -0800 Merge "Fix AudioManagerTest#testVolume" into honeycomb commit 18d0b35a47ad93a9e089f55650293b4fa8586f03 Author: Brian Muramatsu Date: Fri Feb 4 16:34:05 2011 -0800 Fix AudioManagerTest#testVolume "Change I7e5a0724: Fix issue 3371080" changed 2 aspects of how the AudioManager worked: 1. Decreasing the volume from 1 with FLAG_ALLOW_RINGER_MODES no longer changes the mode. It must be decreased from 0. 2. You cannot adjust the volume using ADJUST_LOWER twice in a row... In reality, an ADJUST_SAME event follows, so the mPrevVolDirection gets set to something different and thats why everything still works via the buttons. Change-Id: I95fdbad0ea1c776acebcb222a257a015b8c24162 commit 05d80987089634c50dd7d17b584b25524094b361 Merge: 8cd98cb 638cd40 Author: Brian Muramatsu Date: Mon Feb 7 13:46:40 2011 -0800 am 638cd403: resolved conflicts for merge of 396b9f65 to honeycomb-plus-aosp * commit '638cd403aaa229eb5a923cc2971ae708b820679c': Update Screen Configuration Tests commit 8cd98cbd82aa8e32f938224a9335921a8665b1db Merge: eba50fb 6a618b8 Author: Brian Muramatsu Date: Mon Feb 7 13:46:36 2011 -0800 am 6a618b83: am 72264cf8: Merge "Fix Telephony Tests" into honeycomb * commit '6a618b833d2a8a787fcba8416a8e3f7f0ea620ba': Fix Telephony Tests commit eba50fb692fb931c1115c7b7c4ee3d8f83548e3f Merge: 6931f1b 7b801ef Author: Brett Chabot Date: Mon Feb 7 13:46:34 2011 -0800 am 7b801efc: am 705c163d: Merge "Add support for reference tests in cts-tradefed." into honeycomb * commit '7b801efcb48d11bff16fc4262434dfa011c361f3': Add support for reference tests in cts-tradefed. commit 6931f1bcca9dee560172ecce9a25027e751e28e2 Merge: 871410a f010727 Author: Brett Chabot Date: Mon Feb 7 13:46:11 2011 -0800 am f0107279: am 9b5d3073: Merge "Add an alternate, simpler method for running signature test." into honeycomb * commit 'f0107279914ea25f0758e670d7fa49da9de0a07a': Add an alternate, simpler method for running signature test. commit 871410a4f507b3685480e8fe06c04a9b10cbc752 Merge: bf2ec34 cbbdaee Author: Brian Muramatsu Date: Mon Feb 7 13:44:30 2011 -0800 am cbbdaeed: am a9a182f8: Merge "Delete Options Menu Test in DialogTest" into honeycomb * commit 'cbbdaeed5c553767694978e3b8090620f8feec98': Delete Options Menu Test in DialogTest commit 8aec820a5b866ddf82e032317036399e6ec133ab Merge: c68c683 1586a05 Author: Brian Muramatsu Date: Mon Feb 7 12:23:19 2011 -0800 am 1586a05e: Merge "CTS : remove testCallVoicemail" into gingerbread * commit '1586a05e95b9c8f72a3dc0f88d1d962e1c23b686': CTS : remove testCallVoicemail commit 1586a05e95b9c8f72a3dc0f88d1d962e1c23b686 Merge: 9a9e583 a4a1b97 Author: Brian Muramatsu Date: Mon Feb 7 12:08:38 2011 -0800 Merge "CTS : remove testCallVoicemail" into gingerbread commit a4a1b97d3ca31d493d66dd9e45720c320d7d0943 Author: Madan Ankapura Date: Thu Feb 3 12:05:05 2011 -0800 CTS : remove testCallVoicemail Comment from btmura : Test is invalid, because the CDD doesn't say what is required in terms of permissions by the applications that respond to these intents. Also the Dialer isn't part of the core systems application list defined under the CDD's 3.2.3.1. Finally, it appears that Intent.ACTION_CALL_PRIVILEGED is a private API as well. Change-Id: I9dc661d8f35b0960e79061232014eee51e54410b commit bf2ec34d038a1ffa7061f098086b47ef70d8ea5d Merge: dd8c3cb 3d9ebb9 Author: Brian Muramatsu Date: Mon Feb 7 11:40:07 2011 -0800 am 3d9ebb9d: am efa8118b: Merge "Update BuildVersionTest" into honeycomb * commit '3d9ebb9db6a61913d297e30187a452a46ed89cf8': Update BuildVersionTest commit dd8c3cbce4a074ccde9f1bdf8ee0a75619790305 Merge: 641690e ae5c484 Author: Brian Muramatsu Date: Mon Feb 7 11:37:33 2011 -0800 am ae5c4845: am 5f43aebc: am d8ccc313: am acbf1acf: Merge "Fix Broken MediaRecorderTest#testSetCamera" into gingerbread * commit 'ae5c4845ba87ccf056cc188c4c30032cc8e79543': Fix Broken MediaRecorderTest#testSetCamera commit 641690e215201b46f7482146500485dd465560ef Merge: 73ede63 2238d52 Author: Brian Muramatsu Date: Mon Feb 7 11:34:59 2011 -0800 am 2238d524: am 8ca32b73: Merge "LONG_TEXT is not LONG enough" into honeycomb * commit '2238d5240de85c2980275d21c6de9b3aecc2ca9b': LONG_TEXT is not LONG enough commit 73ede63d65948b183613df4f86f1e42d8f1f1595 Merge: e7dc09e 5a374e4 Author: Brian Muramatsu Date: Mon Feb 7 11:34:55 2011 -0800 am 5a374e4e: am fe9dff8c: Merge "Fix BaseInputConnectionTest" into honeycomb * commit '5a374e4eb0cf2bd7cd1c64f57de37121bb9e1636': Fix BaseInputConnectionTest commit e7dc09e18255117c498b474468fda4763707833f Merge: be9a5e7 4742bad Author: Brian Muramatsu Date: Mon Feb 7 11:34:50 2011 -0800 am 4742badf: am f91d9f57: Merge "Fix InputMethodManagerTest#testInputMethodManager" into honeycomb * commit '4742badfe55240c62a85a2b829147987f476bdc5': Fix InputMethodManagerTest#testInputMethodManager commit be9a5e76d542efa42911edb2ed7dd82f65d8f881 Merge: 089de67 8c361b5 Author: Brian Muramatsu Date: Mon Feb 7 11:22:28 2011 -0800 resolved conflicts for merge of 8c361b56 to master Change-Id: I206038d0787b902251965ae0b526397b620fe2df commit 089de6703340cb7690b6471051320402d39f4011 Merge: 47e30b5 3c49a47 Author: Brian Muramatsu Date: Mon Feb 7 10:57:39 2011 -0800 am 3c49a47c: am 5b7b6664: Merge "Delete ViewGroupTest#testRecompute..." into honeycomb * commit '3c49a47c9b8bd7442d96e04ed043490de24e6637': Delete ViewGroupTest#testRecompute... commit 47e30b5f4c035c379ad106a0e269892033b25139 Merge: 4ee38cf d5035cf Author: Brian Muramatsu Date: Mon Feb 7 10:57:34 2011 -0800 am d5035cfd: am 3a0080c3: Merge "Fix WindowManager_LayoutParamsTest#testCopyFrom" into honeycomb * commit 'd5035cfd62e96be2a9d7a220574f0f533c36a79e': Fix WindowManager_LayoutParamsTest#testCopyFrom commit 638cd403aaa229eb5a923cc2971ae708b820679c Merge: 6a618b8 396b9f6 Author: Brian Muramatsu Date: Fri Feb 4 14:49:52 2011 -0800 resolved conflicts for merge of 396b9f65 to honeycomb-plus-aosp Change-Id: Ie4abf4a48115b0a91730f1d908937d70d9263cf2 commit 6a618b833d2a8a787fcba8416a8e3f7f0ea620ba Merge: 7b801ef 72264cf Author: Brian Muramatsu Date: Fri Feb 4 14:19:38 2011 -0800 am 72264cf8: Merge "Fix Telephony Tests" into honeycomb * commit '72264cf810ede4c98a3de4270bc285529ad92344': Fix Telephony Tests commit 9ffe4a30265c2d22396d536b6660edb48393a289 Author: Brian Muramatsu Date: Fri Feb 4 13:58:02 2011 -0800 Fix MediaStore_Video_MediaTest Again The parent directory won't be present sometimes, so make sure the utility creates the parent directory. Change-Id: I53f4b7748d61928f9848b4f25579a0ea721ec3c4 commit 72264cf810ede4c98a3de4270bc285529ad92344 Merge: 705c163 72e27cf Author: Brian Muramatsu Date: Fri Feb 4 14:17:30 2011 -0800 Merge "Fix Telephony Tests" into honeycomb commit 7b801efcb48d11bff16fc4262434dfa011c361f3 Merge: f010727 705c163 Author: Brett Chabot Date: Fri Feb 4 14:10:29 2011 -0800 am 705c163d: Merge "Add support for reference tests in cts-tradefed." into honeycomb * commit '705c163de4f3348d4a7af1f044f24cc98179e995': Add support for reference tests in cts-tradefed. commit 705c163de4f3348d4a7af1f044f24cc98179e995 Merge: 9b5d307 a0f443c Author: Brett Chabot Date: Fri Feb 4 14:07:19 2011 -0800 Merge "Add support for reference tests in cts-tradefed." into honeycomb commit f0107279914ea25f0758e670d7fa49da9de0a07a Merge: cbbdaee 9b5d307 Author: Brett Chabot Date: Fri Feb 4 14:02:01 2011 -0800 am 9b5d3073: Merge "Add an alternate, simpler method for running signature test." into honeycomb * commit '9b5d307369de5154455baa5b60125052b9118b09': Add an alternate, simpler method for running signature test. commit 9b5d307369de5154455baa5b60125052b9118b09 Merge: a9a182f 584d2b9 Author: Brett Chabot Date: Fri Feb 4 13:59:20 2011 -0800 Merge "Add an alternate, simpler method for running signature test." into honeycomb commit 396b9f65385897afa6f7588eea32b8176cfb274b Merge: 5f43aeb c68c683 Author: Brian Muramatsu Date: Fri Feb 4 13:58:35 2011 -0800 am c68c6834: am 9a9e583f: Merge "Update Screen Configuration Tests" into gingerbread * commit 'c68c6834adb2594128686ccd06ac3db5830227d0': Update Screen Configuration Tests commit a0f443cbc73c109fcc355a7504539e5cde851c15 Author: Brett Chabot Date: Fri Feb 4 13:57:55 2011 -0800 Add support for reference tests in cts-tradefed. Change-Id: Ida0761474ff17bb33ea0f4754b627a7e4b6bc4db commit c68c6834adb2594128686ccd06ac3db5830227d0 Merge: d8ccc31 9a9e583 Author: Brian Muramatsu Date: Fri Feb 4 13:55:12 2011 -0800 am 9a9e583f: Merge "Update Screen Configuration Tests" into gingerbread * commit '9a9e583f1e863b55c4a38409d0ee03827bdb4ff3': Update Screen Configuration Tests commit 9a9e583f1e863b55c4a38409d0ee03827bdb4ff3 Merge: acbf1ac f0083a8 Author: Brian Muramatsu Date: Fri Feb 4 13:43:28 2011 -0800 Merge "Update Screen Configuration Tests" into gingerbread commit f0083a84622e04d05b1eaf4bfb6e4777f76fc05b Author: Brian Muramatsu Date: Fri Oct 29 08:21:49 2010 -0700 Update Screen Configuration Tests Bug 2715720 Update ConfigurationTest to be flexible in regards to the new CDD policies regarding screen sizes and resolutions by getting rid of the static list of allowed resolutions and replacing it with some looser checks. Change-Id: If01457d7dd33bc58e32f1ef77552916006bb5cdf commit 72e27cf86a100e3bba4038734b224f4c0a290200 Author: Brian Muramatsu Date: Fri Feb 4 13:27:47 2011 -0800 Fix Telephony Tests Use feature checks rather than getPhoneType. Remove the assertion that device id must be null for non-telephony devices, because that may be a MEID for a device that although isn't voice capable may have a data connection... Change-Id: I8dd6f8ea34ae3c767fc0b0d5324a0a608f8ed8ad commit 584d2b9fc03df46a8f7f1cc37b3f435ff45a73e5 Author: Brett Chabot Date: Thu Feb 3 17:56:49 2011 -0800 Add an alternate, simpler method for running signature test. This change will allow the signature test to be executed just like a normal JUnit based test, and will thus save a lot of unnecessary logic in the tradefed harness. The existing signature test entry point is still retained, to avoid changing the legacy CTS test harness. Change-Id: I4a21811ee89c11960de99dfa4aa14df06a85afe4 commit cbbdaeed5c553767694978e3b8090620f8feec98 Merge: 3d9ebb9 a9a182f Author: Brian Muramatsu Date: Fri Feb 4 11:12:22 2011 -0800 am a9a182f8: Merge "Delete Options Menu Test in DialogTest" into honeycomb * commit 'a9a182f8b8d6343d7bac9de2a3838a4080eb144a': Delete Options Menu Test in DialogTest commit a9a182f8b8d6343d7bac9de2a3838a4080eb144a Merge: efa8118 5df58d9 Author: Brian Muramatsu Date: Fri Feb 4 11:09:19 2011 -0800 Merge "Delete Options Menu Test in DialogTest" into honeycomb commit 3d9ebb9db6a61913d297e30187a452a46ed89cf8 Merge: ae5c484 efa8118 Author: Brian Muramatsu Date: Thu Feb 3 18:13:47 2011 -0800 am efa8118b: Merge "Update BuildVersionTest" into honeycomb * commit 'efa8118bf2c508a53416a7f4b7bee278802702de': Update BuildVersionTest commit efa8118bf2c508a53416a7f4b7bee278802702de Merge: 8ca32b7 0ba272f Author: Brian Muramatsu Date: Thu Feb 3 18:11:45 2011 -0800 Merge "Update BuildVersionTest" into honeycomb commit 4ee38cf95617cfb4c3acdfaab6f6c9d88f7141a1 Merge: 469f07d 7a2a4bb Author: Brett Chabot Date: Thu Feb 3 18:08:30 2011 -0800 am 7a2a4bbc: am 6e4e6839: Merge "Modify cts-tradefed xml generator to match current schema." into honeycomb * commit '7a2a4bbcb183e0945d4e78998f9ce325da29b9c7': Modify cts-tradefed xml generator to match current schema. commit 469f07d213305592afeba03e70b51bddae5dda0e Merge: da643df 648f4fb Author: Brett Chabot Date: Thu Feb 3 18:08:22 2011 -0800 am 648f4fb5: am fac6b856: Merge "Extract out device info collection constants." into honeycomb * commit '648f4fb5b749c9c357361f0a33c79ce33a4008b8': Extract out device info collection constants. commit da643dfc14fe69b47d028ce04cf675f6485fa134 Merge: 03fa455 aa8921d Author: Brian Muramatsu Date: Thu Feb 3 18:07:20 2011 -0800 am aa8921d1: am 447eb767: Merge "Fix View_UsingViewsTest" into honeycomb * commit 'aa8921d1be20660be16d653cc08a80daf40ebd2d': Fix View_UsingViewsTest commit 5df58d9a4a0c7a01a7a54c09730ee800ea3a600f Author: Brian Muramatsu Date: Thu Feb 3 16:57:20 2011 -0800 Delete Options Menu Test in DialogTest Change-Id: Ieee3f1b7b73c476734af70ef3a7aa8f10182616c commit ae5c4845ba87ccf056cc188c4c30032cc8e79543 Merge: 2238d52 5f43aeb Author: Brian Muramatsu Date: Thu Feb 3 16:39:25 2011 -0800 am 5f43aebc: am d8ccc313: am acbf1acf: Merge "Fix Broken MediaRecorderTest#testSetCamera" into gingerbread * commit '5f43aebca037a165801b152ca66c11527837c93a': Fix Broken MediaRecorderTest#testSetCamera commit 5f43aebca037a165801b152ca66c11527837c93a Merge: 9c08b20 d8ccc31 Author: Brian Muramatsu Date: Thu Feb 3 16:36:54 2011 -0800 am d8ccc313: am acbf1acf: Merge "Fix Broken MediaRecorderTest#testSetCamera" into gingerbread * commit 'd8ccc313f8b7263f6b772f97c740288857d49f2f': Fix Broken MediaRecorderTest#testSetCamera commit d8ccc313f8b7263f6b772f97c740288857d49f2f Merge: ba0d40a acbf1ac Author: Brian Muramatsu Date: Thu Feb 3 16:33:47 2011 -0800 am acbf1acf: Merge "Fix Broken MediaRecorderTest#testSetCamera" into gingerbread * commit 'acbf1acfbf0ca165981c301fbf1627392d911a97': Fix Broken MediaRecorderTest#testSetCamera commit acbf1acfbf0ca165981c301fbf1627392d911a97 Merge: 0c561f8 acf5915 Author: Brian Muramatsu Date: Thu Feb 3 16:10:50 2011 -0800 Merge "Fix Broken MediaRecorderTest#testSetCamera" into gingerbread commit 0ba272f96ff22d94d0f44648764030cc6ed7855e Author: Brian Muramatsu Date: Thu Feb 3 16:05:53 2011 -0800 Update BuildVersionTest Expect version 3.0 and and sdk 11. Change-Id: Iba91bb53829f082140bdfeb76e4e6de3ae4b98a6 commit 2238d5240de85c2980275d21c6de9b3aecc2ca9b Merge: 5a374e4 8ca32b7 Author: Brian Muramatsu Date: Thu Feb 3 15:41:21 2011 -0800 am 8ca32b73: Merge "LONG_TEXT is not LONG enough" into honeycomb * commit '8ca32b739a5c7882621dc8bcc8e88b89febbdeda': LONG_TEXT is not LONG enough commit 5a374e4eb0cf2bd7cd1c64f57de37121bb9e1636 Merge: 4742bad fe9dff8 Author: Brian Muramatsu Date: Thu Feb 3 15:41:19 2011 -0800 am fe9dff8c: Merge "Fix BaseInputConnectionTest" into honeycomb * commit 'fe9dff8cd5beea459d66eba4abb991c5c54f3713': Fix BaseInputConnectionTest commit 4742badfe55240c62a85a2b829147987f476bdc5 Merge: 8c361b5 f91d9f5 Author: Brian Muramatsu Date: Thu Feb 3 15:41:17 2011 -0800 am f91d9f57: Merge "Fix InputMethodManagerTest#testInputMethodManager" into honeycomb * commit 'f91d9f57421c209c4491bdd8e36fc115ecdf921e': Fix InputMethodManagerTest#testInputMethodManager commit 8c361b5680873fd32d4d8f872c7961b3d35343ce Merge: 3c49a47 98aa5c9 Author: Brian Muramatsu Date: Thu Feb 3 15:41:08 2011 -0800 am 98aa5c93: Merge "Fix WindowTest Tests" into honeycomb * commit '98aa5c937d60a2641c6634307b37d576a6c859f2': Fix WindowTest Tests commit 3c49a47c9b8bd7442d96e04ed043490de24e6637 Merge: d5035cf 5b7b666 Author: Brian Muramatsu Date: Thu Feb 3 15:40:52 2011 -0800 am 5b7b6664: Merge "Delete ViewGroupTest#testRecompute..." into honeycomb * commit '5b7b66640dfc04d6ed91a83fa6ac96dcf79e786c': Delete ViewGroupTest#testRecompute... commit d5035cfd62e96be2a9d7a220574f0f533c36a79e Merge: 7a2a4bb 3a0080c Author: Brian Muramatsu Date: Thu Feb 3 15:40:21 2011 -0800 am 3a0080c3: Merge "Fix WindowManager_LayoutParamsTest#testCopyFrom" into honeycomb * commit '3a0080c3272b13e54d5c213e2b191f4c7bd58e22': Fix WindowManager_LayoutParamsTest#testCopyFrom commit 8ca32b739a5c7882621dc8bcc8e88b89febbdeda Merge: fe9dff8 583beba Author: Brian Muramatsu Date: Thu Feb 3 15:29:37 2011 -0800 Merge "LONG_TEXT is not LONG enough" into honeycomb commit fe9dff8cd5beea459d66eba4abb991c5c54f3713 Merge: f91d9f5 140a6e9 Author: Brian Muramatsu Date: Thu Feb 3 15:29:27 2011 -0800 Merge "Fix BaseInputConnectionTest" into honeycomb commit f91d9f57421c209c4491bdd8e36fc115ecdf921e Merge: 98aa5c9 f815ec1 Author: Brian Muramatsu Date: Thu Feb 3 15:29:18 2011 -0800 Merge "Fix InputMethodManagerTest#testInputMethodManager" into honeycomb commit 98aa5c937d60a2641c6634307b37d576a6c859f2 Merge: 5b7b666 4348bff Author: Brian Muramatsu Date: Thu Feb 3 15:29:09 2011 -0800 Merge "Fix WindowTest Tests" into honeycomb commit 5b7b66640dfc04d6ed91a83fa6ac96dcf79e786c Merge: 3a0080c 2fc80bc Author: Brian Muramatsu Date: Thu Feb 3 15:28:56 2011 -0800 Merge "Delete ViewGroupTest#testRecompute..." into honeycomb commit 3a0080c3272b13e54d5c213e2b191f4c7bd58e22 Merge: 6e4e683 2b798ad Author: Brian Muramatsu Date: Thu Feb 3 15:28:30 2011 -0800 Merge "Fix WindowManager_LayoutParamsTest#testCopyFrom" into honeycomb commit 583bebac76a956b965c5a0b58284febe9aa3941c Author: Brian Muramatsu Date: Thu Feb 3 13:49:28 2011 -0800 LONG_TEXT is not LONG enough The text wasn't long enough to wrap, so the scrollTo commands didn't work...the ideal solution is to probably create a fixed FrameLayout to enclose the text. Change-Id: I0a079a859ba9cc2d66794827a7fe847b819bee44 commit 140a6e94162024c8d537cc75f6a3caf2d30a3c95 Author: Brian Muramatsu Date: Thu Feb 3 12:57:42 2011 -0800 Fix BaseInputConnectionTest If the target view is not focused, then the ViewRoot won't be able to deliver the key events. Focus the target view before commiting text via the input connection. Change-Id: Ie0772dfb8106c4394a963523700c0316941b5f07 commit 7a2a4bbcb183e0945d4e78998f9ce325da29b9c7 Merge: 648f4fb 6e4e683 Author: Brett Chabot Date: Thu Feb 3 12:04:45 2011 -0800 am 6e4e6839: Merge "Modify cts-tradefed xml generator to match current schema." into honeycomb * commit '6e4e6839f9fc6558a905cdafa31ecdc001c6c33c': Modify cts-tradefed xml generator to match current schema. commit 648f4fb5b749c9c357361f0a33c79ce33a4008b8 Merge: aa8921d fac6b85 Author: Brett Chabot Date: Thu Feb 3 12:04:42 2011 -0800 am fac6b856: Merge "Extract out device info collection constants." into honeycomb * commit 'fac6b8563e934d95f675ff2640c0ff73f07ff6c9': Extract out device info collection constants. commit 6e4e6839f9fc6558a905cdafa31ecdc001c6c33c Merge: fac6b85 cdb404d Author: Brett Chabot Date: Thu Feb 3 12:00:58 2011 -0800 Merge "Modify cts-tradefed xml generator to match current schema." into honeycomb commit fac6b8563e934d95f675ff2640c0ff73f07ff6c9 Merge: 447eb76 2f903ad Author: Brett Chabot Date: Thu Feb 3 12:00:49 2011 -0800 Merge "Extract out device info collection constants." into honeycomb commit f815ec1415a9dc173a6b59db40ba868ff76820ee Author: Brian Muramatsu Date: Thu Feb 3 11:44:21 2011 -0800 Fix InputMethodManagerTest#testInputMethodManager The ActionBar's FrameLayout was taking the focus, so the InputMethodManager was not accepting text. Make the EditText take focus to make the InputMethodManager accept text. Change-Id: I8766f616a83f2e78b6aa361b90461ae62a8b4839 commit aa8921d1be20660be16d653cc08a80daf40ebd2d Merge: c7f111f 447eb76 Author: Brian Muramatsu Date: Thu Feb 3 11:16:51 2011 -0800 am 447eb767: Merge "Fix View_UsingViewsTest" into honeycomb * commit '447eb76768b905389bab781d14d585ccccbf65d9': Fix View_UsingViewsTest commit 447eb76768b905389bab781d14d585ccccbf65d9 Merge: b01d3ed ffac390 Author: Brian Muramatsu Date: Thu Feb 3 11:10:06 2011 -0800 Merge "Fix View_UsingViewsTest" into honeycomb commit cdb404daccfdb0b498d5b325916e351bd082e499 Author: Brett Chabot Date: Fri Jan 28 10:34:41 2011 -0800 Modify cts-tradefed xml generator to match current schema. Bug 3403768 Change-Id: I5b01c081fdde563a1e2bdf5dc5b894e6befd665b commit 2f903ad9bb17b897ad6b3b0d27b15e25b2a8b37c Author: Brett Chabot Date: Wed Feb 2 18:22:18 2011 -0800 Extract out device info collection constants. Previously, there was duplicate copies of device info constants in device-side code, and in the cts harness host code. This change creates a library shared between the device and host side. Change-Id: I6539f07f50a3a8c657209ca40e1f0d11aed96154 commit 4348bffb5f262c6026a5abbe440ee97524d22fb0 Author: Brian Muramatsu Date: Wed Feb 2 18:25:00 2011 -0800 Fix WindowTest Tests Removed all the methods trying to test the options menu. There is code that deliberately no-ops these methods if the app is targeted for HC. Ideally, we should have another CTS stub with a lower target SDK version and then test the options panel there. Finally, fix an assertion that no longer held due to the System Bar taking up part of the screen. Change-Id: I2637e1494623e4c2dd7cda0f8d2d3d030dc1d356 commit 03fa455596e2a022cb2304de55e91d4a74eefa8d Merge: 1c7751b c7f111f Author: Brian Muramatsu Date: Wed Feb 2 18:08:42 2011 -0800 am c7f111fe: am b01d3edd: Merge "Fix ViewTest#testScrolling" into honeycomb * commit 'c7f111fe8355832f35a49b822e82662c6fbf19c9': Fix ViewTest#testScrolling commit c7f111fe8355832f35a49b822e82662c6fbf19c9 Merge: 39294aa b01d3ed Author: Brian Muramatsu Date: Wed Feb 2 18:06:21 2011 -0800 am b01d3edd: Merge "Fix ViewTest#testScrolling" into honeycomb * commit 'b01d3eddb596b482ac6d7297bfae0ed9c7f324df': Fix ViewTest#testScrolling commit b01d3eddb596b482ac6d7297bfae0ed9c7f324df Merge: cd4df43 c166871 Author: Brian Muramatsu Date: Wed Feb 2 18:03:52 2011 -0800 Merge "Fix ViewTest#testScrolling" into honeycomb commit ffac39003fb3b5574db1a1b50eacbf7c06bff0b7 Author: Brian Muramatsu Date: Wed Feb 2 17:27:34 2011 -0800 Fix View_UsingViewsTest The RelativeLayout and TextView now have the same number of states. Add another state to the TextView that is common to both views to check whether setDuplicateParentStateEnabled works properly. Change-Id: Ib23abfd0af4b10a2d23da9cf13d83bce8f86afc6 commit 1c7751b8414c55cd5a3926bf42aa0fcc496ac021 Merge: ba059e5 39294aa Author: Brian Muramatsu Date: Wed Feb 2 16:20:35 2011 -0800 am 39294aa2: am cd4df433: Merge "Fix TextViewTest#testAccessError" into honeycomb * commit '39294aa24c84ce4fbd52c6b44f33ef800a6d1ca7': Fix TextViewTest#testAccessError commit ba059e5616f2932d5bb7f6d5fb63695eb1af26a7 Merge: c22cabd 2ca9105 Author: Brian Muramatsu Date: Wed Feb 2 16:20:31 2011 -0800 am 2ca91050: am b881d632: Merge "Fix ContextTest#testObtainStyledAttributes" into honeycomb * commit '2ca91050612cb45ebbcd36e01388d5b40d5d687c': Fix ContextTest#testObtainStyledAttributes commit c22cabd36e134a55c5f93f65175cea422402ec67 Merge: 7033a37 4cb33c8 Author: Brian Muramatsu Date: Wed Feb 2 16:20:27 2011 -0800 am 4cb33c8d: am da71c207: Merge "Fix ServiceTest to Match New Permissions Behavior" into honeycomb * commit '4cb33c8d3755a6f521c3223b63697a52a22c4423': Fix ServiceTest to Match New Permissions Behavior commit 7033a377e6d390ef91ae89aeb31e7d4a2e42dbf7 Merge: c6249b7 8b6ab56 Author: Brian Muramatsu Date: Wed Feb 2 16:20:24 2011 -0800 am 8b6ab56c: am 6c2b8590: Merge "Fix 2 MediaStore Tests" into honeycomb * commit '8b6ab56cca2b017f1ecbf8aa474f41291e450f30': Fix 2 MediaStore Tests commit c166871e1a80db5521035ac0a5b340074f6bc5d2 Author: Brian Muramatsu Date: Wed Feb 2 16:18:54 2011 -0800 Fix ViewTest#testScrolling The test was failing because the MockView's invalidate() method was not being called. That is because there is now a package private invalidate(boolean) that is being called instead. As a result, theres no way to keep these assertions. That was confusing... Change-Id: Idfd4e53c90690e71c8f6362336a7c92ca5c558af commit 2fc80bc5a8f0e3d053491f8547264f15d166eb7f Author: Brian Muramatsu Date: Wed Feb 2 15:54:01 2011 -0800 Delete ViewGroupTest#testRecompute... This test now requires a full activity for the attachInfo to be set. I'm not exactly sure what this test was trying to do... Change-Id: I4da2b4e8aecf1f29bb00465295a2f949ace90fbd commit 39294aa24c84ce4fbd52c6b44f33ef800a6d1ca7 Merge: 2ca9105 cd4df43 Author: Brian Muramatsu Date: Wed Feb 2 15:52:21 2011 -0800 am cd4df433: Merge "Fix TextViewTest#testAccessError" into honeycomb * commit 'cd4df43374de1e5616aaca362bb1c0c30e56bbe4': Fix TextViewTest#testAccessError commit 2ca91050612cb45ebbcd36e01388d5b40d5d687c Merge: 4cb33c8 b881d63 Author: Brian Muramatsu Date: Wed Feb 2 15:52:14 2011 -0800 am b881d632: Merge "Fix ContextTest#testObtainStyledAttributes" into honeycomb * commit 'b881d63217ba5609879256dddf916e2f8f8b7131': Fix ContextTest#testObtainStyledAttributes commit 4cb33c8d3755a6f521c3223b63697a52a22c4423 Merge: 8b6ab56 da71c20 Author: Brian Muramatsu Date: Wed Feb 2 15:52:10 2011 -0800 am da71c207: Merge "Fix ServiceTest to Match New Permissions Behavior" into honeycomb * commit 'da71c207592694e9a95e2089024afbe8696d0026': Fix ServiceTest to Match New Permissions Behavior commit 8b6ab56cca2b017f1ecbf8aa474f41291e450f30 Merge: 246f850 6c2b859 Author: Brian Muramatsu Date: Wed Feb 2 15:52:08 2011 -0800 am 6c2b8590: Merge "Fix 2 MediaStore Tests" into honeycomb * commit '6c2b85909e56d092c7b99e3ce74375001b361866': Fix 2 MediaStore Tests commit 2b798ad6b5b56d74a6a9a47d5485208da5f52376 Author: Brian Muramatsu Date: Wed Feb 2 15:28:17 2011 -0800 Fix WindowManager_LayoutParamsTest#testCopyFrom "Change I81466054: remove support for PUSH_BUFFER surf..." removed the memory type change, since it is automatically set... Change-Id: I68133beb59c5b62f3862d201ad377baf170d6d96 commit c6249b7cae234a54e8f66b41830e62d44a8f79ac Author: Gloria Wang Date: Wed Feb 2 14:51:48 2011 -0800 Fix the build Change-Id: Ia5ada1dd292575945b99da95c2a091f0c97d8afc commit cd4df43374de1e5616aaca362bb1c0c30e56bbe4 Merge: b881d63 8b76fb1 Author: Brian Muramatsu Date: Wed Feb 2 14:19:23 2011 -0800 Merge "Fix TextViewTest#testAccessError" into honeycomb commit c7e621d4c08857388f201880b07d9d5244adb5ac Merge: e09e85f 280000f Author: Gloria Wang Date: Wed Feb 2 14:09:30 2011 -0800 Merge "CTS for the DRM framework - The test will get a list of available plugins first - Then it will be run for each of the plugins - If there is no plugins installed, it will return OK" commit b881d63217ba5609879256dddf916e2f8f8b7131 Merge: da71c20 6d44322 Author: Brian Muramatsu Date: Wed Feb 2 14:06:50 2011 -0800 Merge "Fix ContextTest#testObtainStyledAttributes" into honeycomb commit da71c207592694e9a95e2089024afbe8696d0026 Merge: 6c2b859 e4d5a1b Author: Brian Muramatsu Date: Wed Feb 2 14:02:40 2011 -0800 Merge "Fix ServiceTest to Match New Permissions Behavior" into honeycomb commit 6c2b85909e56d092c7b99e3ce74375001b361866 Merge: 0150410 cb96468 Author: Brian Muramatsu Date: Wed Feb 2 13:58:43 2011 -0800 Merge "Fix 2 MediaStore Tests" into honeycomb commit e09e85f04d76b8493950010481fb97699dd4ec56 Merge: eade130 246f850 Author: Brian Muramatsu Date: Wed Feb 2 13:22:21 2011 -0800 am 246f850f: am 01504108: Merge "Fix TimePickerTest#testSetOnTimeChangedListener" into honeycomb * commit '246f850feb9477693bf5fbf8fdf42bc7a4f5da91': Fix TimePickerTest#testSetOnTimeChangedListener commit eade13085cc8ccc8ea94de0dd5eb03195a693f59 Merge: 606b53f 8f690fd Author: Brian Muramatsu Date: Wed Feb 2 13:22:18 2011 -0800 am 8f690fdd: am 0f46aef2: Merge "Fix SQLiteCursorTest#testRequery2" into honeycomb * commit '8f690fdda17e9cfa00cfcc39273fb70a93be7605': Fix SQLiteCursorTest#testRequery2 commit 246f850feb9477693bf5fbf8fdf42bc7a4f5da91 Merge: 8f690fd 0150410 Author: Brian Muramatsu Date: Wed Feb 2 13:19:40 2011 -0800 am 01504108: Merge "Fix TimePickerTest#testSetOnTimeChangedListener" into honeycomb * commit '015041085dcb81c22151620df3129fd9a6ded9e6': Fix TimePickerTest#testSetOnTimeChangedListener commit 8f690fdda17e9cfa00cfcc39273fb70a93be7605 Merge: bda34ff 0f46aef Author: Brian Muramatsu Date: Wed Feb 2 13:19:26 2011 -0800 am 0f46aef2: Merge "Fix SQLiteCursorTest#testRequery2" into honeycomb * commit '0f46aef2412716bc95d06a24d50e801608e84a07': Fix SQLiteCursorTest#testRequery2 commit cb9646883ab27e7acef52b7901423058f35a8727 Author: Brian Muramatsu Date: Wed Feb 2 13:11:14 2011 -0800 Fix 2 MediaStore Tests These tests were passing in files that did not really exist and sending a fake size to the ContentProvider. The provider no longer blindly trusts the size given by the ContentValues. Since it actually opens the file and checks its length, the size it really inserted didn't match the fake value passed via the test. Thus, actually create a fake file of a certain length and use that in the test. The update tests following the insertion still blindly trust the size value in the ContentValues, so those don't need an actual file to back the test... The providers also insert their own date modified times rather than trusting the given ContentValues, so make sure to use seconds as the documentation recommends rather than milliseconds. Change-Id: I3a1fcee296b5831e08a75f1a6fddd276b9055c07 commit 015041085dcb81c22151620df3129fd9a6ded9e6 Merge: 0f46aef 990ca4c Author: Brian Muramatsu Date: Wed Feb 2 12:26:27 2011 -0800 Merge "Fix TimePickerTest#testSetOnTimeChangedListener" into honeycomb commit 8b76fb121a40e93bbf13919482761b50654878bf Author: Brian Muramatsu Date: Wed Feb 2 12:19:22 2011 -0800 Fix TextViewTest#testAccessError "Change Ib6326b27: Auto-clearing setError popup" may have caused errors now to be cleared on input. Change-Id: I2d0ac3b453efa057d1d798086e7e9c5b5dd4f5f0 commit 990ca4ce5f1fa3b4d5cee9cd1b34a80475a4f34e Author: Brian Muramatsu Date: Wed Feb 2 12:00:54 2011 -0800 Fix TimePickerTest#testSetOnTimeChangedListener TimePicker no longer fires the listener if the hour or minute being set is the same... Change-Id: I7785f0ec1395f8695ffbdab2fc3fa1bd4824b120 commit 280000f75f35feb1035996f0b085d32c7190cb66 Author: Gloria Wang Date: Tue Feb 1 15:36:36 2011 -0800 CTS for the DRM framework - The test will get a list of available plugins first - Then it will be run for each of the plugins - If there is no plugins installed, it will return OK Change-Id: Ifd12b7e6cc0bc9e6117e4bfd1177f1ad12947ca1 commit 0f46aef2412716bc95d06a24d50e801608e84a07 Merge: d74adf6 c47ce3f Author: Brian Muramatsu Date: Wed Feb 2 11:30:53 2011 -0800 Merge "Fix SQLiteCursorTest#testRequery2" into honeycomb commit 6d443224ba208cdca57858a29c068434dfafd686 Author: Brian Muramatsu Date: Tue Feb 1 18:26:48 2011 -0800 Fix ContextTest#testObtainStyledAttributes The DatePicker has a couple more style attributes, so this test started to fail. Change the test to be robust to changes in the attributes. Also fix up references to internal resources...but a lot of them still remain. Change-Id: Id06ec9af2745171a0b3acc5017006b22a17e670f commit c47ce3f7693ca940fc7b42fb39fac72205850024 Author: Brian Muramatsu Date: Tue Feb 1 17:38:54 2011 -0800 Fix SQLiteCursorTest#testRequery2 "Change I56e0bd17: in GB requery() didn't throw exceptions" for bug 3302851 made require no longer throw IllegalStateExceptions. Change-Id: I509d0633d0c8d6a80154e5ca3796cc6263205c2b commit 606b53f04bf43b53a56b7c32ad8e1d25b6ad8ead Merge: 59c250d bda34ff Author: Brian Muramatsu Date: Tue Feb 1 17:38:17 2011 -0800 am bda34ffe: am d74adf60: Delete InstrumentationTest callOnDestroy Test * commit 'bda34ffef8a7291843a12e1ebd09413b8c66b97e': Delete InstrumentationTest callOnDestroy Test commit bda34ffef8a7291843a12e1ebd09413b8c66b97e Merge: a6ddbd7 d74adf6 Author: Brian Muramatsu Date: Tue Feb 1 17:35:43 2011 -0800 am d74adf60: Delete InstrumentationTest callOnDestroy Test * commit 'd74adf607816b5a0df3ab90fc578400a8129756a': Delete InstrumentationTest callOnDestroy Test commit d74adf607816b5a0df3ab90fc578400a8129756a Author: Brian Muramatsu Date: Tue Feb 1 16:43:55 2011 -0800 Delete InstrumentationTest callOnDestroy Test Bug 3414097 "Applications are not supposed to in any way shape or form directly call onDestroy()." Change-Id: I8598ad54d7ff2ce0bbc026b8daf3abba58655b13 commit e4d5a1b752a009e87e73f0cabe70a22330b89e8e Author: Brian Muramatsu Date: Tue Feb 1 15:33:13 2011 -0800 Fix ServiceTest to Match New Permissions Behavior "Change I5d61930a: Just a little 'ol activity manager permission..." changed the ActivityManager, so that an application doesn't need to have the permissions required by its own components to start them. Change-Id: If35769e87d052a415ece36bd54586303ae9a9fff commit 59c250dbf0cdb102ea4f4cd1bf6e94649f39647c Merge: 117f5cf a6ddbd7 Author: Brian Muramatsu Date: Tue Feb 1 14:23:18 2011 -0800 am a6ddbd74: am 9c08b207: am ba0d40a4: am 0c561f8b: Merge "Fix ProgressBarTest" into gingerbread * commit 'a6ddbd74c5e9b752cdd4cf097ff70cc53dcad401': Fix ProgressBarTest commit 117f5cf594eb00238fb0e12b5f9fb4cc8e17f6a3 Merge: 179795c f73de5a Author: Brian Muramatsu Date: Tue Feb 1 14:23:13 2011 -0800 am f73de5a7: am 2d550c0a: am e59c4d65: am c87a0f01: Merge "Fix Broken ContextWrapperTest#testAccessTheme" into gingerbread * commit 'f73de5a716ccf0c5297f95c37950dac123690947': Fix Broken ContextWrapperTest#testAccessTheme commit 179795c6dbbca52493d3e7d69823b7f97860b282 Merge: af2c812 e25ee16 Author: Brian Muramatsu Date: Tue Feb 1 14:23:10 2011 -0800 am e25ee162: am ae4232e9: am 0a52b4ad: am 494f0b2f: Merge "Delete AlarmManagerTest#testSetTimeZone" into gingerbread * commit 'e25ee162f97477449d0b7b33d22f8c3125b4bad4': Delete AlarmManagerTest#testSetTimeZone commit a6ddbd74c5e9b752cdd4cf097ff70cc53dcad401 Merge: f73de5a 9c08b20 Author: Brian Muramatsu Date: Tue Feb 1 14:19:25 2011 -0800 am 9c08b207: am ba0d40a4: am 0c561f8b: Merge "Fix ProgressBarTest" into gingerbread * commit '9c08b207455f88ac0c712561d18043b3633d34d9': Fix ProgressBarTest commit f73de5a716ccf0c5297f95c37950dac123690947 Merge: e25ee16 2d550c0 Author: Brian Muramatsu Date: Tue Feb 1 14:19:22 2011 -0800 am 2d550c0a: am e59c4d65: am c87a0f01: Merge "Fix Broken ContextWrapperTest#testAccessTheme" into gingerbread * commit '2d550c0ab2c70b77e7003c9ae821d62bc3a256b7': Fix Broken ContextWrapperTest#testAccessTheme commit e25ee162f97477449d0b7b33d22f8c3125b4bad4 Merge: c0228d4 ae4232e Author: Brian Muramatsu Date: Tue Feb 1 14:19:18 2011 -0800 am ae4232e9: am 0a52b4ad: am 494f0b2f: Merge "Delete AlarmManagerTest#testSetTimeZone" into gingerbread * commit 'ae4232e9132382127767859005efe67146c24b1a': Delete AlarmManagerTest#testSetTimeZone commit af2c8129ffaaef14411f683f3437a642dda0a17a Merge: e7d807e c0228d4 Author: Brett Chabot Date: Tue Feb 1 13:27:00 2011 -0800 am c0228d4c: am 8efbbfcf: Merge "Minor cts result schema fixes. `" into honeycomb * commit 'c0228d4c8fe733ad6e9c3e2c148a1925d6b075b5': Minor cts result schema fixes. ` commit 9c08b207455f88ac0c712561d18043b3633d34d9 Merge: 2d550c0 ba0d40a Author: Brian Muramatsu Date: Tue Feb 1 12:21:05 2011 -0800 am ba0d40a4: am 0c561f8b: Merge "Fix ProgressBarTest" into gingerbread * commit 'ba0d40a4e638c77938f9fd89eaddd0f8f41e631d': Fix ProgressBarTest commit 2d550c0ab2c70b77e7003c9ae821d62bc3a256b7 Merge: ae4232e e59c4d6 Author: Brian Muramatsu Date: Tue Feb 1 12:21:03 2011 -0800 am e59c4d65: am c87a0f01: Merge "Fix Broken ContextWrapperTest#testAccessTheme" into gingerbread * commit 'e59c4d6564dce7506d09eeff5a5408b5842994ff': Fix Broken ContextWrapperTest#testAccessTheme commit ba0d40a4e638c77938f9fd89eaddd0f8f41e631d Merge: e59c4d6 0c561f8 Author: Brian Muramatsu Date: Tue Feb 1 12:19:24 2011 -0800 am 0c561f8b: Merge "Fix ProgressBarTest" into gingerbread * commit '0c561f8b7b94ab36c79ac2da02412fb620959eef': Fix ProgressBarTest commit e59c4d6564dce7506d09eeff5a5408b5842994ff Merge: 0a52b4a c87a0f0 Author: Brian Muramatsu Date: Tue Feb 1 12:19:22 2011 -0800 am c87a0f01: Merge "Fix Broken ContextWrapperTest#testAccessTheme" into gingerbread * commit 'c87a0f0116780a644a2b8fb95fceeedd13434736': Fix Broken ContextWrapperTest#testAccessTheme commit 0c561f8b7b94ab36c79ac2da02412fb620959eef Merge: c87a0f0 c9a13f1 Author: Brian Muramatsu Date: Tue Feb 1 12:17:56 2011 -0800 Merge "Fix ProgressBarTest" into gingerbread commit ae4232e9132382127767859005efe67146c24b1a Merge: 5854081 0a52b4a Author: Brian Muramatsu Date: Tue Feb 1 12:13:53 2011 -0800 am 0a52b4ad: am 494f0b2f: Merge "Delete AlarmManagerTest#testSetTimeZone" into gingerbread * commit '0a52b4ad889b1cfe5cf93e03f8c82e221a025d54': Delete AlarmManagerTest#testSetTimeZone commit 0a52b4ad889b1cfe5cf93e03f8c82e221a025d54 Merge: cf02222 494f0b2 Author: Brian Muramatsu Date: Tue Feb 1 12:08:28 2011 -0800 am 494f0b2f: Merge "Delete AlarmManagerTest#testSetTimeZone" into gingerbread * commit '494f0b2f4d4bb260da04c7ffb94172b4a4e07250': Delete AlarmManagerTest#testSetTimeZone commit c87a0f0116780a644a2b8fb95fceeedd13434736 Merge: 494f0b2 0ff793e Author: Brian Muramatsu Date: Tue Feb 1 12:06:57 2011 -0800 Merge "Fix Broken ContextWrapperTest#testAccessTheme" into gingerbread commit 494f0b2f4d4bb260da04c7ffb94172b4a4e07250 Merge: 6ff0fca 2c3bd2c Author: Brian Muramatsu Date: Tue Feb 1 11:56:59 2011 -0800 Merge "Delete AlarmManagerTest#testSetTimeZone" into gingerbread commit c0228d4c8fe733ad6e9c3e2c148a1925d6b075b5 Merge: 50cada7 8efbbfc Author: Brett Chabot Date: Tue Feb 1 11:14:54 2011 -0800 am 8efbbfcf: Merge "Minor cts result schema fixes. `" into honeycomb * commit '8efbbfcffd5b440d476b9aa52496a83b8db70e41': Minor cts result schema fixes. ` commit 8efbbfcffd5b440d476b9aa52496a83b8db70e41 Merge: 7ff35aa 2543c35 Author: Brett Chabot Date: Tue Feb 1 11:03:52 2011 -0800 Merge "Minor cts result schema fixes. `" into honeycomb commit 2543c355c33b0744452e6a3c28bcf98501bfabec Author: Brett Chabot Date: Tue Feb 1 09:24:29 2011 -0800 Minor cts result schema fixes. ` Change-Id: I33fe70918c36f21b13ef101ac686f37e35091438 commit e7d807e9eb69ae8176abcd5316382c7b7ce6b196 Author: Leon Scroggins Date: Fri Jan 28 14:18:13 2011 -0500 Fix test. Change-Id: Iabfa2e4ca41638349541fbbc21c16f4ffb80325d commit 2c3bd2c8b7dd410e8e774d1a0d5516c66ea3aaa0 Author: Brian Muramatsu Date: Mon Jan 31 17:57:26 2011 -0800 Delete AlarmManagerTest#testSetTimeZone Bug 3188260 I don't think this can or will be fixed, so delete this test. Change-Id: Ibaa5d7a215b5ef7ec9430d41b80d8215e3ec03b6 commit 0ff793e42a9cf452d3bdef96682716959e95dc25 Author: Brian Muramatsu Date: Mon Jan 31 17:36:51 2011 -0800 Fix Broken ContextWrapperTest#testAccessTheme Bug 3188260 The annotation said "needs investigation", but the test works fine. There was a weird comment about setTheme only working for the first time which is true...and looks like a bug in ContextThemeWrapper. Change-Id: Ia228243d333dbced1568fd04dc39b8e441532c5a commit acf591572770c730de56e8005fa341c5252015e1 Author: Brian Muramatsu Date: Mon Jan 31 16:54:55 2011 -0800 Fix Broken MediaRecorderTest#testSetCamera Bug 3188260 The test needs to unlock the camera before passing it to the MediaRecorder. This is apparently normal as seen in VideoCamera.java in the Camera project. Change-Id: Iecc55a2e39929c3637ff5eed805a75fcf5568ca1 commit c9a13f11de7b1dd08bc05c84810eb17ce051c8f3 Author: Brian Muramatsu Date: Mon Jan 31 16:16:48 2011 -0800 Fix ProgressBarTest Bug 3188260 - Remove broken testAccessInterpolatorContext, because it was doing the same thing as the test above it. - Change references to com.android.internal to android... Change-Id: Id3698e7a17463f2c21c6f4afe7e87bbd00e4986a commit 54fca93ad49d043b1e7334075bb1c850e0821b72 Merge: 04ed416 50cada7 Author: Brian Muramatsu Date: Mon Jan 31 15:46:51 2011 -0800 am 50cada76: am 58540818: am cf022220: am 6ff0fca8: Merge "Fix Broken MessageQueueTests" into gingerbread * commit '50cada761c2620b1b3b491c7b55de2a3762131af': Fix Broken MessageQueueTests commit 04ed416d1500619f5d7968be45ad168e56c36db8 Merge: 8b137a8 3a22149 Author: Brian Muramatsu Date: Mon Jan 31 15:46:29 2011 -0800 am 3a221490: am 6e5cf9be: am d3fcdf0c: am c016f668: Merge "Fix Broken RemoteViewsTest" into gingerbread * commit '3a221490a48a53db39877c6febdddceea0c66cf6': Fix Broken RemoteViewsTest commit 50cada761c2620b1b3b491c7b55de2a3762131af Merge: 3a22149 5854081 Author: Brian Muramatsu Date: Mon Jan 31 15:28:30 2011 -0800 am 58540818: am cf022220: am 6ff0fca8: Merge "Fix Broken MessageQueueTests" into gingerbread * commit '5854081826740f4a64a2d1f310d6427465d2e10b': Fix Broken MessageQueueTests commit 5854081826740f4a64a2d1f310d6427465d2e10b Merge: 6e5cf9b cf02222 Author: Brian Muramatsu Date: Mon Jan 31 15:25:50 2011 -0800 am cf022220: am 6ff0fca8: Merge "Fix Broken MessageQueueTests" into gingerbread * commit 'cf022220746f434b70a155bed8f69920db14f982': Fix Broken MessageQueueTests commit cf022220746f434b70a155bed8f69920db14f982 Merge: d3fcdf0 6ff0fca Author: Brian Muramatsu Date: Mon Jan 31 15:22:46 2011 -0800 am 6ff0fca8: Merge "Fix Broken MessageQueueTests" into gingerbread * commit '6ff0fca83a52b4e1025308dc13ad420005d6975c': Fix Broken MessageQueueTests commit 6ff0fca83a52b4e1025308dc13ad420005d6975c Merge: c016f66 08997e0 Author: Brian Muramatsu Date: Mon Jan 31 15:13:42 2011 -0800 Merge "Fix Broken MessageQueueTests" into gingerbread commit 3a221490a48a53db39877c6febdddceea0c66cf6 Merge: 6c49e33 6e5cf9b Author: Brian Muramatsu Date: Mon Jan 31 15:13:28 2011 -0800 am 6e5cf9be: am d3fcdf0c: am c016f668: Merge "Fix Broken RemoteViewsTest" into gingerbread * commit '6e5cf9be2f32877e43a983319271df1845c3ac68': Fix Broken RemoteViewsTest commit 08997e064ecd7925ded0b65035104a4b09550f11 Author: Brian Muramatsu Date: Wed Dec 29 15:51:28 2010 -0800 Fix Broken MessageQueueTests Rewrite the addIdleHandler and removeIdleHandler tests to be more clear. Change-Id: I19547149d4cd85c535099ff5ca08703045ef73eb commit 6e5cf9be2f32877e43a983319271df1845c3ac68 Merge: ae832e7 d3fcdf0 Author: Brian Muramatsu Date: Mon Jan 31 15:11:01 2011 -0800 am d3fcdf0c: am c016f668: Merge "Fix Broken RemoteViewsTest" into gingerbread * commit 'd3fcdf0c1fc823a9a307347c51a32492c1219025': Fix Broken RemoteViewsTest commit d3fcdf0c1fc823a9a307347c51a32492c1219025 Merge: 261a4cb c016f66 Author: Brian Muramatsu Date: Mon Jan 31 15:07:21 2011 -0800 am c016f668: Merge "Fix Broken RemoteViewsTest" into gingerbread * commit 'c016f66855664dd62f4abdc2dd2af08a5dd27d76': Fix Broken RemoteViewsTest commit 8b137a84c10d2194ce40cc18b4be39f6f0b5bfe2 Merge: 3cd908c 6c49e33 Author: Brett Chabot Date: Mon Jan 31 15:00:53 2011 -0800 am 6c49e339: am 7ff35aa2: Merge "Add --class and --method options to cts tradefed." into honeycomb * commit '6c49e33906fd75e5844fc82e28c82b5d4942a6e8': Add --class and --method options to cts tradefed. commit c016f66855664dd62f4abdc2dd2af08a5dd27d76 Merge: 77b77e6 6aae7aa Author: Brian Muramatsu Date: Mon Jan 31 15:00:42 2011 -0800 Merge "Fix Broken RemoteViewsTest" into gingerbread commit 3cd908c48e992ebdfad10e8d70f95caf011539a8 Merge: 89ffc2d 76d0be0 Author: Jeff Brown Date: Mon Jan 31 15:00:39 2011 -0800 am 76d0be02: am 819d5119: Merge "Fix test to pass in a reasonable timestamp." into honeycomb * commit '76d0be02728c3ca87dbaad2b4f9da23e1da5539c': Fix test to pass in a reasonable timestamp. commit 89ffc2df1a201724b7610a6fedacf65011b7b3f1 Merge: 724cf3d f06781e Author: Brian Muramatsu Date: Mon Jan 31 15:00:36 2011 -0800 am f06781e4: am 54c92136: Merge "Delete Useless LayoutTests" into honeycomb * commit 'f06781e46ab8aa02ec2a750ad416e8d1b1573d62': Delete Useless LayoutTests commit 724cf3d7b229cf03cbcb0e8c9a677a416e8cd962 Merge: ea25b1e 34d4c80 Author: Brett Chabot Date: Mon Jan 31 15:00:33 2011 -0800 am 34d4c80b: am 24b6845d: Merge "launcher scipt for cts-tradefed" into honeycomb * commit '34d4c80b6558409016dd6b415516e18d0099f42d': launcher scipt for cts-tradefed commit ea25b1e6bf374914f04b3bf6fc3ea6fb2d0cbb9a Merge: 758a35e d4e5af5 Author: Brian Muramatsu Date: Mon Jan 31 15:00:30 2011 -0800 am d4e5af56: am 7cd393e2: Merge "Remove NPE Tests in SelectionTest" into honeycomb * commit 'd4e5af56a96be41fcf34f29dfc1ca709306c2271': Remove NPE Tests in SelectionTest commit 758a35e3b61e6c0f3c1b37668476c89acc6aac4c Merge: 4ca1293 1dda4f6 Author: Brian Muramatsu Date: Mon Jan 31 15:00:25 2011 -0800 am 1dda4f62: am 39f6ac9d: Merge "Fix TextUtilsTest" into honeycomb * commit '1dda4f6279224e0e617f46927fab3dc5b4eabdee': Fix TextUtilsTest commit 6aae7aa796f8cbba231b6754a405cec00be7acf9 Author: Brian Muramatsu Date: Wed Dec 29 13:02:36 2010 -0800 Fix Broken RemoteViewsTest The Bitmaps weren't being loaded using the same configuration and options, so these tests were failing. Change-Id: If74280f1e1f2d8f499b131c2db1d7f438e8701c7 commit 6c49e33906fd75e5844fc82e28c82b5d4942a6e8 Merge: 76d0be0 7ff35aa Author: Brett Chabot Date: Mon Jan 31 13:56:13 2011 -0800 am 7ff35aa2: Merge "Add --class and --method options to cts tradefed." into honeycomb * commit '7ff35aa2d00824fe19e418f393c8221635adb7f4': Add --class and --method options to cts tradefed. commit 76d0be02728c3ca87dbaad2b4f9da23e1da5539c Merge: f06781e 819d511 Author: Jeff Brown Date: Mon Jan 31 13:53:18 2011 -0800 am 819d5119: Merge "Fix test to pass in a reasonable timestamp." into honeycomb * commit '819d51196c6c653cfe76481a816ceb302d0e3554': Fix test to pass in a reasonable timestamp. commit f06781e46ab8aa02ec2a750ad416e8d1b1573d62 Merge: 34d4c80 54c9213 Author: Brian Muramatsu Date: Mon Jan 31 13:53:15 2011 -0800 am 54c92136: Merge "Delete Useless LayoutTests" into honeycomb * commit '54c921364b925e8e25570a8b40d40d22048afd6e': Delete Useless LayoutTests commit 34d4c80b6558409016dd6b415516e18d0099f42d Merge: d4e5af5 24b6845 Author: Brett Chabot Date: Mon Jan 31 13:53:13 2011 -0800 am 24b6845d: Merge "launcher scipt for cts-tradefed" into honeycomb * commit '24b6845d71a5b6e21d8940d42411354d691ca3fc': launcher scipt for cts-tradefed commit d4e5af56a96be41fcf34f29dfc1ca709306c2271 Merge: 1dda4f6 7cd393e Author: Brian Muramatsu Date: Mon Jan 31 13:53:10 2011 -0800 am 7cd393e2: Merge "Remove NPE Tests in SelectionTest" into honeycomb * commit '7cd393e2a59c7e392b15c40861c1852c90781101': Remove NPE Tests in SelectionTest commit 1dda4f6279224e0e617f46927fab3dc5b4eabdee Merge: 02b413c 39f6ac9 Author: Brian Muramatsu Date: Mon Jan 31 13:52:58 2011 -0800 am 39f6ac9d: Merge "Fix TextUtilsTest" into honeycomb * commit '39f6ac9de2ac79b93448af1fb127de6d90ec4e3c': Fix TextUtilsTest commit 7ff35aa2d00824fe19e418f393c8221635adb7f4 Merge: 819d511 ef5a604 Author: Brett Chabot Date: Mon Jan 31 13:47:34 2011 -0800 Merge "Add --class and --method options to cts tradefed." into honeycomb commit 819d51196c6c653cfe76481a816ceb302d0e3554 Merge: 54c9213 9d4fd95 Author: Jeff Brown Date: Mon Jan 31 13:44:26 2011 -0800 Merge "Fix test to pass in a reasonable timestamp." into honeycomb commit 9d4fd951a0e75542c636174e9c77bbb35cee302a Author: Jeff Brown Date: Mon Jan 31 13:13:57 2011 -0800 Fix test to pass in a reasonable timestamp. As of Honeycomb, the system checks the timestamp of events before delivering them so that it can drop stale events from the input queue. Some DialogTests were injecting motion events with a timestamp of 0 which is usually going to be more than 10 seconds in the past so they were dropped. Other CTS tests do the right thing and pass in reasonable timestamps. Bug: 3350093 Change-Id: I3335947e257d977488882b2ab1b4babfbb80e014 commit 54c921364b925e8e25570a8b40d40d22048afd6e Merge: 24b6845 ad74169 Author: Brian Muramatsu Date: Mon Jan 31 12:43:51 2011 -0800 Merge "Delete Useless LayoutTests" into honeycomb commit 24b6845d71a5b6e21d8940d42411354d691ca3fc Merge: 7cd393e a91ea00 Author: Brett Chabot Date: Mon Jan 31 12:36:49 2011 -0800 Merge "launcher scipt for cts-tradefed" into honeycomb commit ad74169a2048f5e0a1de5c17ead65743f71293b8 Author: Brian Muramatsu Date: Mon Jan 31 12:23:48 2011 -0800 Delete Useless LayoutTests Bug 3198659 Couple new tests were failing because getLineDirections in the test class was returning null. It turns out there is no way via the public API to construct a Directions object. Its been like this for a while, so there were a ton of other tests checking to see that NPE occurred. Destroy all the tests that do so... Change-Id: I31f6c162e42085fb1742c1573099d8f9908e2dc1 commit 7cd393e2a59c7e392b15c40861c1852c90781101 Merge: 39f6ac9 ce63b11 Author: Brian Muramatsu Date: Mon Jan 31 12:13:13 2011 -0800 Merge "Remove NPE Tests in SelectionTest" into honeycomb commit 39f6ac9de2ac79b93448af1fb127de6d90ec4e3c Merge: e603147 9ca31d9 Author: Brian Muramatsu Date: Mon Jan 31 12:03:41 2011 -0800 Merge "Fix TextUtilsTest" into honeycomb commit a91ea00122b117291e2d3719c0d528c5d6fac6ed Author: Brett Chabot Date: Sun Jan 30 13:48:20 2011 -0800 launcher scipt for cts-tradefed Bug 3403768 Change-Id: Ic11400a0d795410dcb56a52b0db4acedf6eeded0 commit 4ca1293c9fda86a1483e1173003579fb58c187f1 Merge: 935620d 02b413c Author: The Android Open Source Project Date: Sun Jan 30 12:53:44 2011 -0800 am 02b413c1: Reconcile gingerbread-plus-aosp and honeycomb * commit '02b413c1b665e4b18968ea47b8945a59f2a0694f': commit 02b413c1b665e4b18968ea47b8945a59f2a0694f Merge: dba8405 e603147 Author: The Android Open Source Project Date: Sun Jan 30 12:39:50 2011 -0800 Reconcile gingerbread-plus-aosp and honeycomb Change-Id: I398c5e8853c57a82e755264efcc3b2f927b83574 commit e603147db839a81aa3a11c1a1fa80bd054cf1833 Merge: 6cc9796 7e24d1e Author: The Android Open Source Project Date: Sun Jan 30 12:39:50 2011 -0800 Mass merge from gingerbread - do not merge Change-Id: I26ed427d9c83c2a569ccb493f3db12f150d050e3 commit 7e24d1e5402cb026a7d7ce7975c2c5995f65fc69 Merge: 91bd791 261a4cb Author: Brian Muramatsu Date: Sat Jan 29 11:25:35 2011 -0800 am 261a4cb9: am 77b77e65: Merge "Updated features test to check new features reported in Gingerbread to fix warning of device reporting a disallowed feature for front-facing camera, nfc, gyroscope, sip, etc)." into gingerbread * commit '261a4cb9adf4d0d6c293d88504791c6ff821d244': Updated features test to check new features reported in Gingerbread to fix warning of device reporting a disallowed feature for front-facing camera, nfc, gyroscope, sip, etc). commit 91bd791477ad7b03ca082c447b600cf4d395e61b Merge: 165b925 c3f2df3 Author: Brian Muramatsu Date: Sat Jan 29 09:55:06 2011 -0800 am c3f2df39: am 3e1f6714: Merge "Fix DX Tests Compilation Script" into gingerbread * commit 'c3f2df392c6d446852befd4060959baac54779b3': Fix DX Tests Compilation Script commit 165b9258448237045bbae00a8d0a993acaa4899e Merge: 46eabff 83fb57c Author: Brian Muramatsu Date: Sat Jan 29 09:40:58 2011 -0800 am 83fb57c5: am b2c05ebd: Merge "CTS test is not considering the case when the devcie get into SILENT mode by volume down key." into gingerbread * commit '83fb57c5126fe0613fd304f7c94e4970bb984b7e': CTS test is not considering the case when the devcie get into SILENT mode by volume down key. commit 935620db3f69675a2312727eaddd66134dac89d6 Merge: 65eb29d dba8405 Author: Brian Muramatsu Date: Sat Jan 29 09:18:54 2011 -0800 am dba84050: am ae832e7e: am 261a4cb9: am 77b77e65: Merge "Updated features test to check new features reported in Gingerbread to fix warning of device reporting a disallowed feature for front-facing camera, nfc, gyroscope, sip, etc)." into gingerbread * commit 'dba84050aa162ce8d1235a8c07a28929bae8671b': Updated features test to check new features reported in Gingerbread to fix warning of device reporting a disallowed feature for front-facing camera, nfc, gyroscope, sip, etc). commit dba84050aa162ce8d1235a8c07a28929bae8671b Merge: 40694c3 ae832e7 Author: Brian Muramatsu Date: Sat Jan 29 09:13:33 2011 -0800 am ae832e7e: am 261a4cb9: am 77b77e65: Merge "Updated features test to check new features reported in Gingerbread to fix warning of device reporting a disallowed feature for front-facing camera, nfc, gyroscope, sip, etc)." into gingerbread * commit 'ae832e7e3af79cf959716e645784dea9fe4245a5': Updated features test to check new features reported in Gingerbread to fix warning of device reporting a disallowed feature for front-facing camera, nfc, gyroscope, sip, etc). commit 46eabff4629a609ce3f60af5e0e0ea799675210f Merge: 6127f7e 751c2b3 Author: John Reck Date: Fri Jan 28 18:44:44 2011 -0800 am 751c2b3b: (-s ours) Merge "DO NOT MERGE - Moved IconDb creation to UI thread" into gingerbread * commit '751c2b3ba00e3475c8bc2eb42b456cf20e09321d': DO NOT MERGE - Moved IconDb creation to UI thread commit 6127f7efda234cc87e0c5e67d2c6e1d0d77c0b16 Merge: 2703dd1 fb50e86 Author: Brian Muramatsu Date: Fri Jan 28 18:44:39 2011 -0800 am fb50e86e: am fd6e2ba6: Merge "Allow 2.3.2" into gingerbread * commit 'fb50e86ebcd88f9d6fed24b8721211f62277e194': Allow 2.3.2 commit 2703dd13480fc8d686185eadff91f50ccde7e66b Merge: 601524c d8a282b Author: Dan Morrill Date: Fri Jan 28 18:44:26 2011 -0800 am d8a282bb: am 9e8ad24b: Merge "Big restructuring of this code to make it more readable and better modularized. Also switches to a simpler model: instead of a pong game, now the host Android device initializes the microcontroller with an initial state, and then calls * commit 'd8a282bbcd2c2c4e8154f4202b85f1674cd4a68e': Big restructuring of this code to make it more readable and better modularized. Also switches to a simpler model: instead of a pong game, now the host Android device initializes the microcontroller with an initial state, and then calls on the microcontroller for updates. The microcontroller is just used as a model/state engine for what the app will render. Barring bugs, this microcontroller-side code should now be done. commit 601524ca40676c9892c739c7d1b9ac7b09dd02c1 Merge: b6f5e9a d0c3d34 Author: Brian Muramatsu Date: Fri Jan 28 18:44:22 2011 -0800 am d0c3d341: am 66786bf8: Merge "Revert "fix keytests for azerty keyboard"" into gingerbread * commit 'd0c3d3414ba7b5ab7b745aa12ea91d6cc612276c': Revert "fix keytests for azerty keyboard" commit 9ca31d94624dcda7ec57b89e2f3a38d2ddd74b6a Author: Brian Muramatsu Date: Fri Jan 28 17:11:35 2011 -0800 Fix TextUtilsTest Remove some needless NPE checks. Also "fix" the tests to work with the new "improved behavior". The new code throws out the ellipses if there is not enough space. It also doesn't include the Unicode space character at the front in some situations too... Change-Id: I28ef8b8cad1f9eca8a736194ca29b7a387329903 commit b6f5e9a22e0407564d955b916a3f1209f9b208ae Merge: a97bd2e afeb220 Author: Brian Muramatsu Date: Fri Jan 28 16:50:57 2011 -0800 resolved conflicts for merge of afeb220b to honeycomb-merge Change-Id: Ib596c72c9eedf81f1d51bb424978ff8587152326 commit ae832e7e3af79cf959716e645784dea9fe4245a5 Merge: a430972 261a4cb Author: Brian Muramatsu Date: Fri Jan 28 14:39:35 2011 -0800 am 261a4cb9: am 77b77e65: Merge "Updated features test to check new features reported in Gingerbread to fix warning of device reporting a disallowed feature for front-facing camera, nfc, gyroscope, sip, etc)." into gingerbread * commit '261a4cb9adf4d0d6c293d88504791c6ff821d244': Updated features test to check new features reported in Gingerbread to fix warning of device reporting a disallowed feature for front-facing camera, nfc, gyroscope, sip, etc). commit 261a4cb9adf4d0d6c293d88504791c6ff821d244 Merge: c3f2df3 77b77e6 Author: Brian Muramatsu Date: Fri Jan 28 14:35:17 2011 -0800 am 77b77e65: Merge "Updated features test to check new features reported in Gingerbread to fix warning of device reporting a disallowed feature for front-facing camera, nfc, gyroscope, sip, etc)." into gingerbread * commit '77b77e65ce4be5b4c60053f901d5f245447c86bc': Updated features test to check new features reported in Gingerbread to fix warning of device reporting a disallowed feature for front-facing camera, nfc, gyroscope, sip, etc). commit 77b77e65ce4be5b4c60053f901d5f245447c86bc Merge: 3e1f671 f8451ed Author: Brian Muramatsu Date: Fri Jan 28 14:27:31 2011 -0800 Merge "Updated features test to check new features reported in Gingerbread to fix warning of device reporting a disallowed feature for front-facing camera, nfc, gyroscope, sip, etc)." into gingerbread commit f8451ed936bc3d31839f338411a3aa37460fe883 Author: Reena Lee Date: Thu Jan 27 17:34:17 2011 -0800 Updated features test to check new features reported in Gingerbread to fix warning of device reporting a disallowed feature for front-facing camera, nfc, gyroscope, sip, etc). Change-Id: Id10bf78dd0681c739e8f313d8e602665b1bf3dcf commit a97bd2ea8c98c89755b63dbcd19d8a252c70b94b Merge: 6e1f52c 305f48c Author: Brian Muramatsu Date: Thu Jan 27 20:33:35 2011 -0800 am 305f48c5: (-s ours) am 3e6372ca: Merge "Merge remote branch \'korg/froyo\' into manualmerge" into gingerbread * commit '305f48c5203581094b21605a1548aca39c4489e3': fix NoCallPermission tests for non-telephony devices Huawei fix for receive message tests failing on Mobile Internet Devices, Personal Media Players and other non-phone devices fix sms testcases for non-telephony devices Huawei fix for call function tests failing on Mobile Internet Devices, Personal Media Players and other non-phone devices DO NOT MERGE fix failing test testWifiInfoProperties for non-telephony devices fix test for non-telephony devices Use Vogar Expectations to Clean Up Remaining Tests fix keytests for azerty keyboard The layout height should be the value scaled by the density. Set ChromeClient to webview to gurantee the getprogress() value 100ms does not gurantee trigerring the audio. the test always passed with 200ms Remove Broken NoActivityRelatedPermissionTest fix WQVGA resolution commit 6e1f52c9b628db1a2e9956c7d4d1626ec5f84171 Merge: 1f512de e0da584 Author: Jean-Baptiste Queru Date: Thu Jan 27 18:38:53 2011 -0800 am e0da5843: (-s ours) Merge from open-source gingerbread - do not merge * commit 'e0da584372d6354e2c6089789b3745577c00608f': DO NOT MERGE - Nuke AbsListViewTest#testOnScroll.. commit 1f512def633a59d791d100fa12668e88d94aeb96 Merge: d9403d9 65f2e47 Author: Jean-Baptiste Queru Date: Thu Jan 27 18:38:50 2011 -0800 am 65f2e477: Merge from open-source gingerbread * commit '65f2e477fa7de61ba07ec82488e43c692bd6ecd1': Ignore Tests with Side Effects commit d9403d98f5938a73f0e0364b6c8d0a636fe3f1f2 Merge: 961029f 93cede4 Author: Jean-Baptiste Queru Date: Thu Jan 27 18:38:45 2011 -0800 am 93cede40: Merge from open-source gingerbread * commit '93cede4082545ac9b5ad16e3d0e3fb3140ce48d7': Fix OpenGlEsVersionTest commit 961029fa30a60f309714fca98e4cb426e51ce213 Merge: aca6f9e 882774b Author: Jean-Baptiste Queru Date: Thu Jan 27 18:38:41 2011 -0800 am 882774bf: Merge from open-source gingerbread * commit '882774bfbfe54c896a86ceda8b4b249ed4b4601c': Increment CTS Version to 2.3_r1 commit aca6f9ef4e53243d51a82a9f95c02ee43a9b1785 Merge: d551d0c dfc4ef7 Author: Jean-Baptiste Queru Date: Thu Jan 27 18:38:34 2011 -0800 am dfc4ef7e: Merge from open-source gingerbread * commit 'dfc4ef7e6f1e24037f5836202ade8513b235feac': commit ef5a60418773dfc6a51df24fbb5efd61e081b76c Author: Brett Chabot Date: Wed Jan 19 19:54:14 2011 -0800 Add --class and --method options to cts tradefed. These options will allow a single test class or method to be executed. Change-Id: I159877c98b7b3ba12ca6c4426a85b566eb10a1a3 commit d551d0caa1121a0ecc9bef0f90f78b44cd343d55 Merge: 7da4eaf f204056 Author: Nick Kralevich Date: Thu Jan 27 08:10:58 2011 -0800 am f2040561: Merge "Don\'t allow writable files in /sys" into gingerbread * commit 'f2040561fe3b5f0a1274d3793166fa407317e66c': Don't allow writable files in /sys commit 7da4eaf42b2be96c5d186c22fdb1e96ca3886fbc Merge: 23858c1 532ac36 Author: Jean-Baptiste Queru Date: Wed Jan 26 21:56:01 2011 -0800 am 532ac367: Merge from open-source gingerbread * commit '532ac367e67e2509857d4b55461521e11f563699': Fix Build - DO NOT MERGE commit 23858c171eb728d47fa56e5209f1015a6c3b8a01 Merge: dc7ae46 99b8750 Author: Brian Muramatsu Date: Wed Jan 26 21:55:30 2011 -0800 am 99b8750c: am 5766f495: Merge "Test requestRouteToHost() except TYPE_WIFI" into froyo * commit '99b8750ca3a9eb102a3335beeddee681085b1cca': Test requestRouteToHost() except TYPE_WIFI commit dc7ae464d1af7fd1759ac5b9a59545b7fb5ba709 Merge: cdc3299 071ac0e Author: Wei-Ta Chen Date: Wed Jan 26 21:14:14 2011 -0800 am 071ac0eb: (-s ours) Do not merge. * commit '071ac0eb92389a6a8b586135c7369e7a8c62eb9a': Do not merge. commit 65eb29d4a1eb8c0d09686624ade199e713433efb Merge: c19cbe6 40694c3 Author: Brian Muramatsu Date: Wed Jan 26 19:08:35 2011 -0800 am 40694c32: am a4309728: am c3f2df39: am 3e1f6714: Merge "Fix DX Tests Compilation Script" into gingerbread * commit '40694c327dde09a71d2675832394738a35639df3': Fix DX Tests Compilation Script commit ce63b118505920b7854b7413bb3cbba648a3b333 Author: Brian Muramatsu Date: Wed Jan 26 17:24:44 2011 -0800 Remove NPE Tests in SelectionTest Bug 3203128 Change-Id: I7c51400ed5d9a3b3d173579bd4d56efbc7b8a878 commit 40694c327dde09a71d2675832394738a35639df3 Merge: 7d3cc79 a430972 Author: Brian Muramatsu Date: Wed Jan 26 16:57:58 2011 -0800 am a4309728: am c3f2df39: am 3e1f6714: Merge "Fix DX Tests Compilation Script" into gingerbread * commit 'a43097288375323ca34e8f7437bc8ffee9a57afd': Fix DX Tests Compilation Script commit a43097288375323ca34e8f7437bc8ffee9a57afd Merge: c466bf6 c3f2df3 Author: Brian Muramatsu Date: Wed Jan 26 16:07:48 2011 -0800 am c3f2df39: am 3e1f6714: Merge "Fix DX Tests Compilation Script" into gingerbread * commit 'c3f2df392c6d446852befd4060959baac54779b3': Fix DX Tests Compilation Script commit c3f2df392c6d446852befd4060959baac54779b3 Merge: 83fb57c 3e1f671 Author: Brian Muramatsu Date: Wed Jan 26 16:03:57 2011 -0800 am 3e1f6714: Merge "Fix DX Tests Compilation Script" into gingerbread * commit '3e1f6714f76e3a69ab02ad2e0533ccc6e3247806': Fix DX Tests Compilation Script commit 3e1f6714f76e3a69ab02ad2e0533ccc6e3247806 Merge: b2c05eb 807a6ed Author: Brian Muramatsu Date: Wed Jan 26 15:42:21 2011 -0800 Merge "Fix DX Tests Compilation Script" into gingerbread commit 807a6ed967940cc07c879a76821aa8e491d8196e Author: Brian Muramatsu Date: Wed Jan 5 13:47:07 2011 -0800 Fix DX Tests Compilation Script Bug 3323353 Don't rely on environment variables like ANDROID_BUILD_TOP in the script. Instead pass in the out directory via the Makefile. Change-Id: I2b4533750137fe13c265da6d0f8752696352f403 commit f675fafebac64830f5a66600b0d1e309d761f0b7 Merge: 11ca1f6 8b37718 Author: Brian Muramatsu Date: Wed Jan 26 15:24:59 2011 -0800 Merge "Fix DX Tests Compilation Script" into froyo commit 8b377183149fe0a3a7193b58fadadcff7f8a94d6 Author: Brian Muramatsu Date: Wed Jan 5 13:47:07 2011 -0800 Fix DX Tests Compilation Script Bug 3323353 Don't rely on environment variables like ANDROID_BUILD_TOP in the script. Instead pass in the out directory via the Makefile. Change-Id: I38cef047853dbd7941a4196d79a79d4f9b9f0f2f commit c19cbe6234b7cbf5e2106b9aafb78c440c03061e Merge: ba5ccbf 7d3cc79 Author: Brian Muramatsu Date: Wed Jan 26 12:08:25 2011 -0800 am 7d3cc791: am 6cc97966: Fix (Arrow|Scrolling)MovementMethodTests * commit '7d3cc791b32d3a28ea26345dd133bd05358bd77d': Fix (Arrow|Scrolling)MovementMethodTests commit 7d3cc791b32d3a28ea26345dd133bd05358bd77d Merge: ce15ad6 6cc9796 Author: Brian Muramatsu Date: Wed Jan 26 11:57:27 2011 -0800 am 6cc97966: Fix (Arrow|Scrolling)MovementMethodTests * commit '6cc97966e394e443fb65910766d8b3bd30ea2257': Fix (Arrow|Scrolling)MovementMethodTests commit cdc32991d200d2a796f51e51316bf7a146943756 Merge: abe2cb5 fc004e2 Author: Brian Muramatsu Date: Wed Jan 26 11:01:31 2011 -0800 am fc004e2a: am c94170d4: Merge "Use getAssets().getLocales() to compare with en_US." into froyo * commit 'fc004e2a874adc902bc8dd0c16d3fe6242873178': Use getAssets().getLocales() to compare with en_US. commit abe2cb5d23e93a075bb9d3631e970a4d1536f1b9 Merge: 9f817ff e053d2d Author: Brian Muramatsu Date: Wed Jan 26 11:01:25 2011 -0800 am e053d2db: am a0805727: Merge "resize the layout" into froyo * commit 'e053d2dbc99e8470556eb9586d3a9cbb9e4b474b': resize the layout commit 9f817ffdbb17b5e78a23990b89df0ea4f93ecb66 Merge: 67906c5 6fb0a4a Author: Brian Muramatsu Date: Wed Jan 26 11:00:45 2011 -0800 am 6fb0a4a4: am 643804b6: Merge "Add a new test testApksAlwaysReadable()" into froyo * commit '6fb0a4a40e868bb94cdbb4d472d163413f0f3753': Add a new test testApksAlwaysReadable() commit 67906c5468c15832bb7758c3be9048764f2105d6 Merge: c082a45 cc028bc Author: Brian Muramatsu Date: Wed Jan 26 11:00:36 2011 -0800 am cc028bc0: am e0ee543b: Merge "CTS test is not considering the case when the devcie get into SILENT mode by volume down key. It needs to be raised twice to get back to NORMAL mode from the SILENT mode." into froyo * commit 'cc028bc0f481263cfc4559d389e935289a8e8b82': CTS test is not considering the case when the devcie get into SILENT mode by volume down key. It needs to be raised twice to get back to NORMAL mode from the SILENT mode. commit c082a45adcb4ff4f3488e0278223d46e87a356fd Merge: cfdbc85 9ab2683 Author: Brian Muramatsu Date: Wed Jan 26 11:00:28 2011 -0800 am 9ab26838: am 595eb0f1: Merge "Webview needs to set instance of ChromeClient to use getProgress value. assertLoadUrlSuccessfully is using view.getProgress() which returns no meaningful value without ChromeClient." into froyo * commit '9ab26838c3276e0c3b7553ea5efa1c1d691f88d7': Webview needs to set instance of ChromeClient to use getProgress value. assertLoadUrlSuccessfully is using view.getProgress() which returns no meaningful value without ChromeClient. commit cfdbc859619c49ec270ce9521981f709a97acb6b Merge: 69b7e21 43c2bbc Author: Brian Muramatsu Date: Wed Jan 26 10:48:46 2011 -0800 am 43c2bbca: am 7ca0842d: Merge "Remove Private API Tests for PhoneNumberUtils" into froyo * commit '43c2bbca04d2e92376a2cbe0a60f02b0aeae4c1f': Remove Private API Tests for PhoneNumberUtils commit 69b7e2132b8d4f2e739178d59311641b7146979c Merge: e8c469a 93456cf Author: Brian Muramatsu Date: Wed Jan 26 10:48:39 2011 -0800 am 93456cfe: am f7ee88af: Merge "Fix Broken LinkifyTest Tests" into froyo * commit '93456cfea5cc8c206f16e289bd83383d074d2643': Fix Broken LinkifyTest Tests commit e8c469a42b9878ad19846f5d51b087a850e71b46 Merge: 78821fa 72f9027 Author: Brian Muramatsu Date: Wed Jan 26 10:48:31 2011 -0800 am 72f9027d: am 480770f1: Merge "Fix InsetDrawableTest#testGetOpacity" into froyo * commit '72f9027d943628cb51d30e75f9fea265c7926dfa': Fix InsetDrawableTest#testGetOpacity commit 78821fa04cdd1089db8e0f98d0c1a1c8fb47dcec Merge: efa3c8b c0d0294 Author: Brian Muramatsu Date: Wed Jan 26 10:48:24 2011 -0800 am c0d02940: am 8326d122: Merge "Fix More TextViewTest Landscape Issues" into froyo * commit 'c0d029403aade6bb034f1f0c0cef3fb339fbd9d4': Fix More TextViewTest Landscape Issues commit efa3c8bde7946caf50b77abad4cfed30d54ebcb7 Merge: 29f230e a23fab5 Author: Brian Muramatsu Date: Wed Jan 26 10:48:13 2011 -0800 am a23fab59: am d17bbee3: Merge "Fix TelephonyManagerTest Iso Checks" into froyo * commit 'a23fab590c36aff171b472115677dfb23d803403': Fix TelephonyManagerTest Iso Checks commit 29f230e6857536079b4e233f5f1802d53d71cdeb Merge: 189a691 5a95ac0 Author: Brian Muramatsu Date: Wed Jan 26 09:14:46 2011 -0800 am 5a95ac00: am f2f68c3d: Merge "Remove Broken LayoutTest Tests" into froyo * commit '5a95ac00f9937db7e9b483ec6c3c9beb28c888dd': Remove Broken LayoutTest Tests commit 189a69162cceb6ffc03d1be4ae59cda1a48dac69 Merge: e44922b bc461ba Author: Jeff Hamilton Date: Wed Jan 26 10:50:44 2011 -0600 resolved conflicts for merge of bc461ba5 to honeycomb-merge Change-Id: I3bab127429e922daafc8c30fb11e3e6cda4c6bb5 commit e44922b4fc970aac4e2f8e02df4de07c439c35c5 Merge: 542482f 1cc918c Author: Jean-Baptiste Queru Date: Wed Jan 26 08:22:07 2011 -0800 Merge 1cc918c9 from gingerbread Change-Id: Ib0052ac9c6c8474206e9c470fb88f359c42eccd2 commit ba5ccbfdb7b9e0ec82c414191dff37e3d86df3bd Merge: 2d69e23 ce15ad6 Author: Brian Muramatsu Date: Tue Jan 25 16:21:40 2011 -0800 am ce15ad69: am c466bf6a: am 83fb57c5: am b2c05ebd: Merge "CTS test is not considering the case when the devcie get into SILENT mode by volume down key." into gingerbread * commit 'ce15ad69b260d7dbd8a264b1cb7311cbeafb7430': CTS test is not considering the case when the devcie get into SILENT mode by volume down key. commit ce15ad69b260d7dbd8a264b1cb7311cbeafb7430 Merge: 4b4d26a c466bf6 Author: Brian Muramatsu Date: Tue Jan 25 16:04:52 2011 -0800 am c466bf6a: am 83fb57c5: am b2c05ebd: Merge "CTS test is not considering the case when the devcie get into SILENT mode by volume down key." into gingerbread * commit 'c466bf6ab7c60b419c67887b5269113f716602d8': CTS test is not considering the case when the devcie get into SILENT mode by volume down key. commit 6cc97966e394e443fb65910766d8b3bd30ea2257 Author: Brian Muramatsu Date: Tue Jan 25 15:59:18 2011 -0800 Fix (Arrow|Scrolling)MovementMethodTests Bug 3308878 onKeyDown throws a NPE when the KeyEvent is null now and sometimes doesn't throw a NPE like it used to... Change-Id: Ida624a9a1984d5be1a8eb0bd3744b3e4c249bbc8 commit c466bf6ab7c60b419c67887b5269113f716602d8 Merge: 94e7cec 83fb57c Author: Brian Muramatsu Date: Tue Jan 25 14:49:10 2011 -0800 am 83fb57c5: am b2c05ebd: Merge "CTS test is not considering the case when the devcie get into SILENT mode by volume down key." into gingerbread * commit '83fb57c5126fe0613fd304f7c94e4970bb984b7e': CTS test is not considering the case when the devcie get into SILENT mode by volume down key. commit 83fb57c5126fe0613fd304f7c94e4970bb984b7e Merge: 751c2b3 b2c05eb Author: Brian Muramatsu Date: Tue Jan 25 14:46:16 2011 -0800 am b2c05ebd: Merge "CTS test is not considering the case when the devcie get into SILENT mode by volume down key." into gingerbread * commit 'b2c05ebd53c5ee70ad065b736f97b06810380f32': CTS test is not considering the case when the devcie get into SILENT mode by volume down key. commit b2c05ebd53c5ee70ad065b736f97b06810380f32 Merge: fd6e2ba c98a671 Author: Brian Muramatsu Date: Tue Jan 25 14:32:30 2011 -0800 Merge "CTS test is not considering the case when the devcie get into SILENT mode by volume down key." into gingerbread commit c98a671f2336e0018ea48035cc0747c0cb10a035 Author: m-miyahara Date: Mon Jan 24 21:30:27 2011 +0900 CTS test is not considering the case when the devcie get into SILENT mode by volume down key. When volume gets down to SILENT mode, added the condition to go to VIBRATE mode or SILENT mode instead of SILENT mode only. Change-Id: I4ad6302d3d3eba3109e3d0de3060685c9a7013c8 commit 11ca1f658cc4b0b691615744fd72c28618476de6 Merge: db0c98c 1a9a8a1 Author: Brian Muramatsu Date: Tue Jan 25 13:56:00 2011 -0800 Merge "Changing the delay time from 250ms to 3000ms, because avoiding a race condition in testOnReceivedIcon." into froyo commit 1a9a8a178d0c3c45f969f3abbd75e0728a70e458 Author: m-miyahara Date: Mon Jan 24 21:59:11 2011 +0900 Changing the delay time from 250ms to 3000ms, because avoiding a race condition in testOnReceivedIcon. Change-Id: I3bd5595cdb5c2f96794383382ebfe4231f878243 commit db0c98c4b7aabb1c68bc9758d437ee1ddbb1182e Merge: fee4a1a 800c9ca Author: Brian Muramatsu Date: Tue Jan 25 13:49:42 2011 -0800 Merge "CTS test is not considering the case when the devcie get into SILENT mode by volume down key." into froyo commit 800c9ca719f69e04e59403ba3dc5138cdb880d44 Author: m-miyahara Date: Mon Jan 24 21:30:27 2011 +0900 CTS test is not considering the case when the devcie get into SILENT mode by volume down key. When volume gets down to SILENT mode, added the condition to go to VIBRATE mode or SILENT mode instead of SILENT mode only. Change-Id: I50e4d45035975c418d244e15d892d37435119d72 commit 2d69e23c2d85b0e5e6ab67c20877a4f2e405264b Merge: 92c1a83 4b4d26a Author: Wu-cheng Li Date: Mon Jan 24 19:02:32 2011 -0800 am 4b4d26ad: am e0973f3b: Merge "Add camera CTS to verify GPS exif data." into honeycomb * commit '4b4d26adf66cb52e0c516d943730acd059047ab4': Add camera CTS to verify GPS exif data. commit 4b4d26adf66cb52e0c516d943730acd059047ab4 Merge: 2818ed0 e0973f3 Author: Wu-cheng Li Date: Mon Jan 24 18:58:29 2011 -0800 am e0973f3b: Merge "Add camera CTS to verify GPS exif data." into honeycomb * commit 'e0973f3b254051cd7eaa3db843e1969c39019c48': Add camera CTS to verify GPS exif data. commit e0973f3b254051cd7eaa3db843e1969c39019c48 Merge: 542482f 95b4923 Author: Wu-cheng Li Date: Mon Jan 24 18:49:06 2011 -0800 Merge "Add camera CTS to verify GPS exif data." into honeycomb commit 92c1a83bcb3abd3428ea15fdd4d41363a723994b Merge: b86d0dc 2818ed0 Author: John Reck Date: Mon Jan 24 14:37:34 2011 -0800 am 2818ed09: (-s ours) am 94e7cec1: (-s ours) am 751c2b3b: Merge "DO NOT MERGE - Moved IconDb creation to UI thread" into gingerbread * commit '2818ed09d6ff974bfabdb69ae901ff19408c4b1f': DO NOT MERGE - Moved IconDb creation to UI thread commit b86d0dccfd074fd3d4a3eb75fdc4f6e58ed0f653 Merge: fe52e93 3aa788a Author: Brian Muramatsu Date: Mon Jan 24 14:37:31 2011 -0800 am 3aa788af: am 3cf24960: am fb50e86e: am fd6e2ba6: Merge "Allow 2.3.2" into gingerbread * commit '3aa788afd10726f4af88893bd0f708fcc9d8c7a6': Allow 2.3.2 commit 2818ed09d6ff974bfabdb69ae901ff19408c4b1f Merge: 3aa788a 94e7cec Author: John Reck Date: Mon Jan 24 14:34:23 2011 -0800 am 94e7cec1: (-s ours) am 751c2b3b: Merge "DO NOT MERGE - Moved IconDb creation to UI thread" into gingerbread * commit '94e7cec1452353bcf626886b338d9d05d2d767d1': DO NOT MERGE - Moved IconDb creation to UI thread commit 3aa788afd10726f4af88893bd0f708fcc9d8c7a6 Merge: ac5c6c6 3cf2496 Author: Brian Muramatsu Date: Mon Jan 24 14:34:20 2011 -0800 am 3cf24960: am fb50e86e: am fd6e2ba6: Merge "Allow 2.3.2" into gingerbread * commit '3cf249601c0a09bf516acbe3a0dc6fdcab1f16a7': Allow 2.3.2 commit fe52e93a4faaa3d6b0de8b4742a331c7abdb9981 Merge: 83c5cf6 ac5c6c6 Author: Dan Morrill Date: Mon Jan 24 14:22:09 2011 -0800 am ac5c6c66: am eecec6b4: am d8a282bb: am 9e8ad24b: Merge "Big restructuring of this code to make it more readable and better modularized. Also switches to a simpler model: instead of a pong game, now the host Android device initializes the microcontroller with an ini * commit 'ac5c6c66ee08b2483218eb905f625183ec2a03c4': Big restructuring of this code to make it more readable and better modularized. Also switches to a simpler model: instead of a pong game, now the host Android device initializes the microcontroller with an initial state, and then calls on the microcontroller for updates. The microcontroller is just used as a model/state engine for what the app will render. Barring bugs, this microcontroller-side code should now be done. commit 83c5cf64a6cae1c17ab7e55b6026f69a6080a6f3 Merge: 4184667 182c14a Author: Brian Muramatsu Date: Mon Jan 24 14:22:05 2011 -0800 am 182c14a0: am d565070c: am d0c3d341: am 66786bf8: Merge "Revert "fix keytests for azerty keyboard"" into gingerbread * commit '182c14a07d6ec6d785960606eb5c68b2d53eb31c': Revert "fix keytests for azerty keyboard" commit ac5c6c66ee08b2483218eb905f625183ec2a03c4 Merge: 182c14a eecec6b Author: Dan Morrill Date: Mon Jan 24 14:19:15 2011 -0800 am eecec6b4: am d8a282bb: am 9e8ad24b: Merge "Big restructuring of this code to make it more readable and better modularized. Also switches to a simpler model: instead of a pong game, now the host Android device initializes the microcontroller with an initial state, a * commit 'eecec6b46d0f7f55662b0d0e6ff3b126799f2508': Big restructuring of this code to make it more readable and better modularized. Also switches to a simpler model: instead of a pong game, now the host Android device initializes the microcontroller with an initial state, and then calls on the microcontroller for updates. The microcontroller is just used as a model/state engine for what the app will render. Barring bugs, this microcontroller-side code should now be done. commit 182c14a07d6ec6d785960606eb5c68b2d53eb31c Merge: bb90d98 d565070 Author: Brian Muramatsu Date: Mon Jan 24 14:19:06 2011 -0800 am d565070c: am d0c3d341: am 66786bf8: Merge "Revert "fix keytests for azerty keyboard"" into gingerbread * commit 'd565070c9f6221f7debe990f564e4f404d2f1523': Revert "fix keytests for azerty keyboard" commit 4184667951d3323ef69381a0d365e11f9f77461b Merge: 9bfc2f2 bb90d98 Author: Brian Muramatsu Date: Mon Jan 24 13:58:30 2011 -0800 am bb90d98f: resolved conflicts for merge of a6082421 to honeycomb-plus-aosp * commit 'bb90d98f2b71aeb2089d1ddf0da8110214a58ef7': Fix Bad Merge commit bb90d98f2b71aeb2089d1ddf0da8110214a58ef7 Merge: e07d475 a608242 Author: Brian Muramatsu Date: Mon Jan 24 13:46:14 2011 -0800 resolved conflicts for merge of a6082421 to honeycomb-plus-aosp Change-Id: Ib5ea898248fc33de98a739abd929abad3c7d0fc1 commit 9bfc2f22c184ac99cb038faafd8ee10745a0cc2f Merge: c014066 e07d475 Author: Kristian Monsen Date: Mon Jan 24 13:30:12 2011 -0800 am e07d4750: am 542482f9: Fix regexp, do not use whitespace in the model name * commit 'e07d47504adb315053cdfde283f64d24f09c56c8': Fix regexp, do not use whitespace in the model name commit e07d47504adb315053cdfde283f64d24f09c56c8 Merge: f50eba9 542482f Author: Kristian Monsen Date: Mon Jan 24 11:15:47 2011 -0800 am 542482f9: Fix regexp, do not use whitespace in the model name * commit '542482f997a85bb26e770577fba445338225b043': Fix regexp, do not use whitespace in the model name commit 542482f997a85bb26e770577fba445338225b043 Author: Kristian Monsen Date: Mon Jan 24 15:37:24 2011 +0000 Fix regexp, do not use whitespace in the model name Fixes CTS test Fix for bug 3382833 Change-Id: I0f7be34753ca01a87f715f25c762967c6a2bb78b commit 95b4923ed7f8d373a14bb769cf6b6e151e1e94aa Author: Wu-cheng Li Date: Mon Jan 24 17:26:55 2011 +0800 Add camera CTS to verify GPS exif data. bug:3381761 Change-Id: Ia4bc03ba87a530093d6f4de003b7e7539a6c5523 commit c01406637169d3bb3cd807968643fc9ee34efe07 Merge: bf7a517 f50eba9 Author: Brian Muramatsu Date: Sun Jan 23 08:08:55 2011 -0800 am f50eba9a: (-s ours) am 6e54ccec: (-s ours) am 305f48c5: am 3e6372ca: Merge "Merge remote branch \'korg/froyo\' into manualmerge" into gingerbread * commit 'f50eba9a8e65a8c116a14df861db1799046a6f52': fix NoCallPermission tests for non-telephony devices Huawei fix for receive message tests failing on Mobile Internet Devices, Personal Media Players and other non-phone devices fix sms testcases for non-telephony devices Huawei fix for call function tests failing on Mobile Internet Devices, Personal Media Players and other non-phone devices DO NOT MERGE fix failing test testWifiInfoProperties for non-telephony devices fix test for non-telephony devices Use Vogar Expectations to Clean Up Remaining Tests fix keytests for azerty keyboard The layout height should be the value scaled by the density. Set ChromeClient to webview to gurantee the getprogress() value 100ms does not gurantee trigerring the audio. the test always passed with 200ms Remove Broken NoActivityRelatedPermissionTest fix WQVGA resolution commit f50eba9a8e65a8c116a14df861db1799046a6f52 Merge: c35f091 6e54cce Author: Brian Muramatsu Date: Sun Jan 23 08:01:43 2011 -0800 am 6e54ccec: (-s ours) am 305f48c5: am 3e6372ca: Merge "Merge remote branch \'korg/froyo\' into manualmerge" into gingerbread * commit '6e54ccec6fadeebac0c5de5f583e58a95441e8a9': fix NoCallPermission tests for non-telephony devices Huawei fix for receive message tests failing on Mobile Internet Devices, Personal Media Players and other non-phone devices fix sms testcases for non-telephony devices Huawei fix for call function tests failing on Mobile Internet Devices, Personal Media Players and other non-phone devices DO NOT MERGE fix failing test testWifiInfoProperties for non-telephony devices fix test for non-telephony devices Use Vogar Expectations to Clean Up Remaining Tests fix keytests for azerty keyboard The layout height should be the value scaled by the density. Set ChromeClient to webview to gurantee the getprogress() value 100ms does not gurantee trigerring the audio. the test always passed with 200ms Remove Broken NoActivityRelatedPermissionTest fix WQVGA resolution commit bf7a517076c51b3b0c17ae5aed232cecfeea9898 Merge: 4ec40b6 c35f091 Author: Jean-Baptiste Queru Date: Fri Jan 21 16:08:31 2011 -0800 am c35f0918: (-s ours) am a3342afd: (-s ours) am e0da5843: Merge from open-source gingerbread - do not merge * commit 'c35f091823f90b8109f8eb433bf5977c7c20da5d': DO NOT MERGE - Nuke AbsListViewTest#testOnScroll.. commit 4ec40b6200344b2b9d1e3019f27da1f2fd4b8d15 Merge: fb135b7 c7bcfe7 Author: Jean-Baptiste Queru Date: Fri Jan 21 16:08:29 2011 -0800 am c7bcfe7c: am 8233c621: am 65f2e477: Merge from open-source gingerbread * commit 'c7bcfe7ccf15cf2fea127aa2e853377947b78155': Ignore Tests with Side Effects commit fb135b769956de7de9671276af7d6c15690825f8 Merge: 0077d55 5259313 Author: Jean-Baptiste Queru Date: Fri Jan 21 16:08:26 2011 -0800 am 52593131: am 9b468be3: am 93cede40: Merge from open-source gingerbread * commit '52593131da48fffb57a6f38dddb978d19e3bfb20': Fix OpenGlEsVersionTest commit 0077d55144f6220da303969628ac963015533835 Merge: c9ef1c8 ab1fd0b Author: Jean-Baptiste Queru Date: Fri Jan 21 16:08:24 2011 -0800 am ab1fd0b7: am ec6daf10: am 882774bf: Merge from open-source gingerbread * commit 'ab1fd0b7250da20ba99284f061c1986537b7e5ba': Increment CTS Version to 2.3_r1 commit c9ef1c8a2bfd9830f6a0d7e39193f76b020f3568 Merge: 5e5a5b2 d668d4f Author: Jean-Baptiste Queru Date: Fri Jan 21 16:08:21 2011 -0800 am d668d4f3: am c1409555: am dfc4ef7e: Merge from open-source gingerbread * commit 'd668d4f35fa6a1727ea211b046742e6938552271': commit c35f091823f90b8109f8eb433bf5977c7c20da5d Merge: c7bcfe7 a3342af Author: Jean-Baptiste Queru Date: Fri Jan 21 16:05:24 2011 -0800 am a3342afd: (-s ours) am e0da5843: Merge from open-source gingerbread - do not merge * commit 'a3342afdd10a159ccf1a8dbb68e99b30c1bf9e23': DO NOT MERGE - Nuke AbsListViewTest#testOnScroll.. commit c7bcfe7ccf15cf2fea127aa2e853377947b78155 Merge: 5259313 8233c62 Author: Jean-Baptiste Queru Date: Fri Jan 21 16:05:21 2011 -0800 am 8233c621: am 65f2e477: Merge from open-source gingerbread * commit '8233c6218a1e711391a9e4baddf0734447d547b1': Ignore Tests with Side Effects commit 52593131da48fffb57a6f38dddb978d19e3bfb20 Merge: ab1fd0b 9b468be Author: Jean-Baptiste Queru Date: Fri Jan 21 16:05:16 2011 -0800 am 9b468be3: am 93cede40: Merge from open-source gingerbread * commit '9b468be31ae9f418da5b8dd31013f7a31243eb2c': Fix OpenGlEsVersionTest commit ab1fd0b7250da20ba99284f061c1986537b7e5ba Merge: d668d4f ec6daf1 Author: Jean-Baptiste Queru Date: Fri Jan 21 16:05:10 2011 -0800 am ec6daf10: am 882774bf: Merge from open-source gingerbread * commit 'ec6daf10b2456d5d761b83d81bc3e1b162b1ddf4': Increment CTS Version to 2.3_r1 commit d668d4f35fa6a1727ea211b046742e6938552271 Merge: 066f049 c140955 Author: Jean-Baptiste Queru Date: Fri Jan 21 16:05:02 2011 -0800 am c1409555: am dfc4ef7e: Merge from open-source gingerbread * commit 'c14095557d4db9550d080c8e149513b6cddf2bfe': commit 94e7cec1452353bcf626886b338d9d05d2d767d1 Merge: 3cf2496 751c2b3 Author: John Reck Date: Fri Jan 21 14:06:04 2011 -0800 am 751c2b3b: Merge "DO NOT MERGE - Moved IconDb creation to UI thread" into gingerbread * commit '751c2b3ba00e3475c8bc2eb42b456cf20e09321d': DO NOT MERGE - Moved IconDb creation to UI thread commit 751c2b3ba00e3475c8bc2eb42b456cf20e09321d Merge: fb50e86 f3f7f79 Author: John Reck Date: Fri Jan 21 14:03:25 2011 -0800 Merge "DO NOT MERGE - Moved IconDb creation to UI thread" into gingerbread commit 3cf249601c0a09bf516acbe3a0dc6fdcab1f16a7 Merge: eecec6b fb50e86 Author: Brian Muramatsu Date: Fri Jan 21 13:43:55 2011 -0800 am fb50e86e: am fd6e2ba6: Merge "Allow 2.3.2" into gingerbread * commit 'fb50e86ebcd88f9d6fed24b8721211f62277e194': Allow 2.3.2 commit fb50e86ebcd88f9d6fed24b8721211f62277e194 Merge: d8a282b fd6e2ba Author: Brian Muramatsu Date: Fri Jan 21 13:42:42 2011 -0800 am fd6e2ba6: Merge "Allow 2.3.2" into gingerbread * commit 'fd6e2ba607206a0535640fbe2eb0c6e3b7c3cbf9': Allow 2.3.2 commit fd6e2ba607206a0535640fbe2eb0c6e3b7c3cbf9 Merge: 9e8ad24 d761ffd Author: Brian Muramatsu Date: Fri Jan 21 13:40:37 2011 -0800 Merge "Allow 2.3.2" into gingerbread commit d761ffd1202a46854dfb5d93d8b2b54036b5dbd6 Author: Brian Muramatsu Date: Fri Jan 21 13:36:36 2011 -0800 Allow 2.3.2 Change-Id: Ia69fc5ed32c6563a27559b35b76f2195a1afa1e4 commit eecec6b46d0f7f55662b0d0e6ff3b126799f2508 Merge: d565070 d8a282b Author: Dan Morrill Date: Fri Jan 21 12:34:15 2011 -0800 am d8a282bb: am 9e8ad24b: Merge "Big restructuring of this code to make it more readable and better modularized. Also switches to a simpler model: instead of a pong game, now the host Android device initializes the microcontroller with an initial state, and then calls * commit 'd8a282bbcd2c2c4e8154f4202b85f1674cd4a68e': Big restructuring of this code to make it more readable and better modularized. Also switches to a simpler model: instead of a pong game, now the host Android device initializes the microcontroller with an initial state, and then calls on the microcontroller for updates. The microcontroller is just used as a model/state engine for what the app will render. Barring bugs, this microcontroller-side code should now be done. commit d565070c9f6221f7debe990f564e4f404d2f1523 Merge: a608242 d0c3d34 Author: Brian Muramatsu Date: Fri Jan 21 12:34:11 2011 -0800 am d0c3d341: am 66786bf8: Merge "Revert "fix keytests for azerty keyboard"" into gingerbread * commit 'd0c3d3414ba7b5ab7b745aa12ea91d6cc612276c': Revert "fix keytests for azerty keyboard" commit d8a282bbcd2c2c4e8154f4202b85f1674cd4a68e Merge: d0c3d34 9e8ad24 Author: Dan Morrill Date: Fri Jan 21 12:16:20 2011 -0800 am 9e8ad24b: Merge "Big restructuring of this code to make it more readable and better modularized. Also switches to a simpler model: instead of a pong game, now the host Android device initializes the microcontroller with an initial state, and then calls on the micro * commit '9e8ad24b83d71fb4a22ee0e8906aa3938c0c0d9e': Big restructuring of this code to make it more readable and better modularized. Also switches to a simpler model: instead of a pong game, now the host Android device initializes the microcontroller with an initial state, and then calls on the microcontroller for updates. The microcontroller is just used as a model/state engine for what the app will render. Barring bugs, this microcontroller-side code should now be done. commit d0c3d3414ba7b5ab7b745aa12ea91d6cc612276c Merge: afeb220 66786bf Author: Brian Muramatsu Date: Fri Jan 21 12:16:18 2011 -0800 am 66786bf8: Merge "Revert "fix keytests for azerty keyboard"" into gingerbread * commit '66786bf8511f4bf87df176ed9ea2c997d04fd876': Revert "fix keytests for azerty keyboard" commit 9e8ad24b83d71fb4a22ee0e8906aa3938c0c0d9e Merge: 66786bf 6bfbb18 Author: Dan Morrill Date: Fri Jan 21 11:50:39 2011 -0800 Merge "Big restructuring of this code to make it more readable and better modularized. Also switches to a simpler model: instead of a pong game, now the host Android device initializes the microcontroller with an initial state, and then calls on the microcontroller for updates. The microcontroller is just used as a model/state engine for what the app will render. Barring bugs, this microcontroller-side code should now be done." into gingerbread commit 66786bf8511f4bf87df176ed9ea2c997d04fd876 Merge: fe90f82 b540563 Author: Brian Muramatsu Date: Fri Jan 21 11:43:13 2011 -0800 Merge "Revert "fix keytests for azerty keyboard"" into gingerbread commit f3f7f795988600df2e6a0d498c7ce11db73f714a Author: John Reck Date: Tue Jan 18 15:42:06 2011 -0800 DO NOT MERGE - Moved IconDb creation to UI thread Bug: 3241808 Change-Id: I2631c083d954742c12cea04cb68a442ae7fcd855 commit b540563eba88dee712c296c53cd8088bcc0368e7 Author: Brian Muramatsu Date: Fri Jan 21 11:24:35 2011 -0800 Revert "fix keytests for azerty keyboard" This reverts commit 444e0e6a6a04b492e828fe6d6bd976c2fd2fa64c. The test didn't work on Nexus S after azerty fix. Probably something like KeyCharactreMap#getEvents will need to be used instead. Change-Id: I8353846492265d76b5c4fdc19806a919b326b01f commit a6082421bf0e116486a3d82f4a50cd73ebaba75d Merge: 6e54cce afeb220 Author: Brian Muramatsu Date: Fri Jan 21 11:35:01 2011 -0800 am afeb220b: am fe90f822: Merge "Fix Bad Merge" into gingerbread * commit 'afeb220bee8768288034fdf0bbf11eb77d0bb8e5': Fix Bad Merge commit fee4a1a4a72d0c593e314b3ce216a13c03a460a5 Merge: 73bdc80 aa024d5 Author: Brian Muramatsu Date: Fri Jan 21 11:33:55 2011 -0800 Merge "Revert "fix keytests for azerty keyboard"" into froyo commit aa024d5ac6803e2c4b65f008ca921b4bf9e98383 Author: Brian Muramatsu Date: Fri Jan 21 11:24:35 2011 -0800 Revert "fix keytests for azerty keyboard" This reverts commit 444e0e6a6a04b492e828fe6d6bd976c2fd2fa64c. The test didn't work on Nexus S after azerty fix. Probably something like KeyCharactreMap#getEvents will need to be used instead. Change-Id: I3cc952ebdca7b55c3060cd53446383f47f9c1a1a commit afeb220bee8768288034fdf0bbf11eb77d0bb8e5 Merge: 305f48c fe90f82 Author: Brian Muramatsu Date: Fri Jan 21 11:29:25 2011 -0800 am fe90f822: Merge "Fix Bad Merge" into gingerbread * commit 'fe90f8229ebae4b8afec81190018440120a97c37': Fix Bad Merge commit fe90f8229ebae4b8afec81190018440120a97c37 Merge: 3e6372c 2616419 Author: Brian Muramatsu Date: Fri Jan 21 11:14:53 2011 -0800 Merge "Fix Bad Merge" into gingerbread commit 2616419c0ddfd92b6ae9751ca4beef127bd16e7f Author: Brian Muramatsu Date: Fri Jan 21 11:09:15 2011 -0800 Fix Bad Merge My merging of Froyo changes reintroduced a test in NoActivityRelatedPermissionTest that had already been removed. Change-Id: I103e615be7b32196a6eab0ad07016002fa25207c commit 6bfbb180d86252bfae06d2e2022024e02e94c594 Author: Dan Morrill Date: Fri Jan 21 10:04:37 2011 -0800 Big restructuring of this code to make it more readable and better modularized. Also switches to a simpler model: instead of a pong game, now the host Android device initializes the microcontroller with an initial state, and then calls on the microcontroller for updates. The microcontroller is just used as a model/state engine for what the app will render. Barring bugs, this microcontroller-side code should now be done. Change-Id: I064963c7485d698a0764270224c99ab7f99d5677 commit 6e54ccec6fadeebac0c5de5f583e58a95441e8a9 Merge: a3342af 305f48c Author: Brian Muramatsu Date: Thu Jan 20 18:19:02 2011 -0800 am 305f48c5: am 3e6372ca: Merge "Merge remote branch \'korg/froyo\' into manualmerge" into gingerbread * commit '305f48c5203581094b21605a1548aca39c4489e3': fix NoCallPermission tests for non-telephony devices Huawei fix for receive message tests failing on Mobile Internet Devices, Personal Media Players and other non-phone devices fix sms testcases for non-telephony devices Huawei fix for call function tests failing on Mobile Internet Devices, Personal Media Players and other non-phone devices DO NOT MERGE fix failing test testWifiInfoProperties for non-telephony devices fix test for non-telephony devices Use Vogar Expectations to Clean Up Remaining Tests fix keytests for azerty keyboard The layout height should be the value scaled by the density. Set ChromeClient to webview to gurantee the getprogress() value 100ms does not gurantee trigerring the audio. the test always passed with 200ms Remove Broken NoActivityRelatedPermissionTest fix WQVGA resolution commit 5e5a5b2fb7e9471699b2608c1060d6094ae0ea77 Merge: 5f2e23b 066f049 Author: Kristian Monsen Date: Thu Jan 20 17:24:36 2011 -0800 am 066f0497: am eba2120f: Fix for CTS test * commit '066f0497da67435f85bd334c1bc5aa705ccea55f': Fix for CTS test commit 066f0497da67435f85bd334c1bc5aa705ccea55f Merge: fa3b45b eba2120 Author: Kristian Monsen Date: Thu Jan 20 17:01:44 2011 -0800 am eba2120f: Fix for CTS test * commit 'eba2120fa786c80a8564505b508c98a733a7581f': Fix for CTS test commit 305f48c5203581094b21605a1548aca39c4489e3 Merge: e0da584 3e6372c Author: Brian Muramatsu Date: Thu Jan 20 15:28:35 2011 -0800 am 3e6372ca: Merge "Merge remote branch \'korg/froyo\' into manualmerge" into gingerbread * commit '3e6372cabe2c3a5a7a7339bad98f7b9b8783bc04': fix NoCallPermission tests for non-telephony devices Huawei fix for receive message tests failing on Mobile Internet Devices, Personal Media Players and other non-phone devices fix sms testcases for non-telephony devices Huawei fix for call function tests failing on Mobile Internet Devices, Personal Media Players and other non-phone devices DO NOT MERGE fix failing test testWifiInfoProperties for non-telephony devices fix test for non-telephony devices Use Vogar Expectations to Clean Up Remaining Tests fix keytests for azerty keyboard The layout height should be the value scaled by the density. Set ChromeClient to webview to gurantee the getprogress() value 100ms does not gurantee trigerring the audio. the test always passed with 200ms Remove Broken NoActivityRelatedPermissionTest fix WQVGA resolution commit 3e6372cabe2c3a5a7a7339bad98f7b9b8783bc04 Merge: 0908d9f 474ca2e Author: Brian Muramatsu Date: Thu Jan 20 15:19:16 2011 -0800 Merge "Merge remote branch 'korg/froyo' into manualmerge" into gingerbread commit 474ca2e23952463f7ce8eb6fea56ae51151d3a47 Merge: 0908d9f 73bdc80 Author: Brian Muramatsu Date: Thu Jan 20 14:58:27 2011 -0800 Merge remote branch 'korg/froyo' into manualmerge Conflicts: tests/tests/permission/src/android/permission/cts/NoActivityRelatedPermissionTest.java tests/tests/telephony/src/android/telephony/cts/SmsManagerTest.java Change-Id: Ie74c678a6ae142d9861b6965a8ca89ff58ebfa83 commit 73bdc805341ee42879a2fcfce257b85d729340a4 Merge: 2d90097 3f7db68 Author: Brian Muramatsu Date: Thu Jan 20 14:46:05 2011 -0800 Merge "fix NoCallPermission tests for non-telephony devices" into froyo commit 3f7db68f330ace4adeceb004a70b344ca5a81b0d Author: Madan Ankapura Date: Tue Jan 18 18:17:29 2011 -0800 fix NoCallPermission tests for non-telephony devices non-telephony devices are not expected to honour tel:url requests, and hence the tests for such URL are by default passed in device which launch telephony feature. Change-Id: I2531adfc15065971fa240a49311f19fd2972b856 commit 2d9009759b5e52b980489f4b943bce416ba2abc1 Merge: 5e48510 94322c7 Author: Brian Muramatsu Date: Thu Jan 20 14:21:04 2011 -0800 Merge "Set ChromeClient to webview to gurantee the getprogress() value" into froyo commit 5e48510ca9908acd7e3cbce89b4aad64b6ce2d26 Merge: 4bb1881 fd416d0 Author: Jean-Baptiste Queru Date: Thu Jan 20 12:23:01 2011 -0800 reconcile froyo CTS variants Change-Id: I3500118d665df5045d800d2e1d70107b47b52baf commit fd416d0dbb4b47179fb303e7f58af44e6e44819e Merge: 8de5cfb 4bb1881 Author: Brian Muramatsu Date: Thu Jan 20 12:18:36 2011 -0800 am 4bb18810: Merge "Huawei fix for receive message tests failing on Mobile Internet Devices, Personal Media Players and other non-phone devices" into froyo * commit '4bb188100dd8252cb54bcf2edb20171b63e13334': Huawei fix for receive message tests failing on Mobile Internet Devices, Personal Media Players and other non-phone devices commit 4bb188100dd8252cb54bcf2edb20171b63e13334 Merge: d9f2e5c 0d775f0 Author: Brian Muramatsu Date: Thu Jan 20 12:08:34 2011 -0800 Merge "Huawei fix for receive message tests failing on Mobile Internet Devices, Personal Media Players and other non-phone devices" into froyo commit 8de5cfb6ba7eb1368eb4629cb8763e56ddb7de47 Merge: 864df46 d9f2e5c Author: Brian Muramatsu Date: Thu Jan 20 12:07:37 2011 -0800 am d9f2e5c1: Merge "fix sms testcases for non-telephony devices" into froyo * commit 'd9f2e5c11bafb636e1b4c3a6613a918793634f31': fix sms testcases for non-telephony devices commit 0d775f06fb2d508d353f1c81610f60495460d958 Author: Adam Zajac Date: Tue Jan 11 10:54:49 2011 -0800 Huawei fix for receive message tests failing on Mobile Internet Devices, Personal Media Players and other non-phone devices Change-Id: I3262b3878ce91ae369216286bc2f9baeb2ba8bc7 commit d9f2e5c11bafb636e1b4c3a6613a918793634f31 Merge: bc3a4cb 76a90ec Author: Brian Muramatsu Date: Thu Jan 20 11:55:28 2011 -0800 Merge "fix sms testcases for non-telephony devices" into froyo commit 76a90ec5d6a1a7cba1f68bf356d9728819205393 Author: Madan Ankapura Date: Wed Dec 22 17:00:08 2010 -0800 fix sms testcases for non-telephony devices send/receive sms testing should be disabled for non-telephony devices. Change-Id: I9e88d3443207eb8f8deb21b8222686be87125edb commit eba2120fa786c80a8564505b508c98a733a7581f Author: Kristian Monsen Date: Thu Jan 20 19:54:00 2011 +0000 Fix for CTS test Chrome caches authentication, created a hack in the server to always try to authenticate this url. Change-Id: I7a12a545336b0f6e012cc0b98e27fb51222b179d commit 864df4648970c45b5ee7aab137f1e3f8c77d5ed0 Merge: 058644c bc3a4cb Author: Brian Muramatsu Date: Thu Jan 20 11:20:44 2011 -0800 am bc3a4cb2: Merge "Huawei fix for call function tests failing on Mobile Internet Devices, Personal Media Players and other non-phone devices" into froyo * commit 'bc3a4cb246cedc170c8dc4c9868115b30ac523fd': Huawei fix for call function tests failing on Mobile Internet Devices, Personal Media Players and other non-phone devices commit 058644c2527926cd7b26a3938c1a607d27866883 Merge: 9e16335 4921649 Author: Brian Muramatsu Date: Thu Jan 20 11:16:50 2011 -0800 am 49216498: Merge "Remove Broken NoActivityRelatedPermissionTest" into froyo * commit '4921649835854b316cc50c62a756330b20627f93': Remove Broken NoActivityRelatedPermissionTest commit bc3a4cb246cedc170c8dc4c9868115b30ac523fd Merge: 4921649 8c6e347 Author: Brian Muramatsu Date: Thu Jan 20 11:14:44 2011 -0800 Merge "Huawei fix for call function tests failing on Mobile Internet Devices, Personal Media Players and other non-phone devices" into froyo commit 8c6e347393c8a3b7ebfea8c0f980eb1e51a3cc37 Author: Adam Zajac Date: Tue Jan 11 10:51:45 2011 -0800 Huawei fix for call function tests failing on Mobile Internet Devices, Personal Media Players and other non-phone devices Change-Id: I176e3e12a723c43e643558c1923802fc9b733c19 commit 4921649835854b316cc50c62a756330b20627f93 Merge: 9780f18 56d8ae5 Author: Brian Muramatsu Date: Thu Jan 20 10:58:12 2011 -0800 Merge "Remove Broken NoActivityRelatedPermissionTest" into froyo commit 5f2e23b2586c246a000c49c3190b0a9a7e7897f9 Merge: a06569d fa3b45b Author: Kristian Monsen Date: Thu Jan 20 06:40:04 2011 -0800 am fa3b45ba: am 94af7909: Fixing the tests to work with our adapted CacheManager * commit 'fa3b45ba689a1aacbad31fca0ec2d487162b73ed': Fixing the tests to work with our adapted CacheManager commit fa3b45ba689a1aacbad31fca0ec2d487162b73ed Merge: bd9ea60 94af790 Author: Kristian Monsen Date: Thu Jan 20 06:37:20 2011 -0800 am 94af7909: Fixing the tests to work with our adapted CacheManager * commit '94af790975d2db2132eca5e3a7eda0febe081317': Fixing the tests to work with our adapted CacheManager commit 94af790975d2db2132eca5e3a7eda0febe081317 Author: Kristian Monsen Date: Thu Jan 20 12:39:26 2011 +0000 Fixing the tests to work with our adapted CacheManager Change-Id: Ibc612a95e62653ecc8440fec79a01ce989d98361 commit 9e163359af580c7e0120766a6ea62c0bdc6f9719 Merge: 3210c01 9780f18 Author: Brian Muramatsu Date: Wed Jan 19 18:29:32 2011 -0800 am 9780f18f: (-s ours) Merge "DO NOT MERGE fix failing test testWifiInfoProperties for non-telephony devices" into froyo * commit '9780f18fc4b464deade657a4ebc2c797f4c11713': DO NOT MERGE fix failing test testWifiInfoProperties for non-telephony devices commit 9780f18fc4b464deade657a4ebc2c797f4c11713 Merge: 3210c01 62f41fe Author: Brian Muramatsu Date: Wed Jan 19 18:11:48 2011 -0800 Merge "DO NOT MERGE fix failing test testWifiInfoProperties for non-telephony devices" into froyo commit 62f41fec87af5f8fc1b2003609a9e8906d7499ff Author: Madan Ankapura Date: Thu Nov 11 18:31:24 2010 -0800 DO NOT MERGE fix failing test testWifiInfoProperties for non-telephony devices Device can still have a valid networkId even after disconnection if it was associated with AP, getWifiState is a better check to get valid state. Change-Id: I31a8ca38f304fbf639e1f3111be4b5ed406e3b3c commit 3210c01c57896f7049487dc1b8f92bad42d5d72c Merge: 48c7bf5 8426265 Author: Brian Muramatsu Date: Wed Jan 19 17:22:14 2011 -0800 Merge "fix test for non-telephony devices" into froyo commit 8426265358e94afc16cb85aef8cbb2984955486e Author: Madan Ankapura Date: Tue Jan 18 02:09:20 2011 -0800 fix test for non-telephony devices check for the presence of the telephony feature before testing for the call. Change-Id: I2989033fcb163d1b1440806ad7a9a5dc501318d3 commit 48c7bf54ed26395c4fd695b36dadb0522b97b695 Merge: b86dd16 d26929a Author: Brian Muramatsu Date: Wed Jan 19 17:02:01 2011 -0800 Merge "100ms does not gurantee trigerring the audio. the test always passed with 200ms" into froyo commit 0908d9f6abfa90bc47103558e3e423e2cab7b1e8 Merge: 06a3611 ec5e035 Author: Brian Muramatsu Date: Wed Jan 19 15:52:11 2011 -0800 Merge "Merge remote branch 'korg/froyo' into merge" into gingerbread commit 06a36115e10c9d33ad0f0cce4af74e5e0baa1490 Merge: 724cbbd 01a0f53 Author: Brian Muramatsu Date: Wed Jan 19 15:51:58 2011 -0800 Merge "Use Vogar Expectations to Clean Up Remaining Tests" into gingerbread commit ec5e03504ae76c2b189fd09884b19cbb565dd155 Merge: 724cbbd b86dd16 Author: Brian Muramatsu Date: Wed Jan 19 15:08:17 2011 -0800 Merge remote branch 'korg/froyo' into merge commit 01a0f536eb8b9a5dc97a5e15507d0ffe9786b578 Author: Brian Muramatsu Date: Wed Jan 19 14:38:47 2011 -0800 Use Vogar Expectations to Clean Up Remaining Tests There were still some core tests that couldn't pass in the overall CTS run that passed individually. There were also some framework tests that are also consistently failing. In the interest of time, these tests will be suppressed. To avoid a multi-project change, create a expectations file in the CTS project and use that to filter out some core tests. This approach actually seems useful, so use to to filter out some of the framework tests as well! This is probably easier than deleting and adding annotations! Change-Id: I93a94c7cf9d388da4fcf0074c6b64688535c25e4 commit a3342afdd10a159ccf1a8dbb68e99b30c1bf9e23 Merge: 8233c62 e0da584 Author: Jean-Baptiste Queru Date: Wed Jan 19 08:28:09 2011 -0800 am e0da5843: Merge from open-source gingerbread - do not merge * commit 'e0da584372d6354e2c6089789b3745577c00608f': DO NOT MERGE - Nuke AbsListViewTest#testOnScroll.. commit 8233c6218a1e711391a9e4baddf0734447d547b1 Merge: 9b468be 65f2e47 Author: Jean-Baptiste Queru Date: Wed Jan 19 08:28:06 2011 -0800 am 65f2e477: Merge from open-source gingerbread * commit '65f2e477fa7de61ba07ec82488e43c692bd6ecd1': Ignore Tests with Side Effects commit 9b468be31ae9f418da5b8dd31013f7a31243eb2c Merge: ec6daf1 93cede4 Author: Jean-Baptiste Queru Date: Wed Jan 19 08:28:04 2011 -0800 am 93cede40: Merge from open-source gingerbread * commit '93cede4082545ac9b5ad16e3d0e3fb3140ce48d7': Fix OpenGlEsVersionTest commit ec6daf10b2456d5d761b83d81bc3e1b162b1ddf4 Merge: c140955 882774b Author: Jean-Baptiste Queru Date: Wed Jan 19 08:28:01 2011 -0800 am 882774bf: Merge from open-source gingerbread * commit '882774bfbfe54c896a86ceda8b4b249ed4b4601c': Increment CTS Version to 2.3_r1 commit c14095557d4db9550d080c8e149513b6cddf2bfe Merge: 4fa52b6 dfc4ef7 Author: Jean-Baptiste Queru Date: Wed Jan 19 08:27:58 2011 -0800 am dfc4ef7e: Merge from open-source gingerbread * commit 'dfc4ef7e6f1e24037f5836202ade8513b235feac': commit e0da584372d6354e2c6089789b3745577c00608f Merge: 65f2e47 724cbbd Author: Jean-Baptiste Queru Date: Wed Jan 19 08:25:15 2011 -0800 Merge from open-source gingerbread - do not merge Change-Id: Iaffc24738c8f9f362dfd9952f7855b6a30cd1893 commit 65f2e477fa7de61ba07ec82488e43c692bd6ecd1 Merge: 93cede4 ffb3f02 Author: Jean-Baptiste Queru Date: Wed Jan 19 08:25:06 2011 -0800 Merge from open-source gingerbread Change-Id: I04b555b1b05d2ac8cd40f3070aee548650ac550e commit 93cede4082545ac9b5ad16e3d0e3fb3140ce48d7 Merge: 882774b 6c923b6 Author: Jean-Baptiste Queru Date: Wed Jan 19 08:24:58 2011 -0800 Merge from open-source gingerbread Change-Id: I3f529f7cba42aca38f574277a7d2830084b79271 commit 882774bfbfe54c896a86ceda8b4b249ed4b4601c Merge: dfc4ef7 11c93a1 Author: Jean-Baptiste Queru Date: Wed Jan 19 08:24:51 2011 -0800 Merge from open-source gingerbread Change-Id: I8609e39a3881f74d1952f4061455af9bb9476078 commit dfc4ef7e6f1e24037f5836202ade8513b235feac Merge: f204056 17aa488 Author: Jean-Baptiste Queru Date: Wed Jan 19 08:24:33 2011 -0800 Merge from open-source gingerbread Change-Id: Ia24060add81186960781229089e8b3eee1390935 commit a06569d75c9bd300e82867d011bc4617969c0563 Merge: 7a2f0b2 bd9ea60 Author: Dianne Hackborn Date: Tue Jan 18 21:59:04 2011 -0800 am bd9ea608: am efda322f: Merge "Fix the build some more." into honeycomb * commit 'bd9ea608877b0d66ded58a66485b9c2c1a88be84': Fix the build some more. commit 7a2f0b209ff3130e5c1fe1381b965d7351181caf Merge: 906d99b 36cd64a Author: Dianne Hackborn Date: Tue Jan 18 21:57:48 2011 -0800 am 36cd64aa: am bf1bb115: Merge "Fix build." into honeycomb * commit '36cd64aa0bd283b67b08605ba4b14280892ffb8c': Fix build. commit 906d99b690db65551d85f6152572dcb518376012 Merge: b259e91 b5f4d75 Author: repo sync Date: Tue Jan 18 21:57:41 2011 -0800 am b5f4d754: resolved conflicts for merge of 655deedf to honeycomb-plus-aosp * commit 'b5f4d7546a7fad8778f564d98a8e3476fa28a579': Moved IconDb creation to UI thread commit bd9ea608877b0d66ded58a66485b9c2c1a88be84 Merge: 36cd64a efda322 Author: Dianne Hackborn Date: Tue Jan 18 18:38:56 2011 -0800 am efda322f: Merge "Fix the build some more." into honeycomb * commit 'efda322fc5bd780f5352360be11d009997c54bd5': Fix the build some more. commit 36cd64aa0bd283b67b08605ba4b14280892ffb8c Merge: b5f4d75 bf1bb11 Author: Dianne Hackborn Date: Tue Jan 18 18:36:24 2011 -0800 am bf1bb115: Merge "Fix build." into honeycomb * commit 'bf1bb11552333ca98edd58c504b955a92409fc2a': Fix build. commit 724cbbd45e4ba794c199e906adb6c51a6422a388 Merge: ffb3f02 7a338e4 Author: Brian Muramatsu Date: Tue Jan 18 18:25:32 2011 -0800 Merge "DO NOT MERGE - Nuke AbsListViewTest#testOnScroll.." into gingerbread commit 7a338e4eac14fd1b21c0d54a89c6ff9c3207f6c9 Author: Brian Muramatsu Date: Tue Jan 18 18:22:01 2011 -0800 DO NOT MERGE - Nuke AbsListViewTest#testOnScroll.. Bug 3062700 This is broken like GridViewTest due to a bug in TouchUtils and overscroll. It will have to be revisited later. Change-Id: I06eb857f133c9678d5e0ef51e5f3d51229d61759 commit ffb3f0298fac20f0e89efb2537cd5484e40b8913 Merge: 6c923b6 282c6fe Author: Brian Muramatsu Date: Tue Jan 18 18:12:11 2011 -0800 Merge "Ignore Tests with Side Effects" into gingerbread commit b5f4d7546a7fad8778f564d98a8e3476fa28a579 Merge: 4107c91 655deed Author: repo sync Date: Tue Jan 18 17:45:57 2011 -0800 resolved conflicts for merge of 655deedf to honeycomb-plus-aosp Change-Id: I6889c19803ad152bed3f677f47af23e7e9642d1f commit 282c6fe5b45e6a6fdac8bb9d12a2d3c60485d377 Author: Brian Muramatsu Date: Tue Jan 18 17:14:15 2011 -0800 Ignore Tests with Side Effects It looks like a ContentHandlerFactoryTest marked with @SideEffect is causing subsequent luni net tests to fail even though those tests pass on their own. Change-Id: I60a65d4debe2484624c83ea4709dc6231b0dcb10 commit efda322fc5bd780f5352360be11d009997c54bd5 Merge: bf1bb11 4c9c7a7 Author: Dianne Hackborn Date: Tue Jan 18 16:51:51 2011 -0800 Merge "Fix the build some more." into honeycomb commit 4c9c7a7ea871e12794ba6d40c3658dc8ed913a79 Author: Dianne Hackborn Date: Tue Jan 18 16:45:02 2011 -0800 Fix the build some more. Change-Id: I1bd46409546001fdf1ac389a6287ed08c0742ebf commit bf1bb11552333ca98edd58c504b955a92409fc2a Merge: 655deed 6d20e9b Author: Dianne Hackborn Date: Tue Jan 18 16:33:55 2011 -0800 Merge "Fix build." into honeycomb commit 6d20e9b4697be322911ab8e333ebcfd2b0c6814d Author: Dianne Hackborn Date: Tue Jan 18 16:32:43 2011 -0800 Fix build. Change-Id: Ia501982eb3232973113e4d55d664e27f30fe1b31 commit 655deedf265f4d0259cf77d7030b1fc788182fa2 Author: John Reck Date: Tue Jan 18 15:42:06 2011 -0800 Moved IconDb creation to UI thread Bug: 3241808 Change-Id: I4017dad2675f624b5b98b1e129e912cd6dddd380 commit b86dd161a6fcce4346cb8873161910b731d02eb5 Merge: 186779b 444e0e6 Author: Brian Muramatsu Date: Tue Jan 18 15:22:45 2011 -0800 Merge "fix keytests for azerty keyboard" into froyo commit 444e0e6a6a04b492e828fe6d6bd976c2fd2fa64c Author: Madan Ankapura Date: Fri Jan 14 02:13:40 2011 -0800 fix keytests for azerty keyboard Azerty keymap is different when compared to Qwerty. Using "A", fails the testcase in case of azerty, hence use "X" which is the same in both azerty and qwerty. Change-Id: Ia7a570167dc875eca9365171f19f19e056113ffa commit 6c923b63a010ed1ff84754bfc3df4cb0795d9f4a Merge: 11c93a1 f2c3d7d Author: Brian Muramatsu Date: Tue Jan 18 14:52:26 2011 -0800 Merge "Fix OpenGlEsVersionTest" into gingerbread commit f2c3d7db5b5a4bd5edcf80eb347c2d56d9c3767e Author: Brian Muramatsu Date: Tue Jan 18 14:32:21 2011 -0800 Fix OpenGlEsVersionTest Bug 3307156 Put the EGL calls between eglInitialize and eglTerminate. Change-Id: Iec923d58021c115730b538378ab660bc470fa658 commit 186779b705037ef02e1a63a84edfed908bd907cb Merge: 8740d6d 428c1e7 Author: Brian Muramatsu Date: Tue Jan 18 14:01:21 2011 -0800 Merge "The layout height should be the value scaled by the density." into froyo commit 8740d6df2c5a901ea534f57f21002f9db5274abf Merge: 5766f49 56a3d5c Author: Brian Muramatsu Date: Tue Jan 18 13:52:34 2011 -0800 Merge "fix WQVGA resolution" into froyo commit 11c93a1df8bd7e7ad33ecf864f0c0263621aef4b Merge: 17aa488 0ee8568 Author: Brian Muramatsu Date: Tue Jan 18 11:19:57 2011 -0800 Merge "Increment CTS Version to 2.3_r1" into gingerbread commit 0ee8568ab5a48dc753045c4d3980898795d19599 Author: Brian Muramatsu Date: Tue Jan 18 11:14:08 2011 -0800 Increment CTS Version to 2.3_r1 Change-Id: I2db535e51e45b2ee5fcdb425cb2a5b328b0065d5 commit 17aa488bd56e5aeab5f28e3de5d95525c8694714 Merge: a1a8835 dc73e31 Author: Brian Muramatsu Date: Tue Jan 18 10:47:50 2011 -0800 Merge "Merge remote branch 'korg/froyo' into gingerbread" into gingerbread commit 428c1e76d2e66577315fcba0926882f6f5c128a4 Author: Masanori Ogino Date: Tue Jan 18 10:14:03 2011 +0900 The layout height should be the value scaled by the density. Change-Id: Ibdb463d9a50a592a9ffc60d5a8c94b1dbd4353f6 commit b259e917fccd12c1d1456ce0a73aaa9fd368dfb1 Merge: bada23e 4d4cb9e Author: Jeff Brown Date: Mon Jan 17 15:57:52 2011 -0800 Merge "Add joystick support to framework." commit bada23e12d7fd00b8ac585692239a709d28a59cc Merge: e5b5500 4107c91 Author: Kristian Monsen Date: Mon Jan 17 08:26:08 2011 -0800 am 4107c91a: am 65fd9d06: Fixing 2 cookie CTS tests * commit '4107c91a377fd27383b8144c3b7535f67845b21a': Fixing 2 cookie CTS tests commit 4107c91a377fd27383b8144c3b7535f67845b21a Merge: 411895a 65fd9d0 Author: Kristian Monsen Date: Mon Jan 17 08:22:54 2011 -0800 am 65fd9d06: Fixing 2 cookie CTS tests * commit '65fd9d063e971d12fd99ee926380293f83e77375': Fixing 2 cookie CTS tests commit 65fd9d063e971d12fd99ee926380293f83e77375 Author: Kristian Monsen Date: Mon Jan 17 15:54:23 2011 +0000 Fixing 2 cookie CTS tests Clear all cookies before test run Not depending on all broken behavior, get returning a cookie, but hascookies returning 0. Change-Id: I8d71e14bde258cd3385c8bdaaec8ca72f15a9059 commit 4d4cb9ec27b1bea6f5421e59b9302633946fe73d Author: Jeff Brown Date: Sat Jan 15 18:15:28 2011 -0800 Add joystick support to framework. Change-Id: I0608c8520a5987045ba813a841a0f036b905bf84 commit e5b550081ae3a5ba775dacb74d89f84c26f06048 Merge: e50cbb2 411895a Author: Nick Kralevich Date: Sun Jan 16 10:43:17 2011 -0800 am 411895a9: am 4fa52b63: am f2040561: Merge "Don\'t allow writable files in /sys" into gingerbread * commit '411895a9866415ecd89c0a740e9bfd90ab910e77': Don't allow writable files in /sys commit 411895a9866415ecd89c0a740e9bfd90ab910e77 Merge: d8e9b8a 4fa52b6 Author: Nick Kralevich Date: Fri Jan 14 21:29:20 2011 -0800 am 4fa52b63: am f2040561: Merge "Don\'t allow writable files in /sys" into gingerbread * commit '4fa52b635dc39a645de534357a88be3dec253885': Don't allow writable files in /sys commit 4fa52b635dc39a645de534357a88be3dec253885 Merge: 246b21a f204056 Author: Nick Kralevich Date: Fri Jan 14 15:05:22 2011 -0800 am f2040561: Merge "Don\'t allow writable files in /sys" into gingerbread * commit 'f2040561fe3b5f0a1274d3793166fa407317e66c': Don't allow writable files in /sys commit f2040561fe3b5f0a1274d3793166fa407317e66c Merge: 532ac36 cd45e41 Author: Nick Kralevich Date: Fri Jan 14 15:02:59 2011 -0800 Merge "Don't allow writable files in /sys" into gingerbread commit e50cbb2a34b2c3a5f9ddad80db000674764e54f4 Merge: 6bfa13a d8e9b8a Author: Brett Chabot Date: Fri Jan 14 14:57:18 2011 -0800 am d8e9b8a7: am 0fb89bfc: CTS tradefed: Add ability to run or exclude packages. * commit 'd8e9b8a7d639097d514e61160b91e1b83bf97fa5': CTS tradefed: Add ability to run or exclude packages. commit d8e9b8a7d639097d514e61160b91e1b83bf97fa5 Merge: f140358 0fb89bf Author: Brett Chabot Date: Fri Jan 14 14:55:35 2011 -0800 am 0fb89bfc: CTS tradefed: Add ability to run or exclude packages. * commit '0fb89bfc83fca93acc9ec0a67f04721c4d6225b6': CTS tradefed: Add ability to run or exclude packages. commit 6bfa13aa8b8aa2aa6668cdd5fd92eef8ffe4056c Merge: 5ba24a5 f140358 Author: Brett Chabot Date: Fri Jan 14 14:55:26 2011 -0800 am f1403581: am bb6db5ed: Fix cts-tradefed unit tests. * commit 'f1403581c397fc34244905402f19ea1c2b963094': Fix cts-tradefed unit tests. commit f1403581c397fc34244905402f19ea1c2b963094 Merge: a91ea9a bb6db5e Author: Brett Chabot Date: Fri Jan 14 14:53:38 2011 -0800 am bb6db5ed: Fix cts-tradefed unit tests. * commit 'bb6db5edd3a9ef033291f4fb2cf03aa889e9314f': Fix cts-tradefed unit tests. commit 0fb89bfc83fca93acc9ec0a67f04721c4d6225b6 Author: Brett Chabot Date: Fri Jan 14 12:17:19 2011 -0800 CTS tradefed: Add ability to run or exclude packages. CTS tradefed now supports running either a plan, or a list of individual test packages. Also supported is ability to exclude given packages from the run. Change-Id: I3516e78624774799a78dc7b8510aaf03502ac11f commit cd45e41e57a0a03a4f890c634bdcb16701d357e6 Author: Nick Kralevich Date: Fri Jan 14 14:45:52 2011 -0800 Don't allow writable files in /sys Change-Id: Idce7a0eefc8ce8271bf58693ea39820bbcc6117e commit bb6db5edd3a9ef033291f4fb2cf03aa889e9314f Author: Brett Chabot Date: Thu Jan 13 20:09:25 2011 -0800 Fix cts-tradefed unit tests. Change-Id: Iaad20b3ac6d02013ebd8a537af7b46abfdaed1a7 commit dc73e313a242d86a682dcedff643a18c0c07af12 Merge: a1a8835 5766f49 Author: Brian Muramatsu Date: Fri Jan 14 14:16:47 2011 -0800 Merge remote branch 'korg/froyo' into gingerbread Change-Id: Ieea971689f21c7a010c49d85818ef4ac089f3202 commit 5ba24a56055c4e86e725f14f073d287f79c614ed Merge: 009cc34 a91ea9a Author: Jean-Baptiste Queru Date: Fri Jan 14 13:47:33 2011 -0800 am a91ea9af: (-s ours) am 246b21a2: (-s ours) am 532ac367: Merge from open-source gingerbread * commit 'a91ea9af14e849c7affb56963d5fdb3d96948c03': Fix Build - DO NOT MERGE commit a91ea9af14e849c7affb56963d5fdb3d96948c03 Merge: 6e4067f 246b21a Author: Jean-Baptiste Queru Date: Fri Jan 14 13:46:08 2011 -0800 am 246b21a2: (-s ours) am 532ac367: Merge from open-source gingerbread * commit '246b21a21150b412ba8a2d3f4d2793ff247e454d': Fix Build - DO NOT MERGE commit 246b21a21150b412ba8a2d3f4d2793ff247e454d Merge: 5d40cca 532ac36 Author: Jean-Baptiste Queru Date: Fri Jan 14 13:43:04 2011 -0800 am 532ac367: Merge from open-source gingerbread * commit '532ac367e67e2509857d4b55461521e11f563699': Fix Build - DO NOT MERGE commit 532ac367e67e2509857d4b55461521e11f563699 Merge: 99b8750 a1a8835 Author: Jean-Baptiste Queru Date: Fri Jan 14 13:28:28 2011 -0800 Merge from open-source gingerbread Change-Id: I07b6386751edf88850f7cc2b8db36b743e615aa4 commit 009cc345a10f6eba9881c773075df8d928da5b9b Merge: 26f6ca3 6e4067f Author: Brian Muramatsu Date: Fri Jan 14 12:35:19 2011 -0800 am 6e4067f0: am 5d40ccab: am 99b8750c: am 5766f495: Merge "Test requestRouteToHost() except TYPE_WIFI" into froyo * commit '6e4067f0495bb58880da7cbe45aeabdbc5f58012': Test requestRouteToHost() except TYPE_WIFI commit 6e4067f0495bb58880da7cbe45aeabdbc5f58012 Merge: 08cd006 5d40cca Author: Brian Muramatsu Date: Fri Jan 14 12:32:27 2011 -0800 am 5d40ccab: am 99b8750c: am 5766f495: Merge "Test requestRouteToHost() except TYPE_WIFI" into froyo * commit '5d40ccab71f9ae3f65439a89c054410e5b8b33d4': Test requestRouteToHost() except TYPE_WIFI commit 5d40ccab71f9ae3f65439a89c054410e5b8b33d4 Merge: 1802305 99b8750 Author: Brian Muramatsu Date: Fri Jan 14 12:01:43 2011 -0800 am 99b8750c: am 5766f495: Merge "Test requestRouteToHost() except TYPE_WIFI" into froyo * commit '99b8750ca3a9eb102a3335beeddee681085b1cca': Test requestRouteToHost() except TYPE_WIFI commit 99b8750ca3a9eb102a3335beeddee681085b1cca Merge: 071ac0e 5766f49 Author: Brian Muramatsu Date: Fri Jan 14 11:58:32 2011 -0800 am 5766f495: Merge "Test requestRouteToHost() except TYPE_WIFI" into froyo * commit '5766f49549275c02f9a513aae82bcfa867cb551b': Test requestRouteToHost() except TYPE_WIFI commit 5766f49549275c02f9a513aae82bcfa867cb551b Merge: c94170d d2e87ef Author: Brian Muramatsu Date: Fri Jan 14 11:32:33 2011 -0800 Merge "Test requestRouteToHost() except TYPE_WIFI" into froyo commit 26f6ca3fe3989400aa4ef4b1d17831564fcbc597 Merge: 7dcdb64 08cd006 Author: Kristian Monsen Date: Fri Jan 14 04:21:10 2011 -0800 am 08cd006e: am 6ceb1b2c: Merge "CTS test fix" into honeycomb * commit '08cd006e0a473dac2a4ecbdcf74395a5211c8974': CTS test fix commit 08cd006e0a473dac2a4ecbdcf74395a5211c8974 Merge: 567fe51 6ceb1b2 Author: Kristian Monsen Date: Fri Jan 14 04:19:40 2011 -0800 am 6ceb1b2c: Merge "CTS test fix" into honeycomb * commit '6ceb1b2ce0f67119fd275ebab5d2d3500da4e526': CTS test fix commit 6ceb1b2ce0f67119fd275ebab5d2d3500da4e526 Merge: 39056ad 07c800e Author: Kristian Monsen Date: Fri Jan 14 04:17:53 2011 -0800 Merge "CTS test fix" into honeycomb commit 7dcdb644517ad6254129574b14c449a3943742de Merge: 028e365 567fe51 Author: Wu-cheng Li Date: Thu Jan 13 20:58:27 2011 -0800 am 567fe511: am 39056ade: Merge "Fix camera scene mode CTS." into honeycomb * commit '567fe511fa98afce300428dbdb0f20dd4cbed35b': Fix camera scene mode CTS. commit 567fe511fa98afce300428dbdb0f20dd4cbed35b Merge: 7cd6ec6 39056ad Author: Wu-cheng Li Date: Thu Jan 13 20:56:43 2011 -0800 am 39056ade: Merge "Fix camera scene mode CTS." into honeycomb * commit '39056ade49129602dbc6fe3bf224268a4da83c98': Fix camera scene mode CTS. commit 39056ade49129602dbc6fe3bf224268a4da83c98 Merge: 45f7e1e 79f5b72 Author: Wu-cheng Li Date: Thu Jan 13 20:54:56 2011 -0800 Merge "Fix camera scene mode CTS." into honeycomb commit 79f5b720223a0aca5ac9666724491461ddf52524 Author: Wu-cheng Li Date: Fri Jan 14 12:48:12 2011 +0800 Fix camera scene mode CTS. In auto scene mode, camera HAL will not remember the previous flash, focus, and white-balance. It will just take values set by parameters. bug:3345896 Change-Id: I22aac42875199e40605fdc4816ed88ac2d324323 commit 028e365de699bd5be3a2b29de6286d168f31882e Merge: 95b0708 7cd6ec6 Author: Brian Muramatsu Date: Thu Jan 13 18:04:28 2011 -0800 am 7cd6ec63: am 45f7e1ec: Merge "Fix CompoundButtonTest#testOnCreateDrawableState" into honeycomb * commit '7cd6ec6365b4c45446df4bee52d4fe3a52807df1': Fix CompoundButtonTest#testOnCreateDrawableState commit 7cd6ec6365b4c45446df4bee52d4fe3a52807df1 Merge: d914b39 45f7e1e Author: Brian Muramatsu Date: Thu Jan 13 18:02:54 2011 -0800 am 45f7e1ec: Merge "Fix CompoundButtonTest#testOnCreateDrawableState" into honeycomb * commit '45f7e1ec14ba4e65b3ebea42e42107f99214398b': Fix CompoundButtonTest#testOnCreateDrawableState commit 45f7e1ec14ba4e65b3ebea42e42107f99214398b Merge: 68a45d5 85cf90f Author: Brian Muramatsu Date: Thu Jan 13 18:01:18 2011 -0800 Merge "Fix CompoundButtonTest#testOnCreateDrawableState" into honeycomb commit 95b07080503745415cd10ac47d4990530fb0fd62 Merge: dc5a751 d914b39 Author: Brian Muramatsu Date: Thu Jan 13 17:44:29 2011 -0800 am d914b397: am 68a45d56: Merge "Fix View_FocusHandlingTest" into honeycomb * commit 'd914b3977ad67b9f9a7913605dd67d91d7912755': Fix View_FocusHandlingTest commit d914b3977ad67b9f9a7913605dd67d91d7912755 Merge: 55206d8 68a45d5 Author: Brian Muramatsu Date: Thu Jan 13 17:42:35 2011 -0800 am 68a45d56: Merge "Fix View_FocusHandlingTest" into honeycomb * commit '68a45d5640de85af50687b17ae805f036d34a2a3': Fix View_FocusHandlingTest commit 68a45d5640de85af50687b17ae805f036d34a2a3 Merge: fa4b56c e10d3a5 Author: Brian Muramatsu Date: Thu Jan 13 17:40:55 2011 -0800 Merge "Fix View_FocusHandlingTest" into honeycomb commit dc5a7512854cfda7ccfdcd80fc90f51b32a397ba Merge: be1e4fd 55206d8 Author: Gilles Debunne Date: Thu Jan 13 14:57:14 2011 -0800 am 55206d87: am fa4b56c1: Merge "Fix for View_UsingViewsTest." into honeycomb * commit '55206d870138553b83e7c8b30332dffff9007f15': Fix for View_UsingViewsTest. commit 55206d870138553b83e7c8b30332dffff9007f15 Merge: b368718 fa4b56c Author: Gilles Debunne Date: Thu Jan 13 14:54:29 2011 -0800 am fa4b56c1: Merge "Fix for View_UsingViewsTest." into honeycomb * commit 'fa4b56c15d9322af578eea44fd5466b13c5d9660': Fix for View_UsingViewsTest. commit fa4b56c15d9322af578eea44fd5466b13c5d9660 Merge: 93efcba 51477d1 Author: Gilles Debunne Date: Thu Jan 13 14:51:16 2011 -0800 Merge "Fix for View_UsingViewsTest." into honeycomb commit 51477d19b72af1643f028dbed6b716b0af55eed9 Author: Gilles Debunne Date: Thu Jan 13 14:46:58 2011 -0800 Fix for View_UsingViewsTest. The multiline state is added by the TextView and interferes with the test. Bug 3347206 Change-Id: I538cdc45113bfc9b92e9a1bd1ee0b1bd3eeb2586 commit be1e4fd4a3545cd1c99bdcdbd1c9f65d30de839a Merge: 0a04d2f b368718 Author: Brett Chabot Date: Thu Jan 13 13:30:41 2011 -0800 am b368718c: am 93efcba4: Attempt to fix EventLogTest flakiness. * commit 'b368718cbc0f1be62890a322d839d1eff127df78': Attempt to fix EventLogTest flakiness. commit e10d3a5ea8d6624c507848552893a8fa0ad83d78 Author: Brian Muramatsu Date: Wed Jan 12 16:52:48 2011 -0800 Fix View_FocusHandlingTest Use a theme without an ActionBar to test the focusing. Change-Id: I4723ecfbfb136edeffe1cbf75778e1c3984a0730 commit b368718cbc0f1be62890a322d839d1eff127df78 Merge: 8a7d453 93efcba Author: Brett Chabot Date: Thu Jan 13 13:27:50 2011 -0800 am 93efcba4: Attempt to fix EventLogTest flakiness. * commit '93efcba4bb80c55d7063c520b6ed99a285f74e97': Attempt to fix EventLogTest flakiness. commit 93efcba4bb80c55d7063c520b6ed99a285f74e97 Author: Brett Chabot Date: Thu Jan 13 13:21:44 2011 -0800 Attempt to fix EventLogTest flakiness. Bug 3350354 Change-Id: I76da69b1e46142fe25f5547af827465a5af077a1 commit 0a04d2f5d3fe403d6f952e59dd40e9abd56a9780 Merge: 1512981 8a7d453 Author: Wei-Ta Chen Date: Thu Jan 13 12:40:41 2011 -0800 am 8a7d453d: (-s ours) am 1802305f: (-s ours) am 071ac0eb: Do not merge. * commit '8a7d453df358d0e69b5be84450982c41b8665fbd': Do not merge. commit 8a7d453df358d0e69b5be84450982c41b8665fbd Merge: 0720a9d 1802305 Author: Wei-Ta Chen Date: Thu Jan 13 12:38:34 2011 -0800 am 1802305f: (-s ours) am 071ac0eb: Do not merge. * commit '1802305fa6880cce22fa5b047ae6fca4c22bfd24': Do not merge. commit 1802305fa6880cce22fa5b047ae6fca4c22bfd24 Merge: 1cb45be 071ac0e Author: Wei-Ta Chen Date: Thu Jan 13 12:06:33 2011 -0800 am 071ac0eb: Do not merge. * commit '071ac0eb92389a6a8b586135c7369e7a8c62eb9a': Do not merge. commit 85cf90fed35a934b3ef90e19ca7ecc02cd8ae0f8 Author: Brian Muramatsu Date: Wed Jan 12 15:32:46 2011 -0800 Fix CompoundButtonTest#testOnCreateDrawableState This fragile test checked the exact length of the drawable state array. It appears that TextView has a new state, so this test broke. Just check the last state which the CompountButton modifies when its checked. Change-Id: If18907826d4266e8417e72ebd6b18ab8542624a5 commit 07c800eee8660843df59a3eccd42ea8f0d9421ce Author: Kristian Monsen Date: Thu Jan 13 19:46:16 2011 +0000 CTS test fix Fixed the user agent string test. It passes now, and should hopefully also pass for future versions. Change-Id: I3831391abe318da93f16f56951e1e7337929956d commit d2e87ef5f1e6e912db7c066337d56f0b424bd580 Author: Masanori Ogino Date: Thu Jan 13 15:52:34 2011 +0900 Test requestRouteToHost() except TYPE_WIFI If the device is set Wifi-ON, then testRequestRouteToHost always fails. Change-Id: Ie487773552e8f6f1d4838755cc39e23c5aa57c1d commit 071ac0eb92389a6a8b586135c7369e7a8c62eb9a Author: Wei-Ta Chen Date: Wed Dec 22 18:00:40 2010 -0800 Do not merge. Backport BitmapRegionDecoder's CTS tests from Honeycomb to Gingerbread. Bug: 3309014 //////////////////////////////////////////////////////////////////////// This is a combination of 3 commits. Add CTS tests for BitmapRegionDecoder.java. Change-Id: I84283a63c1bcdf0cbafd943db633bda50a98e65f Ensure that the cropped bitmap is using the Bitmap.Config we expect. Change-Id: Id3e79fc30b276830bac7e9abbcf43bcf1d69b1d1 Add JPEGs with restart markers to the set of the testing images. (Change-Id: Ic70110e3057aa2130f56d5da3438943a8d1ee79b) /////////////////////////////////////////////////////////////// commit 1512981290a41f68218b06696cfd9bd4f17c18ae Merge: cfaa5ba 0720a9d Author: Brian Muramatsu Date: Wed Jan 12 19:04:44 2011 -0800 am 0720a9d9: am 1cb45bea: am fc004e2a: am c94170d4: Merge "Use getAssets().getLocales() to compare with en_US." into froyo * commit '0720a9d94c7787db42cbc99e0e50afa05f68c1b5': Use getAssets().getLocales() to compare with en_US. commit 0720a9d94c7787db42cbc99e0e50afa05f68c1b5 Merge: ab48caf 1cb45be Author: Brian Muramatsu Date: Wed Jan 12 19:01:09 2011 -0800 am 1cb45bea: am fc004e2a: am c94170d4: Merge "Use getAssets().getLocales() to compare with en_US." into froyo * commit '1cb45bea95303838087d74dad0b1a6b61e95813a': Use getAssets().getLocales() to compare with en_US. commit cfaa5ba6aa3eeceb15172bc3ba5d565ca58406c1 Merge: 2ce4d10 ab48caf Author: Brian Muramatsu Date: Wed Jan 12 18:03:08 2011 -0800 am ab48caf4: am c5aa8ced: am e053d2db: am a0805727: Merge "resize the layout" into froyo * commit 'ab48caf44834f7d1422242a3f425d7355ce94bae': resize the layout commit 2ce4d10d996b6bded47703b9a77622c1433db87d Merge: 2b3bce3 0906075 Author: Brian Muramatsu Date: Wed Jan 12 18:03:06 2011 -0800 am 0906075d: am d4390bf1: am 6fb0a4a4: am 643804b6: Merge "Add a new test testApksAlwaysReadable()" into froyo * commit '0906075d224ffd3924a70775f1ef28a2a1df4861': Add a new test testApksAlwaysReadable() commit 2b3bce369d94bfca91ad44ab0740e18da8a63d82 Merge: 253eaf8 9203021 Author: Brian Muramatsu Date: Wed Jan 12 18:03:04 2011 -0800 am 92030213: am d9f3df62: am cc028bc0: am e0ee543b: Merge "CTS test is not considering the case when the devcie get into SILENT mode by volume down key. It needs to be raised twice to get back to NORMAL mode from the SILENT mode." into froyo * commit '92030213afe7f071550f5e4ff5f1fbe23f983e05': CTS test is not considering the case when the devcie get into SILENT mode by volume down key. It needs to be raised twice to get back to NORMAL mode from the SILENT mode. commit 253eaf810ce5e30ba4e7460bb68044834fbf214d Merge: f177fed ef016ac Author: Brian Muramatsu Date: Wed Jan 12 18:03:01 2011 -0800 am ef016aca: am 78f036d5: am 9ab26838: am 595eb0f1: Merge "Webview needs to set instance of ChromeClient to use getProgress value. assertLoadUrlSuccessfully is using view.getProgress() which returns no meaningful value without ChromeClient." into froyo * commit 'ef016acab7cf937cc4458dc6e92ea367636529f0': Webview needs to set instance of ChromeClient to use getProgress value. assertLoadUrlSuccessfully is using view.getProgress() which returns no meaningful value without ChromeClient. commit f177fed572bd9709c1e509ff019921f7875a0e85 Merge: 533790b 4250524 Author: Brian Muramatsu Date: Wed Jan 12 18:02:59 2011 -0800 am 42505247: am 4cd77c93: am 43c2bbca: am 7ca0842d: Merge "Remove Private API Tests for PhoneNumberUtils" into froyo * commit '42505247909a57a29b859ca21fcb8df2888791a3': Remove Private API Tests for PhoneNumberUtils commit 533790b2d9be022b299dac9f25cdecb05a818d32 Merge: d34222a 2b9d808 Author: Brian Muramatsu Date: Wed Jan 12 18:02:56 2011 -0800 am 2b9d8080: am 1ec78c67: am 93456cfe: am f7ee88af: Merge "Fix Broken LinkifyTest Tests" into froyo * commit '2b9d80802263abbfa49157549cef41a8e6ecce74': Fix Broken LinkifyTest Tests commit d34222ace16d7b0ff19cc692eb970e68d2245332 Merge: 6c4952a 6148ea5 Author: Brian Muramatsu Date: Wed Jan 12 18:02:53 2011 -0800 am 6148ea51: am 75a1c9b1: am 72f9027d: am 480770f1: Merge "Fix InsetDrawableTest#testGetOpacity" into froyo * commit '6148ea514a067f4c13cd70db6fe3d1922fc27af0': Fix InsetDrawableTest#testGetOpacity commit 6c4952a79247a6926499b22121963920328e023f Merge: 9413ff7 dcd6ec9 Author: Brian Muramatsu Date: Wed Jan 12 18:02:49 2011 -0800 am dcd6ec9b: am 47212e74: am c0d02940: am 8326d122: Merge "Fix More TextViewTest Landscape Issues" into froyo * commit 'dcd6ec9b4d6261e75ee9c003dd7aa6082166b335': Fix More TextViewTest Landscape Issues commit 9413ff718d14fa075d7fdd32d40051cef2243694 Merge: 48dac63 d029478 Author: Brian Muramatsu Date: Wed Jan 12 18:02:46 2011 -0800 am d029478f: am 6b2dc908: am a23fab59: am d17bbee3: Merge "Fix TelephonyManagerTest Iso Checks" into froyo * commit 'd029478f00fbd11696b5bb16fbdba32386105745': Fix TelephonyManagerTest Iso Checks commit ab48caf44834f7d1422242a3f425d7355ce94bae Merge: 0906075 c5aa8ce Author: Brian Muramatsu Date: Wed Jan 12 17:58:56 2011 -0800 am c5aa8ced: am e053d2db: am a0805727: Merge "resize the layout" into froyo * commit 'c5aa8cedd5fdc967856a58b004a33a5a7b255f91': resize the layout commit 0906075d224ffd3924a70775f1ef28a2a1df4861 Merge: 9203021 d4390bf Author: Brian Muramatsu Date: Wed Jan 12 17:58:37 2011 -0800 am d4390bf1: am 6fb0a4a4: am 643804b6: Merge "Add a new test testApksAlwaysReadable()" into froyo * commit 'd4390bf1327fb5606c2345790f94d63de94faa4b': Add a new test testApksAlwaysReadable() commit 92030213afe7f071550f5e4ff5f1fbe23f983e05 Merge: ef016ac d9f3df6 Author: Brian Muramatsu Date: Wed Jan 12 17:58:31 2011 -0800 am d9f3df62: am cc028bc0: am e0ee543b: Merge "CTS test is not considering the case when the devcie get into SILENT mode by volume down key. It needs to be raised twice to get back to NORMAL mode from the SILENT mode." into froyo * commit 'd9f3df627e5d49773f4f534e9d422819a665e367': CTS test is not considering the case when the devcie get into SILENT mode by volume down key. It needs to be raised twice to get back to NORMAL mode from the SILENT mode. commit ef016acab7cf937cc4458dc6e92ea367636529f0 Merge: 4250524 78f036d Author: Brian Muramatsu Date: Wed Jan 12 17:58:28 2011 -0800 am 78f036d5: am 9ab26838: am 595eb0f1: Merge "Webview needs to set instance of ChromeClient to use getProgress value. assertLoadUrlSuccessfully is using view.getProgress() which returns no meaningful value without ChromeClient." into froyo * commit '78f036d563c5bc6904001ca36cbf5c63bcd4fb13': Webview needs to set instance of ChromeClient to use getProgress value. assertLoadUrlSuccessfully is using view.getProgress() which returns no meaningful value without ChromeClient. commit 42505247909a57a29b859ca21fcb8df2888791a3 Merge: 2b9d808 4cd77c9 Author: Brian Muramatsu Date: Wed Jan 12 17:57:56 2011 -0800 am 4cd77c93: am 43c2bbca: am 7ca0842d: Merge "Remove Private API Tests for PhoneNumberUtils" into froyo * commit '4cd77c93f5f9f2c506a0ab7323b818a25016ade5': Remove Private API Tests for PhoneNumberUtils commit 2b9d80802263abbfa49157549cef41a8e6ecce74 Merge: 6148ea5 1ec78c6 Author: Brian Muramatsu Date: Wed Jan 12 17:57:53 2011 -0800 am 1ec78c67: am 93456cfe: am f7ee88af: Merge "Fix Broken LinkifyTest Tests" into froyo * commit '1ec78c67fa51cb76a303a6c59be0d8847ffc45e9': Fix Broken LinkifyTest Tests commit 6148ea514a067f4c13cd70db6fe3d1922fc27af0 Merge: dcd6ec9 75a1c9b Author: Brian Muramatsu Date: Wed Jan 12 17:57:45 2011 -0800 am 75a1c9b1: am 72f9027d: am 480770f1: Merge "Fix InsetDrawableTest#testGetOpacity" into froyo * commit '75a1c9b131a6244cbc8905b6a12c294a5b2b1de8': Fix InsetDrawableTest#testGetOpacity commit dcd6ec9b4d6261e75ee9c003dd7aa6082166b335 Merge: d029478 47212e7 Author: Brian Muramatsu Date: Wed Jan 12 17:57:41 2011 -0800 am 47212e74: am c0d02940: am 8326d122: Merge "Fix More TextViewTest Landscape Issues" into froyo * commit '47212e74c2e9920327422c65933cfbe6c613adc7': Fix More TextViewTest Landscape Issues commit d029478f00fbd11696b5bb16fbdba32386105745 Merge: d7ddda1 6b2dc90 Author: Brian Muramatsu Date: Wed Jan 12 17:57:34 2011 -0800 am 6b2dc908: am a23fab59: am d17bbee3: Merge "Fix TelephonyManagerTest Iso Checks" into froyo * commit '6b2dc908654865b343e762bea6607970bcfe082b': Fix TelephonyManagerTest Iso Checks commit 48dac63536c33d571bfb6996d162e4eef4b917d3 Merge: d2aa1a8 d7ddda1 Author: Wei-Ta Chen Date: Wed Jan 12 17:06:55 2011 -0800 am d7ddda1f: am 669442e3: Add JPEGs with restart markers to the set of the testing images. * commit 'd7ddda1fb626886687fc24bfc81db78be71a88c9': Add JPEGs with restart markers to the set of the testing images. commit d7ddda1fb626886687fc24bfc81db78be71a88c9 Merge: 476d3f5 669442e Author: Wei-Ta Chen Date: Wed Jan 12 17:04:45 2011 -0800 am 669442e3: Add JPEGs with restart markers to the set of the testing images. * commit '669442e3d6730373227dc71a35ba9babf13459be': Add JPEGs with restart markers to the set of the testing images. commit d2aa1a8cdad44766cc69d09b3b891f266dcf7780 Merge: f8114bb 476d3f5 Author: Brian Muramatsu Date: Wed Jan 12 17:01:53 2011 -0800 am 476d3f5f: am 0350dc1c: am 5a95ac00: am f2f68c3d: Merge "Remove Broken LayoutTest Tests" into froyo * commit '476d3f5f7cd561fe6a5d2afd11001e23c839d27f': Remove Broken LayoutTest Tests commit 669442e3d6730373227dc71a35ba9babf13459be Author: Wei-Ta Chen Date: Wed Jan 12 17:00:05 2011 -0800 Add JPEGs with restart markers to the set of the testing images. Change-Id: Ic70110e3057aa2130f56d5da3438943a8d1ee79b commit 476d3f5f7cd561fe6a5d2afd11001e23c839d27f Merge: 4531fda 0350dc1 Author: Brian Muramatsu Date: Wed Jan 12 16:58:29 2011 -0800 am 0350dc1c: am 5a95ac00: am f2f68c3d: Merge "Remove Broken LayoutTest Tests" into froyo * commit '0350dc1cdcea07592ed2a3e36a3b4d96b47075f8': Remove Broken LayoutTest Tests commit f8114bb1d720345d649eb7a0a17ce38dda5247ae Merge: e117419 4531fda Author: Brian Muramatsu Date: Wed Jan 12 16:08:54 2011 -0800 am 4531fda2: resolved conflicts for merge of 21c7d57b to honeycomb-plus-aosp * commit '4531fda29d2e20ed67db7cdb136f3258c4a479af': Delete DatePickerDialogTest commit 4531fda29d2e20ed67db7cdb136f3258c4a479af Merge: 8210882 21c7d57 Author: Brian Muramatsu Date: Wed Jan 12 16:01:46 2011 -0800 resolved conflicts for merge of 21c7d57b to honeycomb-plus-aosp Change-Id: Ib74264d2c4a4b291e6a80c3faf54361ca5e890ca commit e11741904e4ba4cb20fcdc22cdf7a69b9c476e13 Merge: f39376d 8210882 Author: Jean-Baptiste Queru Date: Wed Jan 12 15:35:04 2011 -0800 am 82108824: am b0ad6447: am 1cc918c9: reconcile with open-source gingerbread CTS * commit '82108824cf1440093001d4f7ef28138048754d15': Add vogar expectation file support for CTS. Nuke TrafficStatsTest#testTrafficStatsWithHost... Nuke GridViewTest#testScroll Nuke WebChromeClientTest#testOnReceivedIcon Update BuildVersionTest for 2.3 and 2.3.1 Update startcts Script Allowing more than one index for cursor position Corrected android.media.cts.AudioEffectTest#test1_0ConstructorFromType commit 82108824cf1440093001d4f7ef28138048754d15 Merge: 19160dc b0ad644 Author: Jean-Baptiste Queru Date: Wed Jan 12 15:31:13 2011 -0800 am b0ad6447: am 1cc918c9: reconcile with open-source gingerbread CTS * commit 'b0ad644738619bab0a63268054d3a625baeb1047': Add vogar expectation file support for CTS. Nuke TrafficStatsTest#testTrafficStatsWithHost... Nuke GridViewTest#testScroll Nuke WebChromeClientTest#testOnReceivedIcon Update BuildVersionTest for 2.3 and 2.3.1 Update startcts Script Allowing more than one index for cursor position Corrected android.media.cts.AudioEffectTest#test1_0ConstructorFromType commit f39376d403f51e9f6b08073d17d35b9ef3b428cc Merge: 92869f0 19160dc Author: Wei-Ta Chen Date: Wed Jan 12 15:13:04 2011 -0800 am 19160dc7: Ensure that the cropped bitmap is using the Bitmap.Config we expect. * commit '19160dc7edd328ee4b995a1d5b7c068c85be6094': Ensure that the cropped bitmap is using the Bitmap.Config we expect. commit 19160dc7edd328ee4b995a1d5b7c068c85be6094 Author: Wei-Ta Chen Date: Wed Jan 12 14:17:20 2011 -0800 Ensure that the cropped bitmap is using the Bitmap.Config we expect. Change-Id: Id3e79fc30b276830bac7e9abbcf43bcf1d69b1d1 commit 1cb45bea95303838087d74dad0b1a6b61e95813a Merge: c5aa8ce fc004e2 Author: Brian Muramatsu Date: Tue Jan 11 15:50:15 2011 -0800 am fc004e2a: am c94170d4: Merge "Use getAssets().getLocales() to compare with en_US." into froyo * commit 'fc004e2a874adc902bc8dd0c16d3fe6242873178': Use getAssets().getLocales() to compare with en_US. commit fc004e2a874adc902bc8dd0c16d3fe6242873178 Merge: e053d2d c94170d Author: Brian Muramatsu Date: Tue Jan 11 15:48:00 2011 -0800 am c94170d4: Merge "Use getAssets().getLocales() to compare with en_US." into froyo * commit 'c94170d4ad510feca70f768548ab76ea9dd1a606': Use getAssets().getLocales() to compare with en_US. commit c94170d4ad510feca70f768548ab76ea9dd1a606 Merge: a080572 22547e9 Author: Brian Muramatsu Date: Tue Jan 11 15:43:00 2011 -0800 Merge "Use getAssets().getLocales() to compare with en_US." into froyo commit c5aa8cedd5fdc967856a58b004a33a5a7b255f91 Merge: d4390bf e053d2d Author: Brian Muramatsu Date: Tue Jan 11 15:40:42 2011 -0800 am e053d2db: am a0805727: Merge "resize the layout" into froyo * commit 'e053d2dbc99e8470556eb9586d3a9cbb9e4b474b': resize the layout commit 22547e96065e72491ca2d88e252cbba914827006 Author: DanielMo Date: Mon Jan 10 17:57:33 2011 +0800 Use getAssets().getLocales() to compare with en_US. The LocaleUtils.isSupportedLocale() is listed locale from ICU data resource. The ICU data resource is provided by Android official release and all of data resources are including en_US. The test case below is compared string with APK resource not ICU data and APK resource string is depended on phone locale. The test case should query locale from phone locale. Change-Id: Ib31e9a6cd4b9697d516b14244dabe7e14bd90499 commit e053d2dbc99e8470556eb9586d3a9cbb9e4b474b Merge: 6fb0a4a a080572 Author: Brian Muramatsu Date: Tue Jan 11 14:54:04 2011 -0800 am a0805727: Merge "resize the layout" into froyo * commit 'a0805727fcf3afd9f165c6ab15a0210715a1c885': resize the layout commit a0805727fcf3afd9f165c6ab15a0210715a1c885 Merge: 643804b 20f1f73 Author: Brian Muramatsu Date: Tue Jan 11 14:39:43 2011 -0800 Merge "resize the layout" into froyo commit 20f1f73b26742774a262ab00252b21ff28170cff Author: cci Date: Sat Jan 8 21:23:05 2011 +0800 resize the layout Change-Id: I8a3d8147f76b472ca737bbd67e83b43b6d810adc commit d4390bf1327fb5606c2345790f94d63de94faa4b Merge: d9f3df6 6fb0a4a Author: Brian Muramatsu Date: Tue Jan 11 13:31:22 2011 -0800 am 6fb0a4a4: am 643804b6: Merge "Add a new test testApksAlwaysReadable()" into froyo * commit '6fb0a4a40e868bb94cdbb4d472d163413f0f3753': Add a new test testApksAlwaysReadable() commit 6fb0a4a40e868bb94cdbb4d472d163413f0f3753 Merge: cc028bc 643804b Author: Brian Muramatsu Date: Tue Jan 11 13:28:58 2011 -0800 am 643804b6: Merge "Add a new test testApksAlwaysReadable()" into froyo * commit '643804b68c7b7bd118ee1cf7d2ffc317a7ded028': Add a new test testApksAlwaysReadable() commit 643804b68c7b7bd118ee1cf7d2ffc317a7ded028 Merge: e0ee543 06a6c16 Author: Brian Muramatsu Date: Tue Jan 11 13:15:49 2011 -0800 Merge "Add a new test testApksAlwaysReadable()" into froyo commit 06a6c1680f5daf0c9df07673268017dd411427b4 Author: Masanori Ogino Date: Sun Dec 26 17:25:03 2010 +0900 Add a new test testApksAlwaysReadable() Now testSystemDirAccess() will test not writable/deletable for all files in /system/app. Change-Id: I4ad2b32ff00f54ccee43228c8bdf0c136bc297f7 commit d9f3df627e5d49773f4f534e9d422819a665e367 Merge: 78f036d cc028bc Author: Brian Muramatsu Date: Tue Jan 11 12:35:48 2011 -0800 am cc028bc0: am e0ee543b: Merge "CTS test is not considering the case when the devcie get into SILENT mode by volume down key. It needs to be raised twice to get back to NORMAL mode from the SILENT mode." into froyo * commit 'cc028bc0f481263cfc4559d389e935289a8e8b82': CTS test is not considering the case when the devcie get into SILENT mode by volume down key. It needs to be raised twice to get back to NORMAL mode from the SILENT mode. commit 92869f0c39b50e5618d4293ebdf9c83b885cfe79 Merge: 01f719a 2395b3a Author: Brett Chabot Date: Tue Jan 11 12:34:31 2011 -0800 am 2395b3a7: Merge "Fix compile error." into honeycomb * commit '2395b3a74a91e5ef10cdd0edea22685c4df967a1': Fix compile error. commit 01f719a21e849a69d0df6650881959294566624f Merge: c814529 054b64a Author: Brian Muramatsu Date: Tue Jan 11 12:34:29 2011 -0800 am 054b64a4: Merge "CTS tradefed: ignore known failures." into honeycomb * commit '054b64a4d0440f9a3f0a2b8de379f7b7355aa44e': CTS tradefed: ignore known failures. commit 78f036d563c5bc6904001ca36cbf5c63bcd4fb13 Merge: 4cd77c9 9ab2683 Author: Brian Muramatsu Date: Tue Jan 11 12:33:50 2011 -0800 am 9ab26838: am 595eb0f1: Merge "Webview needs to set instance of ChromeClient to use getProgress value. assertLoadUrlSuccessfully is using view.getProgress() which returns no meaningful value without ChromeClient." into froyo * commit '9ab26838c3276e0c3b7553ea5efa1c1d691f88d7': Webview needs to set instance of ChromeClient to use getProgress value. assertLoadUrlSuccessfully is using view.getProgress() which returns no meaningful value without ChromeClient. commit cc028bc0f481263cfc4559d389e935289a8e8b82 Merge: 9ab2683 e0ee543 Author: Brian Muramatsu Date: Tue Jan 11 12:33:39 2011 -0800 am e0ee543b: Merge "CTS test is not considering the case when the devcie get into SILENT mode by volume down key. It needs to be raised twice to get back to NORMAL mode from the SILENT mode." into froyo * commit 'e0ee543b59789a1ff370d30ec06fce6a8446de11': CTS test is not considering the case when the devcie get into SILENT mode by volume down key. It needs to be raised twice to get back to NORMAL mode from the SILENT mode. commit 9ab26838c3276e0c3b7553ea5efa1c1d691f88d7 Merge: 43c2bbc 595eb0f Author: Brian Muramatsu Date: Tue Jan 11 12:31:17 2011 -0800 am 595eb0f1: Merge "Webview needs to set instance of ChromeClient to use getProgress value. assertLoadUrlSuccessfully is using view.getProgress() which returns no meaningful value without ChromeClient." into froyo * commit '595eb0f1500816227e3e60ebe2ef7d9e1256479d': Webview needs to set instance of ChromeClient to use getProgress value. assertLoadUrlSuccessfully is using view.getProgress() which returns no meaningful value without ChromeClient. commit e0ee543b59789a1ff370d30ec06fce6a8446de11 Merge: 595eb0f 2519185 Author: Brian Muramatsu Date: Tue Jan 11 12:08:59 2011 -0800 Merge "CTS test is not considering the case when the devcie get into SILENT mode by volume down key. It needs to be raised twice to get back to NORMAL mode from the SILENT mode." into froyo commit 2519185412d2bed81fe6c0736d4a06ce8bb32a8e Author: Eunice Date: Tue Jan 4 13:53:08 2011 -0800 CTS test is not considering the case when the devcie get into SILENT mode by volume down key. It needs to be raised twice to get back to NORMAL mode from the SILENT mode. Change-Id: I094840860ae92256263331dd0e3d40fa26a3a6e1 commit 2395b3a74a91e5ef10cdd0edea22685c4df967a1 Merge: 054b64a 2a9491a Author: Brett Chabot Date: Tue Jan 11 11:43:11 2011 -0800 Merge "Fix compile error." into honeycomb commit 2a9491a55d75b4075fc9199b56a6b1a0b08efe74 Author: Brett Chabot Date: Tue Jan 11 11:41:36 2011 -0800 Fix compile error. Change-Id: Iea13f1340fdce4734abbb22b7e52f417b05f0698 commit 595eb0f1500816227e3e60ebe2ef7d9e1256479d Merge: 7ca0842 36b78c1 Author: Brian Muramatsu Date: Tue Jan 11 11:29:23 2011 -0800 Merge "Webview needs to set instance of ChromeClient to use getProgress value. assertLoadUrlSuccessfully is using view.getProgress() which returns no meaningful value without ChromeClient." into froyo commit 36b78c1a9a9da0f938fed721602f164834b66f4d Author: Eunice Date: Wed Jan 5 00:28:46 2011 -0800 Webview needs to set instance of ChromeClient to use getProgress value. assertLoadUrlSuccessfully is using view.getProgress() which returns no meaningful value without ChromeClient. Change-Id: Id8e2cdf5002f774984560a068ea8055e485dd135 commit 054b64a4d0440f9a3f0a2b8de379f7b7355aa44e Merge: 57a97ec 4f8143c Author: Brian Muramatsu Date: Tue Jan 11 11:08:29 2011 -0800 Merge "CTS tradefed: ignore known failures." into honeycomb commit c8145296e8cd179ca04e029b94d30c3c7de76808 Merge: f5e26a5 57a97ec Author: Wei-Ta Chen Date: Mon Jan 10 22:31:08 2011 -0800 am 57a97ecb: Add CTS tests for BitmapRegionDecoder.java. * commit '57a97ecb7edb19ccfb01767686f9f97751822cd9': Add CTS tests for BitmapRegionDecoder.java. commit 57a97ecb7edb19ccfb01767686f9f97751822cd9 Author: Wei-Ta Chen Date: Wed Dec 22 18:00:40 2010 -0800 Add CTS tests for BitmapRegionDecoder.java. Change-Id: I84283a63c1bcdf0cbafd943db633bda50a98e65f commit 4cd77c93f5f9f2c506a0ab7323b818a25016ade5 Merge: 1ec78c6 43c2bbc Author: Brian Muramatsu Date: Mon Jan 10 17:43:29 2011 -0800 am 43c2bbca: am 7ca0842d: Merge "Remove Private API Tests for PhoneNumberUtils" into froyo * commit '43c2bbca04d2e92376a2cbe0a60f02b0aeae4c1f': Remove Private API Tests for PhoneNumberUtils commit 43c2bbca04d2e92376a2cbe0a60f02b0aeae4c1f Merge: 93456cf 7ca0842 Author: Brian Muramatsu Date: Mon Jan 10 17:40:38 2011 -0800 am 7ca0842d: Merge "Remove Private API Tests for PhoneNumberUtils" into froyo * commit '7ca0842d074c7b165e2f6f6fa45da6219c9fe288': Remove Private API Tests for PhoneNumberUtils commit 7ca0842d074c7b165e2f6f6fa45da6219c9fe288 Merge: f7ee88a 9775220 Author: Brian Muramatsu Date: Mon Jan 10 17:33:24 2011 -0800 Merge "Remove Private API Tests for PhoneNumberUtils" into froyo commit 1ec78c67fa51cb76a303a6c59be0d8847ffc45e9 Merge: 75a1c9b 93456cf Author: Brian Muramatsu Date: Mon Jan 10 17:30:08 2011 -0800 am 93456cfe: am f7ee88af: Merge "Fix Broken LinkifyTest Tests" into froyo * commit '93456cfea5cc8c206f16e289bd83383d074d2643': Fix Broken LinkifyTest Tests commit 93456cfea5cc8c206f16e289bd83383d074d2643 Merge: 72f9027 f7ee88a Author: Brian Muramatsu Date: Mon Jan 10 17:28:03 2011 -0800 am f7ee88af: Merge "Fix Broken LinkifyTest Tests" into froyo * commit 'f7ee88af00bc07eeeb904d92d033aca3e2a0961f': Fix Broken LinkifyTest Tests commit 4f8143c0d5fd192987e71c7cfa91d890cb7e883c Author: Brett Chabot Date: Tue Dec 14 18:29:44 2010 -0800 CTS tradefed: ignore known failures. This commit changes cts-tradefed, similiar to the existing CTS harness, to ignore results from tests that are not listed in the CTS test package xml. There are two main parts of this change: - refactor the code that parses the test package xml, to expose methods to determine if test is defined in xml (ITestCaseRepo, ITestPackageDef) - Add a filter for CTS plan test results, that will discard test results from unknown tests (ResultFilter, and changes to PlanTest to use ResultFilter) Change-Id: Idf195682ebeab7fbb30562ac2d7aacbdd6679e13 commit f7ee88af00bc07eeeb904d92d033aca3e2a0961f Merge: 480770f d46b6f9 Author: Brian Muramatsu Date: Mon Jan 10 17:13:30 2011 -0800 Merge "Fix Broken LinkifyTest Tests" into froyo commit d46b6f9fd26124217d790ecbf1ed76b1201ddec5 Author: Brian Muramatsu Date: Wed Dec 29 12:02:43 2010 -0800 Fix Broken LinkifyTest Tests Updated the assertions...not sure why these were marked as broken as the code seems to work logically. Change-Id: I3a9e1161e8a20d51d76d159e9f050329065398e4 commit 75a1c9b131a6244cbc8905b6a12c294a5b2b1de8 Merge: 47212e7 72f9027 Author: Brian Muramatsu Date: Mon Jan 10 17:06:54 2011 -0800 am 72f9027d: am 480770f1: Merge "Fix InsetDrawableTest#testGetOpacity" into froyo * commit '72f9027d943628cb51d30e75f9fea265c7926dfa': Fix InsetDrawableTest#testGetOpacity commit 72f9027d943628cb51d30e75f9fea265c7926dfa Merge: c0d0294 480770f Author: Brian Muramatsu Date: Mon Jan 10 17:04:32 2011 -0800 am 480770f1: Merge "Fix InsetDrawableTest#testGetOpacity" into froyo * commit '480770f1a7baf10c619bd2256681362707c85ceb': Fix InsetDrawableTest#testGetOpacity commit 480770f1a7baf10c619bd2256681362707c85ceb Merge: 8326d12 41d2452 Author: Brian Muramatsu Date: Mon Jan 10 16:53:07 2011 -0800 Merge "Fix InsetDrawableTest#testGetOpacity" into froyo commit 47212e74c2e9920327422c65933cfbe6c613adc7 Merge: 6b2dc90 c0d0294 Author: Brian Muramatsu Date: Mon Jan 10 16:44:54 2011 -0800 am c0d02940: am 8326d122: Merge "Fix More TextViewTest Landscape Issues" into froyo * commit 'c0d029403aade6bb034f1f0c0cef3fb339fbd9d4': Fix More TextViewTest Landscape Issues commit c0d029403aade6bb034f1f0c0cef3fb339fbd9d4 Merge: a23fab5 8326d12 Author: Brian Muramatsu Date: Mon Jan 10 16:42:05 2011 -0800 am 8326d122: Merge "Fix More TextViewTest Landscape Issues" into froyo * commit '8326d122c51d9eff2c9e8b08463851c7c50f5f26': Fix More TextViewTest Landscape Issues commit 41d2452e4163df531046bab552faceeae45243dc Author: Brian Muramatsu Date: Tue Dec 28 16:01:07 2010 -0800 Fix InsetDrawableTest#testGetOpacity Bug 2397630 BitmapDrawableTest#testMutate changed the constant state which affected InsetDrawableTest#testGetOpacity. However, the test wasn't doing much of anything, so I've changed it a bit to call setAlpha and check getOpacity a couple times. This test shouldn't have a problem with constant state, because it calls setAlpha before checking anything. Change-Id: I1cca5cb18107a647e40c13a7c88c905856436595 commit 8326d122c51d9eff2c9e8b08463851c7c50f5f26 Merge: d17bbee b1b4507 Author: Brian Muramatsu Date: Mon Jan 10 16:27:02 2011 -0800 Merge "Fix More TextViewTest Landscape Issues" into froyo commit a1a8835edfb4890fff6347512aae3d4fa21e6850 Merge: 1cc918c 0ef902d Author: Brian Muramatsu Date: Mon Jan 10 14:47:40 2011 -0800 Merge "Fix Build - DO NOT MERGE" into gingerbread commit 0ef902db7c80a1616aadee5ec5aa182a3d597824 Author: Brian Muramatsu Date: Mon Jan 10 14:46:57 2011 -0800 Fix Build - DO NOT MERGE Change-Id: If7519440a39abf10657f6ce35faccb219f4ce055 commit 6b2dc908654865b343e762bea6607970bcfe082b Merge: 0350dc1 a23fab5 Author: Brian Muramatsu Date: Mon Jan 10 14:23:42 2011 -0800 am a23fab59: am d17bbee3: Merge "Fix TelephonyManagerTest Iso Checks" into froyo * commit 'a23fab590c36aff171b472115677dfb23d803403': Fix TelephonyManagerTest Iso Checks commit a23fab590c36aff171b472115677dfb23d803403 Merge: 5a95ac0 d17bbee Author: Brian Muramatsu Date: Mon Jan 10 14:21:14 2011 -0800 am d17bbee3: Merge "Fix TelephonyManagerTest Iso Checks" into froyo * commit 'd17bbee3671c0c460a86e899e72c1bd3938f86eb': Fix TelephonyManagerTest Iso Checks commit 0350dc1cdcea07592ed2a3e36a3b4d96b47075f8 Merge: 21c7d57 5a95ac0 Author: Brian Muramatsu Date: Mon Jan 10 14:13:07 2011 -0800 am 5a95ac00: am f2f68c3d: Merge "Remove Broken LayoutTest Tests" into froyo * commit '5a95ac00f9937db7e9b483ec6c3c9beb28c888dd': Remove Broken LayoutTest Tests commit 5a95ac00f9937db7e9b483ec6c3c9beb28c888dd Merge: bc461ba f2f68c3 Author: Brian Muramatsu Date: Mon Jan 10 14:11:00 2011 -0800 am f2f68c3d: Merge "Remove Broken LayoutTest Tests" into froyo * commit 'f2f68c3d78915edd0897b2203b70814c3b773dda': Remove Broken LayoutTest Tests commit d17bbee3671c0c460a86e899e72c1bd3938f86eb Merge: f2f68c3 bb7617c Author: Brian Muramatsu Date: Mon Jan 10 14:09:00 2011 -0800 Merge "Fix TelephonyManagerTest Iso Checks" into froyo commit f2f68c3d78915edd0897b2203b70814c3b773dda Merge: 470233f f7f1742 Author: Brian Muramatsu Date: Mon Jan 10 14:03:26 2011 -0800 Merge "Remove Broken LayoutTest Tests" into froyo commit 21c7d57baee981d9b4a1c1abfb612cc1e67f09d1 Merge: b0ad644 bc461ba Author: Brian Muramatsu Date: Mon Jan 10 13:01:54 2011 -0800 am bc461ba5: am 470233f3: Merge "Delete DatePickerDialogTest" into froyo * commit 'bc461ba517ccc360042dfa97daac50844b4f8983': Delete DatePickerDialogTest commit bc461ba517ccc360042dfa97daac50844b4f8983 Merge: 1cc918c 470233f Author: Brian Muramatsu Date: Mon Jan 10 13:00:08 2011 -0800 am 470233f3: Merge "Delete DatePickerDialogTest" into froyo * commit '470233f310d56a1f8c50f5358686afa68807c045': Delete DatePickerDialogTest commit 470233f310d56a1f8c50f5358686afa68807c045 Merge: 97be933 3dcf631 Author: Brian Muramatsu Date: Mon Jan 10 12:43:06 2011 -0800 Merge "Delete DatePickerDialogTest" into froyo commit b0ad644738619bab0a63268054d3a625baeb1047 Merge: 2e59391 1cc918c Author: Jean-Baptiste Queru Date: Mon Jan 10 12:28:37 2011 -0800 am 1cc918c9: reconcile with open-source gingerbread CTS * commit '1cc918c90c8902d2f8b45b17126697c35aced001': Add vogar expectation file support for CTS. Nuke TrafficStatsTest#testTrafficStatsWithHost... Nuke GridViewTest#testScroll Nuke WebChromeClientTest#testOnReceivedIcon Update BuildVersionTest for 2.3 and 2.3.1 Update startcts Script Allowing more than one index for cursor position Corrected android.media.cts.AudioEffectTest#test1_0ConstructorFromType commit 1cc918c90c8902d2f8b45b17126697c35aced001 Merge: 6404875 41d4f5c Author: Jean-Baptiste Queru Date: Mon Jan 10 12:22:15 2011 -0800 reconcile with open-source gingerbread CTS Change-Id: I48668c65b9c0f0921954d309b4b53e026af3a86f commit 41d4f5ca8f78dd1ed2efffe432c521e9450f462d Merge: d3a946e 5977e94 Author: Brian Muramatsu Date: Mon Jan 10 12:08:56 2011 -0800 Merge "Add vogar expectation file support for CTS." into gingerbread commit f5e26a591c7025be38c50a146c33a715efc67030 Merge: 7497a73 69d82b7 Author: Brett Chabot Date: Sun Jan 9 16:40:10 2011 -0800 am 69d82b7d: Add simple tests for ActivityManager static is* methods. * commit '69d82b7d8cf1343281b0e52328ece1a11cd04903': Add simple tests for ActivityManager static is* methods. commit 69d82b7d8cf1343281b0e52328ece1a11cd04903 Author: Brett Chabot Date: Sun Jan 9 14:23:20 2011 -0800 Add simple tests for ActivityManager static is* methods. Bug 3329873 Change-Id: Icee42f7dcd391d886c5e50c74bae537c09807323 commit 7497a739fec31b659ef022db2b02755c92e06eec Merge: db504a4 37015f9 Author: Romain Guy Date: Sun Jan 9 11:39:00 2011 -0800 am 37015f9e: Merge "Fix two CTS crashes due to misuse of Canvas. Bug #3282045" into honeycomb * commit '37015f9ef08857e969b6085a742a888d174c9c3c': Fix two CTS crashes due to misuse of Canvas. Bug #3282045 commit 37015f9ef08857e969b6085a742a888d174c9c3c Merge: 6bc1c12 37d06ad Author: Romain Guy Date: Sun Jan 9 11:35:04 2011 -0800 Merge "Fix two CTS crashes due to misuse of Canvas. Bug #3282045" into honeycomb commit 37d06ad49a5202213c51b3a3076d614354518c26 Author: Romain Guy Date: Sun Jan 9 11:37:39 2011 -0800 Fix two CTS crashes due to misuse of Canvas. Bug #3282045 A Canvas must have a backing Bitmap for drawing to work. Change-Id: I2698c9d064349a95bfbfd445cfaf4ad1c32c76a2 commit db504a4e8c0d2149334748ac8ab4717303e03475 Merge: 97c6fb8 bc19ed9 Author: Jesse Wilson Date: Fri Jan 7 15:52:12 2011 -0800 Merge "Test that we can format dates thru 2038." commit bc19ed963fd6d193899135cd7a118a95f3ceb140 Author: Jesse Wilson Date: Fri Jan 7 12:54:45 2011 -0800 Test that we can format dates thru 2038. Change-Id: Ib352db34af40c3bc214cf0d52f06751fbd1d530a http://code.google.com/p/android/issues/detail?id=13050 commit 5977e94bfe57100042cdf41e476d7cb971137e5f Author: Brett Chabot Date: Mon Dec 13 16:42:42 2010 -0800 Add vogar expectation file support for CTS. Bug 3181338 Change-Id: I97e1f8781d7b2781241aec13f1452c51ed6b91cd commit d3a946e87ce2786ad8e47e2a87a12badf1ac0cfe Merge: f97b83c dc9b86b Author: Brian Muramatsu Date: Fri Jan 7 15:35:30 2011 -0800 Merge "Nuke TrafficStatsTest#testTrafficStatsWithHost..." into gingerbread commit dc9b86b38e05bc12e20137540285316dc3835e26 Author: Brian Muramatsu Date: Mon Dec 20 13:57:14 2010 -0800 Nuke TrafficStatsTest#testTrafficStatsWithHost... Bug 3189208 Removing this test due to potential problems with GB. This will need to be brought back and investigated. Change-Id: Ifeafdf44464c652b063edfb51c5f7931624b6973 commit f97b83c3190dbbf2dbefd070caf4ca8fe98ae44a Merge: 37ccb98 9393f48 Author: Brian Muramatsu Date: Fri Jan 7 15:16:41 2011 -0800 Merge "Nuke GridViewTest#testScroll" into gingerbread commit 9393f4891ee3642b6268ec009a8552ff567d35b5 Author: Brian Muramatsu Date: Mon Dec 20 13:49:32 2010 -0800 Nuke GridViewTest#testScroll Bug 3097462 Remove flakey test and now broken test on GB. Could be a problem with TouchUtils or the test. Change-Id: Iecc09f4a997be24e08ea0b38c915073cf99a9d46 commit 37ccb98622dab6a2cff315d9a6bea54b761410ac Merge: 244ff85 0a32c81 Author: Brian Muramatsu Date: Fri Jan 7 15:05:14 2011 -0800 Merge "Nuke WebChromeClientTest#testOnReceivedIcon" into gingerbread commit 0a32c81efdde76a4c95be703edbec65cdeeb8381 Author: Brian Muramatsu Date: Mon Dec 20 13:46:54 2010 -0800 Nuke WebChromeClientTest#testOnReceivedIcon Remove this troublesome test that has been very flakey. Change-Id: I66af4d3a9e9f96fd082f4c75784941446536ead8 commit 244ff85ed93580cc94bed218c28c4b2bd51fab5d Merge: e09fc7f c4d9a56 Author: Brian Muramatsu Date: Fri Jan 7 14:58:08 2011 -0800 Merge "Update BuildVersionTest for 2.3 and 2.3.1" into gingerbread commit c4d9a5600a9b984ec52c10c278dae92038c635e5 Author: Brian Muramatsu Date: Mon Dec 20 13:34:37 2010 -0800 Update BuildVersionTest for 2.3 and 2.3.1 Bug 3097462 Change-Id: I52b9fbe0288619e906a657a8ee5992b975b3ad67 commit e09fc7f7ad747ee185d7604695986c000bd19672 Merge: ea6b6f0 c59fe85 Author: Brian Muramatsu Date: Fri Jan 7 14:30:31 2011 -0800 Merge "Allowing more than one index for cursor position" into gingerbread commit ea6b6f0ba25e66783d56c2b1d4c2daf0ceacf91a Merge: af88bd9 20a2529 Author: Brian Muramatsu Date: Fri Jan 7 14:07:38 2011 -0800 Merge "Corrected android.media.cts.AudioEffectTest#test1_0ConstructorFromType" into gingerbread commit af88bd95d27a3fa86610aa1f86cd422724a09648 Merge: 25d543e 5c5eebe Author: Brian Muramatsu Date: Fri Jan 7 14:01:42 2011 -0800 Merge "Update startcts Script" into gingerbread commit 5c5eebec6282efa12b5091e66fc9d88c4606138c Author: Brian Muramatsu Date: Mon Dec 20 15:43:09 2010 -0800 Update startcts Script Update the startcts script to be compatible with the latest SDK which puts adb under the "platform-tools" directory. Also do not require that SDK_ROOT to be set. Just search the PATH for adb instead since the SDK is no longer needed for ddmlib. Change-Id: I9ce8269272d3100f7ce15ee43d49b31aa905e557 commit 97c6fb8da7f50a7e3a2afdbc8b1721df86f509a8 Merge: ff428a6 6bc1c12 Author: Steve Block Date: Fri Jan 7 11:08:34 2011 -0800 am 6bc1c125: Revert "Make CacheManagerTest write to cache directly." * commit '6bc1c1256361d5f11a176fca1522d9d1a5e248bb': Revert "Make CacheManagerTest write to cache directly." commit ff428a6a2e58f83472e6fb3bc6f7fcaa8924c8b1 Merge: 54850f3 729e299 Author: Steve Block Date: Fri Jan 7 11:08:32 2011 -0800 am 729e2995: Fix a comment in CTS CacheManagerTest.testCacheDisabled() * commit '729e2995b8fd6b9ced44fd9bfc0f59c1c88effd1': Fix a comment in CTS CacheManagerTest.testCacheDisabled() commit 6bc1c1256361d5f11a176fca1522d9d1a5e248bb Author: Steve Block Date: Fri Jan 7 17:48:14 2011 +0000 Revert "Make CacheManagerTest write to cache directly." This change uses a non-public method in CacheManagerTest.testCacheFile(). There's no guarantee that we'll continue to support non-public methods in the future, so this is inappropriate for a CTS test. This reverts commit 73da8539b16c43ce8155ccfc98a0cfa69ed35a77. Bug: 3270236 Change-Id: I1d31aa04a66b2f4f2b3c0bcd7a5caabca310845c commit 729e2995b8fd6b9ced44fd9bfc0f59c1c88effd1 Author: Steve Block Date: Fri Jan 7 17:43:47 2011 +0000 Fix a comment in CTS CacheManagerTest.testCacheDisabled() Bug: 3270236 Change-Id: I5a929e5e98015dea356dc378869eaaed76d3017d commit 54850f3752493440ec60ff77f52ea5684471e5ae Merge: 8cf0deb b096064 Author: Steve Block Date: Fri Jan 7 07:58:11 2011 -0800 am b0960642: Revert "Allow CacheManager to be initially disabled." * commit 'b0960642fddb898d070f2b6fd6c734f9d4dda851': Revert "Allow CacheManager to be initially disabled." commit 8cf0debb5aa2738a08da8f5d9036fdef5ae92967 Merge: 6930da6 2fb6cd5 Author: Steve Block Date: Fri Jan 7 07:58:09 2011 -0800 am 2fb6cd50: Revert "getCacheFileBaseDir() should return null when disabled." * commit '2fb6cd50d691bfca18198873ac2d3469e2b71bef': Revert "getCacheFileBaseDir() should return null when disabled." commit 6930da64981c61aa1d09af42e35f2ca7a0da5b8f Merge: 9c0900f 2328c54 Author: Wu-cheng Li Date: Fri Jan 7 07:40:35 2011 -0800 am 2328c548: Do not use getParameter to check zoom value in zoom callback. * commit '2328c548c192b60b254c6efbef52da334eb4fc9c': Do not use getParameter to check zoom value in zoom callback. commit b0960642fddb898d070f2b6fd6c734f9d4dda851 Author: Steve Block Date: Wed Dec 22 16:23:54 2010 +0000 Revert "Allow CacheManager to be initially disabled." Cherry-pick from master. This is no longer needed as the CacheManager should always be enabled. This reverts commit 0dee316c165ec017d0456eb7fa041a839ef72190. Bug: 3270236 Change-Id: I9f40ebf3b069d35b78e2c969fbabd35985f1eb81 commit 2fb6cd50d691bfca18198873ac2d3469e2b71bef Author: Steve Block Date: Wed Dec 22 16:23:34 2010 +0000 Revert "getCacheFileBaseDir() should return null when disabled." Cherry-pick from master. This is no longer needed as the CacheManager should always be enabled. This reverts commit ded09b59f283386d920cb14a9597c38b289383c9. Bug: 3270236 Change-Id: Ifb393c93bc1e8bf138a75ae221a7de4dfaacea13 commit 9c0900f9747ec0ff95b7661ac3b46394f1c58456 Merge: 12247d8 8bb9aae Author: Steve Block Date: Fri Jan 7 07:05:58 2011 -0800 Merge changes I481dcd6a,I29516f45 * changes: Revert "Allow CacheManager to be initially disabled." Revert "getCacheFileBaseDir() should return null when disabled." commit 2328c548c192b60b254c6efbef52da334eb4fc9c Author: Wu-cheng Li Date: Fri Jan 7 19:54:52 2011 +0800 Do not use getParameter to check zoom value in zoom callback. When the test calls getParameter, the zoom value may have changed again. We should not compare it to the value from zoom callback. bug:3197618 Change-Id: Ic89c62326be16e5292527a897dc9c51daad168f5 commit 94322c79dba3c7ca5f29dc163f27efaf90e98c46 Author: Eunice Date: Thu Jan 6 02:21:58 2011 -0800 Set ChromeClient to webview to gurantee the getprogress() value commit d26929ab5fbffc055c1e4137e436fc1adcd2e774 Author: Eunice Date: Wed Jan 5 23:35:19 2011 -0800 100ms does not gurantee trigerring the audio. the test always passed with 200ms commit 12247d81a024860cec34eaa24d27907568313e75 Author: John Reck Date: Wed Jan 5 17:25:03 2011 -0800 Fix slight regression Bug: 3306992 Was trying to backup/restore columns that weren't in the table, filtered those out of the backup. Change-Id: Icc17f34ff845c3aedd639fb30973bad535d7f9a3 commit 7260d920bd72751d2ef065861a56023871e6d9fd Merge: 9e08c63 db13b79 Author: Jeff Brown Date: Wed Jan 5 14:52:17 2011 -0800 Merge "Add dispatch key shortcut window callback." commit 9e08c6365a84d8e53794546ea63eb69e36ff4037 Merge: d7c3011 2e59391 Author: Jean-Baptiste Queru Date: Wed Jan 5 14:30:04 2011 -0800 am 2e593912: (-s ours) am 64048756: am 97be933d: (-s ours) reconcile with open-source CTS - DO NOT MERGE * commit '2e5939127e8295a836398e53f6e6524707a8efad': reconcile with open-source CTS - DO NOT MERGE commit 2e5939127e8295a836398e53f6e6524707a8efad Merge: f28b92f 6404875 Author: Jean-Baptiste Queru Date: Wed Jan 5 14:28:31 2011 -0800 am 64048756: am 97be933d: (-s ours) reconcile with open-source CTS - DO NOT MERGE * commit '640487561466a65e306a7d8b6bcd65a71a72c7d5': reconcile with open-source CTS - DO NOT MERGE commit 640487561466a65e306a7d8b6bcd65a71a72c7d5 Merge: b9017db 97be933 Author: Jean-Baptiste Queru Date: Wed Jan 5 14:25:54 2011 -0800 am 97be933d: (-s ours) reconcile with open-source CTS - DO NOT MERGE * commit '97be933da2aa76acd8384e7b8420444193508133': reconcile with open-source CTS - DO NOT MERGE commit 97be933da2aa76acd8384e7b8420444193508133 Author: Jean-Baptiste Queru Date: Wed Jan 5 14:23:28 2011 -0800 reconcile with open-source CTS - DO NOT MERGE Change-Id: I9660088dbd3611bdf4283b3a15618272d18de9ab commit db13b79105a61cac5519936d1986c6abce2ed390 Author: Jeff Brown Date: Wed Jan 5 12:55:05 2011 -0800 Add dispatch key shortcut window callback. Change-Id: I0700636cadd754b3ff0c4c7f1876ccc1d40ff826 commit d7c3011d38fe5e29e53e1db2f45a010349b9c525 Merge: 0828a04 f28b92f Author: Steve Block Date: Wed Jan 5 03:52:31 2011 -0800 am f28b92f8: am b9017dbe: Add a CTS test for a WebView crash due to AppCache * commit 'f28b92f8d92fbda394610c94daff115177254696': Add a CTS test for a WebView crash due to AppCache commit f28b92f8d92fbda394610c94daff115177254696 Merge: 4fd545b b9017db Author: Steve Block Date: Wed Jan 5 03:48:47 2011 -0800 am b9017dbe: Add a CTS test for a WebView crash due to AppCache * commit 'b9017dbe7a9bb1b191c54d246b0248b7b22d1530': Add a CTS test for a WebView crash due to AppCache commit c59fe85a7cd516caf51deea78daee810a0b4cf90 Author: Rasmus Tengblad Date: Wed Jan 5 09:29:01 2011 +0100 Allowing more than one index for cursor position Many implementations of cursor handling for bi-directional text and text containing complex glyphs need two indices to correctly store a cursor position. The CTS should allow this. Change-Id: I587b6ef1e0aef4c3417ece75cf932a630565cb88 commit 0828a047b8fb8e5ff8a6126c0f2b77b45749dd71 Author: Wu-cheng Li Date: Wed Jan 5 13:58:38 2011 +0800 Add CTS to test invalid camera parameters. bug:3104514 Change-Id: I6e88ab7fa9ca6fc62f34816ef0eecfb381f4ca22 commit 232b2dea31e9aea71cdd6699e66226f8f05fb78d Merge: ce39799 b15a0d6 Author: Wu-cheng Li Date: Tue Jan 4 19:45:01 2011 -0800 Merge "Use setProfile to make sure the recording settings are valid." commit ce3979960e98cea2566c3e93f547a2488f9b1e3e Author: Vasu Nori Date: Tue Jan 4 15:13:57 2011 -0800 fix tests after Change-Id: I8b7c3b051fd1a146e4026f8f8acfdd099f9a70cf remove the test that deals with creating a database in prohibited area. instead of throwing an exception, the error is treated as database corruption error after the CL Change-Id: I8b7c3b051fd1a146e4026f8f8acfdd099f9a70cf Change-Id: I48327b318480671ca8328f3644872f5362886ee3 commit b9017dbe7a9bb1b191c54d246b0248b7b22d1530 Author: Steve Block Date: Fri Dec 31 15:36:10 2010 +0000 Add a CTS test for a WebView crash due to AppCache This crash occurred when AppCache was used without having set the database path. Bug: 3305684 Change-Id: I90209f63c77b731f98280ea6da8c453e02840f5a commit 2d334cfe368ac66d4b6d7d8291d2307754f28418 Merge: 9ede1cc 0438a2c Author: John Reck Date: Tue Jan 4 11:02:50 2011 -0800 Merge "Fix CTS bookmark backup/restore" commit b15a0d69de953bd9aff5b2534afc8b0d3e9d0501 Author: Wu-cheng Li Date: Tue Jan 4 19:52:41 2011 +0800 Use setProfile to make sure the recording settings are valid. Originally the test used MediaRecorder.OutputFormat.DEFAULT and MediaRecorder.VideoEncoder.DEFAULT. It also used default preview size as video size. But the recording would fail. bug:3197565 Change-Id: I78f6c82d65e10920582ab49e94343c51bf1800af commit b1b45076e9c928bd1a544469dd67e7c0335b49d9 Author: Brian Muramatsu Date: Tue Dec 28 14:13:12 2010 -0800 Fix More TextViewTest Landscape Issues Issue 12472 Remove an unused view from the layout that was not letting some widgets increase in height. Change-Id: I7fbb84638a3b54c874cb76fa8b9fcc965d161891 commit 977522004dcea20d5e45fafa8e20e5d8502fab9c Author: Brian Muramatsu Date: Tue Dec 28 13:46:32 2010 -0800 Remove Private API Tests for PhoneNumberUtils Issue 13363 compareLoosely and compareStrictly are private APIs that should not be tested in CTS. Change-Id: I41d5139f0dbe47c32e66014a0523260c4340de64 commit 9ede1cc3121e4f383a466c5bae3f7d7656482d7f Merge: aeb750b c3706bc Author: Brian Muramatsu Date: Thu Dec 23 12:00:33 2010 -0800 Merge "Fix ScrollViewTest#testRequestChildRectangle..." commit aeb750bd81658a82a77e9023e8218bfa15def0d9 Merge: 0f8ba1b cfae500 Author: Brian Muramatsu Date: Thu Dec 23 11:58:14 2010 -0800 Merge "Fix InstrumentationTest#testSendPointerSync" commit 0f8ba1beab7c6edde0a45d1b0429079f3123d482 Merge: 1537ad7 082804b Author: Brian Muramatsu Date: Thu Dec 23 11:52:04 2010 -0800 Merge "Fix MetaKeyKeyListenerTest#testHandleKeyUp" commit 1537ad7be89acb761cb718290be3eb06230e0988 Merge: dbcb415 8546458 Author: Gilles Debunne Date: Thu Dec 23 10:31:36 2010 -0800 Merge "Fix a test for DrawableContainerState with no Drawable." commit dbcb415cec0992bddb43636e81c75f29fb5b2b7f Merge: 8c12ae8 ad9ac39 Author: Wu-cheng Li Date: Wed Dec 22 19:41:11 2010 -0800 Merge "Check default camera white-balance and color effect." commit ad9ac39070639060f7a645faeda9a7358d7b65b0 Author: Wu-cheng Li Date: Thu Dec 23 11:30:47 2010 +0800 Check default camera white-balance and color effect. Change-Id: Ib225fdd1f106f8f406dbcf4f6cc7d6c2f7800a83 commit 8546458322e35805302b01ce2a56a6fd50593ecd Author: Gilles Debunne Date: Wed Dec 22 18:20:27 2010 -0800 Fix a test for DrawableContainerState with no Drawable. The -1 value is expected. Coherent with the getIntrinsicWidth/Height method that return -1 when undefined. Bug 3192851 Change-Id: Ic96edd666939b1432bd9d021e84cc213d5c0a900 commit 082804b2ef53e533e965f39e68175ed6ad1b4593 Author: Brian Muramatsu Date: Wed Dec 22 17:27:46 2010 -0800 Fix MetaKeyKeyListenerTest#testHandleKeyUp Bug 3267538 The VIRTUAL_KEYBOARD is a FULL keyboard type that has MODIFIER_BEHAVIOR_CHORDED. The test are failing because they are testing the MODIFIER_BEHAVIOR_CHORDED_OR_TOGGLED behavior. Fix them and specify VIRTUAL_KEYBOARD in the KeyEvents since other devices may not by default use the VIRTUAL_KEYBOARD. Change-Id: I8244c9eafc98b9ea3fc1a44364860a9995e99c17 commit 0438a2c1e2cda4308dabdccd323b890efbfabf3a Author: John Reck Date: Wed Dec 22 15:42:00 2010 -0800 Fix CTS bookmark backup/restore Bug: 3295930 Change-Id: Idbdf0a28a1f604ce17b0c16c48f9478fb63b1274 commit cfae5009533f60bdd95b48b54db10987cd1a499f Author: Brian Muramatsu Date: Wed Dec 22 14:21:44 2010 -0800 Fix InstrumentationTest#testSendPointerSync The test sends a motion event with a coordinate of (50, 50). This now ends up being absorbed by the ActionBarView's LinearLayout. Change the testing coordinate to (100, 100)... Change-Id: Ibbbe02657bbb99b5db1f41948b7d5a2ba5f97ceb commit 8c12ae8cced9bb5e45a331aba7ded97626c94df2 Author: James Dong Date: Wed Dec 22 12:32:57 2010 -0800 Fixed a cts issue where camera id was not passed to get the profile. As a result, a non-existing profile (720p) is used to verify the FRONT camera's camcorder profile bug - 3306248 Change-Id: I31da801895712bf2eb6a17f358b0455305bc8991 commit 8bb9aae9fd894fa78afc66fd851c80b9696871c1 Author: Steve Block Date: Wed Dec 22 16:23:54 2010 +0000 Revert "Allow CacheManager to be initially disabled." This is no longer needed as the CacheManager should always be enabled. This reverts commit 0dee316c165ec017d0456eb7fa041a839ef72190. Bug: 3270236 Change-Id: I481dcd6a81c600f67ddac7000dd8b109d1d96866 commit 572629e91e89228a41af2c5376db2c8da290f583 Author: Steve Block Date: Wed Dec 22 16:23:34 2010 +0000 Revert "getCacheFileBaseDir() should return null when disabled." This is no longer needed as the CacheManager should always be enabled. This reverts commit ded09b59f283386d920cb14a9597c38b289383c9. Bug: 3270236 Change-Id: I29516f452c963552f33be8011350afdf44c99948 commit 56d8ae53f99e13b8b1dae7fdc505897ece31759d Author: Brian Muramatsu Date: Mon Dec 20 12:13:03 2010 -0800 Remove Broken NoActivityRelatedPermissionTest Bug 1910487 Change-Id: I8dfa05222713e4d4f6a11aa42567510b06859a07 commit 20a252994ae0c0ef668e23bd296581f3bc2f4915 Author: Christer Fletcher Date: Mon Dec 20 12:53:32 2010 +0100 Corrected android.media.cts.AudioEffectTest#test1_0ConstructorFromType The test case queries for all effects and then tries to recreate them by using the type uuid of the effect. This however failed for effects that did not implement a standard type. These effects will have their type set to AudioEffect.EFFECT_TYPE_NULL and thus reconstruction of them would fail. Made the test skip effects that has this NULL type. Change-Id: I352844a473a174c2fbf7d37fc0f40923c00b957b commit 73da8539b16c43ce8155ccfc98a0cfa69ed35a77 Author: Iain Merrick Date: Fri Dec 17 11:09:51 2010 +0000 Make CacheManagerTest write to cache directly. Rather than using the Apache HTTP stack to load data into the cache, we now call createCacheFile and saveCacheFile directly. This means the same test works with both the Apache and Chromium HTTP stacks. Bug: 3270236 Change-Id: I3c7ce91745fbdf6455f2e73d99d70848901eab92 commit c3706bc439a416b87d6148d939bd36a40926b556 Author: Brian Muramatsu Date: Thu Dec 16 16:30:42 2010 -0800 Fix ScrollViewTest#testRequestChildRectangle... The test sets up a scroll view with a layout with 3-5 widgets inside of it. It picks a rectangle in the lower right of the scroll view that shoul cause scrolling, because the vertical fading edge takes up some of the height. However, the vertical fading edge isn't enabled by default anymore, so no scrolling occurred. Enable scrolling in the test to make it work again. Change-Id: I8e1c64a971df5af0f8e71d8e3e1e4c97726be8d9 commit 3ed0c8a1f788bfe88794441ffd44c10583f7db1e Merge: 8ef256f f908129 Author: Brian Muramatsu Date: Thu Dec 16 14:58:58 2010 -0800 Merge "Fix AutoCompleteTextViewTest" commit 8ef256fc52fa101ced2f878e6094404c022013d7 Merge: 99066ac 7aedcde Author: Brian Muramatsu Date: Thu Dec 16 14:39:13 2010 -0800 Merge "Fix GridViewTest#testSetHorizontalSpacing" commit 7aedcde777004e38f57ff76ac845c50db9b14677 Author: Brian Muramatsu Date: Thu Dec 16 12:47:47 2010 -0800 Fix GridViewTest#testSetHorizontalSpacing The test creates a GridView with 20 columns and puts 3 elements into it. It then sets the horizontal spacing to values like 0 and 5 and checks that the spacing between the views are 0 and 5. However, the GridView is distributing the elements on the wide screen, so the spacing isn't correct. Thus, set the stretch mode to none to fix the issue. This isn't a new behavior in GridView. Change-Id: Id30d378021b8de9d6c1e87cf79d5e2b75467749a commit 99066ac5f3834a8baf223494219637f865dd1887 Author: Brian Muramatsu Date: Thu Dec 16 10:23:28 2010 -0800 Fix View_UsingViewsTest#testSetFocus Action bar focus issue again... Change-Id: I772748087f811bc172f4445eb70a3e80da19ef1b commit b25cd2d2bd83857c2a9faa9f57d7b69532e93bd1 Author: Brian Muramatsu Date: Wed Dec 15 14:14:39 2010 -0800 Fix ViewTest#testAccessMeasureDimension Remove the test of setting negative widths and heights. When setting these values, they are filtered through a mask, so these negative numbers come back unsigned and don't match... Change-Id: If24af582c44317137f504c99b9f6d52cc591470a commit 81113caa33ad3448d11003153570375ebb57c405 Merge: 6bc5f67 258e441 Author: Brian Muramatsu Date: Wed Dec 15 18:48:08 2010 -0800 Merge "Fix ListViewTest#testDispatchKeyEvent" commit 6bc5f67a409b03707b7041b6df72d66b5c57ff1e Merge: 3199dbe 7375565 Author: Gilles Debunne Date: Wed Dec 15 18:25:30 2010 -0800 Merge "Fix cts test. A long string is not long enough on tablet devices!" commit f908129b007a77caff1371667cfae64826be485e Author: Brian Muramatsu Date: Wed Dec 15 18:15:22 2010 -0800 Fix AutoCompleteTextViewTest The dropdown doesn't show up if there aren't enough items in the list. The "inflatePopup" method was setting the text to blank and then trying to show the dropdown. As soon as that happened, mIsShowing was set to true, but the handler for the popup dismisses it because it doesn't have enough leters. Fix the tests to support this new behavior. Change-Id: Icab9eafa7a8945522da4345a2617b6062fd7131b commit 7375565c2caf62392b32049cafb7df0730373794 Author: Gilles Debunne Date: Wed Dec 15 17:59:50 2010 -0800 Fix cts test. A long string is not long enough on tablet devices! Bug 3289834 Change-Id: I07f99a7de3667bcc433a2a89b974a8af1b95adc6 commit 258e4413dd541b8f61b045f9b5c3d84f83d652a1 Author: Brian Muramatsu Date: Wed Dec 15 16:41:37 2010 -0800 Fix ListViewTest#testDispatchKeyEvent ...action bar focus strikes again!!! Change-Id: I2dea6a534edac35f4035066fff5b39a45ac5858c commit 3199dbe0570d5458d9a7bf8db879beb906878a1b Merge: 47474b5 2e9168c Author: Brian Muramatsu Date: Wed Dec 15 15:27:02 2010 -0800 Merge "Fix CheckedTextViewTest#testChecked" commit 47474b5388c1b89fef73ed15c5c938b806157f4a Merge: 1223416 61aeb17 Author: Eric Laurent Date: Wed Dec 15 15:26:36 2010 -0800 Merge "Fix issue 2676107." commit 2e9168cd8c7cc71657df9f965ebc075ca0eab720 Author: Brian Muramatsu Date: Wed Dec 15 14:55:33 2010 -0800 Fix CheckedTextViewTest#testChecked The test calls ListView#setItemChecked. setItemChecked updates the ListView's map of checked widgets properly and then asks for a relayout. The ListView seems to only update the children that are visible, because fixing the layout causes the views themselves to become checked properly. Change-Id: Ieba755d276c9ea2ed231777f05b2c4fec4654cb4 commit 1223416963a229184e5b886a00ef841c89b2f22f Merge: 264e69b b1e184a Author: Brian Muramatsu Date: Wed Dec 15 14:17:27 2010 -0800 Merge "Focus Fixes in ViewTest" commit b1e184a0867a21ba021cead3edb1fff458625b57 Author: Brian Muramatsu Date: Wed Dec 15 14:09:10 2010 -0800 Focus Fixes in ViewTest Some more tests were not requesting focus, so the test was not sending the key events to the right widgets. This is due to the action bar taking the initial focus now which is intended at this moment in time. Change-Id: I89e3ce4a1ca7bf07e1678a9cdd6fa664869e9862 commit 264e69b5eaba73a702a582f5343da68493f6ee01 Merge: 8dba67d 9d5e30d Author: Brian Muramatsu Date: Wed Dec 15 13:52:40 2010 -0800 Merge "Fix SMS Tests for Non-telephony Devices" commit 9d5e30dbe9a5c2a6310455cfcbcd32b19ecc64cc Author: Brian Muramatsu Date: Tue Dec 14 15:01:41 2010 -0800 Fix SMS Tests for Non-telephony Devices Change the assertions to check that no messages come back when sending the SMS messages to the device. These tests will now timeout when waiting for the messages which indicates success. Change-Id: I449e0ad617bb4d5af68ade21319c483d57c140da commit 61aeb1732d595c20ba927595683720f8787c29b7 Author: Eric Laurent Date: Wed Dec 15 12:37:19 2010 -0800 Fix issue 2676107. Added test for maximum record start time on devices claiming PackageManager.FEATURE_AUDIO_LOW_LATENCY feature. Change-Id: I284e1ba241677c48d3e9ad237e4276fdbdc10fcd commit 8dba67dc821b231205c626f4135e299eeb08d3bc Merge: f04208c 2b3c7c0 Author: Brian Muramatsu Date: Wed Dec 15 12:03:12 2010 -0800 Merge "Fix DialerFilterTest" commit 2b3c7c011eec9e0bd18c14611d312bd1026c8715 Author: Brian Muramatsu Date: Tue Dec 14 16:10:09 2010 -0800 Fix DialerFilterTest The key events were being lost, because the the widget didn't start with focus like it did in previous releases. This is due to the action bar now taking focus and is working as intended. Change-Id: I9200dde28494a881b0f83d1a7c6e638b9e703552 commit f04208cf19e419cd8021af2aedf7d04649e1ad78 Author: Ben Murdoch Date: Tue Dec 14 10:13:21 2010 +0000 Fix WebViewClient form submission CTS failure Since we picked up webkit r65340, we cannot trigger a page navigation in the onload handler and expect it to create a history entry. We must do the navigation asynchronously. Requires a change in external/webkit, see I592ae7ba0acc7478789599aeb6973675ed415a37 Bug: 3241908 Change-Id: I8cefff3aeb0e05c63b4b7900777096abe2937841 commit 61236128a879f5b4811103900f7a85306b3631c0 Merge: 7c01c5d 0bbce23 Author: Brad Fitzpatrick Date: Tue Dec 14 16:26:38 2010 -0800 Merge "CTS test for SharedPreferences MODE_MULTI_PROCESS" commit 0bbce232b5e7e0f1d0321039a43e13850d73d43e Author: Brad Fitzpatrick Date: Tue Dec 14 15:37:06 2010 -0800 CTS test for SharedPreferences MODE_MULTI_PROCESS MODE_MULTI_PROCESS is introduced in Icf93f9df Change-Id: I6154edab0024be46dcc0c4010186f0fc8e90ce95 commit bb7617c4ec38423e2d7029a6753c59faf845fe76 Author: Brian Muramatsu Date: Tue Dec 14 15:27:22 2010 -0800 Fix TelephonyManagerTest Iso Checks Even though a device may not have the telephony feature it may define these properties if it uses a SIM. Change-Id: I29caedc365112e76a8e47a8df9646361b62954f7 commit 7c01c5dd1196040ddb112ea6467454c51acc03c0 Merge: d3f92b8 02a787a Author: Brian Muramatsu Date: Tue Dec 14 14:44:48 2010 -0800 Merge "Fix TabActivityTest" commit d3f92b80515e6567b267067cc2c5733faf6b0226 Merge: 65a2889 2b724c7 Author: Brian Muramatsu Date: Tue Dec 14 14:43:31 2010 -0800 Merge "Revert "New tests for the new MipmapDrawable class."" commit 2b724c769821d931e8ba1dd3e1861378194c46f5 Author: Brian Muramatsu Date: Tue Dec 14 14:21:25 2010 -0800 Revert "New tests for the new MipmapDrawable class." Bug 3285373 This reverts commit 4e19452bb42984178390f65028afe38e2cf55cf0. The class is now hidden in HC. However, it's great to see that new tests are being added! Change-Id: Ibfd1b8a585a6b2c81a1eb261a432f91207f66484 commit 02a787a1bb4c1b0b479c1089f01441dadf795a62 Author: Brian Muramatsu Date: Tue Dec 14 14:00:44 2010 -0800 Fix TabActivityTest Remove the onSaveInstanceState check, since it is not always called. Change-Id: Ia7c80808d7f23d6b7dbff81f62bd7ab5ce704615 commit 65a2889071c1881b144430e36a3170fe4de75303 Merge: ded09b5 33f8253 Author: Brian Muramatsu Date: Tue Dec 14 13:43:50 2010 -0800 Merge "Fix Activity Lifecycle CTS Tests" commit 33f825300d0827e8eb8ff7bffe81954fd4e12359 Author: Brian Muramatsu Date: Tue Dec 14 13:08:21 2010 -0800 Fix Activity Lifecycle CTS Tests Don't check that onSaveInstanceState is called. onSaveInstanceState is called after onPause now, but onSaveInstanceState may not even be called anymore. Change-Id: I4e3e64f730388c01be83221ea364620ab30eee6d commit ded09b59f283386d920cb14a9597c38b289383c9 Author: Iain Merrick Date: Tue Dec 14 13:49:58 2010 +0000 getCacheFileBaseDir() should return null when disabled. BUG=3270236 Change-Id: I9de75546c78d13b412df48e39b29af9855b07ab4 commit 08686eabc408e7619f2d2d79e921e0e43b14fc25 Merge: dae6229 91650b6 Author: Steve Block Date: Tue Dec 14 02:51:19 2010 -0800 Merge "Test WebView.addJavascriptInterface() with an oddly named property" commit dae6229490afbe8941bee1d3b90d2e1bf4ed9107 Author: Jeff Brown Date: Mon Dec 13 14:44:42 2010 -0800 Add tests for new KeyEvent modifier methods. Change-Id: Ie71385ca0ee620f7232e5bbaa7be016a8866e776 commit d92f7f47f46a35aff355a0deeed607d7f5b61e48 Author: James Dong Date: Mon Dec 13 18:14:16 2010 -0800 Fix the broken build due to a typo. forgot to update the patch. Change-Id: I42d2e63792de211eb5ed1c6c3c473f3bd5a6ad7e commit fa73cdc14a26522c7220971b488e943641b18de2 Merge: 56129c1 9b091b6 Author: James Dong Date: Mon Dec 13 17:39:01 2010 -0800 Merge "Fixed a cts issue where 480p was considered as 720x480 only" commit 9b091b6ac5afb3b45bc181ddd2096ca92ea0ea66 Author: James Dong Date: Mon Dec 13 17:23:45 2010 -0800 Fixed a cts issue where 480p was considered as 720x480 only bug - 3281711 Change-Id: I67f96e073c5d6e0acb8ac9cfc76a439d870f6bc0 commit 56129c167239bd7beeb2562ed088bc81d6a684df Merge: 0e34061 4fd545b Author: Nick Kralevich Date: Mon Dec 13 14:13:42 2010 -0800 am 4fd545b9: am 0a5106f5: still seeing flakyness. Increase retries. * commit '4fd545b92bc6a75d803c309614ff11427d304124': still seeing flakyness. Increase retries. commit 4fd545b92bc6a75d803c309614ff11427d304124 Merge: 38b5a3b 0a5106f Author: Nick Kralevich Date: Mon Dec 13 14:11:40 2010 -0800 am 0a5106f5: still seeing flakyness. Increase retries. * commit '0a5106f5afc37a389d14e79d80b53b2a978ad81d': still seeing flakyness. Increase retries. commit 0a5106f5afc37a389d14e79d80b53b2a978ad81d Author: Nick Kralevich Date: Mon Dec 13 14:02:45 2010 -0800 still seeing flakyness. Increase retries. Change-Id: I988afa2922dc503bcdff455822088ad22c854d97 commit 0e340618f0a40e82bb7785682b10ed52bd796076 Merge: a5fdfb3 38b5a3b Author: Nick Kralevich Date: Mon Dec 13 13:44:57 2010 -0800 am 38b5a3be: am 8dc2b80b: Make ListeningPortsTest less flaky. * commit '38b5a3beffc1c9d042ba2ebeb7b5eb58ed2e61db': Make ListeningPortsTest less flaky. commit 38b5a3beffc1c9d042ba2ebeb7b5eb58ed2e61db Merge: 110cc57 8dc2b80 Author: Nick Kralevich Date: Mon Dec 13 13:42:44 2010 -0800 am 8dc2b80b: Make ListeningPortsTest less flaky. * commit '8dc2b80b06032addf4a93543c90c3603bb6be023': Make ListeningPortsTest less flaky. commit 8dc2b80b06032addf4a93543c90c3603bb6be023 Author: Nick Kralevich Date: Mon Dec 13 12:50:29 2010 -0800 Make ListeningPortsTest less flaky. When a DNS lookup occurs, a new listening UDP socket will be created to receive the DNS response. This listening socket is only temporary, and shouldn't count as a permanent open socket. Bug: 3276283 Change-Id: I45090c0e07d9b360cc26f4bce23833db8c399507 commit a5fdfb3cdc24a5a3d31a69b8a9733d174e0e11bc Merge: 7c85dc7 110cc57 Author: Nick Pelly Date: Mon Dec 13 12:30:31 2010 -0800 am 110cc577: am ace35f36: Merge "Update NfcAdapter.getDefaultAdapter() API in cts." into gingerbread * commit '110cc57786a35c94ecbe0757440c2dcce53e38db': Update NfcAdapter.getDefaultAdapter() API in cts. commit f7f1742e301a825b10ff14d1f03b1c38fc696c04 Author: Brian Muramatsu Date: Mon Dec 13 12:16:25 2010 -0800 Remove Broken LayoutTest Tests Bug 3188260 The annotations said "unsure if asserted widths are correct"... They probably are not due to varying screen sizes and orientations. Change-Id: I64404ce7de3913bb43e7766a7d111843da2ee535 commit 7c85dc7523dd6d1389dd924574dd5eb156f51a00 Author: Brett Chabot Date: Mon Dec 13 12:09:19 2010 -0800 Fix ViewTest#testScrollbarStyle Bug 3280351 Change-Id: I156286fcacd449ac018bf0340cd756fdf8b9b9da commit 3dcf631658eb54e51aa60a682134f40ee3bf9ad5 Author: Brian Muramatsu Date: Mon Dec 13 12:03:35 2010 -0800 Delete DatePickerDialogTest Bug 3188260 It only had @BrokenTests so it was not being run anyway. Change-Id: I93645e7fb7ec6390ac5315624d08bc717a02be62 commit 91650b6e3daa5f9bd491f2c6e262818fbd51f501 Author: Steve Block Date: Tue Dec 7 18:27:26 2010 +0000 Test WebView.addJavascriptInterface() with an oddly named property Change-Id: I7d04eb452ba771726f87737553b30e8bdcab0c9a commit 0407d97e88f4ba600eef39211b044ea30be03e1a Merge: 8579c03 0dee316 Author: Iain Merrick Date: Mon Dec 13 06:11:55 2010 -0800 Merge "Allow CacheManager to be initially disabled." commit 110cc57786a35c94ecbe0757440c2dcce53e38db Merge: da571eb ace35f3 Author: Nick Pelly Date: Fri Dec 10 17:22:25 2010 -0800 am ace35f36: Merge "Update NfcAdapter.getDefaultAdapter() API in cts." into gingerbread * commit 'ace35f36291fdfc0bc49b39a395b8bea71a6c67b': Update NfcAdapter.getDefaultAdapter() API in cts. commit ace35f36291fdfc0bc49b39a395b8bea71a6c67b Merge: 1cbabd4 df336cc Author: Nick Pelly Date: Fri Dec 10 17:18:26 2010 -0800 Merge "Update NfcAdapter.getDefaultAdapter() API in cts." into gingerbread commit 8579c0345b9a34cd885afa71f8fdea292f8d7112 Merge: d70fc9f da571eb Author: Brian Muramatsu Date: Fri Dec 10 16:24:54 2010 -0800 am da571ebd: am 1cbabd4d: am 9354302c: am e0550b02: Merge "fixing non-telephony device test failures" into froyo * commit 'da571ebda8d61863798149bc24ce3add7bf41715': fixing non-telephony device test failures commit da571ebda8d61863798149bc24ce3add7bf41715 Merge: cc9800c 1cbabd4 Author: Brian Muramatsu Date: Fri Dec 10 16:19:49 2010 -0800 am 1cbabd4d: am 9354302c: am e0550b02: Merge "fixing non-telephony device test failures" into froyo * commit '1cbabd4d6d5251fdbad9f0d690caa12ed274063a': fixing non-telephony device test failures commit 1cbabd4d6d5251fdbad9f0d690caa12ed274063a Merge: 525455c 9354302 Author: Brian Muramatsu Date: Fri Dec 10 16:16:21 2010 -0800 am 9354302c: am e0550b02: Merge "fixing non-telephony device test failures" into froyo * commit '9354302c45ceee2b2bc33e1cb65ad364bea65a42': fixing non-telephony device test failures commit 9354302c45ceee2b2bc33e1cb65ad364bea65a42 Merge: cbd66b7 e0550b0 Author: Brian Muramatsu Date: Fri Dec 10 16:08:13 2010 -0800 am e0550b02: Merge "fixing non-telephony device test failures" into froyo * commit 'e0550b02f42dfa086e9515ee0ab9909aefd68473': fixing non-telephony device test failures commit e0550b02f42dfa086e9515ee0ab9909aefd68473 Merge: 4f02478 138292c Author: Brian Muramatsu Date: Fri Dec 10 15:48:30 2010 -0800 Merge "fixing non-telephony device test failures" into froyo commit 138292c5daade20f699e167cad786fe3f1ced282 Author: Madan Ankapura Date: Thu Dec 9 18:25:29 2010 -0800 fixing non-telephony device test failures Some of the telephony tests are not-applicable to non-telephony devices. Change-Id: I527fbd93cfc51c982df8cef94b924783f2272288 commit d70fc9fa00aab1fbdfce05b492c6ff836ccd3ae6 Merge: bf46b69 2551bf9 Author: Gilles Debunne Date: Fri Dec 10 11:48:08 2010 -0800 Merge "New commitCorrection method in InputConnection" commit 2551bf91bd34e9ece0257b30ea2f477427c4abb3 Author: Gilles Debunne Date: Fri Dec 10 11:29:03 2010 -0800 New commitCorrection method in InputConnection Related to https://android-git.corp.google.com/g/#change,84086 Change-Id: I7f5608f07b6c80d0ec0c7794615d013fb5a80b04 commit bf46b6964f30ea4d34a7cac81b3d1befb023d065 Merge: 0702903 0edb4aa Author: Brian Muramatsu Date: Fri Dec 10 11:14:17 2010 -0800 Merge "Fix BaseKeyListenerTest" commit 07029030ccc66df0143ed11cd40d14ddbaaa974f Merge: 4762e3d 5c4ade8 Author: Brian Muramatsu Date: Fri Dec 10 11:10:19 2010 -0800 Merge "Fix Settings_SecureTest" commit 4762e3d8a2920f6e1958b4441e474fa95ac53449 Merge: b39a053 c99e5c2 Author: Brian Muramatsu Date: Fri Dec 10 11:02:55 2010 -0800 Merge "Clean Up KeyEventTest" commit 0dee316c165ec017d0456eb7fa041a839ef72190 Author: Iain Merrick Date: Fri Dec 10 16:41:36 2010 +0000 Allow CacheManager to be initially disabled. The CTS test currently assumes that CacheManager is always enabled. We would like to deprecate this class, and as a first step, we will use the existing API to disable it on startup. This CL updates the CTS tests to permit the cache to be initially disabled. BUG=3270236 Change-Id: Id419ae4f25d057d21f65de397f7642ae99b15553 commit df336ccf294ec3e331235f555fa228f571257869 Author: Nick Pelly Date: Thu Dec 9 19:47:54 2010 -0800 Update NfcAdapter.getDefaultAdapter() API in cts. Change-Id: I718ed1f57ee2a754b93212efb871b3774c8ed062 commit 0edb4aadc3edfa214260b4858c527a3d2dcb6cad Author: Brian Muramatsu Date: Thu Dec 9 15:32:50 2010 -0800 Fix BaseKeyListenerTest Bug 3267650 The default keyboard is now KeyCharacterMap.FULL, so ALT + backspace must be emulated by holding the key down while sending the delete key. ...took the time to also clean up a lot of the code here. Change-Id: I704fa0eeea066a52a42a2fe4d192fbc37c1d2858 commit c99e5c2ed9a0831e6637a76c19733d8bb02becef Author: Brian Muramatsu Date: Wed Dec 8 15:53:47 2010 -0800 Clean Up KeyEventTest Remove the check for NPE. Remove useless assertions in the getKeyData test... Change-Id: Id4d2e1f040168fc3f50a46397a57d96245f39401 commit b39a05306c3a46d9ca1cf434941c9bf44e3bf5dd Merge: d23dde9 e849163 Author: Svetoslav Ganov Date: Thu Dec 9 11:30:09 2010 -0800 Merge "3180287 android.accessibilityservice.cts.AccessibilityEndToEndTest#testTypeViewFocusedAccessibilityEvent fails" commit e8491635046855a345193635027804518803451c Author: Svetoslav Ganov Date: Wed Dec 8 19:16:59 2010 -0800 3180287 android.accessibilityservice.cts.AccessibilityEndToEndTest#testTypeViewFocusedAccessibilityEvent fails Change-Id: Ia7d9936b08e840faa2200adcee8ca0af23e38b03 commit d23dde9d943fe70488a012876756aeead807dd4f Merge: e93aff3 5501dbb Author: Brian Muramatsu Date: Wed Dec 8 17:29:19 2010 -0800 Merge "Fix RemoteViewsTest" commit e93aff3003d5bd3ed0851a5145ed0265d75cab76 Merge: a05714e cc9800c Author: Brian Muramatsu Date: Wed Dec 8 17:26:38 2010 -0800 am cc9800c4: am 525455ce: am cbd66b79: am 4f024787: Merge "Add Basic PreferenceActivityTest" into froyo * commit 'cc9800c4b2b86e6d1d18f1f4f3c99529968cc14b': Add Basic PreferenceActivityTest commit cc9800c4b2b86e6d1d18f1f4f3c99529968cc14b Merge: 8e37fc5 525455c Author: Brian Muramatsu Date: Wed Dec 8 17:24:46 2010 -0800 am 525455ce: am cbd66b79: am 4f024787: Merge "Add Basic PreferenceActivityTest" into froyo * commit '525455ce56b8a4f7405578de9b0fd46f4cca7500': Add Basic PreferenceActivityTest commit 525455ce56b8a4f7405578de9b0fd46f4cca7500 Merge: 2fdf3b4 cbd66b7 Author: Brian Muramatsu Date: Wed Dec 8 17:22:25 2010 -0800 am cbd66b79: am 4f024787: Merge "Add Basic PreferenceActivityTest" into froyo * commit 'cbd66b7946414c313ec38d6f56dde942293e451e': Add Basic PreferenceActivityTest commit a05714e5caac603c6461cf21161e41f7f81148ac Merge: 7df9312 8e37fc5 Author: Brian Muramatsu Date: Wed Dec 8 17:20:42 2010 -0800 am 8e37fc51: am 2fdf3b4e: am a1ea69c9: am cad47af9: Merge "Fix (Qwerty|MultiTap)KeyListenerTest Tests" into froyo * commit '8e37fc51e9b3337261c49ed4aa56f9f967e7216f': Fix (Qwerty|MultiTap)KeyListenerTest Tests commit cbd66b7946414c313ec38d6f56dde942293e451e Merge: a1ea69c 4f02478 Author: Brian Muramatsu Date: Wed Dec 8 17:20:00 2010 -0800 am 4f024787: Merge "Add Basic PreferenceActivityTest" into froyo * commit '4f0247878849011798a597886ceb9d8652cd4942': Add Basic PreferenceActivityTest commit 4f0247878849011798a597886ceb9d8652cd4942 Merge: cad47af 6d3c3bd Author: Brian Muramatsu Date: Wed Dec 8 17:09:43 2010 -0800 Merge "Add Basic PreferenceActivityTest" into froyo commit 8e37fc51e9b3337261c49ed4aa56f9f967e7216f Merge: cda1964 2fdf3b4 Author: Brian Muramatsu Date: Wed Dec 8 17:06:59 2010 -0800 am 2fdf3b4e: am a1ea69c9: am cad47af9: Merge "Fix (Qwerty|MultiTap)KeyListenerTest Tests" into froyo * commit '2fdf3b4efcbbb1c7f4fd934ba8ea52005eea8208': Fix (Qwerty|MultiTap)KeyListenerTest Tests commit 2fdf3b4efcbbb1c7f4fd934ba8ea52005eea8208 Merge: 2e28939 a1ea69c Author: Brian Muramatsu Date: Wed Dec 8 17:03:52 2010 -0800 am a1ea69c9: am cad47af9: Merge "Fix (Qwerty|MultiTap)KeyListenerTest Tests" into froyo * commit 'a1ea69c9ce9766281e8d0ec43c482937fafdd599': Fix (Qwerty|MultiTap)KeyListenerTest Tests commit 6d3c3bd67864c1b091881ca16e233fecc7185da1 Author: Brian Muramatsu Date: Fri Dec 3 12:15:30 2010 -0800 Add Basic PreferenceActivityTest Add a new package for "android.preference.cts" and add some basic tests for PreferenceActivity. Change-Id: I0db5b6550a9223eeaafe6cb420d0b959755e784b commit a1ea69c9ce9766281e8d0ec43c482937fafdd599 Merge: b130394 cad47af Author: Brian Muramatsu Date: Wed Dec 8 16:56:47 2010 -0800 am cad47af9: Merge "Fix (Qwerty|MultiTap)KeyListenerTest Tests" into froyo * commit 'cad47af9002add43a41f39c56e716a62d31f1ada': Fix (Qwerty|MultiTap)KeyListenerTest Tests commit cad47af9002add43a41f39c56e716a62d31f1ada Merge: c2208b4 8301a50 Author: Brian Muramatsu Date: Wed Dec 8 16:39:55 2010 -0800 Merge "Fix (Qwerty|MultiTap)KeyListenerTest Tests" into froyo commit 5c4ade85c2e285dc26c2259493747e02f5c69957 Author: Brian Muramatsu Date: Wed Dec 8 16:33:22 2010 -0800 Fix Settings_SecureTest ...now works the way it should! Change-Id: I8173b47930a70a5280048d98dd2a035a35ccdde7 commit 5501dbb8373643db83815be495d74fd9f0d4f1e9 Author: Brian Muramatsu Date: Wed Dec 8 16:25:53 2010 -0800 Fix RemoteViewsTest Update the RemoteView class list and remove an exception check. Change-Id: I9e295b31fe0b98b9f363d371683d6b01bd6418b7 commit 7df93122e0f6bbaf5b713c5d37854d7f745093a9 Merge: e53e24e 3da69eb Author: Nicolas Catania Date: Wed Dec 8 09:13:30 2010 -0800 Merge "Cleaup typo in a constant." commit e53e24e46cefc8fd74bdc4899e2bf7712706c7f8 Merge: c24f3d8 e944f08 Author: Wu-cheng Li Date: Wed Dec 8 02:08:32 2010 -0800 Merge "Add test for camera scene modes." commit c24f3d89e3df25505c00a5ac569a8f8716e47740 Merge: 13b3bf4 cda1964 Author: Brian Muramatsu Date: Tue Dec 7 23:00:34 2010 -0800 am cda1964d: am 2e289392: am b1303948: am c2208b49: Merge "Makefile Rule for CTS Verifier" into froyo * commit 'cda1964d6b1bbfb170a55758cc0dd819ef664636': Makefile Rule for CTS Verifier commit 13b3bf4feb6096b5f957bdd8da6f5bcd06579f24 Merge: 118056d 4841ff5 Author: Brian Muramatsu Date: Tue Dec 7 23:00:27 2010 -0800 am 4841ff58: am 91291a1f: am 7ae74408: am a59ff92b: Merge "Nuke Problematic ContextWrapperTest" into froyo * commit '4841ff58bbc23dc5a299733826898e33a37fbb95': Nuke Problematic ContextWrapperTest commit 8301a50347223c940cf4775497d92eac1935532f Author: Brian Muramatsu Date: Tue Dec 7 18:09:49 2010 -0800 Fix (Qwerty|MultiTap)KeyListenerTest Tests Bug 3185073 Replace the fragile setup code that required the target TextView to be focused with code that directly call onKeyDown instead. Change-Id: I09396d752a9ac1462b85f2f9fb9349701687abcc commit cda1964d6b1bbfb170a55758cc0dd819ef664636 Merge: 4841ff5 2e28939 Author: Brian Muramatsu Date: Tue Dec 7 16:49:08 2010 -0800 am 2e289392: am b1303948: am c2208b49: Merge "Makefile Rule for CTS Verifier" into froyo * commit '2e2893923fb416178172f4e13855ef58ab158505': Makefile Rule for CTS Verifier commit 2e2893923fb416178172f4e13855ef58ab158505 Merge: 91291a1 b130394 Author: Brian Muramatsu Date: Tue Dec 7 16:45:25 2010 -0800 am b1303948: am c2208b49: Merge "Makefile Rule for CTS Verifier" into froyo * commit 'b1303948a916850e94e795d633e10ee246f996e5': Makefile Rule for CTS Verifier commit b1303948a916850e94e795d633e10ee246f996e5 Merge: 7ae7440 c2208b4 Author: Brian Muramatsu Date: Tue Dec 7 16:43:03 2010 -0800 am c2208b49: Merge "Makefile Rule for CTS Verifier" into froyo * commit 'c2208b49e30b2a08781a272e45341176974d1001': Makefile Rule for CTS Verifier commit c2208b49e30b2a08781a272e45341176974d1001 Merge: a59ff92 f65e620 Author: Brian Muramatsu Date: Tue Dec 7 16:26:53 2010 -0800 Merge "Makefile Rule for CTS Verifier" into froyo commit 118056d68e775f0aac396eb1b7a016d7818785c0 Merge: eec1be8 ad4205f Author: Ying Wang Date: Tue Dec 7 15:30:06 2010 -0800 Merge "Fix build warning" commit 3da69eb7e79d08c907941c3dcdffd63a82b9c498 Author: Nicolas Catania Date: Tue Dec 7 15:29:54 2010 -0800 Cleaup typo in a constant. Added a new pass() method similar to the fail() one. Change-Id: I9bc34dc0c793cad12e610d998234a85448d06644 commit ad4205f1c1001375a2f133abec0b58219e8674c4 Author: Ying Wang Date: Tue Dec 7 15:00:38 2010 -0800 Fix build warning libcore/luni/src/test/java/org/apache/harmony/luni/tests/java/lang does not exist. Change-Id: If0aebdb49d1df4f3da165e6fe02ce534ba82d6d9 commit eec1be8014f343c9eab2b16fbd8fbc36ee7fb159 Merge: b18503f ec838d2 Author: Brad Fitzpatrick Date: Tue Dec 7 14:31:42 2010 -0800 Merge "AccountManagerTest: test caching" commit 4841ff58bbc23dc5a299733826898e33a37fbb95 Merge: f09070c 91291a1 Author: Brian Muramatsu Date: Tue Dec 7 14:25:55 2010 -0800 am 91291a1f: am 7ae74408: am a59ff92b: Merge "Nuke Problematic ContextWrapperTest" into froyo * commit '91291a1fcf178270499597316db7376ef3078fc7': Nuke Problematic ContextWrapperTest commit 91291a1fcf178270499597316db7376ef3078fc7 Merge: d506fda 7ae7440 Author: Brian Muramatsu Date: Tue Dec 7 14:24:18 2010 -0800 am 7ae74408: am a59ff92b: Merge "Nuke Problematic ContextWrapperTest" into froyo * commit '7ae744084a896c1d95165529b60a5e54c8f55065': Nuke Problematic ContextWrapperTest commit 7ae744084a896c1d95165529b60a5e54c8f55065 Merge: fa056cf a59ff92 Author: Brian Muramatsu Date: Tue Dec 7 14:22:13 2010 -0800 am a59ff92b: Merge "Nuke Problematic ContextWrapperTest" into froyo * commit 'a59ff92b4dab5b9bfb301d0a49b5f6d0188b4389': Nuke Problematic ContextWrapperTest commit a59ff92b4dab5b9bfb301d0a49b5f6d0188b4389 Merge: f74dec2 6aca899 Author: Brian Muramatsu Date: Tue Dec 7 14:13:00 2010 -0800 Merge "Nuke Problematic ContextWrapperTest" into froyo commit b18503f171665cfb88683ec8b75fe053e1dccfde Merge: d48c7a6 f09070c Author: Brian Muramatsu Date: Tue Dec 7 14:03:26 2010 -0800 am f09070c8: am d506fda2: am fa056cfe: am f74dec2e: Merge "Delete Broken/Suppressed DatabaseCursorTest Tests" into froyo * commit 'f09070c8a23816fcb2cec9e224367245e95604e5': Delete Broken/Suppressed DatabaseCursorTest Tests commit d48c7a69f40928467ed04f079de9f621b3b2296d Merge: 14d29ef bcc3217 Author: Brian Muramatsu Date: Tue Dec 7 14:03:22 2010 -0800 am bcc32176: am 930911bd: am b1d0af61: am a9fbc832: Merge "Fix Settings_SecureTest#testSecureSettings" into froyo * commit 'bcc3217646b3a61ec9636e4bafdf9a34b7733f46': Fix Settings_SecureTest#testSecureSettings commit f09070c8a23816fcb2cec9e224367245e95604e5 Merge: bcc3217 d506fda Author: Brian Muramatsu Date: Tue Dec 7 14:01:33 2010 -0800 am d506fda2: am fa056cfe: am f74dec2e: Merge "Delete Broken/Suppressed DatabaseCursorTest Tests" into froyo * commit 'd506fda28973a6a9d2ccb485d491d9e3b3b280b5': Delete Broken/Suppressed DatabaseCursorTest Tests commit bcc3217646b3a61ec9636e4bafdf9a34b7733f46 Merge: c56f732 930911b Author: Brian Muramatsu Date: Tue Dec 7 14:01:26 2010 -0800 am 930911bd: am b1d0af61: am a9fbc832: Merge "Fix Settings_SecureTest#testSecureSettings" into froyo * commit '930911bdd7cacbc334ccd8d3bf3319b8498e69a0': Fix Settings_SecureTest#testSecureSettings commit d506fda28973a6a9d2ccb485d491d9e3b3b280b5 Merge: 930911b fa056cf Author: Brian Muramatsu Date: Tue Dec 7 13:48:09 2010 -0800 am fa056cfe: am f74dec2e: Merge "Delete Broken/Suppressed DatabaseCursorTest Tests" into froyo * commit 'fa056cfe140df68cd03e89ccd33347b7d432e93f': Delete Broken/Suppressed DatabaseCursorTest Tests commit fa056cfe140df68cd03e89ccd33347b7d432e93f Merge: b1d0af6 f74dec2 Author: Brian Muramatsu Date: Tue Dec 7 13:45:56 2010 -0800 am f74dec2e: Merge "Delete Broken/Suppressed DatabaseCursorTest Tests" into froyo * commit 'f74dec2e1c6bbd94fe720bc4304aa7fa54348780': Delete Broken/Suppressed DatabaseCursorTest Tests commit f74dec2e1c6bbd94fe720bc4304aa7fa54348780 Merge: a9fbc83 f6ef098 Author: Brian Muramatsu Date: Tue Dec 7 13:36:54 2010 -0800 Merge "Delete Broken/Suppressed DatabaseCursorTest Tests" into froyo commit 14d29ef6648779c429cd926771ea963c8d05471b Merge: c06e5ef c858ddd Author: Steve Block Date: Tue Dec 7 12:18:16 2010 -0800 Merge "Add a test for WebView.removeJavascriptInterface()" commit 930911bdd7cacbc334ccd8d3bf3319b8498e69a0 Merge: 99a8847 b1d0af6 Author: Brian Muramatsu Date: Tue Dec 7 11:39:20 2010 -0800 am b1d0af61: am a9fbc832: Merge "Fix Settings_SecureTest#testSecureSettings" into froyo * commit 'b1d0af6185ebbc22610f54b85b5045c3adf8a425': Fix Settings_SecureTest#testSecureSettings commit c06e5ef654ddc51f48a6e7b16777d87393ef9b3e Merge: 90afc7c c56f732 Author: Brian Muramatsu Date: Tue Dec 7 11:38:29 2010 -0800 am c56f7329: am 99a88476: am 148a110f: am 038aec99: Merge "Removed Broken SurfaceTest" into froyo * commit 'c56f7329b38a8beeca93b484dacf48b333de84aa': Removed Broken SurfaceTest commit ec838d206cd8f5b72bffb99098a2e733fcf1d3f9 Author: Brad Fitzpatrick Date: Tue Dec 7 11:38:01 2010 -0800 AccountManagerTest: test caching Change-Id: I5ee371fa1961571c0123c7b12109a22a14cbed27 commit b1d0af6185ebbc22610f54b85b5045c3adf8a425 Merge: 148a110 a9fbc83 Author: Brian Muramatsu Date: Tue Dec 7 11:37:03 2010 -0800 am a9fbc832: Merge "Fix Settings_SecureTest#testSecureSettings" into froyo * commit 'a9fbc832bd92f276e53a2084a7f8dfdd302006a2': Fix Settings_SecureTest#testSecureSettings commit c56f7329b38a8beeca93b484dacf48b333de84aa Merge: 09c2cb0 99a8847 Author: Brian Muramatsu Date: Tue Dec 7 11:33:34 2010 -0800 am 99a88476: am 148a110f: am 038aec99: Merge "Removed Broken SurfaceTest" into froyo * commit '99a88476f10bd553052a94a786989ef206e80de2': Removed Broken SurfaceTest commit 99a88476f10bd553052a94a786989ef206e80de2 Merge: 549c4ac 148a110 Author: Brian Muramatsu Date: Tue Dec 7 11:31:04 2010 -0800 am 148a110f: am 038aec99: Merge "Removed Broken SurfaceTest" into froyo * commit '148a110f160c157a20517b53ca3f53c7ecf21090': Removed Broken SurfaceTest commit 148a110f160c157a20517b53ca3f53c7ecf21090 Merge: 46ec296 038aec9 Author: Brian Muramatsu Date: Tue Dec 7 11:25:05 2010 -0800 am 038aec99: Merge "Removed Broken SurfaceTest" into froyo * commit '038aec9969584bf88d660b06d1a8bbed3c9b28bb': Removed Broken SurfaceTest commit a9fbc832bd92f276e53a2084a7f8dfdd302006a2 Merge: 038aec9 0b9aac0 Author: Brian Muramatsu Date: Tue Dec 7 11:22:29 2010 -0800 Merge "Fix Settings_SecureTest#testSecureSettings" into froyo commit 038aec9969584bf88d660b06d1a8bbed3c9b28bb Merge: 2ad4648 5c5c4c4 Author: Brian Muramatsu Date: Tue Dec 7 11:14:26 2010 -0800 Merge "Removed Broken SurfaceTest" into froyo commit c858ddd643b1d78ef453c166acf436bb7af1a554 Author: Steve Block Date: Tue Dec 7 17:51:30 2010 +0000 Add a test for WebView.removeJavascriptInterface() Bug: 3234178 Change-Id: Id46edc4484fb485efe90e896a615e564a307bf28 commit 90afc7c31d8accd867253cf31a13cb1399f95fef Merge: 042ad3c 571fdb0 Author: Iain Merrick Date: Tue Dec 7 03:27:01 2010 -0800 Merge "Explicitly clear cookies at the start of CookieSyncManagerTest." commit e944f0889d9f6824d73c297aa3928495d3a4b8d7 Author: Wu-cheng Li Date: Tue Dec 7 16:27:10 2010 +0800 Add test for camera scene modes. Change-Id: Ia63e11507b7a376e75338e1240031a8cadbcbc96 commit 6aca89963bb79ca88941c79bd7d7316066eb8ec3 Author: Brian Muramatsu Date: Mon Dec 6 18:11:37 2010 -0800 Nuke Problematic ContextWrapperTest Change-Id: I8cfef23594ff550ecfc903ddb1e7becb08af79ba commit f6ef098cd3a59a2f5af6f19278d0cf796f5b2f02 Author: Brian Muramatsu Date: Mon Dec 6 18:02:03 2010 -0800 Delete Broken/Suppressed DatabaseCursorTest Tests Bug 3188260 These tests seem to stress test the device. It will probably fail on lower end devices and create unnecessary inquiries. Change-Id: I99309ecac9b90b8db6b329d386ccf84113f825ad commit 5c5c4c4625b08ff76d9369cb8faed9771cabe4ac Author: Brian Muramatsu Date: Mon Dec 6 17:54:15 2010 -0800 Removed Broken SurfaceTest Bug 3188260 It doesn't look like it's doing anything useful. Change-Id: Id7d9270fd1c3e3cb67d54c80336e8d7812a367d8 commit 0b9aac058d4f69e209c25a0ae382a62567c68ec7 Author: Brian Muramatsu Date: Mon Dec 6 13:55:25 2010 -0800 Fix Settings_SecureTest#testSecureSettings Bug 3188260 This test tries to modify secure settings, which it will never be able to do. Change the tests to check that the right exceptions are being thrown. Change-Id: I758bc958979823fb280eec7c5fe53fddb8b5b7f1 commit 042ad3c9a198260adb23adeb68f55358bc00a5af Merge: f5c888b a5f37b7 Author: Brian Muramatsu Date: Mon Dec 6 17:03:34 2010 -0800 Merge "Fix WebViewTest#testScrollBarOverlay" commit f5c888b2a19598b2e22895854055ec22aac04728 Merge: 25dd7fd 09c2cb0 Author: Brian Muramatsu Date: Mon Dec 6 16:44:38 2010 -0800 am 09c2cb02: am 549c4ac6: am 46ec2969: am 2ad4648a: Merge "Change CTS Report Output Directory" into froyo * commit '09c2cb02687c0c7e0b56a935fdafd10517cb2953': Change CTS Report Output Directory commit 25dd7fd623164f34ed214c8b7b21796fdf3aff60 Merge: 463fa9e 2affca2 Author: Hung-ying Tyan Date: Mon Dec 6 16:44:20 2010 -0800 am 2affca29: am c602e7e7: Merge "Fix SystemFeatures.testSipFeatures()." into gingerbread * commit '2affca29e6acb55d2e8e1e56e468aef49f360959': Fix SystemFeatures.testSipFeatures(). commit a5f37b79c6d303b7f736cd85b12af3d5cfe4c853 Author: Brian Muramatsu Date: Tue Nov 30 14:44:10 2010 -0800 Fix WebViewTest#testScrollBarOverlay Bug 3227771 This test was occasionally timing out in waitForIdleSync, so you had to change the device orientation to get it unstuck. Remove the flinging checks that the test was doing and just stick to simple unit testing of the setters and getters. NOTE: Can't seem to reproduce the time out anymore, but still checking this in to stick to simpler unit testing. Change-Id: Iea2648812cb0a0bd478bb82d5148e9e07093b2cf commit 09c2cb02687c0c7e0b56a935fdafd10517cb2953 Merge: 2affca2 549c4ac Author: Brian Muramatsu Date: Mon Dec 6 13:13:50 2010 -0800 am 549c4ac6: am 46ec2969: am 2ad4648a: Merge "Change CTS Report Output Directory" into froyo * commit '549c4ac6f86424c85ceb2ed1f04659e160d6df93': Change CTS Report Output Directory commit 549c4ac6f86424c85ceb2ed1f04659e160d6df93 Merge: c602e7e 46ec296 Author: Brian Muramatsu Date: Mon Dec 6 13:07:09 2010 -0800 am 46ec2969: am 2ad4648a: Merge "Change CTS Report Output Directory" into froyo * commit '46ec2969d7ca83b297e5bb058a60082d4943108d': Change CTS Report Output Directory commit 46ec2969d7ca83b297e5bb058a60082d4943108d Merge: fb230df 2ad4648 Author: Brian Muramatsu Date: Mon Dec 6 12:59:48 2010 -0800 am 2ad4648a: Merge "Change CTS Report Output Directory" into froyo * commit '2ad4648a054aa57fd9092ab880be4c38850863d8': Change CTS Report Output Directory commit 2ad4648a054aa57fd9092ab880be4c38850863d8 Merge: 05281c8 ad5bcd3 Author: Brian Muramatsu Date: Mon Dec 6 12:53:42 2010 -0800 Merge "Change CTS Report Output Directory" into froyo commit ad5bcd38ba2421a32805c0d8a9b5a3c8da351315 Author: Brian Muramatsu Date: Mon Dec 6 12:28:22 2010 -0800 Change CTS Report Output Directory Move the report into a separate directory, because the main CTS rule was deleting the "cts" directory causing issues where the report got deleted after it was done. Change-Id: I8ade6e5d0bdce50285cde4dff572f6263d103dac commit 571fdb0bb4e09ee417f86a7aa823d39876ded204 Author: Iain Merrick Date: Mon Dec 6 15:57:39 2010 +0000 Explicitly clear cookies at the start of CookieSyncManagerTest. I may be misunderstanding the intention behind this test, but as written it can fail if there are already cookies in the store. To make it pass consistently, this CL clears out existing cookies at the start of the test. BUG=3241780 Change-Id: I94843f424b4b371fcdf1c38621feb3354700ded1 commit 463fa9e69c4c360376d881689411ab7da5dcdff2 Merge: d39052c ea31249 Author: Iain Merrick Date: Mon Dec 6 02:34:08 2010 -0800 Merge "Make CookieSyncManagerTest use stricter cookie format." commit 2affca29e6acb55d2e8e1e56e468aef49f360959 Merge: 4c10272 c602e7e Author: Hung-ying Tyan Date: Sun Dec 5 23:50:28 2010 -0800 am c602e7e7: Merge "Fix SystemFeatures.testSipFeatures()." into gingerbread * commit 'c602e7e713711b4d2199f92af1013586f01c5690': Fix SystemFeatures.testSipFeatures(). commit c602e7e713711b4d2199f92af1013586f01c5690 Merge: fa6ab6e 1f8a182 Author: Hung-ying Tyan Date: Sun Dec 5 23:47:51 2010 -0800 Merge "Fix SystemFeatures.testSipFeatures()." into gingerbread commit d39052c67bd6ed919269a67bd2507f3e2e57c487 Merge: 07ae0c5 c8c148b Author: James Dong Date: Fri Dec 3 10:28:55 2010 -0800 Merge "Check whether the video resolutions in camcorder profiles are supported" commit ea31249604a7aec1159b72e4c3d6e52a0182ae0a Author: Iain Merrick Date: Fri Dec 3 15:06:38 2010 +0000 Make CookieSyncManagerTest use stricter cookie format. This test is failing with the Chrome HTTP stack because Chrome is fairly strict about cookie handling, but the test expects the system to allow some non-standard behaviour. First, Chrome was rejecting the cookies because they weren't being set on a complete URL. Fixed by calling getFileUrl() to ensure they have a valid "file:" prefix. Second, Chrome was accepting the "a = b" cookie but returning it as "a=b", which is the format required by the RFC. I've updated the test to use "a=b" throughout. Bug: 3241780 Change-Id: I69a9d200c94df00a45f4db07d7350dbb8ab7ee6a commit 07ae0c5779741bfa634ab6a4518152a010aae51e Merge: e0db24a 5d37c76 Author: Steve Block Date: Fri Dec 3 03:48:39 2010 -0800 Merge "Add a CTS test for calling WebView.addJavascriptInterface() with a null object" commit 5d37c76257b0470d06f3e3215376968b11c0c3bf Author: Steve Block Date: Thu Nov 25 12:25:47 2010 +0000 Add a CTS test for calling WebView.addJavascriptInterface() with a null object Bug: 3247571 Change-Id: I94cf2e287997358724e84525507d8472f0e3a47d commit e0db24afad5e14aafc2d35a423b0dae4b0ae321c Merge: 49115a4 77cf8e6 Author: Bjorn Bringert Date: Fri Dec 3 01:28:08 2010 -0800 Merge "Test that AssetFileDescriptor handles remaing byte count correctly" commit c8c148b4842aebc02df1f92ad8f0f829eb4a339f Author: James Dong Date: Thu Dec 2 16:27:34 2010 -0800 Check whether the video resolutions in camcorder profiles are supported Change-Id: I4a95f9471a749b8cd7d7eb8299981baa9d615bf4 commit 49115a402f04110cee37a2729c268f7a9c4965ca Merge: 7676b45 6b897c8 Author: James Dong Date: Thu Dec 2 19:56:19 2010 -0800 Merge "Add cts test for methods getSupportedVideoSizes and getPreferredPreviewSizeForVideo" commit 7676b45bace1b7dcdba99a62e8d1a0409d6914c7 Merge: 6dc573e 4c10272 Author: Brian Muramatsu Date: Thu Dec 2 19:17:42 2010 -0800 am 4c10272d: am fa6ab6e2: am fb230df7: am 05281c8d: Merge "More CTS Coverage Build Improvements" into froyo * commit '4c10272d36079ba4550eb0f46501da642ec27841': More CTS Coverage Build Improvements commit 4c10272d36079ba4550eb0f46501da642ec27841 Merge: 415a772 fa6ab6e Author: Brian Muramatsu Date: Thu Dec 2 19:10:56 2010 -0800 am fa6ab6e2: am fb230df7: am 05281c8d: Merge "More CTS Coverage Build Improvements" into froyo * commit 'fa6ab6e213d385ed65252855a926ff69452e584a': More CTS Coverage Build Improvements commit fa6ab6e213d385ed65252855a926ff69452e584a Merge: 933a188 fb230df Author: Brian Muramatsu Date: Thu Dec 2 19:03:23 2010 -0800 am fb230df7: am 05281c8d: Merge "More CTS Coverage Build Improvements" into froyo * commit 'fb230df7b18fd662e9ff3696dfecb14c1df8fa09': More CTS Coverage Build Improvements commit fb230df7b18fd662e9ff3696dfecb14c1df8fa09 Merge: e89fe7b 05281c8 Author: Brian Muramatsu Date: Thu Dec 2 18:57:37 2010 -0800 am 05281c8d: Merge "More CTS Coverage Build Improvements" into froyo * commit '05281c8d33c703f80cecec05f7fbf688040c8e24': More CTS Coverage Build Improvements commit 1f8a182dce0eac71801c4fe167381737101c72a1 Author: Hung-ying Tyan Date: Fri Dec 3 10:52:12 2010 +0800 Fix SystemFeatures.testSipFeatures(). Bug: 3249437 Change-Id: I3b2c626a8ae847c238d84a3a70a0c1ba8b1aac7e commit 05281c8d33c703f80cecec05f7fbf688040c8e24 Merge: 82a6e83 16fdad8 Author: Brian Muramatsu Date: Thu Dec 2 18:40:26 2010 -0800 Merge "More CTS Coverage Build Improvements" into froyo commit 16fdad8cd805957941bc6fd4474e1d8d1746fb99 Author: Brian Muramatsu Date: Thu Dec 2 17:13:44 2010 -0800 More CTS Coverage Build Improvements Bug 3245588 The build server couldn't display the XML report with the XSL transformation. Thus, when you clicked on the XML file, you would just see the raw XML which wasn't very useful. So make the report generator output a single HTML file by transforming the XML into HTML in code. Change-Id: Ie8b585551e4150f360a6622b3c6f7298ebd0a1e8 commit 6b897c8fe5328f1cb3daeeacbe8527f412831215 Author: James Dong Date: Fri Sep 24 13:59:21 2010 -0700 Add cts test for methods getSupportedVideoSizes and getPreferredPreviewSizeForVideo o Change the method name to "checkPreferredPreviewSizeForVideo" and will add "checkSupportedVideoSizes" in another patch. Change-Id: I44a61fb366212ebe8848dce6a6f8c3ac747b109e commit 6dc573ee76b92a5c907bdffeb47928b22eb40cc8 Merge: 0558cf0 415a772 Author: Brian Muramatsu Date: Thu Dec 2 14:41:12 2010 -0800 am 415a772f: am 933a188e: am e89fe7b1: am 82a6e83b: Merge "CTS Coverage Build Improvements" into froyo * commit '415a772fa8f5afb2f70d6cd2c1c94d956c5aa38b': CTS Coverage Build Improvements commit 415a772fa8f5afb2f70d6cd2c1c94d956c5aa38b Merge: 824dd71 933a188 Author: Brian Muramatsu Date: Thu Dec 2 14:38:11 2010 -0800 am 933a188e: am e89fe7b1: am 82a6e83b: Merge "CTS Coverage Build Improvements" into froyo * commit '933a188eac56781b680e5f717f5783d80370fce1': CTS Coverage Build Improvements commit 933a188eac56781b680e5f717f5783d80370fce1 Merge: 6ca2e81 e89fe7b Author: Brian Muramatsu Date: Thu Dec 2 14:35:24 2010 -0800 am e89fe7b1: am 82a6e83b: Merge "CTS Coverage Build Improvements" into froyo * commit 'e89fe7b135a09d0432f57cc0a8987ab87f60b984': CTS Coverage Build Improvements commit e89fe7b135a09d0432f57cc0a8987ab87f60b984 Merge: 3aee1be 82a6e83 Author: Brian Muramatsu Date: Thu Dec 2 14:29:08 2010 -0800 am 82a6e83b: Merge "CTS Coverage Build Improvements" into froyo * commit '82a6e83bfb791df25e6f165554fcae12225c76c1': CTS Coverage Build Improvements commit 82a6e83bfb791df25e6f165554fcae12225c76c1 Merge: 369ed98 4b32d08 Author: Brian Muramatsu Date: Thu Dec 2 14:22:00 2010 -0800 Merge "CTS Coverage Build Improvements" into froyo commit 4b32d08a70f6f3b39294aa1c10d3b392638a1039 Author: Brian Muramatsu Date: Thu Dec 2 13:08:44 2010 -0800 CTS Coverage Build Improvements - Add additional dist goals to copy over the CSS and XSL resources to make viewing the report easier. - Fix CtsApiCoverage to take a path argument for dexdeps since the build does not have dexdeps in its path after building. Change-Id: Ia2b346aa7b3d923a2cce75eb0d92995e4a398eb4 commit 77cf8e683cfeb9a4c35c48a9ad62d9ffd48840d3 Author: Bjorn Bringert Date: Thu Dec 2 11:37:20 2010 +0000 Test that AssetFileDescriptor handles remaing byte count correctly Bug: 3240844 Change-Id: Id9a83720436c6276d726d7f6d4f1396dc1735858 commit 0558cf0290ae4876ac798ee70da9ca8b91ccd185 Merge: b4d312c 824dd71 Author: Brian Muramatsu Date: Wed Dec 1 20:21:19 2010 -0800 am 824dd715: am 6ca2e817: am 3aee1be3: am 369ed988: Merge "Temporary Fix for CTS Build" into froyo * commit '824dd7158a91b303b2503d357b690874aa2c8ea6': Temporary Fix for CTS Build commit 824dd7158a91b303b2503d357b690874aa2c8ea6 Merge: 6de9eed 6ca2e81 Author: Brian Muramatsu Date: Wed Dec 1 19:57:37 2010 -0800 am 6ca2e817: am 3aee1be3: am 369ed988: Merge "Temporary Fix for CTS Build" into froyo * commit '6ca2e817e7ad4e2ccb6855603fdccb4e19fd3075': Temporary Fix for CTS Build commit 6ca2e817e7ad4e2ccb6855603fdccb4e19fd3075 Merge: 4744aa7 3aee1be Author: Brian Muramatsu Date: Wed Dec 1 19:55:51 2010 -0800 am 3aee1be3: am 369ed988: Merge "Temporary Fix for CTS Build" into froyo * commit '3aee1be35cb3dcb2677faaebe4b4cb139c87433b': Temporary Fix for CTS Build commit 3aee1be35cb3dcb2677faaebe4b4cb139c87433b Merge: fd396f7 369ed98 Author: Brian Muramatsu Date: Wed Dec 1 19:49:57 2010 -0800 am 369ed988: Merge "Temporary Fix for CTS Build" into froyo * commit '369ed988d3cc023d6e943d632fef8ca9d32c8136': Temporary Fix for CTS Build commit 369ed988d3cc023d6e943d632fef8ca9d32c8136 Merge: b6d7f21 ebccd59 Author: Brian Muramatsu Date: Wed Dec 1 19:44:55 2010 -0800 Merge "Temporary Fix for CTS Build" into froyo commit ebccd59aea78e25360141757621e7bdcc86d5482 Author: Brian Muramatsu Date: Wed Dec 1 19:40:20 2010 -0800 Temporary Fix for CTS Build The build does not set the $PATH, so dexdeps could not be found. Hard code the path for now, but I will fix the tool to properly use a flag to specify the path to dexdeps. Change-Id: I058d5863ff994874e77d922dbb18320d2d27eda2 commit b4d312c2c2b181ee6fecfd8ce852d4cc548c19b3 Merge: ea4b27d 6de9eed Author: Ying Wang Date: Wed Dec 1 17:06:09 2010 -0800 am 6de9eed7: am 4744aa79: am fd396f79: am b6d7f211: Merge "Put cts-test-coverage report to the dist dir if "cts" is in the make goals." into froyo * commit '6de9eed7a9335f262cb55082690e23f7455b057b': Put cts-test-coverage report to the dist dir if "cts" is in the make goals. commit 6de9eed7a9335f262cb55082690e23f7455b057b Merge: 022a890 4744aa7 Author: Ying Wang Date: Wed Dec 1 17:03:30 2010 -0800 am 4744aa79: am fd396f79: am b6d7f211: Merge "Put cts-test-coverage report to the dist dir if "cts" is in the make goals." into froyo * commit '4744aa7918c4bdf68f49d81e411479fcd4d0ad13': Put cts-test-coverage report to the dist dir if "cts" is in the make goals. commit 4744aa7918c4bdf68f49d81e411479fcd4d0ad13 Merge: 47fdb58 fd396f7 Author: Ying Wang Date: Wed Dec 1 17:00:21 2010 -0800 am fd396f79: am b6d7f211: Merge "Put cts-test-coverage report to the dist dir if "cts" is in the make goals." into froyo * commit 'fd396f799b643a305a753acf6246780e992099a4': Put cts-test-coverage report to the dist dir if "cts" is in the make goals. commit fd396f799b643a305a753acf6246780e992099a4 Merge: 19b68ad b6d7f21 Author: Ying Wang Date: Wed Dec 1 16:56:48 2010 -0800 am b6d7f211: Merge "Put cts-test-coverage report to the dist dir if "cts" is in the make goals." into froyo * commit 'b6d7f21189ddfb111e695b595cf0ea6dabb08ed3': Put cts-test-coverage report to the dist dir if "cts" is in the make goals. commit b6d7f21189ddfb111e695b595cf0ea6dabb08ed3 Merge: 46878a6 50889ab Author: Ying Wang Date: Wed Dec 1 16:43:50 2010 -0800 Merge "Put cts-test-coverage report to the dist dir if "cts" is in the make goals." into froyo commit ea4b27dd07013166579cb1b7ec068aebf5008c30 Author: Jesse Wilson Date: Wed Dec 1 16:40:36 2010 -0800 Fix build warning from moved libcore classes. Change-Id: I89834eba9addcd50dd5bcdcb1cf4149c78401363 commit 50889aba12d1972d806393dc8b538fa5c1627558 Author: Ying Wang Date: Wed Dec 1 16:29:54 2010 -0800 Put cts-test-coverage report to the dist dir if "cts" is in the make goals. Bug: 3245588 Change-Id: I7cad15622e1c33e6789e8cd305606554ca07af85 commit 8476626a9e9fd100a1238258250b7043927d9a1d Merge: 07c3055 022a890 Author: Brian Muramatsu Date: Wed Dec 1 03:37:11 2010 -0800 am 022a890a: am 47fdb58b: Instructions Dialog for CTS Audio Quality Verifier * commit '022a890abac1c414717b68830513a517c6b7b510': Instructions Dialog for CTS Audio Quality Verifier commit 07c3055996e8cb26db2278463e0769c36c6e4a7a Merge: e8cdae1 8384c12 Author: Brian Muramatsu Date: Tue Nov 30 12:53:27 2010 -0800 Merge "Refactor Dialog Tests" commit 022a890abac1c414717b68830513a517c6b7b510 Merge: a82d1f6 47fdb58 Author: Brian Muramatsu Date: Tue Nov 30 12:08:23 2010 -0800 am 47fdb58b: Instructions Dialog for CTS Audio Quality Verifier * commit '47fdb58bfa2409f028f10b1176589e255ac844eb': Instructions Dialog for CTS Audio Quality Verifier commit 47fdb58bfa2409f028f10b1176589e255ac844eb Author: Brian Muramatsu Date: Mon Nov 29 16:59:21 2010 -0800 Instructions Dialog for CTS Audio Quality Verifier - Add pass, info, and fail buttons to the Audio Quality Verifier. - Add some instructions to show in the initial info dialog. - Remove the singleTask launch mode so that the pass/fail buttons work properly. Change-Id: I6dd1da7c299866faa9a0ccb7ad1a8e35630abc99 commit e8cdae10c9d0eaf7906f53232a9db478b236a2a9 Merge: 05f4156 102a8e3 Author: Fabrice Di Meglio Date: Mon Nov 29 18:23:03 2010 -0800 Merge "Fix bug #2898737 (test for syncing multiple accounts)" commit 102a8e3f8168d07ad103a1229308ed66216a467d Author: Fabrice Di Meglio Date: Mon Nov 29 18:16:18 2010 -0800 Fix bug #2898737 (test for syncing multiple accounts) - add unit test - some refactoring Change-Id: I7b9da883e8f5184e329fe65e3d4319428d61d6dc commit f65e62008c05a5adf0ecf24f64850748d9ae7e07 Author: Brian Muramatsu Date: Mon Nov 29 16:07:30 2010 -0800 Makefile Rule for CTS Verifier Add a Makefile rule to build and launch the CTS Verifier. This should eliminate the problem of building the app using one lunch target and then installing an app built from a prior lunch target. Change-Id: I87f409eb7f677ff4f8d4d17ef3fb8442b2c20a83 commit 05f41563a18499a23d0999dc31d22c806e564ff1 Merge: 7c01a83 a82d1f6 Author: Brian Muramatsu Date: Mon Nov 29 14:46:17 2010 -0800 am a82d1f6c: am 25d543e4: am 19b68add: am 46878a65: Merge "Fix Build" into froyo * commit 'a82d1f6cee405ac5094f8c8a3382c89006adb840': Fix Build commit a82d1f6cee405ac5094f8c8a3382c89006adb840 Merge: 442e2f5 25d543e Author: Brian Muramatsu Date: Mon Nov 29 14:44:14 2010 -0800 am 25d543e4: am 19b68add: am 46878a65: Merge "Fix Build" into froyo * commit '25d543e4f28575bd9deebdc7ddb7b05e9848bcd3': Fix Build commit 25d543e4f28575bd9deebdc7ddb7b05e9848bcd3 Merge: 1a91065 19b68ad Author: Brian Muramatsu Date: Mon Nov 29 14:41:38 2010 -0800 am 19b68add: am 46878a65: Merge "Fix Build" into froyo * commit '19b68add2857e75ab9303c4e32f1abe987d7186d': Fix Build commit 19b68add2857e75ab9303c4e32f1abe987d7186d Merge: 6873bf0 46878a6 Author: Brian Muramatsu Date: Mon Nov 29 14:39:29 2010 -0800 am 46878a65: Merge "Fix Build" into froyo * commit '46878a65e3915d9eb42043dc812404a37c013acd': Fix Build commit 46878a65e3915d9eb42043dc812404a37c013acd Merge: 3f36806 d7aede2 Author: Brian Muramatsu Date: Mon Nov 29 14:31:18 2010 -0800 Merge "Fix Build" into froyo commit d7aede238521cf1a7fbda859d2b13f13ab53c11a Author: Brian Muramatsu Date: Mon Nov 29 14:28:39 2010 -0800 Fix Build Didn't have the right javac set in my environment... :-( Change-Id: I951a11460eafeb75c081a4a07787aaf320b48b31 commit 7c01a83f5d2bd019a11831ac27ebf54e9b115d01 Merge: b1ea3fe 442e2f5 Author: Brian Muramatsu Date: Mon Nov 29 14:10:34 2010 -0800 am 442e2f54: am 1a91065e: am 6873bf0f: am 3f36806c: Merge "Fix android.net.cts.ProxyTest" into froyo * commit '442e2f5460ce419197de54494ad116563f14037a': Fix android.net.cts.ProxyTest commit 442e2f5460ce419197de54494ad116563f14037a Merge: 75199c6 1a91065 Author: Brian Muramatsu Date: Mon Nov 29 14:08:21 2010 -0800 am 1a91065e: am 6873bf0f: am 3f36806c: Merge "Fix android.net.cts.ProxyTest" into froyo * commit '1a91065ed6dbd0a3c66d5a7cb22766c81fdde628': Fix android.net.cts.ProxyTest commit 1a91065ed6dbd0a3c66d5a7cb22766c81fdde628 Merge: cd55417 6873bf0 Author: Brian Muramatsu Date: Mon Nov 29 14:06:01 2010 -0800 am 6873bf0f: am 3f36806c: Merge "Fix android.net.cts.ProxyTest" into froyo * commit '6873bf0fd29a0537ba8e44459a0674fb77e9029d': Fix android.net.cts.ProxyTest commit 6873bf0fd29a0537ba8e44459a0674fb77e9029d Merge: 69c69f1 3f36806 Author: Brian Muramatsu Date: Mon Nov 29 14:04:12 2010 -0800 am 3f36806c: Merge "Fix android.net.cts.ProxyTest" into froyo * commit '3f36806c4a1790381402017835b1f40a32b91fb7': Fix android.net.cts.ProxyTest commit 3f36806c4a1790381402017835b1f40a32b91fb7 Merge: a89ee93 96a2cfe Author: Brian Muramatsu Date: Mon Nov 29 13:57:54 2010 -0800 Merge "Fix android.net.cts.ProxyTest" into froyo commit b1ea3fe5d904e4e72e1b84ab20d83d3cff42fadf Merge: e928f9f 75199c6 Author: Brian Muramatsu Date: Mon Nov 29 13:06:12 2010 -0800 am 75199c6e: am cd554173: am 69c69f15: am a89ee93f: Merge "Stop WifiManagerTest from disabling current network." into froyo * commit '75199c6ea0f6400e571b50fd9d223650ba675f97': Stop WifiManagerTest from disabling current network. commit e928f9f4fcaeedfeb4d0b8de351def7577661ace Merge: 6ca498b 2c89e7c Author: Brian Muramatsu Date: Mon Nov 29 13:06:10 2010 -0800 am 2c89e7c8: am f5921c41: am 79bf26a1: am 270adf7c: Merge "Fix SettingsTest#testSecureTable" into froyo * commit '2c89e7c850db22498f20e3d26ad9ba4c38bf27b8': Fix SettingsTest#testSecureTable commit 6ca498b41bef873484bdf777faeba2355537a3c6 Merge: fe9c09d e4d0616 Author: David Ingram Date: Mon Nov 29 13:04:04 2010 -0800 am e4d06169: am d6593f64: Updates based on user feedback * commit 'e4d06169713d79983cc6d668711926da968b089e': Updates based on user feedback commit 75199c6ea0f6400e571b50fd9d223650ba675f97 Merge: 2c89e7c cd55417 Author: Brian Muramatsu Date: Mon Nov 29 13:03:51 2010 -0800 am cd554173: am 69c69f15: am a89ee93f: Merge "Stop WifiManagerTest from disabling current network." into froyo * commit 'cd5541736ae9bebda79d8b647d1fc2d8e20aa1db': Stop WifiManagerTest from disabling current network. commit 2c89e7c850db22498f20e3d26ad9ba4c38bf27b8 Merge: e4d0616 f5921c4 Author: Brian Muramatsu Date: Mon Nov 29 13:03:49 2010 -0800 am f5921c41: am 79bf26a1: am 270adf7c: Merge "Fix SettingsTest#testSecureTable" into froyo * commit 'f5921c41db9d6b26fa44d360fede9c69a6c22451': Fix SettingsTest#testSecureTable commit e4d06169713d79983cc6d668711926da968b089e Merge: f0f608a d6593f6 Author: David Ingram Date: Mon Nov 29 13:01:36 2010 -0800 am d6593f64: Updates based on user feedback * commit 'd6593f647bb2feb28d650eb7cb0e7d30d11108b8': Updates based on user feedback commit cd5541736ae9bebda79d8b647d1fc2d8e20aa1db Merge: f5921c4 69c69f1 Author: Brian Muramatsu Date: Mon Nov 29 13:00:44 2010 -0800 am 69c69f15: am a89ee93f: Merge "Stop WifiManagerTest from disabling current network." into froyo * commit '69c69f156bebe834cfbb13eb7f93dc9e25ee723b': Stop WifiManagerTest from disabling current network. commit f5921c41db9d6b26fa44d360fede9c69a6c22451 Merge: d6593f6 79bf26a Author: Brian Muramatsu Date: Mon Nov 29 13:00:39 2010 -0800 am 79bf26a1: am 270adf7c: Merge "Fix SettingsTest#testSecureTable" into froyo * commit '79bf26a1b033b2b200c8a41b7208a62979d99ec9': Fix SettingsTest#testSecureTable commit 96a2cfeefc956465f8f5b3155e940c74894852bd Author: Brian Muramatsu Date: Mon Nov 29 12:54:45 2010 -0800 Fix android.net.cts.ProxyTest Bug 3188260 Remove the code that was trying to write to secure settings and take off the BrokenTest annotation. Change-Id: I0759db38225a9822b25c987e66a7590c555b5e9e commit 69c69f156bebe834cfbb13eb7f93dc9e25ee723b Merge: 79bf26a a89ee93 Author: Brian Muramatsu Date: Mon Nov 29 12:48:18 2010 -0800 am a89ee93f: Merge "Stop WifiManagerTest from disabling current network." into froyo * commit 'a89ee93f57c9857ad60fbf3265b86a1aa2b9e908': Stop WifiManagerTest from disabling current network. commit 79bf26a1b033b2b200c8a41b7208a62979d99ec9 Merge: fe5987e 270adf7 Author: Brian Muramatsu Date: Mon Nov 29 12:48:14 2010 -0800 am 270adf7c: Merge "Fix SettingsTest#testSecureTable" into froyo * commit '270adf7cea3977b02a4f9f9c07a0759504812ee7': Fix SettingsTest#testSecureTable commit a89ee93f57c9857ad60fbf3265b86a1aa2b9e908 Merge: 270adf7 f425f56 Author: Brian Muramatsu Date: Mon Nov 29 12:32:39 2010 -0800 Merge "Stop WifiManagerTest from disabling current network." into froyo commit f0d2bf3e7e6b9cf00a27256414e6ef5c5607cfab Merge: 5d7d046 4143966 Author: Brian Muramatsu Date: Mon Nov 29 12:31:44 2010 -0800 Merge "Stop WifiManagerTest from disabling current network." into eclair commit 270adf7cea3977b02a4f9f9c07a0759504812ee7 Merge: 9dcb0fc 9fa6a78 Author: Brian Muramatsu Date: Mon Nov 29 12:31:00 2010 -0800 Merge "Fix SettingsTest#testSecureTable" into froyo commit 9fa6a7869c42c1dceab61894a8b8636be5e9a92e Author: Brian Muramatsu Date: Mon Nov 22 15:37:13 2010 -0800 Fix SettingsTest#testSecureTable Bug 3188260 Remove the portions of the test that were trying to insert into the secure table and remove the BrokenTest annotation. Change-Id: I4e19fd19cb2075100ef3e555a876209e8a05575a commit f425f56a7c3c1d7cf6d7ef728ad9726b1ad4a662 Author: Brett Chabot Date: Fri Nov 12 17:20:23 2010 -0800 Stop WifiManagerTest from disabling current network. Bug 3181376 Change-Id: Ia8d12a10f4ed0c46325e76f1dffeef93412a55e5 commit 414396620631bc6f4393b6e75a1dba5c9c049233 Author: Brett Chabot Date: Fri Nov 12 17:20:23 2010 -0800 Stop WifiManagerTest from disabling current network. Bug 3181376 Change-Id: I7dad90ba830678357b900709359f10319070c96e commit d6593f647bb2feb28d650eb7cb0e7d30d11108b8 Author: David Ingram Date: Wed Nov 24 16:48:36 2010 +0000 Updates based on user feedback - Checks that the playback volume is not zero. - Experiments which generate multiple recordings (just GainLinearityExperiment currently) now attach their recordings to the results e-mail, just like single recording experiments. This adds another four attachments to the e-mail, but is required to investigate gain linearity problems. - Clipping test renamed to Overflow test to conform with Diagnostic Suite terminology. - Updated README with additional supported loudspeaker and better instructions. - Fixed bug which caused the experiments list to be populated more than once under some circumstances. Change-Id: I6ad05c4657194d04d7d99b9f86ef157942459de4 commit fe9c09d9f75f4b54b48e34f6cc611c6bebdc7c88 Author: Jean-Michel Trivi Date: Mon Nov 15 12:05:17 2010 -0800 Update audio mode tests for MODE_IN_COMMUNICATION Change-Id: Id118c84285710d99d0b34ae46fdfbe92eefecc1b commit 8384c12edac19c20b8ffc115e2fb1c623d500e29 Author: Brian Muramatsu Date: Wed Nov 24 17:44:39 2010 -0800 Refactor Dialog Tests Bug 3184944 The dialog tests start an activity that had a list of buttons where each button launched a different type of dialog and then hit the down button a number of times and then the center button to launch them. Replace this approach with an intent based approach where the tests launch an intent specifying what dialog to create. This should make the tests less fragile to UI changes. Change-Id: I3d36e2f9e6c1b4a065ffda59289a85278e04c8cf commit d1206a95bdeb9a8164ee6d06bba401a59218d124 Merge: b9f9c18 fe1e463 Author: Steve Block Date: Wed Nov 24 12:48:16 2010 -0800 Merge "Remove CTS cookie tests which test behaviour of a single word for the NAME=VALUE pair" commit b9f9c181bbb3f0f00ca3e061560229f8a064cd8a Merge: 6dbe54b 914c63d Author: Brian Muramatsu Date: Wed Nov 24 11:27:43 2010 -0800 Merge "Update KeyCharacterMapTest" commit 6dbe54b76294e7b4045fd56a2d25c3b9232ea896 Author: Iain Merrick Date: Wed Nov 24 16:06:40 2010 +0000 Don't send 403 response to incorrect password. Per RFC 2616, the CTS server should send a 401 response rather than a 403 when WebViewClient sends a bad username and password. Having made this change, WebView now (correctly) sends repeated authentication requests, so I have updated MyWebViewClient to call cancel() on the second and subsequent requests. Bug: 3221972 Change-Id: I56ec350e6fb93d12ba79053dda471e63d7a998b3 commit fe1e463a3100c91970b002f1e04288e533587681 Author: Steve Block Date: Wed Nov 24 16:41:26 2010 +0000 Remove CTS cookie tests which test behaviour of a single word for the NAME=VALUE pair The behaviour excercised by these tests is not crucial to the WebView so is not appropriate for testing in CTS tests. This behaviour is changed by the switch to the Chromium HTTP stack. Bug: 3221839 Change-Id: I1a64adfd7375337057dcc7138e335e0c069466e7 commit 914c63d633d510b4ecdbca97e1e2ad9725347f70 Author: Brian Muramatsu Date: Tue Nov 23 18:22:46 2010 -0800 Update KeyCharacterMapTest SYM added back as non printing key, although it was removed once because it was occasionally shared with a letter on a phone. Change-Id: I131b6e933885e5b8bd03292a9ebdafee783c402e commit 5f04dde11a61f044386c5cc1962aebd29008f6d9 Author: Brian Muramatsu Date: Tue Nov 23 14:48:08 2010 -0800 Fix Some KeyCharacterMapTest Tests Bug 3224704 Switch to the other keyboard...VIRTUAL_KEYBOARD. Change-Id: I9f3b453ffcc6f3b76d09d705f5fec7931fce2f3e commit ae4ee43e6f9605a021ca2ba16fc6eb007b321346 Merge: 815a773 ab10ac5 Author: Brian Muramatsu Date: Tue Nov 23 14:27:56 2010 -0800 Merge "Revert "Fix ContentQueryMapTest#testGetRows"" commit 815a773bd534a61b2985cc726879e35c8451fc45 Author: Brian Muramatsu Date: Tue Nov 23 13:42:35 2010 -0800 Fix InstrumentationTest#testSendStringSync Bug 3224704 Use the virtual keyboard since the built-in keyboard may not exist and Instrumentation#testSendStringSync uses the virtual keyboard now. Change-Id: Ic9404b47fe6046fab1730c745e7acd5a1e9188fc commit ab10ac54b5743cb640e245949a655fb8919cdc77 Author: Brian Muramatsu Date: Tue Nov 23 12:22:45 2010 -0800 Revert "Fix ContentQueryMapTest#testGetRows" This reverts commit 55111a2fa73d0cfb6d21929801bde8fa048193fe. ...and now it no longer throws the exception. commit 1025eb39e6f465df1eb9d006b9fab8a2bf0bd818 Author: Brian Muramatsu Date: Wed Nov 17 16:20:02 2010 -0800 Fix MediaStore testStoreAudioPlaylists* Tests URIs are returned by MediaProvider when inserting playlists now. Change-Id: I28d650b2b975e3ecc3b7f04704574d90f2ed9b92 commit 3701fb406647a894127ea173a18ac96a220bc0c7 Merge: 04d31f8 f0f608a Author: Brian Muramatsu Date: Mon Nov 22 16:29:57 2010 -0800 am f0f608a6: am 5b600e39: am fe5987ee: am 9dcb0fc7: Merge "Fix MultiAppStartupTest" into froyo * commit 'f0f608a66fab902b146c2c8e0abb1d9a4e49448b': Fix MultiAppStartupTest commit f0f608a66fab902b146c2c8e0abb1d9a4e49448b Merge: f88f602 5b600e3 Author: Brian Muramatsu Date: Mon Nov 22 16:26:12 2010 -0800 am 5b600e39: am fe5987ee: am 9dcb0fc7: Merge "Fix MultiAppStartupTest" into froyo * commit '5b600e392536317c8a61e57d97e51f294590ca6a': Fix MultiAppStartupTest commit 5b600e392536317c8a61e57d97e51f294590ca6a Merge: f0083e8 fe5987e Author: Brian Muramatsu Date: Mon Nov 22 16:23:40 2010 -0800 am fe5987ee: am 9dcb0fc7: Merge "Fix MultiAppStartupTest" into froyo * commit 'fe5987ee0c5480c1375c5c4b0d641dfff9fca5d0': Fix MultiAppStartupTest commit 04d31f84d120424ef0673e74c44504d3f1d8bbe9 Merge: 2810274 a0740a0 Author: Brian Muramatsu Date: Mon Nov 22 16:23:04 2010 -0800 Merge "Fix Dates in MediaProvider Tests" commit fe5987ee0c5480c1375c5c4b0d641dfff9fca5d0 Merge: a4416b2 9dcb0fc Author: Brian Muramatsu Date: Mon Nov 22 16:21:05 2010 -0800 am 9dcb0fc7: Merge "Fix MultiAppStartupTest" into froyo * commit '9dcb0fc7ceddd2d0250ea65d3351b7f1f99a0b54': Fix MultiAppStartupTest commit 9dcb0fc7ceddd2d0250ea65d3351b7f1f99a0b54 Merge: 72114d4 d3b598e Author: Brian Muramatsu Date: Mon Nov 22 16:11:39 2010 -0800 Merge "Fix MultiAppStartupTest" into froyo commit 2810274d23c62ffd168b918fa42028453b9b763d Merge: 577bc5d f88f602 Author: Brian Muramatsu Date: Mon Nov 22 14:46:35 2010 -0800 am f88f6025: am f0083e83: am a4416b29: am 72114d41: Merge "CTS API Surface Coverage Tool" into froyo * commit 'f88f6025d784d546a8d82f23ec46029bb2adde91': CTS API Surface Coverage Tool commit f88f6025d784d546a8d82f23ec46029bb2adde91 Merge: 0a43237 f0083e8 Author: Brian Muramatsu Date: Mon Nov 22 14:44:39 2010 -0800 am f0083e83: am a4416b29: am 72114d41: Merge "CTS API Surface Coverage Tool" into froyo * commit 'f0083e83981baef7e31a6deaf135a7723d5f27b0': CTS API Surface Coverage Tool commit f0083e83981baef7e31a6deaf135a7723d5f27b0 Merge: d8e9c14 a4416b2 Author: Brian Muramatsu Date: Mon Nov 22 14:42:52 2010 -0800 am a4416b29: am 72114d41: Merge "CTS API Surface Coverage Tool" into froyo * commit 'a4416b29a6058500db44c2f9bddcfc095cfe66c0': CTS API Surface Coverage Tool commit a4416b29a6058500db44c2f9bddcfc095cfe66c0 Merge: 825551a 72114d4 Author: Brian Muramatsu Date: Mon Nov 22 14:36:40 2010 -0800 am 72114d41: Merge "CTS API Surface Coverage Tool" into froyo * commit '72114d41e0c830b1be3701158d7983e2727a59f0': CTS API Surface Coverage Tool commit 72114d41e0c830b1be3701158d7983e2727a59f0 Merge: a74265a 2f8eead Author: Brian Muramatsu Date: Mon Nov 22 14:24:57 2010 -0800 Merge "CTS API Surface Coverage Tool" into froyo commit 2f8eead2196a410023041db88bba964cb0ef0194 Author: Brian Muramatsu Date: Fri Sep 24 14:56:43 2010 -0700 CTS API Surface Coverage Tool Adds a few make rules to generate coverage reports that use dexdeps to see what methods from the API are directly called from the tests rather than using the usual approach of using EMMA. make cts-test-coverage This rule will generate coverage of the API from the test cases in CtsTestCaseList's CTS_COVERAGE_TEST_CASE_LIST list. make cts-verifier-coverage This rule will generate coverage by the CtsVerifier. Change-Id: I28c8d825cff5b1c6b293b786e28a472059a7259a commit 577bc5d25a69448694e09ef789613e887de7eb1e Merge: 97b3684 3fc7c72 Author: Brian Muramatsu Date: Fri Nov 19 17:17:35 2010 -0800 Merge "Fix SearchRecentSuggestionsTest" commit 97b3684b8b6f26cdcae334ab336d19b4620235fa Merge: 031ae84 0a43237 Author: Brian Muramatsu Date: Fri Nov 19 16:56:28 2010 -0800 am 0a432377: am d8e9c14b: am 825551a7: am a74265a8: Merge "Remove SensorManagerTest BrokenTests" into froyo * commit '0a432377debcf0f7fa6ea54dcf30389eadfbc1a7': Remove SensorManagerTest BrokenTests commit 031ae84b867b535ca6833117c76470097872f145 Author: Dianne Hackborn Date: Fri Nov 19 13:15:57 2010 -0800 Add tests for PackageManager.setInstallerPackageName(). Change-Id: I0b6c59b9aa93acd0f7172bd884138f704aea7dbe commit d3b598e5274c15366caa36da2ddc091839de59eb Author: Brian Muramatsu Date: Fri Nov 19 12:59:38 2010 -0800 Fix MultiAppStartupTest Bug 3209163 Remove activities of unbundled packages. Change-Id: I23c9cd88c1e7c7e09b359ccb1a256b8bf6b0b57d commit 0a432377debcf0f7fa6ea54dcf30389eadfbc1a7 Merge: 490027f d8e9c14 Author: Brian Muramatsu Date: Fri Nov 19 12:12:07 2010 -0800 am d8e9c14b: am 825551a7: am a74265a8: Merge "Remove SensorManagerTest BrokenTests" into froyo * commit 'd8e9c14bdba4b99364597d176beaebe484191469': Remove SensorManagerTest BrokenTests commit d8e9c14bdba4b99364597d176beaebe484191469 Merge: 1ee3f24 825551a Author: Brian Muramatsu Date: Fri Nov 19 12:09:59 2010 -0800 am 825551a7: am a74265a8: Merge "Remove SensorManagerTest BrokenTests" into froyo * commit '825551a7b40069463a187d17641aa53680f26a11': Remove SensorManagerTest BrokenTests commit 825551a7b40069463a187d17641aa53680f26a11 Merge: 08a85b0 a74265a Author: Brian Muramatsu Date: Fri Nov 19 12:05:38 2010 -0800 am a74265a8: Merge "Remove SensorManagerTest BrokenTests" into froyo * commit 'a74265a8eb4c3748fb696220f436ebada926e455': Remove SensorManagerTest BrokenTests commit a74265a8eb4c3748fb696220f436ebada926e455 Merge: 66fa990 113cf67 Author: Brian Muramatsu Date: Fri Nov 19 11:48:22 2010 -0800 Merge "Remove SensorManagerTest BrokenTests" into froyo commit 3fc7c72bb0e54475f19a4e31af9b6536d169fc2d Author: Brian Muramatsu Date: Thu Nov 18 12:55:57 2010 -0800 Fix SearchRecentSuggestionsTest saveRecentQuery saves asynchronously to the database, so wait for the cursor to match the expected count. Change-Id: Icf81499a7d6c972d683f9ab6ebe51ef41893d85f commit a0740a05091c9617983df5f5db72940a6115ce72 Author: Brian Muramatsu Date: Thu Nov 18 12:09:15 2010 -0800 Fix Dates in MediaProvider Tests The tests inserted a date added value and were checking that they came back. However, these tests started failing, because the MediaProvider itself now inserts a date added on its own. Thus, the times were off also due to the fact that the provider uses seconds rather than the test that was putting milliseconds. The prior release also had code to insert the date added times. However, it seems there was a bug where the wrong ContentValues value was being passed to the final insert method which is why it didn't work. The tests were using milliseconds for the date modified, but the documentation for the MediaStore keys say that seconds are used. The tests were failing because the milliseconds were being read out from the database as a truncated integer causing the failures. Change-Id: I0ac982e3424a8103dd8deb36b1f7188e57b68219 commit f363515d999f1ab0f07f3c1751ae6f25c39deb35 Merge: b6621fc 535211a Author: Brian Muramatsu Date: Thu Nov 18 11:22:18 2010 -0800 Merge "Fix InstrumentationTest onSaveInstance Test" commit 535211aedcc9a449802e5570952b9a785a6f9485 Author: Brian Muramatsu Date: Wed Nov 17 15:02:46 2010 -0800 Fix InstrumentationTest onSaveInstance Test Move the onSaveInstanceState call to the main thread to get rid of FragmentManager IllegalStateException: java.lang.IllegalStateException: Must be called from main thread of process at android.app.FragmentManagerImpl.execPendingActions(FragmentManager.java:1027) Change-Id: I57a44ebdb9a3fb977fadf16081e1a7d5b4abb84d commit b6621fce085682a8adaee0e13b39f598cfcbeab2 Merge: 78875f9 490027f Author: Brian Muramatsu Date: Wed Nov 17 14:20:32 2010 -0800 am 490027f0: am 1ee3f244: Merge "Fix Missing Screen Density" into gingerbread * commit '490027f066824cbc0ecfc0158ff94254cfdc7dbd': Fix Missing Screen Density commit 490027f066824cbc0ecfc0158ff94254cfdc7dbd Merge: 99c4a90 1ee3f24 Author: Brian Muramatsu Date: Wed Nov 17 14:18:13 2010 -0800 am 1ee3f244: Merge "Fix Missing Screen Density" into gingerbread * commit '1ee3f244e9e4b34b165a290dad2f22efc717111f': Fix Missing Screen Density commit 1ee3f244e9e4b34b165a290dad2f22efc717111f Merge: f894620 647277e Author: Brian Muramatsu Date: Wed Nov 17 14:16:32 2010 -0800 Merge "Fix Missing Screen Density" into gingerbread commit 647277eff2799faf95a0159520939e300b390258 Author: Brian Muramatsu Date: Tue Nov 16 13:58:42 2010 -0800 Fix Missing Screen Density Accidentally omitted this line when resolving merge conflict. Change-Id: Ib627bbde4f5c45bdd461b5e4904c7d35d9b1ce40 commit 78875f99c2b8f06c9dd3415cfedbe3133e9881b3 Merge: 73d240d 99c4a90 Author: Brian Muramatsu Date: Tue Nov 16 13:33:54 2010 -0800 am 99c4a903: am f8946203: CTS Audio Quality Verifier Integration * commit '99c4a90383925c983831393acbbb46814b8ef876': CTS Audio Quality Verifier Integration commit 99c4a90383925c983831393acbbb46814b8ef876 Merge: 49b68b9 f894620 Author: Brian Muramatsu Date: Tue Nov 16 13:31:32 2010 -0800 am f8946203: CTS Audio Quality Verifier Integration * commit 'f894620337d47a1c8f04740e1a2fe55f24a503bd': CTS Audio Quality Verifier Integration commit f894620337d47a1c8f04740e1a2fe55f24a503bd Author: Brian Muramatsu Date: Tue Nov 9 13:43:39 2010 -0800 CTS Audio Quality Verifier Integration Integrated the audio quality verifier code to make it appear in the CtsVerifier by making some minor changes: - Put audioquality JNI code under separate directory below "jni" called "audioquality" and moved all other JNI to the "verifier" subdirectory. - Made subdirectory "audioquality" for the assets - Prefixed layouts, strings, and other resources with "aq_" - Replaced VerifierApplication that extended android.app.Application with a singleton instance - this needs to be replaced with a content provider or some sort for persistance. - Renamed "VerifierActivity" to "AudioQualityVerifierActivity" since the class name is used in the database for recording pass or fail. - Added AudioTrack#getState check in BackgroundAudio There will be more changes to add instructions and perhaps provide tighter integration. Change-Id: If049091c9f43a340fbd260003fac560b5e414009 commit 73d240db667ee04f77969419bbdd402d989f11ed Merge: c089e6c 49b68b9 Author: Brian Muramatsu Date: Tue Nov 16 12:08:18 2010 -0800 am 49b68b93: am 36b8047c: Check Reporting of New Camera Features * commit '49b68b93587216871b0cc30b638f766ff2786a74': Check Reporting of New Camera Features commit 49b68b93587216871b0cc30b638f766ff2786a74 Merge: 97ffebb 36b8047 Author: Brian Muramatsu Date: Tue Nov 16 12:06:44 2010 -0800 am 36b8047c: Check Reporting of New Camera Features * commit '36b8047c8378894cba4e8b30bcc6006c9edbe5fc': Check Reporting of New Camera Features commit 36b8047c8378894cba4e8b30bcc6006c9edbe5fc Author: Brian Muramatsu Date: Fri Oct 29 15:34:09 2010 -0700 Check Reporting of New Camera Features Bug 3029195 Change-Id: I71aeb42bfb770011fdbaef6340360038dd6b21a1 commit c089e6cf40cbd8add72f61e86e2974b5ad7327e6 Merge: b9a45b7 97ffebb Author: Brian Muramatsu Date: Tue Nov 16 11:35:52 2010 -0800 am 97ffebb8: am 4c67d065: Sanity Check for NFC * commit '97ffebb80256c29ef2957104537eaf598f044e5d': Sanity Check for NFC commit 97ffebb80256c29ef2957104537eaf598f044e5d Merge: 0b006b2 4c67d06 Author: Brian Muramatsu Date: Tue Nov 16 11:33:09 2010 -0800 am 4c67d065: Sanity Check for NFC * commit '4c67d06539a56a47a941fe2bf118fdb937e2a020': Sanity Check for NFC commit 4c67d06539a56a47a941fe2bf118fdb937e2a020 Author: Brian Muramatsu Date: Fri Oct 29 15:53:13 2010 -0700 Sanity Check for NFC Bug 3097462 Change-Id: Ia67238d8626b8c6be4abc02eaaa0feade6b1d40c commit b9a45b70608ad53c9fd286f926872c7e8caeef29 Merge: ecf3c31 0b006b2 Author: Nick Kralevich Date: Tue Nov 16 08:19:22 2010 -0800 am 0b006b2b: am 0058725c: Merge "More directory writable tests." into gingerbread * commit '0b006b2b0fe184376a9f8bed2b349b64bc6a8de8': More directory writable tests. commit 0b006b2b0fe184376a9f8bed2b349b64bc6a8de8 Merge: f991cf5 0058725 Author: Nick Kralevich Date: Tue Nov 16 08:16:36 2010 -0800 am 0058725c: Merge "More directory writable tests." into gingerbread * commit '0058725c5bedf0b0e5bff51e9f318994a27ac46e': More directory writable tests. commit 0058725c5bedf0b0e5bff51e9f318994a27ac46e Merge: bc5e7fd 80b7ca6 Author: Nick Kralevich Date: Tue Nov 16 08:13:13 2010 -0800 Merge "More directory writable tests." into gingerbread commit ecf3c313428dd20b07fd7071dda5369fdde9e1d2 Author: Adam Powell Date: Mon Nov 15 21:20:49 2010 -0800 Updated for ActionBar API changes Change-Id: I600801b518acce311baeadb74f4608ef18f3dcd1 commit 80b7ca697cbe9009216c345c69f1d58722ec76dc Author: Nick Kralevich Date: Mon Nov 15 16:56:01 2010 -0800 More directory writable tests. Change-Id: If122ddae9d440454fbbf206f4ab82b89fbe91392 commit 377d04083e75b8d4a2e9bf2cace043740149c103 Merge: a4172d1 f991cf5 Author: Brian Muramatsu Date: Mon Nov 15 14:44:39 2010 -0800 am f991cf5b: am bc5e7fd2: am 08a85b0d: am 66fa9908: Merge "Close files to prevent resource leakage" into froyo * commit 'f991cf5b248dd2c9c475499239e08747834d8aa6': Close files to prevent resource leakage commit f991cf5b248dd2c9c475499239e08747834d8aa6 Merge: e85d6ee bc5e7fd Author: Brian Muramatsu Date: Mon Nov 15 14:42:30 2010 -0800 am bc5e7fd2: am 08a85b0d: am 66fa9908: Merge "Close files to prevent resource leakage" into froyo * commit 'bc5e7fd2270dff7cec5d7429210330066616a7ae': Close files to prevent resource leakage commit bc5e7fd2270dff7cec5d7429210330066616a7ae Merge: f338acb 08a85b0 Author: Brian Muramatsu Date: Mon Nov 15 14:40:28 2010 -0800 am 08a85b0d: am 66fa9908: Merge "Close files to prevent resource leakage" into froyo * commit '08a85b0da6f842ca00cdb52732aa5b3eb41aa975': Close files to prevent resource leakage commit 08a85b0da6f842ca00cdb52732aa5b3eb41aa975 Merge: d609af1 66fa990 Author: Brian Muramatsu Date: Mon Nov 15 14:34:58 2010 -0800 am 66fa9908: Merge "Close files to prevent resource leakage" into froyo * commit '66fa99087bde8933d50b91d6da13a6d385a2e8cd': Close files to prevent resource leakage commit 66fa99087bde8933d50b91d6da13a6d385a2e8cd Merge: 07a2722 a0e2423 Author: Brian Muramatsu Date: Mon Nov 15 14:28:20 2010 -0800 Merge "Close files to prevent resource leakage" into froyo commit a0e2423e9db16f44c35885c52fe79636e94ff9e8 Author: Dominic Binks Date: Mon Oct 25 15:56:53 2010 -0600 Close files to prevent resource leakage These two files open files to parse them and do not explicitly close them. The result is that on machines with large amounts of memory the heap just continues to grow without GC kicking in to close the files. This change explicitly closes the files such that the resource leakage doesn't happen. Change-Id: Ie2328816ec06ce090d0fa26aad00064b74f93e10 commit a4172d12c473d148bd040025ebb8a74cacbb7930 Merge: a16bbd2 e85d6ee Author: Brett Chabot Date: Mon Nov 15 12:10:47 2010 -0800 am e85d6ee8: am f338acb4: Merge "Stop WifiManagerTest from disabling current network." into gingerbread * commit 'e85d6ee8ad21e7ca147b6553f059af752c05d74a': Stop WifiManagerTest from disabling current network. commit e85d6ee8ad21e7ca147b6553f059af752c05d74a Merge: 150da89 f338acb Author: Brett Chabot Date: Mon Nov 15 12:08:18 2010 -0800 am f338acb4: Merge "Stop WifiManagerTest from disabling current network." into gingerbread * commit 'f338acb48d446a5f75734a91a2e4beb133a7ab10': Stop WifiManagerTest from disabling current network. commit f338acb48d446a5f75734a91a2e4beb133a7ab10 Merge: 8f79909 9340cbb Author: Brett Chabot Date: Mon Nov 15 12:06:02 2010 -0800 Merge "Stop WifiManagerTest from disabling current network." into gingerbread commit 113cf67f683cba95e36af06e134511b363373abe Author: Brian Muramatsu Date: Mon Nov 15 11:39:38 2010 -0800 Remove SensorManagerTest BrokenTests Bug 3188260 These tests required sensor events to be generated. Change-Id: I1d1dcd97d0157cf55f6ab80a9d50887f57f1b0d6 commit 9340cbb609669ba0339cc8d6026bb8a73164a9ee Author: Brett Chabot Date: Fri Nov 12 17:20:23 2010 -0800 Stop WifiManagerTest from disabling current network. Bug 3181376 Change-Id: I93fa28f20a36b2cc90fbe0a59bbfbac758855c3a commit a16bbd246b351ba38e203309c5ed1751ad5ed736 Merge: a19def3 150da89 Author: Nick Kralevich Date: Fri Nov 12 16:13:32 2010 -0800 am 150da89b: am 8f799095: Merge "Block devices should not be readable / writable to apps" into gingerbread * commit '150da89ba4672b9593da5d55970a8eab08ae947b': Block devices should not be readable / writable to apps commit 150da89ba4672b9593da5d55970a8eab08ae947b Merge: 232f99b 8f79909 Author: Nick Kralevich Date: Fri Nov 12 16:11:22 2010 -0800 am 8f799095: Merge "Block devices should not be readable / writable to apps" into gingerbread * commit '8f799095167ef9d1b37083584e96df0f0384ec1b': Block devices should not be readable / writable to apps commit 8f799095167ef9d1b37083584e96df0f0384ec1b Merge: 21b6db2 1db5f13 Author: Nick Kralevich Date: Fri Nov 12 16:09:47 2010 -0800 Merge "Block devices should not be readable / writable to apps" into gingerbread commit 1db5f13c3e2f444a0ee0a29661e8ca0cf54ef60c Author: Nick Kralevich Date: Fri Nov 12 15:58:16 2010 -0800 Block devices should not be readable / writable to apps Change-Id: I8f81ad563327940277291752a84525f3847d5784 commit a19def307dd1e8ac89a8fe29d8664d1aab102fd0 Merge: 6f92fc8 232f99b Author: Brett Chabot Date: Fri Nov 12 15:34:36 2010 -0800 am 232f99b7: am 21b6db22: Merge "Make DatabaseCursorTest#testManyRowsLong use a single transaction." into gingerbread * commit '232f99b7b4596514627846365a5323b850f9b3d2': Make DatabaseCursorTest#testManyRowsLong use a single transaction. commit 232f99b7b4596514627846365a5323b850f9b3d2 Merge: 7487a70 21b6db2 Author: Brett Chabot Date: Fri Nov 12 15:32:26 2010 -0800 am 21b6db22: Merge "Make DatabaseCursorTest#testManyRowsLong use a single transaction." into gingerbread * commit '21b6db22d2d49c69bf66138d674574ece49fbfaa': Make DatabaseCursorTest#testManyRowsLong use a single transaction. commit 21b6db22d2d49c69bf66138d674574ece49fbfaa Merge: 337307b 0da918c Author: Brett Chabot Date: Fri Nov 12 15:30:02 2010 -0800 Merge "Make DatabaseCursorTest#testManyRowsLong use a single transaction." into gingerbread commit 0da918cf620f107c07871ac77d2c942cc46fbc25 Author: Brett Chabot Date: Thu Nov 11 15:42:26 2010 -0800 Make DatabaseCursorTest#testManyRowsLong use a single transaction. Bug 3188416 Change-Id: Ib1f1bd549b2c2342a304b39c1ec75f4d16316d24 commit 6f92fc821954c8b004a126dba5eb5dc5bd859d39 Merge: 498494b 7487a70 Author: Nick Kralevich Date: Fri Nov 12 15:23:28 2010 -0800 am 7487a703: am 337307b5: test sane /dev/mem permissions. Doc update. * commit '7487a703478e10396fa61308abc45ab0befd8cd9': test sane /dev/mem permissions. Doc update. commit 7487a703478e10396fa61308abc45ab0befd8cd9 Merge: 4561375 337307b Author: Nick Kralevich Date: Fri Nov 12 15:21:09 2010 -0800 am 337307b5: test sane /dev/mem permissions. Doc update. * commit '337307b527d5d4ed76fa72e8ad0911c99f6d7c77': test sane /dev/mem permissions. Doc update. commit 337307b527d5d4ed76fa72e8ad0911c99f6d7c77 Author: Nick Kralevich Date: Fri Nov 12 15:01:13 2010 -0800 test sane /dev/mem permissions. Doc update. Change-Id: I85113c2f24f302ad98748d1faa3cbc7cfe6fe615 commit 498494b60da0c9f3ebef24af934c23bb8b3de3b3 Author: Brian Muramatsu Date: Fri Nov 12 14:15:27 2010 -0800 Delete PorterDuff_ModeTest ...hmm. Change-Id: Iea2acac750fa6f597e61640c5fcf6c54c8e05939 commit 11a052eae5264365d8641e17c5ec2830c012a9ff Merge: dcd7922 55111a2 Author: Brian Muramatsu Date: Fri Nov 12 13:35:20 2010 -0800 Merge "Fix ContentQueryMapTest#testGetRows" commit dcd792297185b991f29c1cdd447f8f05ec290f34 Merge: 403da12 1e1ceaa Author: Brian Muramatsu Date: Fri Nov 12 13:34:26 2010 -0800 Merge "Fix BroadcastReceiverTest#testAccessAbortBroadcast" commit 1e1ceaa036e58fa23148386bf7a32d02cfc66cdd Author: Brian Muramatsu Date: Thu Nov 11 15:34:27 2010 -0800 Fix BroadcastReceiverTest#testAccessAbortBroadcast Test fails due to IllegalStateException saying "Call while result is not pending at..." because setPendingResult isn't called on the receiver before calling abortBroadcast. This test is probably not using the receiver in an appropriate way. Change-Id: Ibb8b4afb309f66216d09de9e1bce8acffa69537c commit 55111a2fa73d0cfb6d21929801bde8fa048193fe Author: Brian Muramatsu Date: Thu Nov 11 15:24:06 2010 -0800 Fix ContentQueryMapTest#testGetRows ...new IllegalStateException being thrown to fix Bug 2529736? Change-Id: I92b716cc3479e0c1a1fbab10b0c0571487ff5b19 commit 403da12ade568b2b89aef11f136f2c48d7a5cba5 Merge: 8179164 4561375 Author: Brian Muramatsu Date: Thu Nov 11 12:30:16 2010 -0800 am 45613755: am 2a4915d4: Check SIP Feature Reporting * commit '4561375543dbc89b2bc8d8257a8427a022d1b206': Check SIP Feature Reporting commit 4561375543dbc89b2bc8d8257a8427a022d1b206 Merge: ed0dc03 2a4915d Author: Brian Muramatsu Date: Thu Nov 11 12:27:30 2010 -0800 am 2a4915d4: Check SIP Feature Reporting * commit '2a4915d4cd8e9f69ce75c591708d89f431c2a3eb': Check SIP Feature Reporting commit 2a4915d4cd8e9f69ce75c591708d89f431c2a3eb Author: Brian Muramatsu Date: Fri Oct 29 16:20:04 2010 -0700 Check SIP Feature Reporting Bug 3097462 Change-Id: I4d0cbd95abe6e388facdba60979a691437f6c954 commit 81791646cb60228aad0cfde923c036d04a19430e Merge: 08e5d7c c0ed8d3 Author: Brian Muramatsu Date: Thu Nov 11 11:59:39 2010 -0800 Merge "Fix LayerDrawableTest#testAccessDrawable" commit 08e5d7c49b2233d31e5b7e3ce8a42026ad1a6f4e Merge: 2863a2d ed0dc03 Author: Brian Muramatsu Date: Thu Nov 11 11:37:36 2010 -0800 am ed0dc03d: am 300af1f5: Merge "Revert "Revert Default Result to Pass for Froyo"" into gingerbread * commit 'ed0dc03d3ec397e588fb0bd40cc938cd0a45ff80': Revert "Revert Default Result to Pass for Froyo" commit ed0dc03d3ec397e588fb0bd40cc938cd0a45ff80 Merge: 10979c5 300af1f Author: Brian Muramatsu Date: Thu Nov 11 11:35:58 2010 -0800 am 300af1f5: Merge "Revert "Revert Default Result to Pass for Froyo"" into gingerbread * commit '300af1f53e44bc0fff0bcd932d26fc4c91370a3a': Revert "Revert Default Result to Pass for Froyo" commit 2863a2d6f0abb2602ac22fe7d15b7028f97753cd Merge: 9807ece 14c4587 Author: Brian Muramatsu Date: Thu Nov 11 11:35:51 2010 -0800 Merge "Fix RoundRectShapeTest#testConstructor" commit 300af1f53e44bc0fff0bcd932d26fc4c91370a3a Merge: afa29af 1c88ddf Author: Brian Muramatsu Date: Thu Nov 11 11:33:09 2010 -0800 Merge "Revert "Revert Default Result to Pass for Froyo"" into gingerbread commit 9807ece9ab368c44f7519c320ca0e6a9930000e8 Merge: f00156b 10979c5 Author: Brian Muramatsu Date: Thu Nov 11 11:31:14 2010 -0800 am 10979c5c: am afa29af7: Revert "Whitelist for DebuggableTest#testNoDebuggable" * commit '10979c5c6c5bd5cca11f6106517fcb4ecbc24183': Revert "Whitelist for DebuggableTest#testNoDebuggable" commit 10979c5c6c5bd5cca11f6106517fcb4ecbc24183 Merge: 68b3065 afa29af Author: Brian Muramatsu Date: Thu Nov 11 11:27:52 2010 -0800 am afa29af7: Revert "Whitelist for DebuggableTest#testNoDebuggable" * commit 'afa29af76e77eac6be901442defdb9a0dbdf2c5d': Revert "Whitelist for DebuggableTest#testNoDebuggable" commit c0ed8d30ea719cd9fd13c6d5b24cc4bcdaf18810 Author: Brian Muramatsu Date: Wed Nov 10 18:19:23 2010 -0800 Fix LayerDrawableTest#testAccessDrawable Remove not very useful null check. Change-Id: If8ca6dd4bcc0d404ce64896a1d014700180c3551 commit 1c88ddff3b74b8cceeca2dc72727da1da59b041a Author: Brian Muramatsu Date: Wed Nov 10 18:02:38 2010 -0800 Revert "Revert Default Result to Pass for Froyo" This reverts commit b71074aa05a97dba2588e5d1eeaa66e85ffdeaa7. This works fine in GB now. commit afa29af76e77eac6be901442defdb9a0dbdf2c5d Author: Brian Muramatsu Date: Wed Nov 10 17:59:53 2010 -0800 Revert "Whitelist for DebuggableTest#testNoDebuggable" This reverts commit 43db7d1a686daf430452fc7295ff6c54d7d4489c. This works in GB without the whitelist. Change-Id: Iceda16a626b78d8f761293d70f0381ff6ed80378 commit 14c4587674a6588145b07127694dc5cb9291c8a9 Author: Brian Muramatsu Date: Wed Nov 10 17:52:46 2010 -0800 Fix RoundRectShapeTest#testConstructor It can take a null now. Change-Id: Ibfbef3d67a8394c367727a0bc93afb7e6d7041d6 commit f00156ba442b5fa85e2f7d669e88c45b2d101c6a Merge: 77e7fda 68b3065 Author: Brian Muramatsu Date: Wed Nov 10 16:38:41 2010 -0800 am 68b30653: am 89a16ddd: am d609af11: (-s ours) am 07a27222: Merge "Increment Version to 2.2_r4" into froyo * commit '68b306539d32b8c593f20843b39c4d10cdac56a4': Increment Version to 2.2_r4 commit 68b306539d32b8c593f20843b39c4d10cdac56a4 Merge: fbbb0cb 89a16dd Author: Brian Muramatsu Date: Wed Nov 10 16:34:41 2010 -0800 am 89a16ddd: am d609af11: (-s ours) am 07a27222: Merge "Increment Version to 2.2_r4" into froyo * commit '89a16ddd3665fbc94217c9ff726c9685b4d1b3a3': Increment Version to 2.2_r4 commit 89a16ddd3665fbc94217c9ff726c9685b4d1b3a3 Merge: 6692434 d609af1 Author: Brian Muramatsu Date: Wed Nov 10 16:30:34 2010 -0800 am d609af11: (-s ours) am 07a27222: Merge "Increment Version to 2.2_r4" into froyo * commit 'd609af11d88b7811fae0c9c57028e7ba0ccfd605': Increment Version to 2.2_r4 commit 77e7fdad247dd44dfb1d85c3c09bd890d18b321d Merge: c538214 fbbb0cb Author: Brian Muramatsu Date: Wed Nov 10 16:17:41 2010 -0800 am fbbb0cbf: am 66924346: resolved conflicts for merge of 8763abd2 to gingerbread * commit 'fbbb0cbf07dea6acd761bc6ae9c754b3907274ac': Add Screen Size and Density to Report Header commit fbbb0cbf07dea6acd761bc6ae9c754b3907274ac Merge: df7a826 6692434 Author: Brian Muramatsu Date: Wed Nov 10 16:13:42 2010 -0800 am 66924346: resolved conflicts for merge of 8763abd2 to gingerbread * commit '669243460fa0d304cc23446c04c7e85049309ed9': Add Screen Size and Density to Report Header commit 669243460fa0d304cc23446c04c7e85049309ed9 Merge: a8441cd 8763abd Author: Brian Muramatsu Date: Wed Nov 10 16:08:30 2010 -0800 resolved conflicts for merge of 8763abd2 to gingerbread Change-Id: I019039ccc17ae994d7c89f434ed8e53dc52fa89e commit c538214b012e12e6f7d04cd4c6f484e554489658 Merge: ba8fa76 df7a826 Author: Brian Muramatsu Date: Wed Nov 10 15:50:05 2010 -0800 am df7a8261: am a8441cd3: am 02585130: am 064957af: Merge "Whitelist for DebuggableTest#testNoDebuggable" into froyo * commit 'df7a82612d2a4a5d8fe4bc44566f6311eaf1c2f3': Whitelist for DebuggableTest#testNoDebuggable commit ba8fa76edb7c12e52f9fc825ff9c8b55eece54e1 Merge: 2b627a9 033ba85 Author: Brian Muramatsu Date: Wed Nov 10 15:50:01 2010 -0800 am 033ba853: am 98a77290: am f06d9e3a: am 153dee68: Merge "Revert Default Result to Pass for Froyo" into froyo * commit '033ba853dddf1a4b1a25940d9a8aacea7e29eb29': Revert Default Result to Pass for Froyo commit d609af11d88b7811fae0c9c57028e7ba0ccfd605 Merge: 8763abd 07a2722 Author: Brian Muramatsu Date: Wed Nov 10 15:47:46 2010 -0800 am 07a27222: Merge "Increment Version to 2.2_r4" into froyo * commit '07a27222875557196b70b458d73bc6623ad9463b': Increment Version to 2.2_r4 commit df7a82612d2a4a5d8fe4bc44566f6311eaf1c2f3 Merge: 033ba85 a8441cd Author: Brian Muramatsu Date: Wed Nov 10 15:45:52 2010 -0800 am a8441cd3: am 02585130: am 064957af: Merge "Whitelist for DebuggableTest#testNoDebuggable" into froyo * commit 'a8441cd385819a8fd64ae6775b7a9d2129ee8463': Whitelist for DebuggableTest#testNoDebuggable commit 033ba853dddf1a4b1a25940d9a8aacea7e29eb29 Merge: c86894a 98a7729 Author: Brian Muramatsu Date: Wed Nov 10 15:45:49 2010 -0800 am 98a77290: am f06d9e3a: am 153dee68: Merge "Revert Default Result to Pass for Froyo" into froyo * commit '98a7729085b75996dab769d4cf1a2c607494800a': Revert Default Result to Pass for Froyo commit a8441cd385819a8fd64ae6775b7a9d2129ee8463 Merge: 98a7729 0258513 Author: Brian Muramatsu Date: Wed Nov 10 15:41:16 2010 -0800 am 02585130: am 064957af: Merge "Whitelist for DebuggableTest#testNoDebuggable" into froyo * commit '0258513070d2ef6001ab8c0dba5bff23495732d2': Whitelist for DebuggableTest#testNoDebuggable commit 98a7729085b75996dab769d4cf1a2c607494800a Merge: 40e5ac6 f06d9e3 Author: Brian Muramatsu Date: Wed Nov 10 15:41:11 2010 -0800 am f06d9e3a: am 153dee68: Merge "Revert Default Result to Pass for Froyo" into froyo * commit 'f06d9e3a39d1d6054c69c2a4b0188b50465f8906': Revert Default Result to Pass for Froyo commit 07a27222875557196b70b458d73bc6623ad9463b Merge: d4edc18 c85aaa3 Author: Brian Muramatsu Date: Wed Nov 10 15:40:00 2010 -0800 Merge "Increment Version to 2.2_r4" into froyo commit 8763abd294e452c23c006b14ee981b235d8c9d3e Merge: 0258513 d4edc18 Author: Brian Muramatsu Date: Wed Nov 10 15:38:03 2010 -0800 am d4edc186: Merge "Add Screen Size and Density to Report Header" into froyo * commit 'd4edc186d4e8f69b4967f694dc8baf28534d566b': Add Screen Size and Density to Report Header commit 0258513070d2ef6001ab8c0dba5bff23495732d2 Merge: f06d9e3 064957a Author: Brian Muramatsu Date: Wed Nov 10 15:37:59 2010 -0800 am 064957af: Merge "Whitelist for DebuggableTest#testNoDebuggable" into froyo * commit '064957af4e5505b410deb8887dbf70f9e944f7bc': Whitelist for DebuggableTest#testNoDebuggable commit f06d9e3a39d1d6054c69c2a4b0188b50465f8906 Merge: 06100c1 153dee6 Author: Brian Muramatsu Date: Wed Nov 10 15:37:54 2010 -0800 am 153dee68: Merge "Revert Default Result to Pass for Froyo" into froyo * commit '153dee688a6f7ae180d09e80ddcb0436f152daa9': Revert Default Result to Pass for Froyo commit d4edc186d4e8f69b4967f694dc8baf28534d566b Merge: 064957a e6b12dc Author: Brian Muramatsu Date: Wed Nov 10 15:27:12 2010 -0800 Merge "Add Screen Size and Density to Report Header" into froyo commit e6b12dcd594b2ed15a4ad9c635b8f393463f17a5 Author: Brian Muramatsu Date: Mon Nov 8 14:56:40 2010 -0800 Add Screen Size and Density to Report Header Bug 3148034 Report logical screen size like small or normal and the logical density with density bucket. The density bucket is a guess. Change-Id: Ic7f2dc73f612d9d2d4a5ed44083339b993d8a27b commit 2b627a9f7cdef2ba4104d306b7607cfff8218ca7 Merge: 4502754 c86894a Author: Brett Chabot Date: Wed Nov 10 11:43:28 2010 -0800 am c86894ae: am 40e5ac6f: Set user.dir property when running CTS tests. * commit 'c86894ae451e92ce53596b40bbfdfe195d735699': Set user.dir property when running CTS tests. commit c86894ae451e92ce53596b40bbfdfe195d735699 Merge: 83358c7 40e5ac6 Author: Brett Chabot Date: Wed Nov 10 11:38:57 2010 -0800 am 40e5ac6f: Set user.dir property when running CTS tests. * commit '40e5ac6f21b8a3a459641388831914cb697495b6': Set user.dir property when running CTS tests. commit 45027547d952eabf153eadd45bc6c0e084a4993e Merge: 74eb7e8 693e432 Author: Brian Carlstrom Date: Wed Nov 10 08:52:42 2010 -0800 Merge "Add CookieManager regression test for cookie attributes with spaces after =" commit 693e4326ebd555256d7e1db37dd1ab453a4bf6cc Author: Brian Carlstrom Date: Tue Nov 9 22:06:26 2010 -0800 Add CookieManager regression test for cookie attributes with spaces after = Bug: 3167208 Change-Id: If5c1bf10f55bc5bff7dd71a9bd85e14495ff46bd commit 40e5ac6f21b8a3a459641388831914cb697495b6 Author: Brett Chabot Date: Tue Nov 9 19:47:41 2010 -0800 Set user.dir property when running CTS tests. Some core library tests depend on this property being set. Notably the ones that rely on the File(String path) behavior of using user.dir as the root path when 'path' argument is a relative path. Change-Id: I523c18868c7a3dd881743bca6ec867dad2361068 commit 74eb7e8ac8f93ea9b745fc3aab9a8081a5b5ed36 Merge: 55d262a 83358c7 Author: Brian Muramatsu Date: Mon Nov 8 19:22:43 2010 -0800 am 83358c71: am 959d990e: am 06100c10: am 48cd1128: Merge "Remove Profile Annotations Experiment" into froyo * commit '83358c71826e9fd2a519f236bc10ed55fc796e28': Remove Profile Annotations Experiment commit 064957af4e5505b410deb8887dbf70f9e944f7bc Merge: 153dee6 43db7d1 Author: Brian Muramatsu Date: Mon Nov 8 16:54:22 2010 -0800 Merge "Whitelist for DebuggableTest#testNoDebuggable" into froyo commit 153dee688a6f7ae180d09e80ddcb0436f152daa9 Merge: 48cd112 b71074a Author: Brian Muramatsu Date: Mon Nov 8 16:39:46 2010 -0800 Merge "Revert Default Result to Pass for Froyo" into froyo commit c85aaa34831b94f60be97b2cde83de80d198514f Author: Brian Muramatsu Date: Mon Nov 8 15:30:42 2010 -0800 Increment Version to 2.2_r4 Bug 3166146 Change-Id: Ia4cd623e2c19657916748412c6024a1c93078866 commit 43db7d1a686daf430452fc7295ff6c54d7d4489c Author: Brian Muramatsu Date: Mon Nov 8 12:14:59 2010 -0800 Whitelist for DebuggableTest#testNoDebuggable Bug 3166146 Add a whitelist to let exceptions for Froyo through. In a future release, there will be no whitelist. Change-Id: I2cce1cd82daa2116dfa2e5072ebb1c4bfd0b2fc7 commit 55d262ab7fe16866cac0ba31b2d933ec230b52f9 Merge: ecd6760 1d1d52a Author: Wu-cheng Li Date: Mon Nov 8 13:20:54 2010 -0800 am 1d1d52aa: am 8c2d3af9: android.hardware.Camera.open should return back-facing camera. * commit '1d1d52aac686650ec5c4d429935e556215cec84c': android.hardware.Camera.open should return back-facing camera. commit b71074aa05a97dba2588e5d1eeaa66e85ffdeaa7 Author: Brian Muramatsu Date: Mon Nov 8 12:23:11 2010 -0800 Revert Default Result to Pass for Froyo Bug 3171610 Change the default result back to pass AGAIN for Froyo to mask the failing org.w3c...JUnitTestCaseAdapter. Fixing the JUnitTestCaseAdapter tests to pass would require a change to android.test...InstrumentationTestRunner, so we'll just have to live with masking these failures for now. The test runner throws an exception because the test case names are not actual methods of the JUnitTestCaseAdapter class. The runner then aborts and returns no status and thus the result of the test was the default result which used to be fail but now is being changed to pass in order to mask these failures for Froyo. Change-Id: Iecc54eacc5816ba64c9628aca7b87f8d637f6063 commit 83358c71826e9fd2a519f236bc10ed55fc796e28 Merge: 1d1d52a 959d990 Author: Brian Muramatsu Date: Mon Nov 8 12:19:43 2010 -0800 am 959d990e: am 06100c10: am 48cd1128: Merge "Remove Profile Annotations Experiment" into froyo * commit '959d990e35f083421fe981e313b4e08a66e0c026': Remove Profile Annotations Experiment commit 1d1d52aac686650ec5c4d429935e556215cec84c Merge: f5e4d4f 8c2d3af Author: Wu-cheng Li Date: Mon Nov 8 12:13:39 2010 -0800 am 8c2d3af9: android.hardware.Camera.open should return back-facing camera. * commit '8c2d3af9157c5768222c7d33f18424750c95fdd9': android.hardware.Camera.open should return back-facing camera. commit 959d990e35f083421fe981e313b4e08a66e0c026 Merge: 8c2d3af 06100c1 Author: Brian Muramatsu Date: Mon Nov 8 12:05:29 2010 -0800 am 06100c10: am 48cd1128: Merge "Remove Profile Annotations Experiment" into froyo * commit '06100c103db258ec8b46f2c815c32d337d45367e': Remove Profile Annotations Experiment commit 06100c103db258ec8b46f2c815c32d337d45367e Merge: 86230cd 48cd112 Author: Brian Muramatsu Date: Mon Nov 8 12:00:38 2010 -0800 am 48cd1128: Merge "Remove Profile Annotations Experiment" into froyo * commit '48cd112899cf576acc64f0828e732c8a74730d38': Remove Profile Annotations Experiment commit 48cd112899cf576acc64f0828e732c8a74730d38 Merge: 4e1a100 f8c0a36 Author: Brian Muramatsu Date: Mon Nov 8 11:53:39 2010 -0800 Merge "Remove Profile Annotations Experiment" into froyo commit 8c2d3af9157c5768222c7d33f18424750c95fdd9 Author: Wu-cheng Li Date: Mon Nov 8 11:43:13 2010 +0800 android.hardware.Camera.open should return back-facing camera. bug:3173302 Change-Id: I7cd8dae4fd080493edda3e89fdf1df1a4eb2ad18 commit ecd676045ecfda4b82e3651ddd19f5f94ededd1c Merge: caaf20d f5e4d4f Author: Brian Muramatsu Date: Sat Nov 6 16:25:27 2010 -0700 am f5e4d4f2: am 777375a0: am 86230cd6: am 4e1a1002: Merge "Fix AccountManagerTest#testHasFeatureWithCallback" into froyo * commit 'f5e4d4f244b6ff4389e855f5b55100b04a8839f9': Fix AccountManagerTest#testHasFeatureWithCallback commit caaf20d68f60381ed136f6239f6f1a5adbf8a76e Merge: 2cd47f6 8943ee7 Author: Brian Muramatsu Date: Sat Nov 6 16:25:24 2010 -0700 am 8943ee72: am b6205d66: am ee0a864a: am 300712ec: Merge "Improve SystemFeaturesTest#testCameraFeatures" into froyo * commit '8943ee722b74f1eabe4fac242fc9e7076adad463': Improve SystemFeaturesTest#testCameraFeatures commit 2cd47f61eb64f40d03bcd8324f8ae6b044ee735e Merge: b489474 aa9e034 Author: Brian Muramatsu Date: Sat Nov 6 16:24:12 2010 -0700 am aa9e0342: am ebe6c85e: Revert "Delete some opcode tests for invoke_*" * commit 'aa9e0342893beb05206ad8ba04acda4820775d69': Revert "Delete some opcode tests for invoke_*" commit f5e4d4f244b6ff4389e855f5b55100b04a8839f9 Merge: 8943ee7 777375a Author: Brian Muramatsu Date: Sat Nov 6 14:21:33 2010 -0700 am 777375a0: am 86230cd6: am 4e1a1002: Merge "Fix AccountManagerTest#testHasFeatureWithCallback" into froyo * commit '777375a0115e54048a775bc1d72fbc35354bf9cf': Fix AccountManagerTest#testHasFeatureWithCallback commit 8943ee722b74f1eabe4fac242fc9e7076adad463 Merge: aa9e034 b6205d6 Author: Brian Muramatsu Date: Sat Nov 6 14:21:29 2010 -0700 am b6205d66: am ee0a864a: am 300712ec: Merge "Improve SystemFeaturesTest#testCameraFeatures" into froyo * commit 'b6205d669f1521aec2bb68a771291c2184b3cf46': Improve SystemFeaturesTest#testCameraFeatures commit 777375a0115e54048a775bc1d72fbc35354bf9cf Merge: b6205d6 86230cd Author: Brian Muramatsu Date: Fri Nov 5 15:52:34 2010 -0700 am 86230cd6: am 4e1a1002: Merge "Fix AccountManagerTest#testHasFeatureWithCallback" into froyo * commit '86230cd6f7bfc5cba4abc748ef61043166d4b334': Fix AccountManagerTest#testHasFeatureWithCallback commit 86230cd6f7bfc5cba4abc748ef61043166d4b334 Merge: ee0a864 4e1a100 Author: Brian Muramatsu Date: Fri Nov 5 15:48:44 2010 -0700 am 4e1a1002: Merge "Fix AccountManagerTest#testHasFeatureWithCallback" into froyo * commit '4e1a1002f47c6cb764684e96fa92aca25b81adda': Fix AccountManagerTest#testHasFeatureWithCallback commit 4e1a1002f47c6cb764684e96fa92aca25b81adda Merge: 300712e 767651c Author: Brian Muramatsu Date: Fri Nov 5 15:38:41 2010 -0700 Merge "Fix AccountManagerTest#testHasFeatureWithCallback" into froyo commit b6205d669f1521aec2bb68a771291c2184b3cf46 Merge: ebe6c85 ee0a864 Author: Brian Muramatsu Date: Fri Nov 5 15:28:45 2010 -0700 am ee0a864a: am 300712ec: Merge "Improve SystemFeaturesTest#testCameraFeatures" into froyo * commit 'ee0a864a84babe4eddf00e70f1a5d6ac9e3a86c2': Improve SystemFeaturesTest#testCameraFeatures commit 767651cc8c189730a7e7cc953d620cb9ef63f7e1 Author: Brian Muramatsu Date: Thu Oct 14 14:58:54 2010 -0700 Fix AccountManagerTest#testHasFeatureWithCallback Bug 3097462 Mark testHasFeatureWithCallback as private, since its not a test. CTS was picking it up as a test and trying to run it but failing because that method takes a parameter. Change-Id: Ie90ae033748ef90ff293bd73f962d3087a2975c6 commit ee0a864a84babe4eddf00e70f1a5d6ac9e3a86c2 Merge: bb74a2d 300712e Author: Brian Muramatsu Date: Fri Nov 5 15:22:19 2010 -0700 am 300712ec: Merge "Improve SystemFeaturesTest#testCameraFeatures" into froyo * commit '300712ec14af13e5fda50ab3e082792660bd6a90': Improve SystemFeaturesTest#testCameraFeatures commit 300712ec14af13e5fda50ab3e082792660bd6a90 Merge: 2bcf245 aef7606 Author: Brian Muramatsu Date: Fri Nov 5 15:15:22 2010 -0700 Merge "Improve SystemFeaturesTest#testCameraFeatures" into froyo commit aa9e0342893beb05206ad8ba04acda4820775d69 Merge: c5776e8 ebe6c85 Author: Brian Muramatsu Date: Fri Nov 5 13:57:23 2010 -0700 am ebe6c85e: Revert "Delete some opcode tests for invoke_*" * commit 'ebe6c85e59ba78effc63e404c78215300b92954f': Revert "Delete some opcode tests for invoke_*" commit f8c0a36cd3130cde3808790cfe5a1a31ff5807aa Author: Brian Muramatsu Date: Fri Nov 5 10:52:31 2010 -0700 Remove Profile Annotations Experiment Bug 3166146 Change-Id: I23e09d4c4d828c8094d7feefaa5e1ed1ce07715f commit b48947473e3b4065695b4919e21b2feb58cbadfb Merge: c5776e8 af49c26 Author: Eric Rowe Date: Thu Nov 4 16:20:50 2010 -0700 Merge branch 'master' of ssh://android-git:29418/platform/cts commit ebe6c85e59ba78effc63e404c78215300b92954f Author: Brian Muramatsu Date: Thu Nov 4 16:09:12 2010 -0700 Revert "Delete some opcode tests for invoke_*" This reverts commit 4005ea57a928432b803c268358fe9de709c65615. These tests work fine for GB. commit aef7606da657e6ae37aced9fe5ed9dfd81e9066a Author: Brian Muramatsu Date: Thu Nov 4 15:52:08 2010 -0700 Improve SystemFeaturesTest#testCameraFeatures Incorporate suggestion on improving the reliability of the auto focus feature check. Bug 3166146 Change-Id: Ic513e69386be54cb4a8405c4a8f35d9fa6a6e902 commit c5776e8e5b667f4c010090440ee114fecccd04c8 Merge: 9406f82 22356b7 Author: Brian Muramatsu Date: Thu Nov 4 15:40:53 2010 -0700 am 22356b78: am bb74a2d9: am 2bcf2450: Merge "Delete some opcode tests for invoke_*" into froyo * commit '22356b78578cc76e7bc7642b67fb441d295564df': Delete some opcode tests for invoke_* commit 22356b78578cc76e7bc7642b67fb441d295564df Merge: fc3f82e bb74a2d Author: Brian Muramatsu Date: Thu Nov 4 15:39:40 2010 -0700 am bb74a2d9: am 2bcf2450: Merge "Delete some opcode tests for invoke_*" into froyo * commit 'bb74a2d9531491389493717a50ef246717653486': Delete some opcode tests for invoke_* commit bb74a2d9531491389493717a50ef246717653486 Merge: fc2da3f 2bcf245 Author: Brian Muramatsu Date: Thu Nov 4 15:36:59 2010 -0700 am 2bcf2450: Merge "Delete some opcode tests for invoke_*" into froyo * commit '2bcf2450cc9c532a9416106565c75f10d46ecdf2': Delete some opcode tests for invoke_* commit 2bcf2450cc9c532a9416106565c75f10d46ecdf2 Merge: 48fa39d 4005ea5 Author: Brian Muramatsu Date: Thu Nov 4 15:26:22 2010 -0700 Merge "Delete some opcode tests for invoke_*" into froyo commit 4005ea57a928432b803c268358fe9de709c65615 Author: Brian Muramatsu Date: Thu Nov 4 12:56:25 2010 -0700 Delete some opcode tests for invoke_* These will be added back in a future release! Bug 3147582 Change-Id: I98200ee239d0bd52cbb1b2a3a8a093c0b248aa40 commit af49c261f11171fee9dd6137ad2f78b287a46176 Merge: 9406f82 31ea01d Author: Jason Chen Date: Thu Nov 4 14:03:07 2010 -0700 Merge branch 'master' of ssh://android-git:29418/platform/cts commit 9406f82a507fc787c7d5243103f468ddf6864ca7 Merge: 078158c fc3f82e Author: Brian Muramatsu Date: Thu Nov 4 14:00:54 2010 -0700 am fc3f82e9: am fc2da3f3: am 48fa39dc: Merge "Fix opcode tests for instance_of" into froyo * commit 'fc3f82e9d9462ba7e70302ded5eb903aaa487fa7': Fix opcode tests for instance_of commit fc3f82e9d9462ba7e70302ded5eb903aaa487fa7 Merge: a868fb8 fc2da3f Author: Brian Muramatsu Date: Thu Nov 4 13:58:58 2010 -0700 am fc2da3f3: am 48fa39dc: Merge "Fix opcode tests for instance_of" into froyo * commit 'fc2da3f3cb4b85fdd949833d80d27f6b26375939': Fix opcode tests for instance_of commit fc2da3f3cb4b85fdd949833d80d27f6b26375939 Merge: 9ee94e4 48fa39d Author: Brian Muramatsu Date: Thu Nov 4 13:56:44 2010 -0700 am 48fa39dc: Merge "Fix opcode tests for instance_of" into froyo * commit '48fa39dc596c026c182716675be5f4c613ee2190': Fix opcode tests for instance_of commit 48fa39dc596c026c182716675be5f4c613ee2190 Merge: d508be7 7d3f6eb Author: Brian Muramatsu Date: Thu Nov 4 13:44:42 2010 -0700 Merge "Fix opcode tests for instance_of" into froyo commit 7d3f6eb054534fa2bb7e7526ccba1a7affd6e197 Author: Brian Muramatsu Date: Thu Nov 4 12:51:27 2010 -0700 Fix opcode tests for instance_of Bug 3147582 Change-Id: I444a9955837c7fc3705fa613dd9373d598cda862 commit 31ea01de4252c5adfe5446cdb3426d1b62173141 Merge: 280f6e8 078158c Author: Brian Muramatsu Date: Thu Nov 4 11:37:25 2010 -0700 am 078158c5: am a868fb89: am 9ee94e4c: am d508be76: Merge "Fix opcode tests for invoke_*" into froyo * commit '078158c51a4645146f263d8611e560ce5459ce54': Fix opcode tests for invoke_* commit 280f6e8ae4cc073cea0ad3a08533cd3952d1aa58 Merge: ddd7218 7adc528 Author: Brian Muramatsu Date: Thu Nov 4 11:37:23 2010 -0700 am 7adc5280: am 70ecd5a4: am 7c04cdfd: am 7f738031: Merge "Fix opcode tests for iput_*" into froyo * commit '7adc5280f898ba941a57626203905c7284b38ac3': Fix opcode tests for iput_* commit ddd7218403e0d14ac8b382acd42b558ec4c6d162 Merge: 180b1fb 1a22ea8 Author: Brian Muramatsu Date: Thu Nov 4 11:37:21 2010 -0700 am 1a22ea88: am 120e863b: am babe7483: am c44ffdf9: Merge "Fix opcode tests for new_array and new_instance" into froyo * commit '1a22ea88fd95d875e3221ca9e9d2d27ddd87101e': Fix opcode tests for new_array and new_instance commit 180b1fb4fd8934236097e3aa2537fe6b96fc6187 Merge: 4d70d94 b684de9 Author: Brian Muramatsu Date: Thu Nov 4 11:37:16 2010 -0700 am b684de93: am 14576938: am 2d8c70fa: am dcee3373: Merge "Fix opcode tests for sget_*" into froyo * commit 'b684de93586a95512b273ed54974c49ee05cee96': Fix opcode tests for sget_* commit 078158c51a4645146f263d8611e560ce5459ce54 Merge: 7adc528 a868fb8 Author: Brian Muramatsu Date: Thu Nov 4 11:34:13 2010 -0700 am a868fb89: am 9ee94e4c: am d508be76: Merge "Fix opcode tests for invoke_*" into froyo * commit 'a868fb890ea7e81c98b024b8ab7e916937e445bb': Fix opcode tests for invoke_* commit 7adc5280f898ba941a57626203905c7284b38ac3 Merge: 1a22ea8 70ecd5a Author: Brian Muramatsu Date: Thu Nov 4 11:34:10 2010 -0700 am 70ecd5a4: am 7c04cdfd: am 7f738031: Merge "Fix opcode tests for iput_*" into froyo * commit '70ecd5a45be80cde89721efd59277b324d2a8975': Fix opcode tests for iput_* commit 1a22ea88fd95d875e3221ca9e9d2d27ddd87101e Merge: b684de9 120e863 Author: Brian Muramatsu Date: Thu Nov 4 11:34:06 2010 -0700 am 120e863b: am babe7483: am c44ffdf9: Merge "Fix opcode tests for new_array and new_instance" into froyo * commit '120e863b3994fbfffa5801274f427c65f09cbbfb': Fix opcode tests for new_array and new_instance commit b684de93586a95512b273ed54974c49ee05cee96 Merge: 6393a6c 1457693 Author: Brian Muramatsu Date: Thu Nov 4 11:34:04 2010 -0700 am 14576938: am 2d8c70fa: am dcee3373: Merge "Fix opcode tests for sget_*" into froyo * commit '145769386478734899321abbd0cb7bc990fa7480': Fix opcode tests for sget_* commit a868fb890ea7e81c98b024b8ab7e916937e445bb Merge: 70ecd5a 9ee94e4 Author: Brian Muramatsu Date: Thu Nov 4 11:31:54 2010 -0700 am 9ee94e4c: am d508be76: Merge "Fix opcode tests for invoke_*" into froyo * commit '9ee94e4c983c925ace68541d802b1c57bee1e141': Fix opcode tests for invoke_* commit 70ecd5a45be80cde89721efd59277b324d2a8975 Merge: 120e863 7c04cdf Author: Brian Muramatsu Date: Thu Nov 4 11:31:51 2010 -0700 am 7c04cdfd: am 7f738031: Merge "Fix opcode tests for iput_*" into froyo * commit '7c04cdfd0349d754cea7eaff538aa520d85e58a0': Fix opcode tests for iput_* commit 120e863b3994fbfffa5801274f427c65f09cbbfb Merge: 1457693 babe748 Author: Brian Muramatsu Date: Thu Nov 4 11:31:49 2010 -0700 am babe7483: am c44ffdf9: Merge "Fix opcode tests for new_array and new_instance" into froyo * commit 'babe7483aa764797589c113628eea27c273920c9': Fix opcode tests for new_array and new_instance commit 145769386478734899321abbd0cb7bc990fa7480 Merge: 7eaa53b 2d8c70f Author: Brian Muramatsu Date: Thu Nov 4 11:31:46 2010 -0700 am 2d8c70fa: am dcee3373: Merge "Fix opcode tests for sget_*" into froyo * commit '2d8c70fa68bec265d332002fd2d2e88d117c5015': Fix opcode tests for sget_* commit 9ee94e4c983c925ace68541d802b1c57bee1e141 Merge: 7c04cdf d508be7 Author: Brian Muramatsu Date: Thu Nov 4 11:29:42 2010 -0700 am d508be76: Merge "Fix opcode tests for invoke_*" into froyo * commit 'd508be76ff3742aa1d78744382150c1e9c7bf600': Fix opcode tests for invoke_* commit 7c04cdfd0349d754cea7eaff538aa520d85e58a0 Merge: babe748 7f73803 Author: Brian Muramatsu Date: Thu Nov 4 11:29:30 2010 -0700 am 7f738031: Merge "Fix opcode tests for iput_*" into froyo * commit '7f738031e6dccc8c79a8ecc38432eec8eca243d6': Fix opcode tests for iput_* commit babe7483aa764797589c113628eea27c273920c9 Merge: 2d8c70f c44ffdf Author: Brian Muramatsu Date: Thu Nov 4 11:29:14 2010 -0700 am c44ffdf9: Merge "Fix opcode tests for new_array and new_instance" into froyo * commit 'c44ffdf940e05122d1cf006f57247932e447f48a': Fix opcode tests for new_array and new_instance commit 2d8c70fa68bec265d332002fd2d2e88d117c5015 Merge: c37befc dcee337 Author: Brian Muramatsu Date: Thu Nov 4 11:29:12 2010 -0700 am dcee3373: Merge "Fix opcode tests for sget_*" into froyo * commit 'dcee33739a626101b6a2529e4d72d3bc687b0f09': Fix opcode tests for sget_* commit 4d70d94c3615e2e7d51f50b296bd23285d78a546 Merge: 97af653 6393a6c Author: Brian Muramatsu Date: Thu Nov 4 11:25:33 2010 -0700 am 6393a6cd: am 7eaa53b0: am c37befc4: am a086e33d: Merge "Fix opcode tests for sput_byte" into froyo * commit '6393a6cdafe47b7a8d3bd85a1e6c7c504681fb0a': Fix opcode tests for sput_byte commit 97af65388a862a054396b4fadaea5dc0b2746050 Merge: 69570cd bc1981d Author: Brian Muramatsu Date: Thu Nov 4 11:25:31 2010 -0700 am bc1981d8: am ba355966: am bda10835: am b8481b02: Merge "Fix opcode tests for sput_boolean" into froyo * commit 'bc1981d813ff2f475eed67b2ed43d3eadb09d6f7': Fix opcode tests for sput_boolean commit 69570cd27c5aad496bd72df3a37ae5d4b173c25d Merge: 56a82ae d194054 Author: Brian Muramatsu Date: Thu Nov 4 11:25:28 2010 -0700 am d1940542: am 29d472d3: am b113aa47: am a2bcf4b2: Merge "Fix opcode tests for sput_char" into froyo * commit 'd194054229d692288c06a21931bb198f3c37c5e7': Fix opcode tests for sput_char commit 56a82aedfdb20072c6da5315d4bb6cd22ddf9305 Merge: e667893 84053b6 Author: Brian Muramatsu Date: Thu Nov 4 11:25:25 2010 -0700 am 84053b60: am 9d6fc854: am 287bf9ab: am ef963b80: Merge "Fix opcode tests for sput_object" into froyo * commit '84053b60478abb1a38d2f8f6de05b8dcc70e70c0': Fix opcode tests for sput_object commit d508be76ff3742aa1d78744382150c1e9c7bf600 Merge: 7f73803 7567b20 Author: Brian Muramatsu Date: Thu Nov 4 11:24:12 2010 -0700 Merge "Fix opcode tests for invoke_*" into froyo commit e6678933bb25b7bd587a35c1d9c8b0af38c1bdcd Merge: 6952222 f3cb058 Author: Brian Muramatsu Date: Thu Nov 4 11:23:17 2010 -0700 am f3cb0581: am 015ec5af: am bbc255ef: am a6686ad8: Merge "Fix opcode tests for sput_short" into froyo * commit 'f3cb0581424db464a55b04249cf1050f28dbe01e': Fix opcode tests for sput_short commit 6952222dffc366b63a30f5318ee615ae694138a3 Merge: 32ff03f 32904c2 Author: Brian Muramatsu Date: Thu Nov 4 11:23:14 2010 -0700 am 32904c21: am c82b8772: am 5daa6a96: am e6253eca: Merge "Fix opcode tests for sput" into froyo * commit '32904c213f9ab403ec687cdd82c199699fde8f6d': Fix opcode tests for sput commit 6393a6cdafe47b7a8d3bd85a1e6c7c504681fb0a Merge: bc1981d 7eaa53b Author: Brian Muramatsu Date: Thu Nov 4 11:22:34 2010 -0700 am 7eaa53b0: am c37befc4: am a086e33d: Merge "Fix opcode tests for sput_byte" into froyo * commit '7eaa53b0b65da55017506e83f28c2b67554fc937': Fix opcode tests for sput_byte commit bc1981d813ff2f475eed67b2ed43d3eadb09d6f7 Merge: d194054 ba35596 Author: Brian Muramatsu Date: Thu Nov 4 11:22:32 2010 -0700 am ba355966: am bda10835: am b8481b02: Merge "Fix opcode tests for sput_boolean" into froyo * commit 'ba3559665f20b93299aa675178ea506ba19a86b5': Fix opcode tests for sput_boolean commit d194054229d692288c06a21931bb198f3c37c5e7 Merge: 84053b6 29d472d Author: Brian Muramatsu Date: Thu Nov 4 11:22:25 2010 -0700 am 29d472d3: am b113aa47: am a2bcf4b2: Merge "Fix opcode tests for sput_char" into froyo * commit '29d472d31272a80585a324a6ce6317fa9e6e85ee': Fix opcode tests for sput_char commit 84053b60478abb1a38d2f8f6de05b8dcc70e70c0 Merge: f3cb058 9d6fc85 Author: Brian Muramatsu Date: Thu Nov 4 11:22:23 2010 -0700 am 9d6fc854: am 287bf9ab: am ef963b80: Merge "Fix opcode tests for sput_object" into froyo * commit '9d6fc854c08eb4b773766f46ec2d935dda638521': Fix opcode tests for sput_object commit 7f738031e6dccc8c79a8ecc38432eec8eca243d6 Merge: c44ffdf 7a5a1b9 Author: Brian Muramatsu Date: Thu Nov 4 11:21:44 2010 -0700 Merge "Fix opcode tests for iput_*" into froyo commit f3cb0581424db464a55b04249cf1050f28dbe01e Merge: 32904c2 015ec5a Author: Brian Muramatsu Date: Thu Nov 4 11:20:31 2010 -0700 am 015ec5af: am bbc255ef: am a6686ad8: Merge "Fix opcode tests for sput_short" into froyo * commit '015ec5afbd76897abfe24a80e04b5462864a3d18': Fix opcode tests for sput_short commit 32904c213f9ab403ec687cdd82c199699fde8f6d Merge: a67fd1d c82b877 Author: Brian Muramatsu Date: Thu Nov 4 11:20:26 2010 -0700 am c82b8772: am 5daa6a96: am e6253eca: Merge "Fix opcode tests for sput" into froyo * commit 'c82b87727cb4b579eb6c7689ea0ad41edde25acc': Fix opcode tests for sput commit 7eaa53b0b65da55017506e83f28c2b67554fc937 Merge: ba35596 c37befc Author: Brian Muramatsu Date: Thu Nov 4 11:19:33 2010 -0700 am c37befc4: am a086e33d: Merge "Fix opcode tests for sput_byte" into froyo * commit 'c37befc4f8f43f12a61fc4f90dca3403f25d62b3': Fix opcode tests for sput_byte commit ba3559665f20b93299aa675178ea506ba19a86b5 Merge: 29d472d bda1083 Author: Brian Muramatsu Date: Thu Nov 4 11:19:29 2010 -0700 am bda10835: am b8481b02: Merge "Fix opcode tests for sput_boolean" into froyo * commit 'bda108352a732314779aec6cc22514802623264e': Fix opcode tests for sput_boolean commit 29d472d31272a80585a324a6ce6317fa9e6e85ee Merge: 9d6fc85 b113aa4 Author: Brian Muramatsu Date: Thu Nov 4 11:19:26 2010 -0700 am b113aa47: am a2bcf4b2: Merge "Fix opcode tests for sput_char" into froyo * commit 'b113aa47cef08066aed485571d4b199fbcd134bc': Fix opcode tests for sput_char commit 9d6fc854c08eb4b773766f46ec2d935dda638521 Merge: 015ec5a 287bf9a Author: Brian Muramatsu Date: Thu Nov 4 11:19:22 2010 -0700 am 287bf9ab: am ef963b80: Merge "Fix opcode tests for sput_object" into froyo * commit '287bf9abb937b1306a63dc18d85dd5019da8860e': Fix opcode tests for sput_object commit c44ffdf940e05122d1cf006f57247932e447f48a Merge: dcee337 e0e3d39 Author: Brian Muramatsu Date: Thu Nov 4 11:18:16 2010 -0700 Merge "Fix opcode tests for new_array and new_instance" into froyo commit c37befc4f8f43f12a61fc4f90dca3403f25d62b3 Merge: bda1083 a086e33 Author: Brian Muramatsu Date: Thu Nov 4 11:16:48 2010 -0700 am a086e33d: Merge "Fix opcode tests for sput_byte" into froyo * commit 'a086e33dcb35d12e82fa569db106717aa3b55852': Fix opcode tests for sput_byte commit bda108352a732314779aec6cc22514802623264e Merge: b113aa4 b8481b0 Author: Brian Muramatsu Date: Thu Nov 4 11:16:42 2010 -0700 am b8481b02: Merge "Fix opcode tests for sput_boolean" into froyo * commit 'b8481b0203dec56aa1a067751c3fd3a3ee4e2b74': Fix opcode tests for sput_boolean commit b113aa47cef08066aed485571d4b199fbcd134bc Merge: 287bf9a a2bcf4b Author: Brian Muramatsu Date: Thu Nov 4 11:16:40 2010 -0700 am a2bcf4b2: Merge "Fix opcode tests for sput_char" into froyo * commit 'a2bcf4b27b84e18df5f5c1d9787ca5fb39b5c9f1': Fix opcode tests for sput_char commit 287bf9abb937b1306a63dc18d85dd5019da8860e Merge: bbc255e ef963b8 Author: Brian Muramatsu Date: Thu Nov 4 11:16:37 2010 -0700 am ef963b80: Merge "Fix opcode tests for sput_object" into froyo * commit 'ef963b809d37612faba62ee3176986c8700fc3f4': Fix opcode tests for sput_object commit dcee33739a626101b6a2529e4d72d3bc687b0f09 Merge: a086e33 1a19370 Author: Brian Muramatsu Date: Thu Nov 4 11:15:05 2010 -0700 Merge "Fix opcode tests for sget_*" into froyo commit a086e33dcb35d12e82fa569db106717aa3b55852 Merge: b8481b0 7e7337d Author: Brian Muramatsu Date: Thu Nov 4 11:11:12 2010 -0700 Merge "Fix opcode tests for sput_byte" into froyo commit b8481b0203dec56aa1a067751c3fd3a3ee4e2b74 Merge: a2bcf4b 162261e Author: Brian Muramatsu Date: Thu Nov 4 11:08:37 2010 -0700 Merge "Fix opcode tests for sput_boolean" into froyo commit 015ec5afbd76897abfe24a80e04b5462864a3d18 Merge: c82b877 bbc255e Author: Brian Muramatsu Date: Thu Nov 4 11:05:04 2010 -0700 am bbc255ef: am a6686ad8: Merge "Fix opcode tests for sput_short" into froyo * commit 'bbc255ef9155074744474e6a2802a68feeb5ce03': Fix opcode tests for sput_short commit c82b87727cb4b579eb6c7689ea0ad41edde25acc Merge: b5fbdfc 5daa6a9 Author: Brian Muramatsu Date: Thu Nov 4 11:05:02 2010 -0700 am 5daa6a96: am e6253eca: Merge "Fix opcode tests for sput" into froyo * commit '5daa6a96469217293e08bf5ef996a178d8b44f35': Fix opcode tests for sput commit a2bcf4b27b84e18df5f5c1d9787ca5fb39b5c9f1 Merge: ef963b8 9a0e4df Author: Brian Muramatsu Date: Thu Nov 4 11:03:59 2010 -0700 Merge "Fix opcode tests for sput_char" into froyo commit bbc255ef9155074744474e6a2802a68feeb5ce03 Merge: 5daa6a9 a6686ad Author: Brian Muramatsu Date: Thu Nov 4 11:03:04 2010 -0700 am a6686ad8: Merge "Fix opcode tests for sput_short" into froyo * commit 'a6686ad80f044be421fa6b5a33e2ed6cc8c1bd31': Fix opcode tests for sput_short commit 5daa6a96469217293e08bf5ef996a178d8b44f35 Merge: 05484a1 e6253ec Author: Brian Muramatsu Date: Thu Nov 4 11:03:02 2010 -0700 am e6253eca: Merge "Fix opcode tests for sput" into froyo * commit 'e6253eca5248fa7b19f413b591f95dce59de6500': Fix opcode tests for sput commit 32ff03fe59edff76f38a4525f5f0d69e0fbd7dc7 Merge: 4520192 a67fd1d Author: Brian Muramatsu Date: Thu Nov 4 11:01:08 2010 -0700 am a67fd1d4: am b5fbdfc2: am 05484a1a: am 4a5b8046: Merge "Fix opcode tests for sput_wide" into froyo * commit 'a67fd1d4286471dcb94ce107e22b6d743f7eb49c': Fix opcode tests for sput_wide commit ef963b809d37612faba62ee3176986c8700fc3f4 Merge: a6686ad c518b63 Author: Brian Muramatsu Date: Thu Nov 4 11:01:08 2010 -0700 Merge "Fix opcode tests for sput_object" into froyo commit a67fd1d4286471dcb94ce107e22b6d743f7eb49c Merge: 0889d0d b5fbdfc Author: Brian Muramatsu Date: Thu Nov 4 10:58:40 2010 -0700 am b5fbdfc2: am 05484a1a: am 4a5b8046: Merge "Fix opcode tests for sput_wide" into froyo * commit 'b5fbdfc2b3de44fb6962ecd05b8e03517ce5ba6f': Fix opcode tests for sput_wide commit b5fbdfc2b3de44fb6962ecd05b8e03517ce5ba6f Merge: 4af1fa3 05484a1 Author: Brian Muramatsu Date: Thu Nov 4 10:55:46 2010 -0700 am 05484a1a: am 4a5b8046: Merge "Fix opcode tests for sput_wide" into froyo * commit '05484a1a263a0e504fb86cacb719418974badcc8': Fix opcode tests for sput_wide commit a6686ad80f044be421fa6b5a33e2ed6cc8c1bd31 Merge: e6253ec b068074 Author: Brian Muramatsu Date: Thu Nov 4 10:54:34 2010 -0700 Merge "Fix opcode tests for sput_short" into froyo commit 05484a1a263a0e504fb86cacb719418974badcc8 Merge: 48397de 4a5b804 Author: Brian Muramatsu Date: Thu Nov 4 10:51:26 2010 -0700 am 4a5b8046: Merge "Fix opcode tests for sput_wide" into froyo * commit '4a5b8046d51bb65489b471409692b3c9fe45a2ef': Fix opcode tests for sput_wide commit e6253eca5248fa7b19f413b591f95dce59de6500 Merge: 4a5b804 082a9d3 Author: Brian Muramatsu Date: Thu Nov 4 10:50:08 2010 -0700 Merge "Fix opcode tests for sput" into froyo commit 4a5b8046d51bb65489b471409692b3c9fe45a2ef Merge: c4330fd 488f60e Author: Brian Muramatsu Date: Thu Nov 4 10:41:58 2010 -0700 Merge "Fix opcode tests for sput_wide" into froyo commit 7567b204d44b9b2d955effc1e941ea38236a9a03 Author: Brian Muramatsu Date: Wed Nov 3 18:21:34 2010 -0700 Fix opcode tests for invoke_* Some tests for the invoke-interface instructions involved executing Dalvik code that could not translated into Java like implementing an interface but marking the interface method implementations as protected. The tests complained about not being able to find the classes for the raw dalvik bytecode, but I couldn't make the tests find them even after putting @uses annotations (which BuildDalvikSuite scans to determine what will be on the classpath). Thus, I just deleted them... ...otherwise, more of the same... Bug 3147582 Change-Id: I99a480ce3f2608c56474428ff0db9f354f66d6bc commit 7a5a1b9b096c5b504e14a1e7d784ff863f53f42f Author: Brian Muramatsu Date: Wed Nov 3 12:13:20 2010 -0700 Fix opcode tests for iput_* Bug 3147582 Change-Id: I2c2a2ba0874404bc0ad41b2e504c39ec3e5a6355 commit 4520192bdae6b0973a7bfee37bf498d90d451c50 Merge: 82e3314 0889d0d Author: Brett Chabot Date: Wed Nov 3 12:52:24 2010 -0700 am 0889d0d0: am 4af1fa38: am 48397de4: am c4330fdc: Merge "Fix opcode tests for const-class and filled-new-array" into froyo * commit '0889d0d06f87d9bb0abb82f65f4861ec613cb1f1': Fix opcode tests for const-class and filled-new-array commit 82e3314977e547ab4d423bd284b7e81a77741e1d Merge: 302314e 5dcda9d Author: Brett Chabot Date: Wed Nov 3 12:52:22 2010 -0700 am 5dcda9d3: am 64e9cc27: am d5e27a60: am 819812d3: Merge "Fix opcode tests for check_cast and filled_new_array_range." into froyo * commit '5dcda9d363421265239139599ad17b418ee59912': Fix opcode tests for check_cast and filled_new_array_range. commit 302314e0557a74e61cfc34b557a8c7500ac0eb95 Merge: 48aa572 a1878bc Author: Brett Chabot Date: Wed Nov 3 12:52:19 2010 -0700 am a1878bcf: am c2e5f320: am f75afc13: am 71bb141a: Merge "Fix iget* opcode tests." into froyo * commit 'a1878bcfb52bd7e640f7b6ef191915b333b3c5a7': Fix iget* opcode tests. commit 0889d0d06f87d9bb0abb82f65f4861ec613cb1f1 Merge: 5dcda9d 4af1fa3 Author: Brett Chabot Date: Wed Nov 3 12:49:24 2010 -0700 am 4af1fa38: am 48397de4: am c4330fdc: Merge "Fix opcode tests for const-class and filled-new-array" into froyo * commit '4af1fa387c8a7a66f126ec4e54a51b6c37ddae84': Fix opcode tests for const-class and filled-new-array commit 5dcda9d363421265239139599ad17b418ee59912 Merge: a1878bc 64e9cc2 Author: Brett Chabot Date: Wed Nov 3 12:49:20 2010 -0700 am 64e9cc27: am d5e27a60: am 819812d3: Merge "Fix opcode tests for check_cast and filled_new_array_range." into froyo * commit '64e9cc2795c9fcddd3b2198a4da235de787a08d2': Fix opcode tests for check_cast and filled_new_array_range. commit a1878bcfb52bd7e640f7b6ef191915b333b3c5a7 Merge: 1df6cb1 c2e5f32 Author: Brett Chabot Date: Wed Nov 3 12:49:09 2010 -0700 am c2e5f320: am f75afc13: am 71bb141a: Merge "Fix iget* opcode tests." into froyo * commit 'c2e5f32009ba584c88a1e99016327a08f4a958bf': Fix iget* opcode tests. commit 4af1fa387c8a7a66f126ec4e54a51b6c37ddae84 Merge: 64e9cc2 48397de Author: Brett Chabot Date: Wed Nov 3 12:44:33 2010 -0700 am 48397de4: am c4330fdc: Merge "Fix opcode tests for const-class and filled-new-array" into froyo * commit '48397de47b9807e0dc394090e1acc4a5547ba62d': Fix opcode tests for const-class and filled-new-array commit 64e9cc2795c9fcddd3b2198a4da235de787a08d2 Merge: c2e5f32 d5e27a6 Author: Brett Chabot Date: Wed Nov 3 12:44:30 2010 -0700 am d5e27a60: am 819812d3: Merge "Fix opcode tests for check_cast and filled_new_array_range." into froyo * commit 'd5e27a60bac6ee14fd075fe4fbc855b7aee28517': Fix opcode tests for check_cast and filled_new_array_range. commit c2e5f32009ba584c88a1e99016327a08f4a958bf Merge: 653ad2e f75afc1 Author: Brett Chabot Date: Wed Nov 3 12:44:25 2010 -0700 am f75afc13: am 71bb141a: Merge "Fix iget* opcode tests." into froyo * commit 'f75afc13a5572c3bf934bb36c616f4b84e164505': Fix iget* opcode tests. commit 48397de47b9807e0dc394090e1acc4a5547ba62d Merge: d5e27a6 c4330fd Author: Brett Chabot Date: Wed Nov 3 12:40:18 2010 -0700 am c4330fdc: Merge "Fix opcode tests for const-class and filled-new-array" into froyo * commit 'c4330fdc0db81e1a62d355ced7c3059931463362': Fix opcode tests for const-class and filled-new-array commit d5e27a60bac6ee14fd075fe4fbc855b7aee28517 Merge: f75afc1 819812d Author: Brett Chabot Date: Wed Nov 3 12:40:16 2010 -0700 am 819812d3: Merge "Fix opcode tests for check_cast and filled_new_array_range." into froyo * commit '819812d3331a421eda6e89ad8914696660fcdec3': Fix opcode tests for check_cast and filled_new_array_range. commit f75afc13a5572c3bf934bb36c616f4b84e164505 Merge: 5bc34b8 71bb141 Author: Brett Chabot Date: Wed Nov 3 12:40:12 2010 -0700 am 71bb141a: Merge "Fix iget* opcode tests." into froyo * commit '71bb141a0eedf00efb405c66b76abbff6ec5a76f': Fix iget* opcode tests. commit c4330fdc0db81e1a62d355ced7c3059931463362 Merge: 819812d 694e4b1 Author: Brett Chabot Date: Wed Nov 3 11:37:57 2010 -0700 Merge "Fix opcode tests for const-class and filled-new-array" into froyo commit 819812d3331a421eda6e89ad8914696660fcdec3 Merge: 71bb141 11e66d0 Author: Brett Chabot Date: Wed Nov 3 11:37:49 2010 -0700 Merge "Fix opcode tests for check_cast and filled_new_array_range." into froyo commit 71bb141a0eedf00efb405c66b76abbff6ec5a76f Merge: 2f8435c eb9e402 Author: Brett Chabot Date: Wed Nov 3 11:37:23 2010 -0700 Merge "Fix iget* opcode tests." into froyo commit eb9e402e3b324f7f3765052d38d4604383a0fe92 Author: Brett Chabot Date: Tue Nov 2 19:08:49 2010 -0700 Fix iget* opcode tests. Bug 3147582 Change-Id: I59b57f02c5ec5a7005751d44ba6317606d23cb61 commit 694e4b17a9a860d18a42c4e0b3637fc977db11ed Author: Brett Chabot Date: Tue Nov 2 16:12:06 2010 -0700 Fix opcode tests for const-class and filled-new-array Bug 3147582 Change-Id: Ib74bd8b9d72c834251b9f073fe138985b86dfacf commit 11e66d0d50a730a1dc844af166eefe2c15eeaf5a Author: Brett Chabot Date: Fri Oct 29 17:27:55 2010 -0700 Fix opcode tests for check_cast and filled_new_array_range. Updated test to verify froyo vm behaviur of throwing exceptions at first access. Bug 3147582 Change-Id: Ic0ffc1b7e058ed8c5f8643b8ac39ce95f96ec124 commit e0e3d39c7fb6089b8e6c89e6faf6b2f51bbe4774 Author: Brian Muramatsu Date: Tue Nov 2 15:09:02 2010 -0700 Fix opcode tests for new_array and new_instance Some of these tests were trying to access a private inner class of TestStubs to trigger an IllegalAccessError. However, the tests kept throwing an NoClassDefFoundError instead. This seems to be because the classes.dex does not have the inner classes due to the setup done by BuildDalvikSuite. To get around this, I changed the byte code to try to access a package protected class instead to trigger the IllegalAccessError... Bug 3147582 Change-Id: Icc4ce84011af19617d5fd6244171707a1b1c7b3c commit 1a19370083f613996fe172ffa237e9c4be165243 Author: Brian Muramatsu Date: Tue Nov 2 12:18:06 2010 -0700 Fix opcode tests for sget_* Bug 3147582 Change-Id: I954004d96a411c4781b4011e53082f581f623c9a commit 082a9d337e9aed54b9b98c0d7d508aafacb4101a Author: Brian Muramatsu Date: Mon Nov 1 15:54:39 2010 -0700 Fix opcode tests for sput Bug 3147582 Change-Id: Iaa57bc9345f45a565eea6de4cd676d9d1b481769 commit 162261e6aac0cba8356fe717b6364bb1a9865351 Author: Brian Muramatsu Date: Mon Nov 1 17:37:24 2010 -0700 Fix opcode tests for sput_boolean Bug 3147582 Change-Id: Id21109723e175393d34a3458c1765c11b4898577 commit 7e7337d1a0f5d5ac931b507149e4024a174f5953 Author: Brian Muramatsu Date: Mon Nov 1 17:25:36 2010 -0700 Fix opcode tests for sput_byte Bug 3147582 Change-Id: Id263bccbd2e7e1fd7689549bf4f01fe001eb71fd commit 9a0e4dfb18f0c0f39eb5a1efebf812599f9983ea Author: Brian Muramatsu Date: Mon Nov 1 17:07:54 2010 -0700 Fix opcode tests for sput_char Bug 3147582 Change-Id: I5b9d06d8469f5d7bb2be0970b3fdb4bce21b127a commit c518b63adab6ec231f50b5bff694cf9128a149f8 Author: Brian Muramatsu Date: Mon Nov 1 16:49:22 2010 -0700 Fix opcode tests for sput_object Bug 3147582 Change-Id: I7437599a75161b419f82852ed857c52efaf19dc5 commit b0680743110199d9566718b916f26b33f691414c Author: Brian Muramatsu Date: Mon Nov 1 16:19:03 2010 -0700 Fix opcode tests for sput_short Bug 3147582 Change-Id: Icde18c91b5d34557fdb4fdf7e388c3c28f6eb82c commit 488f60e69522d6f1e316e4e177b03ad10b9b5a61 Author: Brian Muramatsu Date: Mon Nov 1 15:28:48 2010 -0700 Fix opcode tests for sput_wide Bug 3147582 Change-Id: Ia9cce524d95549fb9b0cef661654fe5ac3aaaad6 commit 48aa5728947fb57638b376551f2c55eac76ab887 Merge: d647f22 1df6cb1 Author: Brian Muramatsu Date: Mon Nov 1 12:00:36 2010 -0700 am 1df6cb1b: am 653ad2ec: am 5bc34b8d: am 2f8435cd: Merge "Fix TextViewTest#testSingleLine" into froyo * commit '1df6cb1b0775f03cdf7d08eef3ef27cc785965c0': Fix TextViewTest#testSingleLine commit 1df6cb1b0775f03cdf7d08eef3ef27cc785965c0 Merge: ca80ff8 653ad2e Author: Brian Muramatsu Date: Mon Nov 1 11:58:29 2010 -0700 am 653ad2ec: am 5bc34b8d: am 2f8435cd: Merge "Fix TextViewTest#testSingleLine" into froyo * commit '653ad2ec305b4d0d53c6a7b3b4fb01a70d09fea0': Fix TextViewTest#testSingleLine commit 653ad2ec305b4d0d53c6a7b3b4fb01a70d09fea0 Merge: 4da04ce 5bc34b8 Author: Brian Muramatsu Date: Mon Nov 1 11:56:31 2010 -0700 am 5bc34b8d: am 2f8435cd: Merge "Fix TextViewTest#testSingleLine" into froyo * commit '5bc34b8d8ebea6d651641bbc207eb78fb519080b': Fix TextViewTest#testSingleLine commit 5bc34b8d8ebea6d651641bbc207eb78fb519080b Merge: 4dfdd0a 2f8435c Author: Brian Muramatsu Date: Mon Nov 1 11:52:10 2010 -0700 am 2f8435cd: Merge "Fix TextViewTest#testSingleLine" into froyo * commit '2f8435cd13a7f295d09e9e9372aff5b781b66bde': Fix TextViewTest#testSingleLine commit 2f8435cd13a7f295d09e9e9372aff5b781b66bde Merge: 7ac2ad0 013d5ee Author: Brian Muramatsu Date: Mon Nov 1 11:45:46 2010 -0700 Merge "Fix TextViewTest#testSingleLine" into froyo commit 013d5ee5428a0fde1cbe1befa4587b0d7a5e39c1 Author: Brian Muramatsu Date: Fri Oct 29 12:23:23 2010 -0700 Fix TextViewTest#testSingleLine Bug 2459518 Use the same technique used to fix testMarquee which is to put the TextView into a narrow layout widget so it will wrap regardless of display size. Change-Id: Ic836df399f8147e6283d663e2ee72ab8839d7b6e commit d647f22dbde73903ee125d876d20350a78b5bb8d Merge: f0c201e ca80ff8 Author: Brian Muramatsu Date: Fri Oct 29 10:31:07 2010 -0700 am ca80ff86: am 4da04ce5: am 4dfdd0a1: am 7ac2ad05: Merge "Skip Test if US Locale Not Available" into froyo * commit 'ca80ff86e124aff112fbb979e71f57f45508e276': Skip Test if US Locale Not Available commit ca80ff86e124aff112fbb979e71f57f45508e276 Merge: 40906b6 4da04ce Author: Brian Muramatsu Date: Fri Oct 29 10:28:46 2010 -0700 am 4da04ce5: am 4dfdd0a1: am 7ac2ad05: Merge "Skip Test if US Locale Not Available" into froyo * commit '4da04ce5b3fa765d779436a35b4b63364166b393': Skip Test if US Locale Not Available commit 4da04ce5b3fa765d779436a35b4b63364166b393 Merge: f097536 4dfdd0a Author: Brian Muramatsu Date: Fri Oct 29 10:27:31 2010 -0700 am 4dfdd0a1: am 7ac2ad05: Merge "Skip Test if US Locale Not Available" into froyo * commit '4dfdd0a1c3faa606b41f0a8abec9bf4cc8fb1f93': Skip Test if US Locale Not Available commit f0c201ecf4068438abf8cb64bace2b299c489a10 Merge: be94d6c 40906b6 Author: Brian Muramatsu Date: Fri Oct 29 10:26:19 2010 -0700 am 40906b6d: am f0975367: am 380beebc: am bbdb9f6d: Merge "update CookieManagerTest.java" into froyo * commit '40906b6d38d462f99107634daca9f0026cc126bf': update CookieManagerTest.java commit 4dfdd0a1c3faa606b41f0a8abec9bf4cc8fb1f93 Merge: 380beeb 7ac2ad0 Author: Brian Muramatsu Date: Fri Oct 29 10:25:43 2010 -0700 am 7ac2ad05: Merge "Skip Test if US Locale Not Available" into froyo * commit '7ac2ad057a10e4c995d2ac29c7e682996a4f9d21': Skip Test if US Locale Not Available commit 40906b6d38d462f99107634daca9f0026cc126bf Merge: 54cc9ee f097536 Author: Brian Muramatsu Date: Fri Oct 29 10:24:01 2010 -0700 am f0975367: am 380beebc: am bbdb9f6d: Merge "update CookieManagerTest.java" into froyo * commit 'f09753674a6bca0562730d7f2d3247221cadcc57': update CookieManagerTest.java commit 7ac2ad057a10e4c995d2ac29c7e682996a4f9d21 Merge: bbdb9f6 c7b4d36 Author: Brian Muramatsu Date: Fri Oct 29 10:17:43 2010 -0700 Merge "Skip Test if US Locale Not Available" into froyo commit c7b4d36fd9e23cdd9a7a0ca3615e5bbff1d48f0b Author: Brian Muramatsu Date: Thu Oct 28 12:23:29 2010 -0700 Skip Test if US Locale Not Available Bug 2951291 The test sets the default locale to US, but that may not be an available locale. Skip the test if the US locale is not available. Change-Id: I8502b430f696a11b14cd5d30d53b4aef5c0e5662 commit f09753674a6bca0562730d7f2d3247221cadcc57 Merge: be6310e 380beeb Author: Brian Muramatsu Date: Fri Oct 29 09:57:29 2010 -0700 am 380beebc: am bbdb9f6d: Merge "update CookieManagerTest.java" into froyo * commit '380beebc076184ad454deae3150a2443caaf327c': update CookieManagerTest.java commit 380beebc076184ad454deae3150a2443caaf327c Merge: 401386d bbdb9f6 Author: Brian Muramatsu Date: Fri Oct 29 09:36:13 2010 -0700 am bbdb9f6d: Merge "update CookieManagerTest.java" into froyo * commit 'bbdb9f6d2ef06c1dcf6cf32983f2c7989c61d974': update CookieManagerTest.java commit be94d6c832ef0d3a6e46fd34f7ff3348dacddf2d Merge: 2d7986e 54cc9ee Author: Brian Muramatsu Date: Fri Oct 29 09:29:37 2010 -0700 am 54cc9ee9: am be6310e1: am 401386dc: am a138f2bf: Merge "modify compressRects Api in YuvImageTest.java" into froyo * commit '54cc9ee95154c98a530eeec486ebbf316383cccb': modify compressRects Api in YuvImageTest.java commit 54cc9ee95154c98a530eeec486ebbf316383cccb Merge: 89bc02c be6310e Author: Brian Muramatsu Date: Fri Oct 29 09:27:14 2010 -0700 am be6310e1: am 401386dc: am a138f2bf: Merge "modify compressRects Api in YuvImageTest.java" into froyo * commit 'be6310e11f601b98da83a806804cfa338f255bf0': modify compressRects Api in YuvImageTest.java commit be6310e11f601b98da83a806804cfa338f255bf0 Merge: 0c078c5 401386d Author: Brian Muramatsu Date: Fri Oct 29 09:25:02 2010 -0700 am 401386dc: am a138f2bf: Merge "modify compressRects Api in YuvImageTest.java" into froyo * commit '401386dcd790a5d91ff9f32057827ffafc0ce724': modify compressRects Api in YuvImageTest.java commit bbdb9f6d2ef06c1dcf6cf32983f2c7989c61d974 Merge: a138f2b 08c1a3b Author: Brian Muramatsu Date: Fri Oct 29 09:23:24 2010 -0700 Merge "update CookieManagerTest.java" into froyo commit 401386dcd790a5d91ff9f32057827ffafc0ce724 Merge: 4578942 a138f2b Author: Brian Muramatsu Date: Fri Oct 29 09:23:22 2010 -0700 am a138f2bf: Merge "modify compressRects Api in YuvImageTest.java" into froyo * commit 'a138f2bf64094ba646d16d74b725045960f8fd09': modify compressRects Api in YuvImageTest.java commit 08c1a3bb0a090c138d2d3db3399d5ded236b8cc7 Author: chulkwon.shin Date: Tue Oct 19 10:31:57 2010 +0900 update CookieManagerTest.java Change-Id: I45ecadd4bd3ac592df0af7386c4cb4dc8dd34af5 commit a138f2bf64094ba646d16d74b725045960f8fd09 Merge: 562db2b cac6996 Author: Brian Muramatsu Date: Fri Oct 29 09:10:09 2010 -0700 Merge "modify compressRects Api in YuvImageTest.java" into froyo commit cac69966080b824fe6c10a011f7d2658681ae8de Author: chulkwon.shin Date: Mon Oct 18 16:29:32 2010 +0900 modify compressRects Api in YuvImageTest.java Change-Id: Ic375fe0327d19f89d5747e0388dcddc100a16325 commit 2d7986e6abd9718b1518d6ceb3ed6d3f415d3e77 Merge: cfb9f78 89bc02c Author: Brian Muramatsu Date: Fri Oct 29 08:56:00 2010 -0700 am 89bc02c0: am 0c078c5b: am 4578942f: am 562db2ba: Merge "Add Build Brand and Manufacturer to Report Header" into froyo * commit '89bc02c094b380da1ee3afadfad566fd46bfce75': Add Build Brand and Manufacturer to Report Header commit 89bc02c094b380da1ee3afadfad566fd46bfce75 Merge: be6acd4 0c078c5 Author: Brian Muramatsu Date: Fri Oct 29 08:53:44 2010 -0700 am 0c078c5b: am 4578942f: am 562db2ba: Merge "Add Build Brand and Manufacturer to Report Header" into froyo * commit '0c078c5ba4f9cde3dd834ffe053fe1fc59be1709': Add Build Brand and Manufacturer to Report Header commit 0c078c5ba4f9cde3dd834ffe053fe1fc59be1709 Merge: 99e70c9 4578942 Author: Brian Muramatsu Date: Fri Oct 29 08:51:37 2010 -0700 am 4578942f: am 562db2ba: Merge "Add Build Brand and Manufacturer to Report Header" into froyo * commit '4578942f94c066f766a5da813488192e4165ed93': Add Build Brand and Manufacturer to Report Header commit 4578942f94c066f766a5da813488192e4165ed93 Merge: 1714118 562db2b Author: Brian Muramatsu Date: Fri Oct 29 08:49:12 2010 -0700 am 562db2ba: Merge "Add Build Brand and Manufacturer to Report Header" into froyo * commit '562db2ba7a3d958f0a1c4685fb7eb4da902c7e68': Add Build Brand and Manufacturer to Report Header commit 562db2ba7a3d958f0a1c4685fb7eb4da902c7e68 Merge: f2e28bc d6445ae Author: Brian Muramatsu Date: Fri Oct 29 08:39:08 2010 -0700 Merge "Add Build Brand and Manufacturer to Report Header" into froyo commit d6445aeaa5cc21acf94e6c2204d39938bbaec311 Author: Brian Muramatsu Date: Wed Oct 27 13:31:28 2010 -0700 Add Build Brand and Manufacturer to Report Header Bug 3132855 Change-Id: I44731bed37e285688c135d23dcf63b3216fbddd0 commit cfb9f787fd6d900e5d2f7df8513ea4d48ce70c3b Merge: a7b6e80 be6acd4 Author: Brian Muramatsu Date: Thu Oct 28 09:44:59 2010 -0700 am be6acd40: am 99e70c91: am 17141183: am f2e28bcb: Merge "Validate Telephony Manager Country Codes" into froyo * commit 'be6acd40b83b76ad6e4b6bb533ea2d8e95272e7d': Validate Telephony Manager Country Codes commit be6acd40b83b76ad6e4b6bb533ea2d8e95272e7d Merge: 093b32b 99e70c9 Author: Brian Muramatsu Date: Thu Oct 28 09:43:17 2010 -0700 am 99e70c91: am 17141183: am f2e28bcb: Merge "Validate Telephony Manager Country Codes" into froyo * commit '99e70c9159636f1f2e58eae2592bbaee040d4b4a': Validate Telephony Manager Country Codes commit 99e70c9159636f1f2e58eae2592bbaee040d4b4a Merge: 122198e 1714118 Author: Brian Muramatsu Date: Thu Oct 28 09:41:18 2010 -0700 am 17141183: am f2e28bcb: Merge "Validate Telephony Manager Country Codes" into froyo * commit '17141183e97c15681434ac335ba2e691ad028aaf': Validate Telephony Manager Country Codes commit 17141183e97c15681434ac335ba2e691ad028aaf Merge: e14102d f2e28bc Author: Brian Muramatsu Date: Thu Oct 28 09:38:54 2010 -0700 am f2e28bcb: Merge "Validate Telephony Manager Country Codes" into froyo * commit 'f2e28bcb3eae67ebb0c685e3bb630022498f701c': Validate Telephony Manager Country Codes commit f2e28bcb3eae67ebb0c685e3bb630022498f701c Merge: 80ca0ea ef3a2ec Author: Brian Muramatsu Date: Thu Oct 28 09:30:30 2010 -0700 Merge "Validate Telephony Manager Country Codes" into froyo commit ef3a2ec4484634a31dd8fced75d0a18fb3bc38d9 Author: Brian Muramatsu Date: Fri Oct 22 16:58:40 2010 -0700 Validate Telephony Manager Country Codes Bug 3065551 Make sure getNetworkCountryIso and getSimCountryIso return ISO country codes and not MCC country codes. Also prohibit the use of 3-letter ISO codes... Change-Id: I060383c74f2c4ce2cf702fb91ab319f5bb8dbc33 commit a7b6e805db6a62c69d62a65e3580e02bd302b60f Merge: 2309b57 093b32b Author: Brett Chabot Date: Wed Oct 27 16:03:39 2010 -0700 am 093b32b2: am 122198ea: am e14102df: am 80ca0ea4: Merge "Multi-device support for vm-tests." into froyo commit 093b32b28b70aaa4b17c39d9d624f28078cca66d Merge: ea2904f 122198e Author: Brett Chabot Date: Wed Oct 27 16:01:58 2010 -0700 am 122198ea: am e14102df: am 80ca0ea4: Merge "Multi-device support for vm-tests." into froyo commit 122198ea6e4f9ef79bb748fb4d034581c8a025dc Merge: 203bc7d e14102d Author: Brett Chabot Date: Wed Oct 27 16:00:27 2010 -0700 am e14102df: am 80ca0ea4: Merge "Multi-device support for vm-tests." into froyo commit e14102df7ced82ffa9f5e4f30b3ac9d33a2ad405 Merge: d42fe6c 80ca0ea Author: Brett Chabot Date: Wed Oct 27 15:57:45 2010 -0700 am 80ca0ea4: Merge "Multi-device support for vm-tests." into froyo commit 80ca0ea4643cc8adf8972d2236c9374a5f50585c Merge: 1339370 ad4ce86 Author: Brett Chabot Date: Wed Oct 27 15:47:39 2010 -0700 Merge "Multi-device support for vm-tests." into froyo commit ad4ce868daff0f41e701e2df6e677d969d2cc558 Author: Brett Chabot Date: Tue Oct 26 12:12:27 2010 -0700 Multi-device support for vm-tests. Change-Id: I303fa0a34e1a84cd00a8ef6b16ed841ad454265e commit 2309b577f1a38fd9076bcf4b1c41bd4cb72c2a32 Merge: 701c6bc ea2904f Author: Brett Chabot Date: Wed Oct 27 12:09:16 2010 -0700 am ea2904fd: am 203bc7df: am d42fe6ca: am 13393702: Merge "Tell dalvikvm where to find dalvik-cache." into froyo commit 701c6bc05256985dd4277412e53e44a3a308567e Merge: ef28801 7236b66 Author: Brett Chabot Date: Wed Oct 27 12:09:12 2010 -0700 am 7236b661: am 5d9651c5: am c76640b6: am 4d758343: Merge "Fix dependent vm-test jar path." into froyo commit ef288016cbed7bf393e5c86eaf28da4561703afb Merge: ca10c78 fc2f55a Author: Brian Muramatsu Date: Wed Oct 27 12:09:09 2010 -0700 am fc2f55a9: am a93abbe7: am 385311f3: am 7f74a960: Merge "More CTS Test Runner Fixes" into froyo commit ea2904fd5b0e328f75899139f4ccc121412c9bfc Merge: 7236b66 203bc7d Author: Brett Chabot Date: Wed Oct 27 12:07:06 2010 -0700 am 203bc7df: am d42fe6ca: am 13393702: Merge "Tell dalvikvm where to find dalvik-cache." into froyo commit 7236b661533aa26f9b9497ee226669c4dd9ce986 Merge: fc2f55a 5d9651c Author: Brett Chabot Date: Wed Oct 27 12:07:04 2010 -0700 am 5d9651c5: am c76640b6: am 4d758343: Merge "Fix dependent vm-test jar path." into froyo commit fc2f55a98003b6630f7b04906e483a00d9ff4968 Merge: a11a2c7 a93abbe Author: Brian Muramatsu Date: Wed Oct 27 12:07:01 2010 -0700 am a93abbe7: am 385311f3: am 7f74a960: Merge "More CTS Test Runner Fixes" into froyo commit 203bc7dfaf814f20908217cfb5af93ba0d5b75ea Merge: 5d9651c d42fe6c Author: Brett Chabot Date: Wed Oct 27 12:05:35 2010 -0700 am d42fe6ca: am 13393702: Merge "Tell dalvikvm where to find dalvik-cache." into froyo commit 5d9651c5bb0fecf253bfdb45efa65a0b62ee7972 Merge: a93abbe c76640b Author: Brett Chabot Date: Wed Oct 27 12:05:32 2010 -0700 am c76640b6: am 4d758343: Merge "Fix dependent vm-test jar path." into froyo commit a93abbe7efb1bd90ac7b8874edcf223eccdfd90c Merge: a019187 385311f Author: Brian Muramatsu Date: Wed Oct 27 12:05:29 2010 -0700 am 385311f3: am 7f74a960: Merge "More CTS Test Runner Fixes" into froyo commit d42fe6ca50c3951dd14c8be40d13f1580416f879 Merge: c76640b 1339370 Author: Brett Chabot Date: Wed Oct 27 12:03:38 2010 -0700 am 13393702: Merge "Tell dalvikvm where to find dalvik-cache." into froyo commit c76640b6b838078918e12f940bb9903c19564062 Merge: 385311f 4d75834 Author: Brett Chabot Date: Wed Oct 27 12:03:35 2010 -0700 am 4d758343: Merge "Fix dependent vm-test jar path." into froyo commit 385311f374a8c02c2e4bc8dd5f0cdc0d3c62f192 Merge: d54eb6f 7f74a96 Author: Brian Muramatsu Date: Wed Oct 27 12:03:32 2010 -0700 am 7f74a960: Merge "More CTS Test Runner Fixes" into froyo commit ca10c784f0339c3cf922cbf021b483467ce72b83 Merge: 84c12e2 a11a2c7 Author: Brian Muramatsu Date: Wed Oct 27 11:59:15 2010 -0700 am a11a2c7a: am a019187c: am d54eb6f8: am eb989144: Merge "Show Failures at Top of Report" into froyo commit 84c12e2d352e3983a0a9185e2f9984ee4ef4f440 Merge: 170c7c2 a4a54e9 Author: Brian Muramatsu Date: Wed Oct 27 11:59:08 2010 -0700 am a4a54e95: am 0467ebe7: Add Paths to Missing LUNI Tests commit 133937027a19f18996c9f56b392cd7ee33a36cb8 Merge: 4d75834 9f19727 Author: Brett Chabot Date: Wed Oct 27 11:57:31 2010 -0700 Merge "Tell dalvikvm where to find dalvik-cache." into froyo commit 4d758343fc8114e750a6a3983e6dd9a47359fbe3 Merge: 7f74a96 d584903 Author: Brett Chabot Date: Wed Oct 27 11:57:08 2010 -0700 Merge "Fix dependent vm-test jar path." into froyo commit 7f74a9604bda5c6842073582c6ff72e36a93cbae Merge: eb98914 168beb0 Author: Brian Muramatsu Date: Wed Oct 27 11:51:58 2010 -0700 Merge "More CTS Test Runner Fixes" into froyo commit a11a2c7afa00df33a8c7cff0812015071e11c6a8 Merge: a4a54e9 a019187 Author: Brian Muramatsu Date: Wed Oct 27 11:44:32 2010 -0700 am a019187c: am d54eb6f8: am eb989144: Merge "Show Failures at Top of Report" into froyo commit a019187cf0eff6cec1b130bf1b727016a918740c Merge: 0467ebe d54eb6f Author: Brian Muramatsu Date: Wed Oct 27 11:42:10 2010 -0700 am d54eb6f8: am eb989144: Merge "Show Failures at Top of Report" into froyo commit d54eb6f857f102fbd4b0c10043899507c0ba82b4 Merge: 8ae9901 eb98914 Author: Brian Muramatsu Date: Wed Oct 27 11:40:24 2010 -0700 am eb989144: Merge "Show Failures at Top of Report" into froyo commit eb9891448ce9704789f5c3d557695e5bf145081a Merge: a4762f0 b7ca326 Author: Brian Muramatsu Date: Wed Oct 27 11:28:34 2010 -0700 Merge "Show Failures at Top of Report" into froyo commit a4a54e95dab3aff408b837a598799f1855fe38a1 Merge: a9d710a 0467ebe Author: Brian Muramatsu Date: Wed Oct 27 11:26:44 2010 -0700 am 0467ebe7: Add Paths to Missing LUNI Tests commit 9f197277825d7d29a5a698e58dbe874ec43a5eec Author: Brett Chabot Date: Tue Oct 26 20:30:39 2010 -0700 Tell dalvikvm where to find dalvik-cache. This makes vm-tests work on production devices. Bug 3130080 Change-Id: Ia5faa3cd2d648c19dcad5285548c076b322056d2 commit d584903e70163413f286b860c775f47a55cd3ba8 Author: Brett Chabot Date: Tue Oct 26 16:47:38 2010 -0700 Fix dependent vm-test jar path. Push file to /data/local/tmp/*.jar, not /data/local/tmp*.jar Bug 3130080 Change-Id: I0ea4ab648eea4eb9bc8b35dfdab2986a823a31f4 commit 168beb0b9bcca7bca5c3cea38fdca993db6ead59 Author: Brian Muramatsu Date: Thu Oct 21 12:39:45 2010 -0700 More CTS Test Runner Fixes Changing the initial status of tests now to fail, and making InstrumentationCtsTestRunner explicitly report when it has omitted a test due to profile or feature requirements only. More background on why: Initially, the starting test status was set to PASS. This seemed like a bug, because tests that did not get a result back from the test runner would automatically pass. I noticed this when adding the profile/feature annotations, so I changed the test status to NOT_EXECUTED. However, I discovered that batch test runner would rerun any tests that were not executed, so any tests that were discarded by the annotations would be rerun infinitely.. So then...I changed the test status to start off as OMITTED, so that discarded tests which don't produce any output would get flagged as OMITTED and not cause infinite retrying. However, this uncovered a whole class of tests that were being omitted due to test errors (previously marked PASS even though they were failing). This is because the tests would fail to execute as a batch and then CTS as part of its algorithm would run them individually again. However, due to an error of being unable to load the test class, they would be marked as PASS (before the OMITTED change), because there would be output from the runner... By setting the default status to FAIL, there won't be any tests that get away as PASS due to getting no output from the runner. Unfortunately, this means any tests that aren't executed or thrown out by annotations, will be flagged. There seems to be a couple of tests marked with @Suppress that will need to be changed to @BrokenTest. There is probably a more involved fix to fix these things, but its probably not worth it at this time. The default status also cannot be ERROR, because CTS sees both errors and failures as the same. Change-Id: If1d561ee0e8c4919287469238d29c72c1ba0475c commit b7ca3266241b568337a81b749f10efd172c3c164 Author: Brian Muramatsu Date: Tue Oct 26 11:00:24 2010 -0700 Show Failures at Top of Report Displays a separate section for failures as well as timeouts at the top of the report. This was faster in the browser than having a pulldown that dynamically filtered the results by showing/hiding table rows by their class. Change-Id: Ifb61edef60e0151f38d8a2a5fc252a5e14d7aef7 commit 0467ebe72325c2e122cc6c42f30f6ec17a80788d Author: Brian Muramatsu Date: Tue Oct 26 13:31:36 2010 -0700 Add Paths to Missing LUNI Tests Bug 3130377 The tests were throwing ClassNotFoundExceptions. These are tests referenced by the AllTests suite classes, but they weren't being packaged. Maybe some of these aren't supposed to be run and the AllTest* LUNI files need to be modified. Change-Id: I5219262c92614b76176d2e7cfb2fdc9ac223aee2 commit 170c7c2cc8c0e0e5914e400c0e9dad22cc30858e Merge: 4352107 a9d710a Author: Brett Chabot Date: Mon Oct 25 15:24:11 2010 -0700 am a9d710a9: am dcd3ab17: am 8ae99016: am a4762f0e: Merge "Make vm-tests push jars to a writable directory." into froyo Merge commit 'a9d710a9405ae6d67d3a1e3c7523fae520044f6f' * commit 'a9d710a9405ae6d67d3a1e3c7523fae520044f6f': Make vm-tests push jars to a writable directory. commit a9d710a9405ae6d67d3a1e3c7523fae520044f6f Merge: 6b251e8 dcd3ab1 Author: Brett Chabot Date: Mon Oct 25 15:20:28 2010 -0700 am dcd3ab17: am 8ae99016: am a4762f0e: Merge "Make vm-tests push jars to a writable directory." into froyo Merge commit 'dcd3ab178572dbb9f525854bcf71110be9d73728' into gingerbread-plus-aosp * commit 'dcd3ab178572dbb9f525854bcf71110be9d73728': Make vm-tests push jars to a writable directory. commit dcd3ab178572dbb9f525854bcf71110be9d73728 Merge: 63ae348 8ae9901 Author: Brett Chabot Date: Mon Oct 25 15:13:24 2010 -0700 am 8ae99016: am a4762f0e: Merge "Make vm-tests push jars to a writable directory." into froyo Merge commit '8ae99016f8f61ede80562180077722c21c14c479' into gingerbread * commit '8ae99016f8f61ede80562180077722c21c14c479': Make vm-tests push jars to a writable directory. commit 8ae99016f8f61ede80562180077722c21c14c479 Merge: 1943161 a4762f0 Author: Brett Chabot Date: Mon Oct 25 15:09:10 2010 -0700 am a4762f0e: Merge "Make vm-tests push jars to a writable directory." into froyo Merge commit 'a4762f0e6787bc3cb8fd4139b673f7313ff4ccc6' into froyo * commit 'a4762f0e6787bc3cb8fd4139b673f7313ff4ccc6': Make vm-tests push jars to a writable directory. commit a4762f0e6787bc3cb8fd4139b673f7313ff4ccc6 Merge: 3b5b106 b95cc3e Author: Brett Chabot Date: Mon Oct 25 15:03:23 2010 -0700 Merge "Make vm-tests push jars to a writable directory." into froyo commit b95cc3e26dfdca33901f1ab4529251151fca3aae Author: Brett Chabot Date: Mon Oct 25 14:55:42 2010 -0700 Make vm-tests push jars to a writable directory. With this change, jars are pushed to /data/local/tmp, as opposed to /data/. Bug 3130080 Change-Id: Ic268adb0f8e19c31dc28a20029216da250459da3 commit 4352107ba5dca200edf74d7cc70edaa2ec900280 Merge: bf3507e 6b251e8 Author: Brett Chabot Date: Mon Oct 25 14:52:50 2010 -0700 am 6b251e81: am 63ae3484: am 19431616: am 3b5b1060: Merge "Make CTS host capture JUnit errors too." into froyo Merge commit '6b251e810999b5a7b4fc7b233d67d2e461eeccc4' * commit '6b251e810999b5a7b4fc7b233d67d2e461eeccc4': Make CTS host capture JUnit errors too. commit 6b251e810999b5a7b4fc7b233d67d2e461eeccc4 Merge: b718017 63ae348 Author: Brett Chabot Date: Mon Oct 25 14:43:08 2010 -0700 am 63ae3484: am 19431616: am 3b5b1060: Merge "Make CTS host capture JUnit errors too." into froyo Merge commit '63ae3484a7cba70757b4f1e3990366723220c3de' into gingerbread-plus-aosp * commit '63ae3484a7cba70757b4f1e3990366723220c3de': Make CTS host capture JUnit errors too. commit 63ae3484a7cba70757b4f1e3990366723220c3de Merge: a0e64dd 1943161 Author: Brett Chabot Date: Mon Oct 25 14:37:00 2010 -0700 am 19431616: am 3b5b1060: Merge "Make CTS host capture JUnit errors too." into froyo Merge commit '194316166685d1a09d0cf85233a436bab9727b9a' into gingerbread * commit '194316166685d1a09d0cf85233a436bab9727b9a': Make CTS host capture JUnit errors too. commit 194316166685d1a09d0cf85233a436bab9727b9a Merge: fde18ed 3b5b106 Author: Brett Chabot Date: Mon Oct 25 14:23:54 2010 -0700 am 3b5b1060: Merge "Make CTS host capture JUnit errors too." into froyo Merge commit '3b5b1060e0c8ddd557e2d3bad050c71d85a1a580' into froyo * commit '3b5b1060e0c8ddd557e2d3bad050c71d85a1a580': Make CTS host capture JUnit errors too. commit 3b5b1060e0c8ddd557e2d3bad050c71d85a1a580 Merge: a364ba3 7fcc17d Author: Brett Chabot Date: Mon Oct 25 14:07:33 2010 -0700 Merge "Make CTS host capture JUnit errors too." into froyo commit 7fcc17d9e969d75b69022c8245c7e4e7756d0c34 Author: Brett Chabot Date: Wed Oct 20 20:08:19 2010 -0700 Make CTS host capture JUnit errors too. Bug 3125695 Change-Id: Id33205f3761f09d97eab9287a6a9ed953e4db09a commit bf3507ea4787cf4b2c72b139bc9ff8c30dcc8499 Merge: fff6d10 b718017 Author: Brian Muramatsu Date: Mon Oct 25 10:44:01 2010 -0700 am b718017e: am a0e64dd6: am fde18ed9: am a364ba36: Merge "World Phone Support in testTelephonyFeatures" into froyo Merge commit 'b718017e322c6c254b1336de119e3ffd01174d6d' * commit 'b718017e322c6c254b1336de119e3ffd01174d6d': World Phone Support in testTelephonyFeatures commit fff6d1050947d5bf689e945f339580188acfe0ba Merge: 977dbb3 2ed6e0c Author: Brian Muramatsu Date: Mon Oct 25 10:41:38 2010 -0700 am 2ed6e0c5: am 9b6b5c2e: am 92ce9179: am e3e0586d: Merge "Fix RingertoneManagerTest#testStopPreviousRingtone" into froyo Merge commit '2ed6e0c56be121344473d2e12033ec0c66ecd0d6' * commit '2ed6e0c56be121344473d2e12033ec0c66ecd0d6': Fix RingertoneManagerTest#testStopPreviousRingtone commit b718017e322c6c254b1336de119e3ffd01174d6d Merge: 2ed6e0c a0e64dd Author: Brian Muramatsu Date: Mon Oct 25 10:37:17 2010 -0700 am a0e64dd6: am fde18ed9: am a364ba36: Merge "World Phone Support in testTelephonyFeatures" into froyo Merge commit 'a0e64dd66c8b8cc066f9a73c5c35254ef7cf7362' into gingerbread-plus-aosp * commit 'a0e64dd66c8b8cc066f9a73c5c35254ef7cf7362': World Phone Support in testTelephonyFeatures commit 2ed6e0c56be121344473d2e12033ec0c66ecd0d6 Merge: cb95ad2 9b6b5c2 Author: Brian Muramatsu Date: Mon Oct 25 10:35:04 2010 -0700 am 9b6b5c2e: am 92ce9179: am e3e0586d: Merge "Fix RingertoneManagerTest#testStopPreviousRingtone" into froyo Merge commit '9b6b5c2ef892bbe430d5d2c288e53e64cf952820' into gingerbread-plus-aosp * commit '9b6b5c2ef892bbe430d5d2c288e53e64cf952820': Fix RingertoneManagerTest#testStopPreviousRingtone commit a0e64dd66c8b8cc066f9a73c5c35254ef7cf7362 Merge: 9b6b5c2 fde18ed Author: Brian Muramatsu Date: Mon Oct 25 10:33:40 2010 -0700 am fde18ed9: am a364ba36: Merge "World Phone Support in testTelephonyFeatures" into froyo Merge commit 'fde18ed9434eb31044a05e994e4fd292d810c3cd' into gingerbread * commit 'fde18ed9434eb31044a05e994e4fd292d810c3cd': World Phone Support in testTelephonyFeatures commit 9b6b5c2ef892bbe430d5d2c288e53e64cf952820 Merge: 4adcd36 92ce917 Author: Brian Muramatsu Date: Mon Oct 25 10:28:40 2010 -0700 am 92ce9179: am e3e0586d: Merge "Fix RingertoneManagerTest#testStopPreviousRingtone" into froyo Merge commit '92ce917927034ee5504c43db2269313b8d940585' into gingerbread * commit '92ce917927034ee5504c43db2269313b8d940585': Fix RingertoneManagerTest#testStopPreviousRingtone commit 977dbb3b3d892c2d21297656989e97b97197480b Merge: 180365d cb95ad2 Author: Brian Muramatsu Date: Mon Oct 25 10:27:37 2010 -0700 am cb95ad27: am 4adcd36e: am 795b2237: am 3c5c356d: Merge "Remove PhoneNumberUtilsTest Voicemail Check" into froyo Merge commit 'cb95ad27571e7da75d3027801504fe14213c18ce' * commit 'cb95ad27571e7da75d3027801504fe14213c18ce': Remove PhoneNumberUtilsTest Voicemail Check commit fde18ed9434eb31044a05e994e4fd292d810c3cd Merge: 92ce917 a364ba3 Author: Brian Muramatsu Date: Mon Oct 25 10:23:26 2010 -0700 am a364ba36: Merge "World Phone Support in testTelephonyFeatures" into froyo Merge commit 'a364ba369a2aebf8d41678450991f94873754aab' into froyo * commit 'a364ba369a2aebf8d41678450991f94873754aab': World Phone Support in testTelephonyFeatures commit 92ce917927034ee5504c43db2269313b8d940585 Merge: 795b223 e3e0586 Author: Brian Muramatsu Date: Mon Oct 25 10:21:28 2010 -0700 am e3e0586d: Merge "Fix RingertoneManagerTest#testStopPreviousRingtone" into froyo Merge commit 'e3e0586d8e119edad5442b4bdcf162e78ec154c0' into froyo * commit 'e3e0586d8e119edad5442b4bdcf162e78ec154c0': Fix RingertoneManagerTest#testStopPreviousRingtone commit a364ba369a2aebf8d41678450991f94873754aab Merge: e3e0586 5741ff1 Author: Brian Muramatsu Date: Mon Oct 25 10:12:51 2010 -0700 Merge "World Phone Support in testTelephonyFeatures" into froyo commit cb95ad27571e7da75d3027801504fe14213c18ce Merge: e80e793 4adcd36 Author: Brian Muramatsu Date: Mon Oct 25 10:10:12 2010 -0700 am 4adcd36e: am 795b2237: am 3c5c356d: Merge "Remove PhoneNumberUtilsTest Voicemail Check" into froyo Merge commit '4adcd36edd8e67f0f6745f1b02e3f0400e1ec640' into gingerbread-plus-aosp * commit '4adcd36edd8e67f0f6745f1b02e3f0400e1ec640': Remove PhoneNumberUtilsTest Voicemail Check commit e3e0586d8e119edad5442b4bdcf162e78ec154c0 Merge: 3c5c356 9f9e335 Author: Brian Muramatsu Date: Mon Oct 25 09:59:05 2010 -0700 Merge "Fix RingertoneManagerTest#testStopPreviousRingtone" into froyo commit 4adcd36edd8e67f0f6745f1b02e3f0400e1ec640 Merge: 4c5639f 795b223 Author: Brian Muramatsu Date: Mon Oct 25 09:58:20 2010 -0700 am 795b2237: am 3c5c356d: Merge "Remove PhoneNumberUtilsTest Voicemail Check" into froyo Merge commit '795b2237f2561fbcd461c9684d73e143d4da8182' into gingerbread * commit '795b2237f2561fbcd461c9684d73e143d4da8182': Remove PhoneNumberUtilsTest Voicemail Check commit 795b2237f2561fbcd461c9684d73e143d4da8182 Merge: b177d96 3c5c356 Author: Brian Muramatsu Date: Mon Oct 25 09:28:37 2010 -0700 am 3c5c356d: Merge "Remove PhoneNumberUtilsTest Voicemail Check" into froyo Merge commit '3c5c356d8a75d4ef214c0d94ec23ec94a57c6f0b' into froyo * commit '3c5c356d8a75d4ef214c0d94ec23ec94a57c6f0b': Remove PhoneNumberUtilsTest Voicemail Check commit 180365ddbde795e200250d93c9595afc27b15340 Merge: 1e0f802 e80e793 Author: Brian Muramatsu Date: Mon Oct 25 09:22:39 2010 -0700 am e80e7937: am 4c5639f5: Merge "Update BuildVersionTest" into gingerbread Merge commit 'e80e7937513f9dae338cdb19f209093b5e393e69' * commit 'e80e7937513f9dae338cdb19f209093b5e393e69': Update BuildVersionTest commit 3c5c356d8a75d4ef214c0d94ec23ec94a57c6f0b Merge: c9ed787 eb24462 Author: Brian Muramatsu Date: Mon Oct 25 09:14:52 2010 -0700 Merge "Remove PhoneNumberUtilsTest Voicemail Check" into froyo commit e80e7937513f9dae338cdb19f209093b5e393e69 Merge: 4cfecfa 4c5639f Author: Brian Muramatsu Date: Mon Oct 25 09:07:21 2010 -0700 am 4c5639f5: Merge "Update BuildVersionTest" into gingerbread Merge commit '4c5639f5f37fdef3e1d8f581215952683d4fd59b' into gingerbread-plus-aosp * commit '4c5639f5f37fdef3e1d8f581215952683d4fd59b': Update BuildVersionTest commit 4c5639f5f37fdef3e1d8f581215952683d4fd59b Merge: 82d9daf 28876ae Author: Brian Muramatsu Date: Mon Oct 25 08:51:56 2010 -0700 Merge "Update BuildVersionTest" into gingerbread commit 1e0f802c2b92060f11622536e90391843b6ff6ff Merge: 426e3f9 4cfecfa Author: Brett Chabot Date: Fri Oct 22 16:16:55 2010 -0700 am 4cfecfa0: am 82d9daf8: Add host tests support to cts-tradefed. commit 4cfecfa09ff3b1edfefdf08109e410b693ad338e Merge: 0f8846f 82d9daf Author: Brett Chabot Date: Fri Oct 22 16:16:00 2010 -0700 am 82d9daf8: Add host tests support to cts-tradefed. commit 82d9daf8b1800ef1c7897f2cd3167b6b1920b9fa Author: Brett Chabot Date: Wed Oct 20 20:07:14 2010 -0700 Add host tests support to cts-tradefed. Change-Id: Ic54e067831e64bdf6efbb14476d07caa4bf35fc9 commit 5741ff169df32ac4e0574f6a31b9a0a6be694cc6 Author: Brian Muramatsu Date: Fri Oct 22 15:57:44 2010 -0700 World Phone Support in testTelephonyFeatures Bug 2990592 Some phones support both GSM and CDMA but TelephonyManager#getPhoneType can only report one at a given time. Thus, don't assert that the other telephony features are not set. Change-Id: I469dad4d34ebcc084899a863673bacf49c79bdac commit 9f9e3358ecbb8f54dafa827f5be5b0bd188fade9 Author: Brian Muramatsu Date: Fri Oct 22 15:11:30 2010 -0700 Fix RingertoneManagerTest#testStopPreviousRingtone Bug 2893018 Use adjustStreamVolume to get the device out of vibrate mode, so that isPlaying will return true when its supposed to. Change-Id: Ie86b0781d5c39dfcbc6e15c79c07fc67109896bc commit eb24462c96e27e69fab8049fdaef9eaabefb9ef0 Author: Brian Muramatsu Date: Fri Oct 22 11:52:28 2010 -0700 Remove PhoneNumberUtilsTest Voicemail Check Bug 3097462 Remove the PhoneNumberUtils.getNumberFromIntent assertion that changed from 2.2 to 2.2.1 that would not require a private API call to check. Change-Id: I0583c7736c458901b6bd23cf8280d4dd567f786b commit 28876ae50d1eec078c59b62e2364434ec98b1284 Author: Brian Muramatsu Date: Fri Oct 22 10:58:42 2010 -0700 Update BuildVersionTest Bug 3097462 Increment expected sdk and release numbers. Change-Id: Ib800a63e5d203a9c59aa88445782128e0451f141 commit 426e3f9bd504c4b85e23cbfa2a3a559f2b6dddc9 Merge: 3e1a8cb 0f8846f Author: Dan Morrill Date: Thu Oct 21 17:14:38 2010 -0700 am 0f8846fa: am c9630e6d: am b177d96a: am c9ed7875: Merge "Updating the feature summary test to include a Legend in the info dialog. This required a minor change to the base classes to support adding a View to the info Dialog instead of just text. Also added info stri Merge commit '0f8846faa927c9f1574102f4b28c4860d58dc9c1' * commit '0f8846faa927c9f1574102f4b28c4860d58dc9c1': Updating the feature summary test to include a Legend in the info dialog. This commit 0f8846faa927c9f1574102f4b28c4860d58dc9c1 Merge: 1c40cdc c9630e6 Author: Dan Morrill Date: Thu Oct 21 15:40:13 2010 -0700 am c9630e6d: am b177d96a: am c9ed7875: Merge "Updating the feature summary test to include a Legend in the info dialog. This required a minor change to the base classes to support adding a View to the info Dialog instead of just text. Also added info strings for accel Merge commit 'c9630e6d48c67cef97e0315da6bc4bab30377d98' into gingerbread-plus-aosp * commit 'c9630e6d48c67cef97e0315da6bc4bab30377d98': Updating the feature summary test to include a Legend in the info dialog. This commit 3e1a8cb54c919fc09d15ad60a775298ed1653e2e Merge: c4a734b 1c40cdc Author: Brian Muramatsu Date: Thu Oct 21 13:45:42 2010 -0700 am 1c40cdcd: am a1e027e7: Merge "Revive Deleted ACTION_MULTIPLE_TESTS" into gingerbread Merge commit '1c40cdcdc6c7afc997af9cbbfb68ca9cc4ae602b' * commit '1c40cdcdc6c7afc997af9cbbfb68ca9cc4ae602b': Revive Deleted ACTION_MULTIPLE_TESTS commit c4a734b818eb03d358fe9fc49b20aaf790afc378 Merge: 3772aae de28876 Author: Brian Muramatsu Date: Thu Oct 21 13:45:31 2010 -0700 am de28876b: am 9f57e19c: Merge "Delete CM#testAccessNetworkPreference Test" into gingerbread Merge commit 'de28876bd783ef3b62633a46d5f86d6c3120b176' * commit 'de28876bd783ef3b62633a46d5f86d6c3120b176': Delete CM#testAccessNetworkPreference Test commit 3772aaea91820380b474e60e51a594faf17c44a2 Merge: eb45f13 ea26b2d Author: Nick Kralevich Date: Thu Oct 21 13:43:07 2010 -0700 am ea26b2d5: am a4d5f5a1: Merge "more directory writable tests." into gingerbread Merge commit 'ea26b2d5e6b51b32fb1077c8ef0b1840687a36ba' * commit 'ea26b2d5e6b51b32fb1077c8ef0b1840687a36ba': more directory writable tests. commit eb45f138d9981afff85a092e49a804c52bf4125c Merge: 4d50983 2947036 Author: Dan Morrill Date: Thu Oct 21 13:42:57 2010 -0700 am 29470362: am 7d23080f: am 8af10fb9: am 7b12399f: It turns out that the Arduino serial port char buffer is only 500 bytes, so message size has to be < 500 or else data is lost. This change bumps it down to 128 bytes which should still be big enough. This also has a Merge commit '29470362de51f3df085a8ef59aadef9539392f13' * commit '29470362de51f3df085a8ef59aadef9539392f13': It turns out that the Arduino serial port char buffer is only 500 bytes, so commit c9630e6d48c67cef97e0315da6bc4bab30377d98 Merge: a1e027e b177d96 Author: Dan Morrill Date: Thu Oct 21 13:27:26 2010 -0700 am b177d96a: am c9ed7875: Merge "Updating the feature summary test to include a Legend in the info dialog. This required a minor change to the base classes to support adding a View to the info Dialog instead of just text. Also added info strings for accelerometer and Merge commit 'b177d96ab34fcfbcb804e07b4dd5b022da68840c' into gingerbread * commit 'b177d96ab34fcfbcb804e07b4dd5b022da68840c': Updating the feature summary test to include a Legend in the info dialog. This commit b177d96ab34fcfbcb804e07b4dd5b022da68840c Merge: 8af10fb c9ed787 Author: Dan Morrill Date: Thu Oct 21 12:13:38 2010 -0700 am c9ed7875: Merge "Updating the feature summary test to include a Legend in the info dialog. This required a minor change to the base classes to support adding a View to the info Dialog instead of just text. Also added info strings for accelerometer and magnetometer Merge commit 'c9ed787529c690db70c622fb9c07a9bec1112463' into froyo * commit 'c9ed787529c690db70c622fb9c07a9bec1112463': Updating the feature summary test to include a Legend in the info dialog. This commit c9ed787529c690db70c622fb9c07a9bec1112463 Merge: 7b12399 71351d8 Author: Dan Morrill Date: Thu Oct 21 11:30:25 2010 -0700 Merge "Updating the feature summary test to include a Legend in the info dialog. This required a minor change to the base classes to support adding a View to the info Dialog instead of just text. Also added info strings for accelerometer and magnetometer tests." into froyo commit 71351d810686801b2ed4e0c1e0382629034ba01d Author: Dan Morrill Date: Wed Oct 20 15:26:00 2010 -0700 Updating the feature summary test to include a Legend in the info dialog. This required a minor change to the base classes to support adding a View to the info Dialog instead of just text. Also added info strings for accelerometer and magnetometer tests. Change-Id: I9acd7c893aa85ddb73b3a383b29e7849086e9240 commit 4d509830041df650985a14d8459878f7412da47d Merge: 4fe10f9 643bf05 Author: Brian Muramatsu Date: Thu Oct 21 10:58:52 2010 -0700 am 643bf050: am 61a7ca89: Merge "Remove Fixed Buffer Size in BitmapTest" into gingerbread Merge commit '643bf050bc2830d1f6b604cf75a2e7a506cc9556' * commit '643bf050bc2830d1f6b604cf75a2e7a506cc9556': Remove Fixed Buffer Size in BitmapTest commit 4fe10f9bd72baec7d26c2a4d8eeadc98f9be873b Merge: 2b198a3 9d0f375 Author: Brian Muramatsu Date: Thu Oct 21 10:58:49 2010 -0700 am 9d0f375b: am 877c026d: Merge "Fix ArrowKeyMovementMethodTest#testOnTakeFocus" into gingerbread Merge commit '9d0f375b11f3edbcaf522bb2a612de892d8b914a' * commit '9d0f375b11f3edbcaf522bb2a612de892d8b914a': Fix ArrowKeyMovementMethodTest#testOnTakeFocus commit 2b198a356fe9781d4389b6f3f90172c71160d276 Merge: d8b85de 467b257 Author: Wei-Ta Chen Date: Thu Oct 21 10:53:25 2010 -0700 am 467b2577: am 97ec5c71: Merge "Fix 3106858, where some CTS tests fail in BitmapFactory\'s decode operations." into gingerbread Merge commit '467b2577aef8c1700301a679e314d9e8877fd0a1' * commit '467b2577aef8c1700301a679e314d9e8877fd0a1': Fix 3106858, where some CTS tests fail in BitmapFactory's decode commit d8b85de6a1890ef6d61e9091439ebeec6b2bce2b Merge: 569e63f 928381f Author: Brian Muramatsu Date: Thu Oct 21 09:50:32 2010 -0700 am 928381f4: am d719cf92: Delete ViewTest#testComputeScroll Merge commit '928381f43fce9993334657f187dadf98dfd3321f' * commit '928381f43fce9993334657f187dadf98dfd3321f': Delete ViewTest#testComputeScroll commit 1c40cdcdc6c7afc997af9cbbfb68ca9cc4ae602b Merge: de28876 a1e027e Author: Brian Muramatsu Date: Wed Oct 20 15:38:44 2010 -0700 am a1e027e7: Merge "Revive Deleted ACTION_MULTIPLE_TESTS" into gingerbread Merge commit 'a1e027e795c33463cd45a79d8a8b8b424ff0ae8d' into gingerbread-plus-aosp * commit 'a1e027e795c33463cd45a79d8a8b8b424ff0ae8d': Revive Deleted ACTION_MULTIPLE_TESTS commit a1e027e795c33463cd45a79d8a8b8b424ff0ae8d Merge: 9f57e19 455e407 Author: Brian Muramatsu Date: Wed Oct 20 15:37:23 2010 -0700 Merge "Revive Deleted ACTION_MULTIPLE_TESTS" into gingerbread commit de28876bd783ef3b62633a46d5f86d6c3120b176 Merge: ea26b2d 9f57e19 Author: Brian Muramatsu Date: Wed Oct 20 15:23:28 2010 -0700 am 9f57e19c: Merge "Delete CM#testAccessNetworkPreference Test" into gingerbread Merge commit '9f57e19cb2896be2ef6144ed7d5ac8f769f54cbe' into gingerbread-plus-aosp * commit '9f57e19cb2896be2ef6144ed7d5ac8f769f54cbe': Delete CM#testAccessNetworkPreference Test commit 9f57e19cb2896be2ef6144ed7d5ac8f769f54cbe Merge: a4d5f5a ef07f61 Author: Brian Muramatsu Date: Wed Oct 20 15:20:31 2010 -0700 Merge "Delete CM#testAccessNetworkPreference Test" into gingerbread commit ef07f61a84dc70d668883edcbede50639038cb93 Author: Brian Muramatsu Date: Wed Oct 20 15:04:28 2010 -0700 Delete CM#testAccessNetworkPreference Test Bug 3106981 ConnectivityManager#setNetworkPreference used to be synchronous, but now it merely sends a handler message. As a result, the method won't throw any SecurityExceptions, because it will throw it in the handler instead when trying to write to System.Secure settings. The test tries to write invalid settings or the same settings value to test that it won't throw a SecurityException. Since the method won't throw the exceptions anymore and its not clear how long to wait to confirm that the settings weren't going to be changed, just delete these tests. Change-Id: I9e754bb0e026656511512b17108c42c37d84b069 commit ea26b2d5e6b51b32fb1077c8ef0b1840687a36ba Merge: 2947036 a4d5f5a Author: Nick Kralevich Date: Wed Oct 20 14:04:03 2010 -0700 am a4d5f5a1: Merge "more directory writable tests." into gingerbread Merge commit 'a4d5f5a1b7f285237e09fb87322d09440f899640' into gingerbread-plus-aosp * commit 'a4d5f5a1b7f285237e09fb87322d09440f899640': more directory writable tests. commit 29470362de51f3df085a8ef59aadef9539392f13 Merge: 643bf05 7d23080 Author: Dan Morrill Date: Wed Oct 20 14:03:49 2010 -0700 am 7d23080f: am 8af10fb9: am 7b12399f: It turns out that the Arduino serial port char buffer is only 500 bytes, so message size has to be < 500 or else data is lost. This change bumps it down to 128 bytes which should still be big enough. This also has a start on the Merge commit '7d23080fe10a5cc6196aac601cadc66477035ad2' into gingerbread-plus-aosp * commit '7d23080fe10a5cc6196aac601cadc66477035ad2': It turns out that the Arduino serial port char buffer is only 500 bytes, so commit 643bf050bc2830d1f6b604cf75a2e7a506cc9556 Merge: 9d0f375 61a7ca8 Author: Brian Muramatsu Date: Wed Oct 20 13:55:50 2010 -0700 am 61a7ca89: Merge "Remove Fixed Buffer Size in BitmapTest" into gingerbread Merge commit '61a7ca892ee196da93eb665b66622b60769da00c' into gingerbread-plus-aosp * commit '61a7ca892ee196da93eb665b66622b60769da00c': Remove Fixed Buffer Size in BitmapTest commit 9d0f375b11f3edbcaf522bb2a612de892d8b914a Merge: 467b257 877c026 Author: Brian Muramatsu Date: Wed Oct 20 13:55:37 2010 -0700 am 877c026d: Merge "Fix ArrowKeyMovementMethodTest#testOnTakeFocus" into gingerbread Merge commit '877c026db297e972c2e5a6ee5c458c692edc8896' into gingerbread-plus-aosp * commit '877c026db297e972c2e5a6ee5c458c692edc8896': Fix ArrowKeyMovementMethodTest#testOnTakeFocus commit a4d5f5a1b7f285237e09fb87322d09440f899640 Merge: 7d23080 7849863 Author: Nick Kralevich Date: Wed Oct 20 13:43:01 2010 -0700 Merge "more directory writable tests." into gingerbread commit 78498638a2d64d850dc4f87014280701559de8e2 Author: Nick Kralevich Date: Wed Oct 20 13:37:03 2010 -0700 more directory writable tests. Change-Id: Ia5c2eee6278c8c7d47e7470ae44de1a67958c2fa commit 7d23080fe10a5cc6196aac601cadc66477035ad2 Merge: 61a7ca8 8af10fb Author: Dan Morrill Date: Wed Oct 20 13:23:32 2010 -0700 am 8af10fb9: am 7b12399f: It turns out that the Arduino serial port char buffer is only 500 bytes, so message size has to be < 500 or else data is lost. This change bumps it down to 128 bytes which should still be big enough. This also has a start on the actual Blueto Merge commit '8af10fb92d79c3a72b36dc722db917524d3c68e6' into gingerbread * commit '8af10fb92d79c3a72b36dc722db917524d3c68e6': It turns out that the Arduino serial port char buffer is only 500 bytes, so commit 8af10fb92d79c3a72b36dc722db917524d3c68e6 Merge: b1bdf8a 7b12399 Author: Dan Morrill Date: Wed Oct 20 12:54:42 2010 -0700 am 7b12399f: It turns out that the Arduino serial port char buffer is only 500 bytes, so message size has to be < 500 or else data is lost. This change bumps it down to 128 bytes which should still be big enough. This also has a start on the actual Bluetooth test code Merge commit '7b12399ff9665812af7f4a46ff616754aa1fddb2' into froyo * commit '7b12399ff9665812af7f4a46ff616754aa1fddb2': It turns out that the Arduino serial port char buffer is only 500 bytes, so commit 7b12399ff9665812af7f4a46ff616754aa1fddb2 Author: Dan Morrill Date: Wed Oct 20 12:22:44 2010 -0700 It turns out that the Arduino serial port char buffer is only 500 bytes, so message size has to be < 500 or else data is lost. This change bumps it down to 128 bytes which should still be big enough. This also has a start on the actual Bluetooth test code which is the purpose of all this. Change-Id: I4144821b52800770f707fa3a15a8be16ac4d4146 commit 455e407c7936b061fad42b76ca1986bee62691e3 Author: Brian Muramatsu Date: Wed Oct 20 11:37:25 2010 -0700 Revive Deleted ACTION_MULTIPLE_TESTS Bug 3097462 Use dispatchKeyEvent as suggested instead of instrumentation. Change-Id: Ib567da9cca281b516cb5cc97991d34b67250976f commit 61a7ca892ee196da93eb665b66622b60769da00c Merge: 877c026 020b65e Author: Brian Muramatsu Date: Wed Oct 20 10:53:02 2010 -0700 Merge "Remove Fixed Buffer Size in BitmapTest" into gingerbread commit 877c026db297e972c2e5a6ee5c458c692edc8896 Merge: 97ec5c7 afbf8d7 Author: Brian Muramatsu Date: Wed Oct 20 10:47:12 2010 -0700 Merge "Fix ArrowKeyMovementMethodTest#testOnTakeFocus" into gingerbread commit 467b2577aef8c1700301a679e314d9e8877fd0a1 Merge: 928381f 97ec5c7 Author: Wei-Ta Chen Date: Tue Oct 19 21:39:44 2010 -0700 am 97ec5c71: Merge "Fix 3106858, where some CTS tests fail in BitmapFactory\'s decode operations." into gingerbread Merge commit '97ec5c718f111baa4d249feb15c8c2973b14a85d' into gingerbread-plus-aosp * commit '97ec5c718f111baa4d249feb15c8c2973b14a85d': Fix 3106858, where some CTS tests fail in BitmapFactory's decode commit 97ec5c718f111baa4d249feb15c8c2973b14a85d Merge: d719cf9 10d2664 Author: Wei-Ta Chen Date: Tue Oct 19 21:36:06 2010 -0700 Merge "Fix 3106858, where some CTS tests fail in BitmapFactory's decode operations." into gingerbread commit 10d266404e46aadb43834a9e0c4b7d2036547a1a Author: Wei-Ta Chen Date: Tue Oct 19 19:28:13 2010 -0700 Fix 3106858, where some CTS tests fail in BitmapFactory's decode operations. When BitmapFactory.Options is not set, e.g.: in the case of BitmapFactory.decodeFile(String pathName), we generate the options settings in the native codes based on the device configuration and image format. This resulting options may be different from the options we set to get the testing bitmap. That's why we failed in these testing cases. Also, the failures happen in Gingerbread because we modified the default value of BitmapFactory.Options in 288471d8a, specifically the values of inDither and inPreferredConfig. To fix it, we set Options for the testing bitmap based on the config of the bitmap we get from ImageView.setImageURI() and the like. Bug: 3106858 Change-Id: I24a04c6ee3f93e01605c48b174a7e90b91169c2d commit 020b65ed07008fb416989e78c14e9d227462b50b Author: Brian Muramatsu Date: Tue Oct 19 15:18:26 2010 -0700 Remove Fixed Buffer Size in BitmapTest Bug 3097462 The buffer size has changed probably due to a change that caused other failing tests like in bug 3106858. Fix the test not to depend on a constant for the buffer size. Change-Id: I0360fdffb9d0a198ac8422ea08d0f1e2c1c3996a commit 928381f43fce9993334657f187dadf98dfd3321f Merge: 86eba29 d719cf9 Author: Brian Muramatsu Date: Tue Oct 19 13:36:35 2010 -0700 am d719cf92: Delete ViewTest#testComputeScroll Merge commit 'd719cf92dfd46857dd90b83530b4c2f25c4f91c5' into gingerbread-plus-aosp * commit 'd719cf92dfd46857dd90b83530b4c2f25c4f91c5': Delete ViewTest#testComputeScroll commit 569e63f42928ac340ca069006e722a33560af4af Merge: be6246f 86eba29 Author: Brian Muramatsu Date: Tue Oct 19 13:36:14 2010 -0700 am 86eba296: am 561e5e11: Fix Tests Dependent Upon ACTION_MULTIPLE Events Merge commit '86eba2966cfed6050d886efabb9e9d326a78efbb' * commit '86eba2966cfed6050d886efabb9e9d326a78efbb': Fix Tests Dependent Upon ACTION_MULTIPLE Events commit d719cf92dfd46857dd90b83530b4c2f25c4f91c5 Author: Brian Muramatsu Date: Tue Oct 19 11:41:33 2010 -0700 Delete ViewTest#testComputeScroll Bug 3097462 I don't think this is useful test at all... Change-Id: I6e5a4fccf142831d23ad5e460e831921147d68c3 commit afbf8d71b2a2b13ba99be349d82b75784d80aff6 Author: Brian Muramatsu Date: Tue Oct 19 13:25:11 2010 -0700 Fix ArrowKeyMovementMethodTest#testOnTakeFocus Bug 3097462 Behavior was changed in I5a72f to do nothing in onTakeFocus when the widget has a layout. Change-Id: I03392e711b36b86a702f1cdd2102a6061baddcf4 commit 86eba2966cfed6050d886efabb9e9d326a78efbb Merge: f5ebc6c 561e5e1 Author: Brian Muramatsu Date: Tue Oct 19 11:22:11 2010 -0700 am 561e5e11: Fix Tests Dependent Upon ACTION_MULTIPLE Events Merge commit '561e5e11c900b09b086bf8e40ba3d3bccc847758' into gingerbread-plus-aosp * commit '561e5e11c900b09b086bf8e40ba3d3bccc847758': Fix Tests Dependent Upon ACTION_MULTIPLE Events commit be6246f555d72f928fcc0d60c3fe90af8090ce12 Merge: 4e9e298 f5ebc6c Author: Brian Muramatsu Date: Tue Oct 19 09:56:32 2010 -0700 am f5ebc6c9: am 41988d0a: Fix CursorTreeAdapterTest#testOnGroupCollapsed Merge commit 'f5ebc6c9d685a51872567950976c17c471eebff8' * commit 'f5ebc6c9d685a51872567950976c17c471eebff8': Fix CursorTreeAdapterTest#testOnGroupCollapsed commit 4e9e2988051f04013c3af1278c0d2b0a2525756f Merge: 405fb8b b2ff57d Author: Brian Muramatsu Date: Tue Oct 19 09:54:57 2010 -0700 am b2ff57dc: am b394ae87: Merge "Fix BuildVersionTest#testBuildFingerprint" into gingerbread Merge commit 'b2ff57dcb1a609cb96408bbf06d2000a5be11099' * commit 'b2ff57dcb1a609cb96408bbf06d2000a5be11099': Fix BuildVersionTest#testBuildFingerprint commit 405fb8b9f24e5bd9689c1af444e1556037181479 Merge: dd78b56 9cb321d Author: Brian Muramatsu Date: Tue Oct 19 09:53:38 2010 -0700 am 9cb321d9: am d07a19f7: Merge "Remove WebViewTest#testPerformLongClick" into gingerbread Merge commit '9cb321d94ab478ee84f1467baccd86083e9eaf8d' * commit '9cb321d94ab478ee84f1467baccd86083e9eaf8d': Remove WebViewTest#testPerformLongClick commit dd78b56ba03c3b1afc1e9b9e874a20420933c7f8 Merge: 6dee78d 99ce2db Author: Brian Muramatsu Date: Tue Oct 19 09:53:35 2010 -0700 am 99ce2db0: am e35f67a0: Merge "Update AddressTest#testWriteToParcel" into gingerbread Merge commit '99ce2db0676649bedfe34649543f3343d1d5e8a2' * commit '99ce2db0676649bedfe34649543f3343d1d5e8a2': Update AddressTest#testWriteToParcel commit 6dee78d107e8db4378c55d076b0da5d01c8c2bdb Merge: 31fa611 3c8e51b Author: Brian Muramatsu Date: Tue Oct 19 09:53:22 2010 -0700 am 3c8e51b8: am 8ce90d6d: Merge "Fix LocationManagerTest#testLocationUpdates..." into gingerbread Merge commit '3c8e51b871d213318108b85470cca51af8fa85db' * commit '3c8e51b871d213318108b85470cca51af8fa85db': Fix LocationManagerTest#testLocationUpdates... commit 31fa61111172600c069df014c6fab8f67a532d5d Merge: 49324f3 7799c5c Author: Brian Muramatsu Date: Tue Oct 19 09:52:52 2010 -0700 am 7799c5c5: am a0a04439: Merge "Fix AccountManagerTest#testHasFeatureWithCallback" into gingerbread Merge commit '7799c5c5f3b8e4962f3a6746dfaa23a052ddeea1' * commit '7799c5c5f3b8e4962f3a6746dfaa23a052ddeea1': Fix AccountManagerTest#testHasFeatureWithCallback commit 561e5e11c900b09b086bf8e40ba3d3bccc847758 Author: Brian Muramatsu Date: Mon Oct 18 18:25:47 2010 -0700 Fix Tests Dependent Upon ACTION_MULTIPLE Events Bug 3097462 There is no support for injecting ACTION_MULTIPLE key events in Gingerbread. Remove the tests that checked the onKeyMultiple callback, since they cannot be triggered from tests with instrumentation. Fix GridViewTest to use key down instead...it did not support key up... Change-Id: Ib5811d589c187dcef1c15cd181811e33ed14b303 commit f5ebc6c9d685a51872567950976c17c471eebff8 Merge: b2ff57d 41988d0 Author: Brian Muramatsu Date: Mon Oct 18 17:04:29 2010 -0700 am 41988d0a: Fix CursorTreeAdapterTest#testOnGroupCollapsed Merge commit '41988d0a1ec52a13956b00df49a9a8e61ca8ebd9' into gingerbread-plus-aosp * commit '41988d0a1ec52a13956b00df49a9a8e61ca8ebd9': Fix CursorTreeAdapterTest#testOnGroupCollapsed commit 41988d0a1ec52a13956b00df49a9a8e61ca8ebd9 Author: Brian Muramatsu Date: Mon Oct 18 15:59:05 2010 -0700 Fix CursorTreeAdapterTest#testOnGroupCollapsed Bug 3097462 Child cursors are now closed rather than deactivated when groups are collapsed in Gingerbread, so they need to be recreated after calling onGroupCollapsed. Change-Id: I72d50e0628c25f8acf5522a4a3f3ef60a632e803 commit b2ff57dcb1a609cb96408bbf06d2000a5be11099 Merge: 9cb321d b394ae8 Author: Brian Muramatsu Date: Mon Oct 18 14:30:03 2010 -0700 am b394ae87: Merge "Fix BuildVersionTest#testBuildFingerprint" into gingerbread Merge commit 'b394ae87bb4cdedf28d9134841c3c12e3e02daf4' into gingerbread-plus-aosp * commit 'b394ae87bb4cdedf28d9134841c3c12e3e02daf4': Fix BuildVersionTest#testBuildFingerprint commit b394ae87bb4cdedf28d9134841c3c12e3e02daf4 Merge: d07a19f 0a571eb Author: Brian Muramatsu Date: Mon Oct 18 14:27:24 2010 -0700 Merge "Fix BuildVersionTest#testBuildFingerprint" into gingerbread commit 9cb321d94ab478ee84f1467baccd86083e9eaf8d Merge: 99ce2db d07a19f Author: Brian Muramatsu Date: Mon Oct 18 13:12:04 2010 -0700 am d07a19f7: Merge "Remove WebViewTest#testPerformLongClick" into gingerbread Merge commit 'd07a19f7a869f9fbad20704a670f959fa809809f' into gingerbread-plus-aosp * commit 'd07a19f7a869f9fbad20704a670f959fa809809f': Remove WebViewTest#testPerformLongClick commit 99ce2db0676649bedfe34649543f3343d1d5e8a2 Merge: 3c8e51b e35f67a Author: Brian Muramatsu Date: Mon Oct 18 13:10:09 2010 -0700 am e35f67a0: Merge "Update AddressTest#testWriteToParcel" into gingerbread Merge commit 'e35f67a092d1fe1610a45d8fdc301bc83c95417c' into gingerbread-plus-aosp * commit 'e35f67a092d1fe1610a45d8fdc301bc83c95417c': Update AddressTest#testWriteToParcel commit d07a19f7a869f9fbad20704a670f959fa809809f Merge: e35f67a 1cb6e06 Author: Brian Muramatsu Date: Mon Oct 18 13:08:50 2010 -0700 Merge "Remove WebViewTest#testPerformLongClick" into gingerbread commit e35f67a092d1fe1610a45d8fdc301bc83c95417c Merge: 8ce90d6 0ca9aaf Author: Brian Muramatsu Date: Mon Oct 18 13:07:04 2010 -0700 Merge "Update AddressTest#testWriteToParcel" into gingerbread commit 3c8e51b871d213318108b85470cca51af8fa85db Merge: 7799c5c 8ce90d6 Author: Brian Muramatsu Date: Mon Oct 18 13:03:38 2010 -0700 am 8ce90d6d: Merge "Fix LocationManagerTest#testLocationUpdates..." into gingerbread Merge commit '8ce90d6d11874cf5978b466ff7970bfec5480878' into gingerbread-plus-aosp * commit '8ce90d6d11874cf5978b466ff7970bfec5480878': Fix LocationManagerTest#testLocationUpdates... commit 8ce90d6d11874cf5978b466ff7970bfec5480878 Merge: a0a0443 a254482 Author: Brian Muramatsu Date: Mon Oct 18 13:01:30 2010 -0700 Merge "Fix LocationManagerTest#testLocationUpdates..." into gingerbread commit 7799c5c5f3b8e4962f3a6746dfaa23a052ddeea1 Merge: 8aa90b0 a0a0443 Author: Brian Muramatsu Date: Mon Oct 18 12:04:08 2010 -0700 am a0a04439: Merge "Fix AccountManagerTest#testHasFeatureWithCallback" into gingerbread Merge commit 'a0a044394e92705b26857048b482d51ac7c2a721' into gingerbread-plus-aosp * commit 'a0a044394e92705b26857048b482d51ac7c2a721': Fix AccountManagerTest#testHasFeatureWithCallback commit a0a044394e92705b26857048b482d51ac7c2a721 Merge: 9518a7b ac3a8af Author: Brian Muramatsu Date: Mon Oct 18 12:00:53 2010 -0700 Merge "Fix AccountManagerTest#testHasFeatureWithCallback" into gingerbread commit 49324f3a74862d312430b35df4004a4a1f089373 Merge: 7ffd69f 8aa90b0 Author: Brian Muramatsu Date: Mon Oct 18 10:23:35 2010 -0700 am 8aa90b08: am 9518a7b5: Merge "Feature Checks for Barometer and Gyroscope" into gingerbread Merge commit '8aa90b086bcb6dffce966385c3672d9b4254825c' * commit '8aa90b086bcb6dffce966385c3672d9b4254825c': Feature Checks for Barometer and Gyroscope commit 7ffd69ff2a4ad7c28e840ceffb5dfc2c107712f6 Merge: 1664bc6 afc6c7a Author: Brett Chabot Date: Sat Oct 16 08:58:20 2010 -0700 am afc6c7a4: am 56ac786a: Add device info data to Cts tradefed xml. Merge commit 'afc6c7a48ae95b45c350a12087d9bd66b8ae8280' * commit 'afc6c7a48ae95b45c350a12087d9bd66b8ae8280': Add device info data to Cts tradefed xml. commit 1664bc6a6a4d8036b61bd1e82ff07986be644784 Merge: 73ff798 0655ed9 Author: Brett Chabot Date: Sat Oct 16 08:51:55 2010 -0700 am 0655ed99: am 7e750dbe: Merge "Adjust device info constants for consistency." into gingerbread Merge commit '0655ed993ac278023f456f8ee4355bec7cef5f13' * commit '0655ed993ac278023f456f8ee4355bec7cef5f13': Adjust device info constants for consistency. commit 73ff7985a9120f89e1e53716909c3d68335bca72 Merge: 518b68e 83bcfa3 Author: Brian Muramatsu Date: Sat Oct 16 08:51:37 2010 -0700 am 83bcfa39: am c31239f5: am b1bdf8aa: am bc25cfef: Include Omitted Tests in Total Merge commit '83bcfa399a0eebfa5709e4e352fa597afd8cf39a' * commit '83bcfa399a0eebfa5709e4e352fa597afd8cf39a': Include Omitted Tests in Total commit 8aa90b086bcb6dffce966385c3672d9b4254825c Merge: afc6c7a 9518a7b Author: Brian Muramatsu Date: Fri Oct 15 18:23:07 2010 -0700 am 9518a7b5: Merge "Feature Checks for Barometer and Gyroscope" into gingerbread Merge commit '9518a7b53d9059de8f61614c88dac3eb8ed1cc52' into gingerbread-plus-aosp * commit '9518a7b53d9059de8f61614c88dac3eb8ed1cc52': Feature Checks for Barometer and Gyroscope commit 1cb6e06af811b4d967c5dd08f19c8b8cdeedc9e8 Author: Brian Muramatsu Date: Fri Oct 15 15:54:52 2010 -0700 Remove WebViewTest#testPerformLongClick Bug 3097462 This was throwing a ViewRoot$CalledFromWrongThreadException. However, since this test wasn't actually testing anything, I decided to just delete it. Change-Id: Id6494f15b72a5f3e1ce233761fd4095ef19bcca0 commit 0a571eb6dd0bbf170c17630ea423da3a121839d2 Author: Brian Muramatsu Date: Fri Oct 15 15:08:00 2010 -0700 Fix BuildVersionTest#testBuildFingerprint Bug 3097462 Adjust the test since the board name was removed: Change-Id: Ia7024cb4d20d0d8c774ad326add7692fa0741fd9 https://android-git.corp.google.com/w/?p=platform/build.git;a=commitdiff;h=135a120e3904d782623e4a3fc958ed098e8de384 commit 518b68e35f36b5cd9c00656f157a074b9f9b59a0 Merge: ee1fccf c5ca2cc Author: Brian Muramatsu Date: Fri Oct 15 14:02:36 2010 -0700 am c5ca2cc1: am 119ca6e4: Fix CTS ddmlib Timeout Issues Merge commit 'c5ca2cc11bf71a40dcbdd26c2b7e7b6d61cf7e67' * commit 'c5ca2cc11bf71a40dcbdd26c2b7e7b6d61cf7e67': Fix CTS ddmlib Timeout Issues commit 0ca9aaf0952d0b16c55b039027748d016a21d385 Author: Brian Muramatsu Date: Fri Oct 15 13:02:27 2010 -0700 Update AddressTest#testWriteToParcel Bug 3097462 New fields were added. Change-Id: Ia871d4f7c8afd0d8d4adfdb82a58be7b41318e5f commit a254482bbe209952cf8a04dd56f6c9581eef3286 Author: Brian Muramatsu Date: Fri Oct 15 12:52:42 2010 -0700 Fix LocationManagerTest#testLocationUpdates... Bug 3097462 The looper parameter can be null now. The LocationManager code to throw the exception has been removed and the JavaDoc now also explains that null looper is fine. Change-Id: I66e4478e46e3df0a40c059a8b1b32a282f41e84c commit 9518a7b53d9059de8f61614c88dac3eb8ed1cc52 Merge: 56ac786 0094d69 Author: Brian Muramatsu Date: Fri Oct 15 11:46:29 2010 -0700 Merge "Feature Checks for Barometer and Gyroscope" into gingerbread commit ee1fccff3921c24cbee63d12ad52309478a0012b Merge: 3be4863 e366aea Author: Brian Muramatsu Date: Fri Oct 15 00:08:07 2010 -0700 am e366aeac: am 6a750e81: am 69c17f67: am efc12969: Merge "CTS Test: expected release version updated." into froyo Merge commit 'e366aeac1b2ce6bfa6f7cb5128138e530efea69e' * commit 'e366aeac1b2ce6bfa6f7cb5128138e530efea69e': CTS Test: expected release version updated. commit 3be486341ab9c90785c6e260ccefb7d2f788ad65 Merge: e8e9d16 4b782c4 Author: Brian Muramatsu Date: Fri Oct 15 00:08:03 2010 -0700 am 4b782c48: am f35266c4: am 901ddab7: am b71f097e: Merge "Verify preinstalled apps don\'t have debuggable set." into froyo Merge commit '4b782c48b68d4eb904e776bc4bc6ca9b8cbe8b3f' * commit '4b782c48b68d4eb904e776bc4bc6ca9b8cbe8b3f': Verify preinstalled apps don't have debuggable set. commit e8e9d16a11b79a1099066fe64e1ba58eb77e2e6a Merge: d275f37 6111fb6 Author: Brian Muramatsu Date: Fri Oct 15 00:07:08 2010 -0700 am 6111fb6d: am 5219186d: am bfcb016d: am a51bbb5b: Merge "Remove isWatchingCursor Assertion" into froyo Merge commit '6111fb6d5bfcecb639b76ecbb8ab677e2f08cf3f' * commit '6111fb6d5bfcecb639b76ecbb8ab677e2f08cf3f': Remove isWatchingCursor Assertion commit afc6c7a48ae95b45c350a12087d9bd66b8ae8280 Merge: 0655ed9 56ac786 Author: Brett Chabot Date: Thu Oct 14 16:46:34 2010 -0700 am 56ac786a: Add device info data to Cts tradefed xml. Merge commit '56ac786a7d7045be43f3a7cf31de7ee19af810cf' into gingerbread-plus-aosp * commit '56ac786a7d7045be43f3a7cf31de7ee19af810cf': Add device info data to Cts tradefed xml. commit d275f37a26dc19ed032c5958a25b5e6cde674e07 Merge: 5ad63a4 bc6d51a Author: Brett Chabot Date: Thu Oct 14 15:43:37 2010 -0700 am bc6d51ab: am fed88812: resolved conflicts for merge of a9ab7cdb to gingerbread Merge commit 'bc6d51ab6c3cd5e829636903d32b38a4ccdee617' * commit 'bc6d51ab6c3cd5e829636903d32b38a4ccdee617': CTS host logging fixes. commit ac3a8afcf4292dd827c846c50f3bce0d2ee51a1c Author: Brian Muramatsu Date: Thu Oct 14 14:58:54 2010 -0700 Fix AccountManagerTest#testHasFeatureWithCallback Bug 3097462 Mark testHasFeatureWithCallback as private, since its not a test. CTS was picking it up as a test and trying to run it but failing because that method takes a parameter. Change-Id: Ie90ae033748ef90ff293bd73f962d3087a2975c6 commit 0655ed993ac278023f456f8ee4355bec7cef5f13 Merge: 83bcfa3 7e750db Author: Brett Chabot Date: Thu Oct 14 15:01:17 2010 -0700 am 7e750dbe: Merge "Adjust device info constants for consistency." into gingerbread Merge commit '7e750dbef687d8a3edaf10f2524ac82ecf267864' into gingerbread-plus-aosp * commit '7e750dbef687d8a3edaf10f2524ac82ecf267864': Adjust device info constants for consistency. commit 83bcfa399a0eebfa5709e4e352fa597afd8cf39a Merge: c5ca2cc c31239f Author: Brian Muramatsu Date: Thu Oct 14 14:56:43 2010 -0700 am c31239f5: am b1bdf8aa: am bc25cfef: Include Omitted Tests in Total Merge commit 'c31239f5ea327bc20bc061500ddfe22361ad07d5' into gingerbread-plus-aosp * commit 'c31239f5ea327bc20bc061500ddfe22361ad07d5': Include Omitted Tests in Total commit 56ac786a7d7045be43f3a7cf31de7ee19af810cf Author: Brett Chabot Date: Sun Oct 10 15:14:51 2010 -0700 Add device info data to Cts tradefed xml. This changes attempts to simplify on the related implementation in the previous CTS harness. Instead of using an intermediatary data structure to hold info collected from device, this implementation simply passes the data from the device to the CTS XML result reporter using the existing 'run metrics' mechanism. Change-Id: I780655e08cfc984ff2c0e07dc62273000eecdd33 commit 7e750dbef687d8a3edaf10f2524ac82ecf267864 Merge: c31239f 396c894 Author: Brett Chabot Date: Thu Oct 14 14:46:16 2010 -0700 Merge "Adjust device info constants for consistency." into gingerbread commit c31239f5ea327bc20bc061500ddfe22361ad07d5 Merge: 119ca6e b1bdf8a Author: Brian Muramatsu Date: Thu Oct 14 14:18:54 2010 -0700 am b1bdf8aa: am bc25cfef: Include Omitted Tests in Total Merge commit 'b1bdf8aae8387a442a3940682e4093f82e3e7a19' into gingerbread * commit 'b1bdf8aae8387a442a3940682e4093f82e3e7a19': Include Omitted Tests in Total commit b1bdf8aae8387a442a3940682e4093f82e3e7a19 Merge: 69c17f6 bc25cfe Author: Brian Muramatsu Date: Thu Oct 14 14:01:40 2010 -0700 am bc25cfef: Include Omitted Tests in Total Merge commit 'bc25cfefaddc413cf30fe81422c667355a0ed545' into froyo * commit 'bc25cfefaddc413cf30fe81422c667355a0ed545': Include Omitted Tests in Total commit 0094d69475f42c750b9b504b143d2b1522f40aab Author: Brian Muramatsu Date: Thu Oct 14 13:12:17 2010 -0700 Feature Checks for Barometer and Gyroscope Bug 3097462 Add some checks for new sensor types in SystemFeaturesTest. Change-Id: Ie43fbd9bbcd931ad4c4732e3d3b3e4da629bd343 commit c5ca2cc11bf71a40dcbdd26c2b7e7b6d61cf7e67 Merge: e366aea 119ca6e Author: Brian Muramatsu Date: Thu Oct 14 12:02:08 2010 -0700 am 119ca6e4: Fix CTS ddmlib Timeout Issues Merge commit '119ca6e46ab088aeaeaee2f83605ab5b47169c62' into gingerbread-plus-aosp * commit '119ca6e46ab088aeaeaee2f83605ab5b47169c62': Fix CTS ddmlib Timeout Issues commit bc25cfefaddc413cf30fe81422c667355a0ed545 Author: Brian Muramatsu Date: Thu Oct 14 11:21:29 2010 -0700 Include Omitted Tests in Total I think its better to have a fixed total, so we can tell whether tests were accidentally being left out due to moving tests. Change-Id: Id4559c2b36fdafb82a5aa003274860f67eb8113e commit 396c894d5cb5e7ad7d2e3e2579e433008fb3954f Author: Brett Chabot Date: Tue Oct 12 12:05:14 2010 -0700 Adjust device info constants for consistency. Attempt to use the same attribute values in all three places they are defined. Remove attributes not being referenced in current XML. Change-Id: I3046a16b50e2c3ca3fb273d789007fe7fc294870 commit 5ad63a41505cb613713476ddb836b21d0bfc252f Merge: 40739f1 e593401 Author: Brett Chabot Date: Wed Oct 13 23:35:44 2010 -0700 am e593401f: am 9b9333e7: am ded4f97c: am ae606eeb: Fix CTS host unit tests. Merge commit 'e593401f9797e9b9345ba62bfca89f8811602bcb' * commit 'e593401f9797e9b9345ba62bfca89f8811602bcb': Fix CTS host unit tests. commit 40739f19dff693b2701f163d8177277f2b07f2cb Merge: b2b8e15 6d82f6c Author: Brett Chabot Date: Wed Oct 13 19:15:45 2010 -0700 am 6d82f6c1: am deef3301: Remove DevicePowerPermissionTest#testUserActivity Merge commit '6d82f6c1e7dc8f8b48488fa34368e89904a359a1' * commit '6d82f6c1e7dc8f8b48488fa34368e89904a359a1': Remove DevicePowerPermissionTest#testUserActivity commit 119ca6e46ab088aeaeaee2f83605ab5b47169c62 Author: Brian Muramatsu Date: Wed Oct 13 17:51:32 2010 -0700 Fix CTS ddmlib Timeout Issues http://b/3048776 ddmlib throws ShellUnresponsiveException now if there is no activity. Set the timeout to 0 in CTS to never timeout. This matches the prior behavior, because the test timeouts appear to be controlled through other timers with timeouts set by constants in HostConfig.Ints. Change-Id: I800b2477d115d1edc358a601462db97fa0698e2c commit e366aeac1b2ce6bfa6f7cb5128138e530efea69e Merge: 4b782c4 6a750e8 Author: Brian Muramatsu Date: Wed Oct 13 14:22:31 2010 -0700 am 6a750e81: am 69c17f67: am efc12969: Merge "CTS Test: expected release version updated." into froyo Merge commit '6a750e815cb5f303a2716282d87b2c12d5d1526a' into gingerbread-plus-aosp * commit '6a750e815cb5f303a2716282d87b2c12d5d1526a': CTS Test: expected release version updated. commit 4b782c48b68d4eb904e776bc4bc6ca9b8cbe8b3f Merge: 6111fb6 f35266c Author: Brian Muramatsu Date: Wed Oct 13 14:22:27 2010 -0700 am f35266c4: am 901ddab7: am b71f097e: Merge "Verify preinstalled apps don\'t have debuggable set." into froyo Merge commit 'f35266c4b07378d579701bc2cddea3da4c719eb6' into gingerbread-plus-aosp * commit 'f35266c4b07378d579701bc2cddea3da4c719eb6': Verify preinstalled apps don't have debuggable set. commit 6a750e815cb5f303a2716282d87b2c12d5d1526a Merge: f35266c 69c17f6 Author: Brian Muramatsu Date: Wed Oct 13 13:21:12 2010 -0700 am 69c17f67: am efc12969: Merge "CTS Test: expected release version updated." into froyo Merge commit '69c17f6751c425d0b65de3ad6a5ae7ba597615f2' into gingerbread * commit '69c17f6751c425d0b65de3ad6a5ae7ba597615f2': CTS Test: expected release version updated. commit f35266c4b07378d579701bc2cddea3da4c719eb6 Merge: 5219186 901ddab Author: Brian Muramatsu Date: Wed Oct 13 13:21:06 2010 -0700 am 901ddab7: am b71f097e: Merge "Verify preinstalled apps don\'t have debuggable set." into froyo Merge commit '901ddab7d996e73e20a770ed8ac351f0872e35c0' into gingerbread * commit '901ddab7d996e73e20a770ed8ac351f0872e35c0': Verify preinstalled apps don't have debuggable set. commit 6111fb6d5bfcecb639b76ecbb8ab677e2f08cf3f Merge: bc6d51a 5219186 Author: Brian Muramatsu Date: Wed Oct 13 12:23:39 2010 -0700 am 5219186d: am bfcb016d: am a51bbb5b: Merge "Remove isWatchingCursor Assertion" into froyo Merge commit '5219186d8e34e8d105c9dd35e6544fdb5ec77da6' into gingerbread-plus-aosp * commit '5219186d8e34e8d105c9dd35e6544fdb5ec77da6': Remove isWatchingCursor Assertion commit 69c17f6751c425d0b65de3ad6a5ae7ba597615f2 Merge: 901ddab efc1296 Author: Brian Muramatsu Date: Wed Oct 13 12:20:16 2010 -0700 am efc12969: Merge "CTS Test: expected release version updated." into froyo Merge commit 'efc129691e6fd839b661c8e709cb071f96274107' into froyo * commit 'efc129691e6fd839b661c8e709cb071f96274107': CTS Test: expected release version updated. commit 5219186d8e34e8d105c9dd35e6544fdb5ec77da6 Merge: fed8881 bfcb016 Author: Brian Muramatsu Date: Wed Oct 13 12:08:31 2010 -0700 am bfcb016d: am a51bbb5b: Merge "Remove isWatchingCursor Assertion" into froyo Merge commit 'bfcb016d46f1bb9e74ca7a6a34e1b9eed3fedeca' into gingerbread * commit 'bfcb016d46f1bb9e74ca7a6a34e1b9eed3fedeca': Remove isWatchingCursor Assertion commit efc129691e6fd839b661c8e709cb071f96274107 Merge: b71f097 dbc59ad Author: Brian Muramatsu Date: Wed Oct 13 11:52:59 2010 -0700 Merge "CTS Test: expected release version updated." into froyo commit 901ddab7d996e73e20a770ed8ac351f0872e35c0 Merge: bfcb016 b71f097 Author: Brian Muramatsu Date: Wed Oct 13 11:35:46 2010 -0700 am b71f097e: Merge "Verify preinstalled apps don\'t have debuggable set." into froyo Merge commit 'b71f097e1b6770c2717992c7a7ac42ce53e33e78' into froyo * commit 'b71f097e1b6770c2717992c7a7ac42ce53e33e78': Verify preinstalled apps don't have debuggable set. commit 5d7d046591502974e7b710beaf67c20839ff1231 Merge: 0be396d 0d95530 Author: Brian Muramatsu Date: Wed Oct 13 11:23:59 2010 -0700 Merge "Verify preinstalled apps don't have debuggable set." into eclair commit 0d95530f5e85aca803f65cbc118b79484f1edc9c Author: Nick Kralevich Date: Tue Oct 5 13:46:50 2010 -0700 Verify preinstalled apps don't have debuggable set. Fix bug 3065312. It is a security hole for applications to ship with debuggable set. Make sure we warn people about this. Change-Id: Ie91d2479aa4512804ca2a9c4847c1abd40566f03 commit b71f097e1b6770c2717992c7a7ac42ce53e33e78 Merge: a51bbb5 6ba7bc2 Author: Brian Muramatsu Date: Wed Oct 13 11:13:23 2010 -0700 Merge "Verify preinstalled apps don't have debuggable set." into froyo commit 0be396d66da8fbdeed4532663c7434972cb741c3 Author: Brian Muramatsu Date: Tue Oct 12 15:24:45 2010 -0700 Remove isWatchingCursor Assertion http://b/2893002 Don't always assume isWatchingCursor is always false. Alternate InputMethodManager implementations may return true. Change-Id: I7594302bf6bee9391e5d78bf4ec11ddafb50938b commit bfcb016d46f1bb9e74ca7a6a34e1b9eed3fedeca Merge: a9ab7cd a51bbb5 Author: Brian Muramatsu Date: Wed Oct 13 11:01:10 2010 -0700 am a51bbb5b: Merge "Remove isWatchingCursor Assertion" into froyo Merge commit 'a51bbb5bc612ea23c9b74994e390c354838ccb91' into froyo * commit 'a51bbb5bc612ea23c9b74994e390c354838ccb91': Remove isWatchingCursor Assertion commit a51bbb5bc612ea23c9b74994e390c354838ccb91 Merge: b3555f6 6b515b8 Author: Brian Muramatsu Date: Wed Oct 13 10:54:31 2010 -0700 Merge "Remove isWatchingCursor Assertion" into froyo commit dbc59adba2605308a7c8656000989adf8122d819 Author: Saravanan Solaiyappan Date: Wed Oct 13 09:42:12 2010 -0500 CTS Test: expected release version updated. [Comment] Test: android.os.cts.BuildVersionTest#testReleaseVersion The build platform release is set to 2.2.1 and the test is looking for an expected release of 2.2. So the cts test case was failing. This patch will update the expected release version to 2.2.1. Change-Id: I6581689fb71e7add987d9caa1160a07932c3db81 Signed-off-by: Solaiyappan Saravanan commit bc6d51ab6c3cd5e829636903d32b38a4ccdee617 Merge: e593401 fed8881 Author: Brett Chabot Date: Tue Oct 12 17:48:05 2010 -0700 am fed88812: resolved conflicts for merge of a9ab7cdb to gingerbread Merge commit 'fed8881250de4c79db88048a57777af7871a4db0' into gingerbread-plus-aosp * commit 'fed8881250de4c79db88048a57777af7871a4db0': CTS host logging fixes. commit fed8881250de4c79db88048a57777af7871a4db0 Merge: 9b9333e a9ab7cd Author: Brett Chabot Date: Tue Oct 12 17:36:27 2010 -0700 resolved conflicts for merge of a9ab7cdb to gingerbread Change-Id: I52fb276c0fbc10229560283a8ef5d33d0b6634e8 commit a9ab7cdb948d370aaebbeee8beed4ae05f62c9f2 Merge: ded4f97 b3555f6 Author: Brett Chabot Date: Tue Oct 12 17:14:14 2010 -0700 am b3555f63: Merge "CTS host logging fixes." into froyo Merge commit 'b3555f63287271e675ae7b2967e6ed0ef3e0e6f4' into froyo * commit 'b3555f63287271e675ae7b2967e6ed0ef3e0e6f4': CTS host logging fixes. commit b3555f63287271e675ae7b2967e6ed0ef3e0e6f4 Merge: ae606ee e3944a5 Author: Brett Chabot Date: Tue Oct 12 16:56:20 2010 -0700 Merge "CTS host logging fixes." into froyo commit e3944a5d84c27d31640d0e7801bbe5b68bc8645c Author: Brett Chabot Date: Tue Oct 12 16:05:47 2010 -0700 CTS host logging fixes. Clean up all occurrences of logging empty error messages. Change-Id: I9412232cd4eab9ff74932999f8ea1270c8dabe09 commit b2b8e156502763fce103fc3e7264c7fdcb38ba78 Merge: 9cfae72 9d6ce77 Author: Brett Chabot Date: Tue Oct 12 16:40:36 2010 -0700 am 9d6ce772: am 0bb0f8bc: Merge "Initial cts tradefed xml result reporter." into gingerbread Merge commit '9d6ce7728e74f107d0416240328cf60eebb1d0f1' * commit '9d6ce7728e74f107d0416240328cf60eebb1d0f1': Initial cts tradefed xml result reporter. commit 9cfae72a563c666f390a1c28d87484e04290bcf9 Merge: 62e72c4 eac9330 Author: Saravanan Solaiyappan Date: Tue Oct 12 16:40:25 2010 -0700 am eac93303: am fba2fc3f: am 875e3217: am b1d0385e: CTS Test: Set fullscreenMode as false before checking. Merge commit 'eac933031bebb8bebafd6f8ca9d2b20bdccaf2f0' * commit 'eac933031bebb8bebafd6f8ca9d2b20bdccaf2f0': CTS Test: Set fullscreenMode as false before checking. commit e593401f9797e9b9345ba62bfca89f8811602bcb Merge: 6d82f6c 9b9333e Author: Brett Chabot Date: Tue Oct 12 16:00:35 2010 -0700 am 9b9333e7: am ded4f97c: am ae606eeb: Fix CTS host unit tests. Merge commit '9b9333e7e1af93b1296815642b0815fb6ba45e7f' into gingerbread-plus-aosp * commit '9b9333e7e1af93b1296815642b0815fb6ba45e7f': Fix CTS host unit tests. commit 9b9333e7e1af93b1296815642b0815fb6ba45e7f Merge: deef330 ded4f97 Author: Brett Chabot Date: Tue Oct 12 15:53:13 2010 -0700 am ded4f97c: am ae606eeb: Fix CTS host unit tests. Merge commit 'ded4f97c0b481a567fd66ad325680e9c5a973f57' into gingerbread * commit 'ded4f97c0b481a567fd66ad325680e9c5a973f57': Fix CTS host unit tests. commit ded4f97c0b481a567fd66ad325680e9c5a973f57 Merge: 875e321 ae606ee Author: Brett Chabot Date: Tue Oct 12 15:38:01 2010 -0700 am ae606eeb: Fix CTS host unit tests. Merge commit 'ae606eebc7cd6785a17faf9498bf473319788aa3' into froyo * commit 'ae606eebc7cd6785a17faf9498bf473319788aa3': Fix CTS host unit tests. commit 6ba7bc24b30cc881b297540ca6238fe7b3d067a9 Author: Nick Kralevich Date: Tue Oct 5 13:46:50 2010 -0700 Verify preinstalled apps don't have debuggable set. Fix bug 3065312. It is a security hole for applications to ship with debuggable set. Make sure we warn people about this. Change-Id: I7ffb3e2742f05719fcff3b1ebd3a48c8f487ca29 commit 6b515b805b0cd3a9afebbf23ad96c77965c5e3ef Author: Brian Muramatsu Date: Tue Oct 12 15:24:45 2010 -0700 Remove isWatchingCursor Assertion http://b/2893002 Don't always assume isWatchingCursor is always false. Alternate InputMethodManager implementations may return true. Change-Id: I4252f06054d601f111bca5b0079289a98f8863c0 commit ae606eebc7cd6785a17faf9498bf473319788aa3 Author: Brett Chabot Date: Tue Oct 12 15:20:21 2010 -0700 Fix CTS host unit tests. Change-Id: Ib4836478d58d9761e11074b906b07a0a312e29ed commit 6d82f6c1e7dc8f8b48488fa34368e89904a359a1 Merge: 9d6ce77 deef330 Author: Brett Chabot Date: Tue Oct 12 13:57:00 2010 -0700 am deef3301: Remove DevicePowerPermissionTest#testUserActivity Merge commit 'deef330158a6e3a94bbc13a97f892ad08386091b' into gingerbread-plus-aosp * commit 'deef330158a6e3a94bbc13a97f892ad08386091b': Remove DevicePowerPermissionTest#testUserActivity commit deef330158a6e3a94bbc13a97f892ad08386091b Author: Brett Chabot Date: Tue Oct 12 12:14:44 2010 -0700 Remove DevicePowerPermissionTest#testUserActivity Bug 3027539 Change-Id: I30812435ccc1dbcb9313fa2c870605978704cb1b commit 9d6ce7728e74f107d0416240328cf60eebb1d0f1 Merge: eac9330 0bb0f8b Author: Brett Chabot Date: Mon Oct 11 17:27:01 2010 -0700 am 0bb0f8bc: Merge "Initial cts tradefed xml result reporter." into gingerbread Merge commit '0bb0f8bcf30ee2915ea5f25c49912b382d1e44e5' into gingerbread-plus-aosp * commit '0bb0f8bcf30ee2915ea5f25c49912b382d1e44e5': Initial cts tradefed xml result reporter. commit eac933031bebb8bebafd6f8ca9d2b20bdccaf2f0 Merge: 682c031 fba2fc3 Author: Saravanan Solaiyappan Date: Mon Oct 11 17:26:29 2010 -0700 am fba2fc3f: am 875e3217: am b1d0385e: CTS Test: Set fullscreenMode as false before checking. Merge commit 'fba2fc3f68eb1d3cd98667e774b889f8166acd64' into gingerbread-plus-aosp * commit 'fba2fc3f68eb1d3cd98667e774b889f8166acd64': CTS Test: Set fullscreenMode as false before checking. commit 0bb0f8bcf30ee2915ea5f25c49912b382d1e44e5 Merge: fba2fc3 2511767 Author: Brett Chabot Date: Mon Oct 11 16:42:09 2010 -0700 Merge "Initial cts tradefed xml result reporter." into gingerbread commit fba2fc3f68eb1d3cd98667e774b889f8166acd64 Merge: f64be1b 875e321 Author: Saravanan Solaiyappan Date: Mon Oct 11 16:23:24 2010 -0700 am 875e3217: am b1d0385e: CTS Test: Set fullscreenMode as false before checking. Merge commit '875e321756708e19f3ca2ed9d1800d2464180263' into gingerbread * commit '875e321756708e19f3ca2ed9d1800d2464180263': CTS Test: Set fullscreenMode as false before checking. commit 875e321756708e19f3ca2ed9d1800d2464180263 Merge: c846b9b b1d0385 Author: Saravanan Solaiyappan Date: Mon Oct 11 16:10:00 2010 -0700 am b1d0385e: CTS Test: Set fullscreenMode as false before checking. Merge commit 'b1d0385e05d437d625a394c4d42adf883edb36f2' into froyo * commit 'b1d0385e05d437d625a394c4d42adf883edb36f2': CTS Test: Set fullscreenMode as false before checking. commit b1d0385e05d437d625a394c4d42adf883edb36f2 Author: Saravanan Solaiyappan Date: Mon Oct 11 14:21:12 2010 -0500 CTS Test: Set fullscreenMode as false before checking. [Comment] The following test was failing during the view test cases. android.view.inputmethod.cts.BaseInputConnectionTest#testReportFullscreenMode Reason: The mFullScreenMode is set as true when the test check for false status. Solution: This patch will set as false before it check for the false status as it is implemented for true condition. Change-Id: I7705cea0dd129564a85cc45aa210587076583897 Signed-off-by: Solaiyappan Saravanan commit 62e72c4fe3ca12d2c8b62e6e2cd4e0cebd2aa8cf Merge: 4d067c3 682c031 Author: Brad Fitzpatrick Date: Sun Oct 10 19:12:48 2010 -0700 am 682c031a: am f64be1b8: Merge "More SharedPreferences torture tests." into gingerbread Merge commit '682c031aab737de78dcaa163b9bdf103c2c62c59' * commit '682c031aab737de78dcaa163b9bdf103c2c62c59': More SharedPreferences torture tests. commit 4d067c37b550505213351ed78a2d70dfe42550e1 Merge: 53f4559 f5629a7 Author: Brett Chabot Date: Sun Oct 10 17:15:21 2010 -0700 am f5629a74: am 04982829: am c846b9b0: am 2134440c: Fix cts result xsd Merge commit 'f5629a749745a663ce917b5a847740bfe1387a22' * commit 'f5629a749745a663ce917b5a847740bfe1387a22': Fix cts result xsd commit 53f45593669850abb6db99efe72592d1ee6feeb2 Merge: 392fad0 09f54c2 Author: Wu-cheng Li Date: Sun Oct 10 14:21:42 2010 -0700 am 09f54c27: am 3808e3fb: Make sure camera jpeg quality parameters exist. Merge commit '09f54c27d0a1d3980cfa27061f925f9c6fea18ec' * commit '09f54c27d0a1d3980cfa27061f925f9c6fea18ec': Make sure camera jpeg quality parameters exist. commit 392fad0f734e013921df2d70dd80c359a37a7287 Merge: 997081d 0c48b22 Author: Brett Chabot Date: Sun Oct 10 12:52:15 2010 -0700 am 0c48b22c: am f132b728: am 3d7bcd59: am 3f6c6fc5: Update cts result xml schema to describe current (1.7) format. Merge commit '0c48b22cfe706fc19fb9555968f3f595f1f14e89' * commit '0c48b22cfe706fc19fb9555968f3f595f1f14e89': Update cts result xml schema to describe current (1.7) format. commit 2511767349dc95964cad3034c826e2fd142bb197 Author: Brett Chabot Date: Thu Oct 7 11:29:28 2010 -0700 Initial cts tradefed xml result reporter. Change-Id: Ibdb5714d908dc2fd7a1a308576524482089a24fb commit 997081d9f78b6f30fad0c8ae15839b19e1b747b3 Merge: dbaa29c 6c41beb Author: Brian Muramatsu Date: Sun Oct 10 09:09:57 2010 -0700 am 6c41beb7: am 6d4c987a: resolved conflicts for merge of 9f92e8b7 to gingerbread Merge commit '6c41beb7f19f1b0bb373779a6bb8c23dfb9be9d5' * commit '6c41beb7f19f1b0bb373779a6bb8c23dfb9be9d5': Allow Uppercase and Dashes in Build.DEVICE commit dbaa29c075ff3f5b6b49ce5a637bb352a0b052fb Merge: dc48925 416997e Author: Wu-cheng Li Date: Sat Oct 9 09:40:11 2010 -0700 am 416997e5: am 96c51f7b: Merge "Repeat the tests on every camera on the device." into gingerbread Merge commit '416997e592685e4b8e542792b4a60464c80d051b' * commit '416997e592685e4b8e542792b4a60464c80d051b': Repeat the tests on every camera on the device. commit dc48925c8b97fc31158d876cba82d08dcd82f3d1 Merge: 95dc7b5 394cd24 Author: Brett Chabot Date: Sat Oct 9 09:40:05 2010 -0700 am 394cd24d: am 450e99ae: Remove NoActivityRelatedPermissionTest.testSetPersistent. Merge commit '394cd24d920c4dd93098da15e068b2e9047693fd' * commit '394cd24d920c4dd93098da15e068b2e9047693fd': Remove NoActivityRelatedPermissionTest.testSetPersistent. commit 682c031aab737de78dcaa163b9bdf103c2c62c59 Merge: f5629a7 f64be1b Author: Brad Fitzpatrick Date: Fri Oct 8 15:21:02 2010 -0700 am f64be1b8: Merge "More SharedPreferences torture tests." into gingerbread Merge commit 'f64be1b82654c34e42ba884b5df8ee8ca0ecd403' into gingerbread-plus-aosp * commit 'f64be1b82654c34e42ba884b5df8ee8ca0ecd403': More SharedPreferences torture tests. commit f64be1b82654c34e42ba884b5df8ee8ca0ecd403 Merge: 0498282 1aafe17 Author: Brad Fitzpatrick Date: Fri Oct 8 15:17:55 2010 -0700 Merge "More SharedPreferences torture tests." into gingerbread commit 1aafe176ca1168f07a5dc870c6b56a3abd6c8611 Author: Brad Fitzpatrick Date: Fri Oct 8 15:03:36 2010 -0700 More SharedPreferences torture tests. Change-Id: I2b76b1c2acb3146b178f3fa2a1f2708c405c0ea6 commit f5629a749745a663ce917b5a847740bfe1387a22 Merge: 09f54c2 0498282 Author: Brett Chabot Date: Fri Oct 8 11:58:21 2010 -0700 am 04982829: am c846b9b0: am 2134440c: Fix cts result xsd Merge commit '049828295b245ff8c4ca6be5bb95c9c5b2459a6f' into gingerbread-plus-aosp * commit '049828295b245ff8c4ca6be5bb95c9c5b2459a6f': Fix cts result xsd commit 049828295b245ff8c4ca6be5bb95c9c5b2459a6f Merge: 3808e3f c846b9b Author: Brett Chabot Date: Fri Oct 8 11:52:04 2010 -0700 am c846b9b0: am 2134440c: Fix cts result xsd Merge commit 'c846b9b05e8114cacda0948e9a701a4d7209bfd7' into gingerbread * commit 'c846b9b05e8114cacda0948e9a701a4d7209bfd7': Fix cts result xsd commit c846b9b05e8114cacda0948e9a701a4d7209bfd7 Merge: 3d7bcd5 2134440 Author: Brett Chabot Date: Fri Oct 8 11:39:53 2010 -0700 am 2134440c: Fix cts result xsd Merge commit '2134440cb1191c59c6ea24385815141da28db0ae' into froyo * commit '2134440cb1191c59c6ea24385815141da28db0ae': Fix cts result xsd commit 09f54c27d0a1d3980cfa27061f925f9c6fea18ec Merge: 0c48b22 3808e3f Author: Wu-cheng Li Date: Thu Oct 7 22:22:32 2010 -0700 am 3808e3fb: Make sure camera jpeg quality parameters exist. Merge commit '3808e3fbf1ce5fb2eb2047d9d0b3db3227e5f306' into gingerbread-plus-aosp * commit '3808e3fbf1ce5fb2eb2047d9d0b3db3227e5f306': Make sure camera jpeg quality parameters exist. commit 3808e3fbf1ce5fb2eb2047d9d0b3db3227e5f306 Author: Wu-cheng Li Date: Fri Oct 8 11:19:25 2010 +0800 Make sure camera jpeg quality parameters exist. bug:3073393 Change-Id: I5bff1fce5e9e297cf05345c9a1327700c6384b98 commit 2134440cb1191c59c6ea24385815141da28db0ae Author: Brett Chabot Date: Thu Oct 7 18:38:10 2010 -0700 Fix cts result xsd FeatureInfo and ProcessInfo go inside a DeviceInfo. Change-Id: I9fd1c1388348416efe2bcb5458cf7fc343187381 commit 0c48b22cfe706fc19fb9555968f3f595f1f14e89 Merge: 6c41beb f132b72 Author: Brett Chabot Date: Thu Oct 7 15:47:15 2010 -0700 am f132b728: am 3d7bcd59: am 3f6c6fc5: Update cts result xml schema to describe current (1.7) format. Merge commit 'f132b728a4549d557a5072a2cf09d8c35ff5004b' into gingerbread-plus-aosp * commit 'f132b728a4549d557a5072a2cf09d8c35ff5004b': Update cts result xml schema to describe current (1.7) format. commit 6c41beb7f19f1b0bb373779a6bb8c23dfb9be9d5 Merge: 416997e 6d4c987 Author: Brian Muramatsu Date: Thu Oct 7 13:56:43 2010 -0700 am 6d4c987a: resolved conflicts for merge of 9f92e8b7 to gingerbread Merge commit '6d4c987a6239b8681cc297da8a784d2673acfecd' into gingerbread-plus-aosp * commit '6d4c987a6239b8681cc297da8a784d2673acfecd': Allow Uppercase and Dashes in Build.DEVICE commit f132b728a4549d557a5072a2cf09d8c35ff5004b Merge: 6d4c987 3d7bcd5 Author: Brett Chabot Date: Thu Oct 7 13:39:11 2010 -0700 am 3d7bcd59: am 3f6c6fc5: Update cts result xml schema to describe current (1.7) format. Merge commit '3d7bcd5980683e0f273d8d623688509863debe2f' into gingerbread * commit '3d7bcd5980683e0f273d8d623688509863debe2f': Update cts result xml schema to describe current (1.7) format. commit 3d7bcd5980683e0f273d8d623688509863debe2f Merge: 9f92e8b 3f6c6fc Author: Brett Chabot Date: Thu Oct 7 13:06:12 2010 -0700 am 3f6c6fc5: Update cts result xml schema to describe current (1.7) format. Merge commit '3f6c6fc513ddcb1f2956c2a34bece5437b9153ac' into froyo * commit '3f6c6fc513ddcb1f2956c2a34bece5437b9153ac': Update cts result xml schema to describe current (1.7) format. commit 95dc7b57e8433cd5267f57e7a5d7e877011e089a Merge: fad531a 202fc34 Author: Nick Kralevich Date: Thu Oct 7 12:22:38 2010 -0700 am 202fc341: am 5248dea9: Merge "Verify preinstalled apps don\'t have debuggable set." into gingerbread Merge commit '202fc341eef1e358a3c13a47860b2184344ad800' * commit '202fc341eef1e358a3c13a47860b2184344ad800': Verify preinstalled apps don't have debuggable set. commit fad531a142628e023e65dd5592701a5205bba4be Merge: fa44da9 d8a4115 Author: Brian Muramatsu Date: Thu Oct 7 12:19:22 2010 -0700 am d8a41159: am cd9d50c4: am 57975c41: am eac11cee: Add "Omitted" State for CTS Tests Merge commit 'd8a41159d38cc561120a82eaf750b6e45d36ce58' * commit 'd8a41159d38cc561120a82eaf750b6e45d36ce58': Add "Omitted" State for CTS Tests commit 3f6c6fc513ddcb1f2956c2a34bece5437b9153ac Author: Brett Chabot Date: Thu Oct 7 11:38:34 2010 -0700 Update cts result xml schema to describe current (1.7) format. Change-Id: I72e4373b8a53ac1dffdac3a7653a753b40b2b41f commit 6d4c987a6239b8681cc297da8a784d2673acfecd Merge: 96c51f7 9f92e8b Author: Brian Muramatsu Date: Thu Oct 7 09:18:51 2010 -0700 resolved conflicts for merge of 9f92e8b7 to gingerbread Change-Id: Ia6578be471e4208035c0c8430f232745d1de660b commit 9f92e8b7cae95dd130e80681ea2c5b502ca84f29 Merge: 57975c4 d29fb9d Author: Brian Muramatsu Date: Thu Oct 7 07:29:38 2010 -0700 am d29fb9d5: Allow Uppercase and Dashes in Build.DEVICE Merge commit 'd29fb9d5f2482c639b687983aebe7e3b1c4499dd' into froyo * commit 'd29fb9d5f2482c639b687983aebe7e3b1c4499dd': Allow Uppercase and Dashes in Build.DEVICE commit 416997e592685e4b8e542792b4a60464c80d051b Merge: 394cd24 96c51f7 Author: Wu-cheng Li Date: Thu Oct 7 07:18:34 2010 -0700 am 96c51f7b: Merge "Repeat the tests on every camera on the device." into gingerbread Merge commit '96c51f7b46524a17af143c4054548ed691131f5c' into gingerbread-plus-aosp * commit '96c51f7b46524a17af143c4054548ed691131f5c': Repeat the tests on every camera on the device. commit 394cd24d920c4dd93098da15e068b2e9047693fd Merge: 202fc34 450e99a Author: Brett Chabot Date: Thu Oct 7 07:14:09 2010 -0700 am 450e99ae: Remove NoActivityRelatedPermissionTest.testSetPersistent. Merge commit '450e99ae682d860d25a178be72fa0abf53ddf3e6' into gingerbread-plus-aosp * commit '450e99ae682d860d25a178be72fa0abf53ddf3e6': Remove NoActivityRelatedPermissionTest.testSetPersistent. commit 96c51f7b46524a17af143c4054548ed691131f5c Merge: 450e99a 2b42a88 Author: Wu-cheng Li Date: Thu Oct 7 01:47:30 2010 -0700 Merge "Repeat the tests on every camera on the device." into gingerbread commit 2b42a88d192432e00096cbe69cb9ee8c8590087d Author: Wu-cheng Li Date: Thu Oct 7 14:52:06 2010 +0800 Repeat the tests on every camera on the device. bug:3052237 Change-Id: I21f98b1b4968d8e2c82033a2b326b26f319ebbcc commit d29fb9d5f2482c639b687983aebe7e3b1c4499dd Author: Brian Muramatsu Date: Wed Oct 6 11:01:21 2010 -0700 Allow Uppercase and Dashes in Build.DEVICE Change-Id: I07f24ec7f3fc74aaeaa55eae1f0bb097af59f291 commit 450e99ae682d860d25a178be72fa0abf53ddf3e6 Author: Brett Chabot Date: Wed Oct 6 09:47:51 2010 -0700 Remove NoActivityRelatedPermissionTest.testSetPersistent. Bug 3068230 Change-Id: I524b811d121580f791ea6f4056b622936a2f59fe commit 202fc341eef1e358a3c13a47860b2184344ad800 Merge: d8a4115 5248dea Author: Nick Kralevich Date: Tue Oct 5 15:47:17 2010 -0700 am 5248dea9: Merge "Verify preinstalled apps don\'t have debuggable set." into gingerbread Merge commit '5248dea95549ed3b7607c76e6c76185771ddda9d' into gingerbread-plus-aosp * commit '5248dea95549ed3b7607c76e6c76185771ddda9d': Verify preinstalled apps don't have debuggable set. commit 5248dea95549ed3b7607c76e6c76185771ddda9d Merge: cd9d50c 235bfd5 Author: Nick Kralevich Date: Tue Oct 5 15:44:30 2010 -0700 Merge "Verify preinstalled apps don't have debuggable set." into gingerbread commit 235bfd54165304c9bdcbb8108a19f70b2af0959b Author: Nick Kralevich Date: Tue Oct 5 13:46:50 2010 -0700 Verify preinstalled apps don't have debuggable set. Fix bug 3065312. It is a security hole for applications to ship with debuggable set. Make sure we warn people about this. Change-Id: I7ffb3e2742f05719fcff3b1ebd3a48c8f487ca29 commit d8a41159d38cc561120a82eaf750b6e45d36ce58 Merge: 3f31fec cd9d50c Author: Brian Muramatsu Date: Tue Oct 5 13:13:20 2010 -0700 am cd9d50c4: am 57975c41: am eac11cee: Add "Omitted" State for CTS Tests Merge commit 'cd9d50c4689fe937803be7f588a8e7ba6908c01b' into gingerbread-plus-aosp * commit 'cd9d50c4689fe937803be7f588a8e7ba6908c01b': Add "Omitted" State for CTS Tests commit cd9d50c4689fe937803be7f588a8e7ba6908c01b Merge: 03877c0 57975c4 Author: Brian Muramatsu Date: Tue Oct 5 12:42:23 2010 -0700 am 57975c41: am eac11cee: Add "Omitted" State for CTS Tests Merge commit '57975c41fc34f6d97ee7c1925b377f9d8ca019c0' into gingerbread * commit '57975c41fc34f6d97ee7c1925b377f9d8ca019c0': Add "Omitted" State for CTS Tests commit 57975c41fc34f6d97ee7c1925b377f9d8ca019c0 Merge: 5029d1f eac11ce Author: Brian Muramatsu Date: Tue Oct 5 12:15:46 2010 -0700 am eac11cee: Add "Omitted" State for CTS Tests Merge commit 'eac11ceead475614996047e425ee944d64e8939b' into froyo * commit 'eac11ceead475614996047e425ee944d64e8939b': Add "Omitted" State for CTS Tests commit eac11ceead475614996047e425ee944d64e8939b Author: Brian Muramatsu Date: Mon Oct 4 17:18:51 2010 -0700 Add "Omitted" State for CTS Tests Add a new "omitted" state for tests. This is different from "not executed" to fix a problem where CTS would keep retrying to run the not executed tests over and over again. In a prior change, I switched the default test result from pass to not executed in the test result parser, since I didn't want skipped tests to be reported as passed (or tests that failed horribly to report pass). This worked fine when running a specific package "-p" but started to fail when running the entire plan "--plan CTS." This is because there are two code paths where one infinitely retries if there are any tests not marked as "not executed" but the other just retries once. Tests with the new annotations thus caused an infinite loop of retrying... By setting tests to "omitted" by default, the tests won't be retried over and over. Change-Id: I3b4995089605860b1ed5e6b752dde811132f16f8 commit fa44da9796fa3ebacfbfcdf1f4136c763a42351d Merge: f905c7c 3f31fec Author: Brian Muramatsu Date: Mon Oct 4 14:28:48 2010 -0700 am 3f31fec4: am 03877c00: Fix CTS Script to Use ddmlib-prebuilt Merge commit '3f31fec4ae604108d7fd57ea5e448a817c19a1d5' * commit '3f31fec4ae604108d7fd57ea5e448a817c19a1d5': Fix CTS Script to Use ddmlib-prebuilt commit 3f31fec4ae604108d7fd57ea5e448a817c19a1d5 Merge: 52bf237 03877c0 Author: Brian Muramatsu Date: Mon Oct 4 13:00:45 2010 -0700 am 03877c00: Fix CTS Script to Use ddmlib-prebuilt Merge commit '03877c00694039ab991fb3fd7e91047300161055' into gingerbread-plus-aosp * commit '03877c00694039ab991fb3fd7e91047300161055': Fix CTS Script to Use ddmlib-prebuilt commit 03877c00694039ab991fb3fd7e91047300161055 Author: Brian Muramatsu Date: Mon Oct 4 12:48:11 2010 -0700 Fix CTS Script to Use ddmlib-prebuilt Change-Id: I48e50a0335e8e4af785e554e3506b6cb13658d5e commit f905c7c1874c5f3c518712214e3843bd889ecb39 Merge: 5fd1ec4 52bf237 Author: Wu-cheng Li Date: Thu Sep 30 14:56:57 2010 -0700 am 52bf2373: am 0165d186: Add camera preview fps range test. Merge commit '52bf237331ef79801f515fe66abd285969159209' * commit '52bf237331ef79801f515fe66abd285969159209': Add camera preview fps range test. commit 5fd1ec4ae164ff13c173bf2a1ae07e4646db2a67 Author: Jeff Brown Date: Mon Aug 23 11:58:23 2010 -0700 Add tests for MotionEvent transforms. Change-Id: I1d8ed0840a17ec21dcd9d57fb9c5320688448789 commit 52bf237331ef79801f515fe66abd285969159209 Merge: 34ef675 0165d18 Author: Wu-cheng Li Date: Thu Sep 30 11:48:13 2010 -0700 am 0165d186: Add camera preview fps range test. Merge commit '0165d1867374099d525638e6192342ba639e7954' into gingerbread-plus-aosp * commit '0165d1867374099d525638e6192342ba639e7954': Add camera preview fps range test. commit 0165d1867374099d525638e6192342ba639e7954 Author: Wu-cheng Li Date: Fri Aug 13 17:07:53 2010 -0700 Add camera preview fps range test. Change-Id: Id416be6110d45fb1b8554789a2ab9073293e6c9b commit 1662428b31d3cb9b55a3901b3376ecafad3cde13 Merge: 5585ae4 34ef675 Author: Andreas Huber Date: Thu Sep 30 11:29:26 2010 -0700 am 34ef6758: am 30393d26: fixing the build. Merge commit '34ef675861199f2aa7f9b885248717ead84b30b0' * commit '34ef675861199f2aa7f9b885248717ead84b30b0': fixing the build. commit 5585ae45ddc1c79ccd943da2e9646010daaa1dde Merge: 057b393 ed8d532 Author: Brian Muramatsu Date: Thu Sep 30 11:29:23 2010 -0700 am ed8d5320: am 02675776: am 5029d1f9: am a33954cd: Merge "Fix InstrumentationCtsTestRunner NPE" into froyo Merge commit 'ed8d5320d27b68e57cbcfd12373aa9a5df3df06c' * commit 'ed8d5320d27b68e57cbcfd12373aa9a5df3df06c': Fix InstrumentationCtsTestRunner NPE commit 057b393139e0b2dbf82a0ebfbcaf8f121425adb2 Merge: 353389e 53697ac Author: Brian Muramatsu Date: Thu Sep 30 11:29:20 2010 -0700 am 53697ac2: (-s ours) am 41b62c3e: am 2eb47311: (-s ours) am a6049466: (-s ours) Merge "DO NOT MERGE FileSystemPermissionTest Froyo Backport" into froyo Merge commit '53697ac299241bb9bb77c98979e7adf1da476a02' * commit '53697ac299241bb9bb77c98979e7adf1da476a02': DO NOT MERGE FileSystemPermissionTest Froyo Backport commit 353389e5e1fb23c1e77e5f77b05224c4e499580f Merge: e990cab c835a15 Author: Brian Muramatsu Date: Thu Sep 30 11:29:18 2010 -0700 am c835a15b: am 42e71803: am d205b599: Merge "Support MEIDS Starting with 97, 98, and 99" into froyo Merge commit 'c835a15b342e87a1001a500ec88f8238bed8f83c' * commit 'c835a15b342e87a1001a500ec88f8238bed8f83c': Support MEIDS Starting with 97, 98, and 99 commit e990cab7f5ec6fc2d3727edc7ea8e3468bf51320 Merge: 2ffab7b 07902be Author: Wu-cheng Li Date: Thu Sep 30 11:29:13 2010 -0700 am 07902be1: am 9d377471: Merge "Test all combinations of camera preview sizes and picture sizes." into gingerbread Merge commit '07902be14b8d9f8836a08bf4a4e0fe7064dc1de9' * commit '07902be14b8d9f8836a08bf4a4e0fe7064dc1de9': Test all combinations of camera preview sizes and picture sizes. commit 2ffab7bd119fa1db88ea85adf8418a7c3953fee0 Merge: 3ae732d f17083b Author: Vasu Nori Date: Thu Sep 30 10:50:07 2010 -0700 Merge "don't insert byte[0] into blob type column" commit 34ef675861199f2aa7f9b885248717ead84b30b0 Merge: ed8d532 30393d2 Author: Andreas Huber Date: Thu Sep 30 10:11:41 2010 -0700 am 30393d26: fixing the build. Merge commit '30393d2669e04960c6dc9c736e2239e7ca4ed9af' into gingerbread-plus-aosp * commit '30393d2669e04960c6dc9c736e2239e7ca4ed9af': fixing the build. commit ed8d5320d27b68e57cbcfd12373aa9a5df3df06c Merge: 53697ac 0267577 Author: Brian Muramatsu Date: Thu Sep 30 10:11:38 2010 -0700 am 02675776: am 5029d1f9: am a33954cd: Merge "Fix InstrumentationCtsTestRunner NPE" into froyo Merge commit '02675776e61dd6e93ce42542776eba9fb8c9a2b1' into gingerbread-plus-aosp * commit '02675776e61dd6e93ce42542776eba9fb8c9a2b1': Fix InstrumentationCtsTestRunner NPE commit 53697ac299241bb9bb77c98979e7adf1da476a02 Merge: c835a15 41b62c3 Author: Brian Muramatsu Date: Thu Sep 30 10:11:36 2010 -0700 am 41b62c3e: am 2eb47311: (-s ours) am a6049466: (-s ours) Merge "DO NOT MERGE FileSystemPermissionTest Froyo Backport" into froyo Merge commit '41b62c3e8abdb1e1871875ccacb63c858bf19d62' into gingerbread-plus-aosp * commit '41b62c3e8abdb1e1871875ccacb63c858bf19d62': DO NOT MERGE FileSystemPermissionTest Froyo Backport commit c835a15b342e87a1001a500ec88f8238bed8f83c Merge: 07902be 42e7180 Author: Brian Muramatsu Date: Thu Sep 30 10:11:33 2010 -0700 am 42e71803: am d205b599: Merge "Support MEIDS Starting with 97, 98, and 99" into froyo Merge commit '42e71803cc46348bcaebfca2732feb8a3eb752d9' into gingerbread-plus-aosp * commit '42e71803cc46348bcaebfca2732feb8a3eb752d9': Support MEIDS Starting with 97, 98, and 99 commit 07902be14b8d9f8836a08bf4a4e0fe7064dc1de9 Merge: cac3e67 9d37747 Author: Wu-cheng Li Date: Thu Sep 30 10:08:56 2010 -0700 am 9d377471: Merge "Test all combinations of camera preview sizes and picture sizes." into gingerbread Merge commit '9d377471cae0fc00a01dfff8e52e4b535742a3ab' into gingerbread-plus-aosp * commit '9d377471cae0fc00a01dfff8e52e4b535742a3ab': Test all combinations of camera preview sizes and picture sizes. commit 30393d2669e04960c6dc9c736e2239e7ca4ed9af Author: Andreas Huber Date: Thu Sep 30 09:33:24 2010 -0700 fixing the build. Change-Id: If746de3d0b8cf1c76c24c252eaa6ecec08ae687b commit 02675776e61dd6e93ce42542776eba9fb8c9a2b1 Merge: 41b62c3 5029d1f Author: Brian Muramatsu Date: Thu Sep 30 09:07:32 2010 -0700 am 5029d1f9: am a33954cd: Merge "Fix InstrumentationCtsTestRunner NPE" into froyo Merge commit '5029d1f9d8fb842437e9910d4a7e80ca80da3ca0' into gingerbread * commit '5029d1f9d8fb842437e9910d4a7e80ca80da3ca0': Fix InstrumentationCtsTestRunner NPE commit 41b62c3e8abdb1e1871875ccacb63c858bf19d62 Merge: 42e7180 2eb4731 Author: Brian Muramatsu Date: Thu Sep 30 09:07:30 2010 -0700 am 2eb47311: (-s ours) am a6049466: (-s ours) Merge "DO NOT MERGE FileSystemPermissionTest Froyo Backport" into froyo Merge commit '2eb4731166f5cb4199a7f27ca0421991e3c88554' into gingerbread * commit '2eb4731166f5cb4199a7f27ca0421991e3c88554': DO NOT MERGE FileSystemPermissionTest Froyo Backport commit 42e71803cc46348bcaebfca2732feb8a3eb752d9 Merge: 9d37747 d205b59 Author: Brian Muramatsu Date: Thu Sep 30 09:07:25 2010 -0700 am d205b599: Merge "Support MEIDS Starting with 97, 98, and 99" into froyo Merge commit 'd205b5990a39cbad7c176a017e4af0fff1f35751' into gingerbread * commit 'd205b5990a39cbad7c176a017e4af0fff1f35751': Support MEIDS Starting with 97, 98, and 99 commit 5029d1f9d8fb842437e9910d4a7e80ca80da3ca0 Merge: 2eb4731 a33954c Author: Brian Muramatsu Date: Thu Sep 30 08:28:22 2010 -0700 am a33954cd: Merge "Fix InstrumentationCtsTestRunner NPE" into froyo Merge commit 'a33954cdff6fc03b7a45b125c66853eed9aa610f' into froyo * commit 'a33954cdff6fc03b7a45b125c66853eed9aa610f': Fix InstrumentationCtsTestRunner NPE commit 2eb4731166f5cb4199a7f27ca0421991e3c88554 Merge: d205b59 a604946 Author: Brian Muramatsu Date: Thu Sep 30 08:28:19 2010 -0700 am a6049466: (-s ours) Merge "DO NOT MERGE FileSystemPermissionTest Froyo Backport" into froyo Merge commit 'a6049466ea3120da6866ed1d23518416940323e0' into froyo * commit 'a6049466ea3120da6866ed1d23518416940323e0': DO NOT MERGE FileSystemPermissionTest Froyo Backport commit 3ae732dc20937d003480de5a6d3f853a29c48b4c Merge: f0d1fe8 cac3e67 Author: Brian Muramatsu Date: Wed Sep 29 22:13:50 2010 -0700 am cac3e679: am cb2cfa03: Merge "Cts Feature/Profile Annotations" into gingerbread Merge commit 'cac3e679dc49bec1f424ea8632099d8a1df23eba' * commit 'cac3e679dc49bec1f424ea8632099d8a1df23eba': Cts Feature/Profile Annotations commit f0d1fe8ce6ff0fa1e09b5a285c626cf3245dabb4 Merge: efa1b80 0eea97d Author: Brian Carlstrom Date: Wed Sep 29 22:12:40 2010 -0700 am 0eea97db: am f45516ef: Remove build warning due to test cleanup Merge commit '0eea97db557674577a62cd56696c70ba52d56d76' * commit '0eea97db557674577a62cd56696c70ba52d56d76': Remove build warning due to test cleanup commit 56a3d5c1ffb76907a9ffcabf97423312ec02ab34 Author: madan ankapura Date: Wed Sep 29 21:45:56 2010 -0700 fix WQVGA resolution WQVGA resolution is defined as 240x400 (ldpi/normal) in CDD Change-Id: Ib3747696cff6daac9d8dec9e45e5d333d3e7aabd commit 9d377471cae0fc00a01dfff8e52e4b535742a3ab Merge: cb2cfa0 8ff4fa9 Author: Wu-cheng Li Date: Wed Sep 29 17:13:22 2010 -0700 Merge "Test all combinations of camera preview sizes and picture sizes." into gingerbread commit 8ff4fa9b074b6c3daec910079124857e6f070ff4 Author: Wu-cheng Li Date: Wed Sep 29 17:00:11 2010 -0700 Test all combinations of camera preview sizes and picture sizes. Also make sure supported sizes do not contain invalid values like "WVGA,VGA,HVGA". bug:2900957 Change-Id: I368789b07f7752a5e60c321f068cd532ed70be1b commit f17083bac3bc801e0c495a67021743048b5e7e82 Author: Vasu Nori Date: Wed Sep 29 14:20:48 2010 -0700 don't insert byte[0] into blob type column that gives unexpected results. in the latest sqlite versions, sqlite folks have fixed this to always return null. so, fix the test. Change-Id: Ia06470f6cfa0aa5981d56dd58e91d2e4cc9538a5 commit a33954cdff6fc03b7a45b125c66853eed9aa610f Merge: a604946 87435e4 Author: Brian Muramatsu Date: Wed Sep 29 13:11:10 2010 -0700 Merge "Fix InstrumentationCtsTestRunner NPE" into froyo commit 87435e48e77d7e43cc10b5d0bf140efd5e596829 Author: Brian Muramatsu Date: Wed Sep 29 13:05:55 2010 -0700 Fix InstrumentationCtsTestRunner NPE ...when iterating over the features using the emulator. Change-Id: Id1958239786c900b72e0b9244602a7f66c485ed1 commit cac3e679dc49bec1f424ea8632099d8a1df23eba Merge: 0eea97d cb2cfa0 Author: Brian Muramatsu Date: Wed Sep 29 12:01:21 2010 -0700 am cb2cfa03: Merge "Cts Feature/Profile Annotations" into gingerbread Merge commit 'cb2cfa03131b154893d3482b1236b7db7ca52d4b' into gingerbread-plus-aosp * commit 'cb2cfa03131b154893d3482b1236b7db7ca52d4b': Cts Feature/Profile Annotations commit cb2cfa03131b154893d3482b1236b7db7ca52d4b Merge: f45516e 57980ae Author: Brian Muramatsu Date: Wed Sep 29 11:59:00 2010 -0700 Merge "Cts Feature/Profile Annotations" into gingerbread commit a6049466ea3120da6866ed1d23518416940323e0 Merge: d205b59 3e8bc92 Author: Brian Muramatsu Date: Wed Sep 29 11:38:18 2010 -0700 Merge "DO NOT MERGE FileSystemPermissionTest Froyo Backport" into froyo commit 2ad016d3bf341035104b8cf241b3d691642a0fab Author: Brian Muramatsu Date: Wed Sep 29 11:07:14 2010 -0700 Backport TelephonyManagerTest Enhancements - Support MEIDS Starting with 97, 98, and 99 (Bug 3041176) - Checking of ESNs - Probe "hardware_id" for non-telephony devices Change-Id: If0ef902bd5262348fb82e93230fec8683a4e2c09 commit d205b5990a39cbad7c176a017e4af0fff1f35751 Merge: 9a4ac9a de5f210 Author: Brian Muramatsu Date: Wed Sep 29 10:59:34 2010 -0700 Merge "Support MEIDS Starting with 97, 98, and 99" into froyo commit 0eea97db557674577a62cd56696c70ba52d56d76 Merge: 8c636f6 f45516e Author: Brian Carlstrom Date: Wed Sep 29 10:46:39 2010 -0700 am f45516ef: Remove build warning due to test cleanup Merge commit 'f45516ef7d5a1199b88b44e24d9568a4e018ffd7' into gingerbread-plus-aosp * commit 'f45516ef7d5a1199b88b44e24d9568a4e018ffd7': Remove build warning due to test cleanup commit f45516ef7d5a1199b88b44e24d9568a4e018ffd7 Author: Brian Carlstrom Date: Wed Sep 29 09:08:18 2010 -0700 Remove build warning due to test cleanup Tracking libcore change 1f8243e3d2b5a3f8e0398c304d1dea0395cbc368 Change-Id: Ic20288ec98f0147ccf77b18cd9ece8476bafdd7b commit efa1b80c5b23429df069cc99df265d63151f6941 Merge: 67d53e1 8c636f6 Author: Dianne Hackborn Date: Tue Sep 28 13:59:17 2010 -0700 am 8c636f6c: am 4d6abcf2: Merge "Add tests for granting URIs with path-based permissions." into gingerbread Merge commit '8c636f6c5a0526d794d47b9ac39928998bc475d0' * commit '8c636f6c5a0526d794d47b9ac39928998bc475d0': Add tests for granting URIs with path-based permissions. commit 67d53e16dea9f1d818f8d94d16a6e2de27578490 Merge: c14dad6 d752e24 Author: Jean-Baptiste Queru Date: Tue Sep 28 12:48:54 2010 -0700 am d752e249: (-s ours) am e2c576fe: am 9a4ac9ab: (-s ours) Reconcile open-source froyo and Google-internal froyo - DO NOT MERGE Merge commit 'd752e24917c5feaa888327802cd4723141428c12' * commit 'd752e24917c5feaa888327802cd4723141428c12': commit 8c636f6c5a0526d794d47b9ac39928998bc475d0 Merge: d752e24 4d6abcf Author: Dianne Hackborn Date: Tue Sep 28 11:35:14 2010 -0700 am 4d6abcf2: Merge "Add tests for granting URIs with path-based permissions." into gingerbread Merge commit '4d6abcf29caa73462ffcc49a3cdaa27e8943b2e9' into gingerbread-plus-aosp * commit '4d6abcf29caa73462ffcc49a3cdaa27e8943b2e9': Add tests for granting URIs with path-based permissions. commit 4d6abcf29caa73462ffcc49a3cdaa27e8943b2e9 Merge: e2c576f 84310aa Author: Dianne Hackborn Date: Tue Sep 28 11:23:57 2010 -0700 Merge "Add tests for granting URIs with path-based permissions." into gingerbread commit 84310aad87a2a39ba1685ef2e57e0791423db2ce Author: Dianne Hackborn Date: Mon Sep 27 22:03:52 2010 -0700 Add tests for granting URIs with path-based permissions. Change-Id: Ib83f2967a49ee08cd823448ce8ca6e27fd42f7bb commit de5f210b51106f21d207093f84b7d15d60820a18 Author: Brian Muramatsu Date: Tue Sep 28 11:02:01 2010 -0700 Support MEIDS Starting with 97, 98, and 99 Bug 3041176 97, 98, and 99 are valid reporting body identifiers now. http://www.tiaonline.org/standards/resources/meid/ Change-Id: I59d563e8193d900d34cff1d80dd6330f7841ee9f commit d752e24917c5feaa888327802cd4723141428c12 Merge: fb0c02e e2c576f Author: Jean-Baptiste Queru Date: Tue Sep 28 07:32:56 2010 -0700 am e2c576fe: am 9a4ac9ab: (-s ours) Reconcile open-source froyo and Google-internal froyo - DO NOT MERGE Merge commit 'e2c576fe2dc71cc40d4bffa4973a39c0bfb4e750' into gingerbread-plus-aosp * commit 'e2c576fe2dc71cc40d4bffa4973a39c0bfb4e750': commit e2c576fe2dc71cc40d4bffa4973a39c0bfb4e750 Merge: c74cd30 9a4ac9a Author: Jean-Baptiste Queru Date: Tue Sep 28 07:20:50 2010 -0700 am 9a4ac9ab: (-s ours) Reconcile open-source froyo and Google-internal froyo - DO NOT MERGE Merge commit '9a4ac9ab2de6b28b0dcf4f49127dc4075c4148c6' into gingerbread * commit '9a4ac9ab2de6b28b0dcf4f49127dc4075c4148c6': commit 9a4ac9ab2de6b28b0dcf4f49127dc4075c4148c6 Merge: 7bc0e8e 52c31d0 Author: Jean-Baptiste Queru Date: Tue Sep 28 07:00:51 2010 -0700 Reconcile open-source froyo and Google-internal froyo - DO NOT MERGE Change-Id: Iac3c5a0ce50330a29634f36ef7408a669d5c110a commit c14dad64d2d063ea4a253faf17124af9e9f435ec Merge: 7759fca fb0c02e Author: Brian Muramatsu Date: Mon Sep 27 21:28:42 2010 -0700 am fb0c02e7: (-s ours) am c74cd309: am 52c31d04: (-s ours) am 7bc0e8e2: (-s ours) DO NOT MERGE Cts Feature/Profile Annotations Merge commit 'fb0c02e7271b3eb945e353dbcf83edf173a9b40d' * commit 'fb0c02e7271b3eb945e353dbcf83edf173a9b40d': DO NOT MERGE Cts Feature/Profile Annotations commit 7759fcac90c261b3fc9db3b1510e6981e3df08a3 Merge: 5e4d383 61fc13f Author: Brett Chabot Date: Mon Sep 27 21:02:45 2010 -0700 am 61fc13f1: am 0717235e: Merge "Split CTS device setup into separate stages." into gingerbread Merge commit '61fc13f17c3622fc1ccda42dc20f1a758b5cb9f4' * commit '61fc13f17c3622fc1ccda42dc20f1a758b5cb9f4': Split CTS device setup into separate stages. commit 5e4d38314f2334dcd18580dd966c162d33672188 Merge: afe4214 f6495f8 Author: Nick Kralevich Date: Mon Sep 27 20:33:33 2010 -0700 am f6495f89: am f2e39cb7: Merge "Verify /dev and /proc are not writable." into gingerbread Merge commit 'f6495f895df8a85092edf07feca905bcd978534e' * commit 'f6495f895df8a85092edf07feca905bcd978534e': Verify /dev and /proc are not writable. commit afe4214c7dd3d287bc96d0c951c140be098c5507 Merge: 3f0ef58 29f90b7 Author: Dianne Hackborn Date: Mon Sep 27 20:32:49 2010 -0700 am 29f90b78: am 0c7230d7: Add CTS test for calling getType() of a provider. Merge commit '29f90b78708a85d432657e9bf98aa1ff82158c3e' * commit '29f90b78708a85d432657e9bf98aa1ff82158c3e': Add CTS test for calling getType() of a provider. commit 0285262b1086fac2892ac0cd4023cece6070ff31 Author: Brian Muramatsu Date: Mon Sep 27 17:17:55 2010 -0700 FileSystemPermissionTest Eclair Backport Bug 2749525 Change-Id: Ia4cd3d0b4e20e17789cbb0ee3f37c28c2ff4ad27 commit 3e8bc9223ef2f9a1bb0fdbcdce75121decc31b24 Author: Brian Muramatsu Date: Mon Sep 27 17:17:55 2010 -0700 DO NOT MERGE FileSystemPermissionTest Froyo Backport Bug 2749525 Change-Id: Ib276a471c04de6299592989807bae42ed7530178 commit fb0c02e7271b3eb945e353dbcf83edf173a9b40d Merge: 61fc13f c74cd30 Author: Brian Muramatsu Date: Mon Sep 27 16:35:51 2010 -0700 am c74cd309: am 52c31d04: (-s ours) am 7bc0e8e2: (-s ours) DO NOT MERGE Cts Feature/Profile Annotations Merge commit 'c74cd3092397bbdc943ddc61cf2f67b6b4aee1e5' into gingerbread-plus-aosp * commit 'c74cd3092397bbdc943ddc61cf2f67b6b4aee1e5': DO NOT MERGE Cts Feature/Profile Annotations commit c74cd3092397bbdc943ddc61cf2f67b6b4aee1e5 Merge: 0717235 52c31d0 Author: Brian Muramatsu Date: Mon Sep 27 16:31:56 2010 -0700 am 52c31d04: (-s ours) am 7bc0e8e2: (-s ours) DO NOT MERGE Cts Feature/Profile Annotations Merge commit '52c31d041432a42cc5e5649df6b01ca48843e94f' into gingerbread * commit '52c31d041432a42cc5e5649df6b01ca48843e94f': DO NOT MERGE Cts Feature/Profile Annotations commit 52c31d041432a42cc5e5649df6b01ca48843e94f Merge: 8c2a6b7 7bc0e8e Author: Brian Muramatsu Date: Mon Sep 27 16:16:38 2010 -0700 am 7bc0e8e2: (-s ours) DO NOT MERGE Cts Feature/Profile Annotations Merge commit '7bc0e8e2367cc49b0ce8f1fdef3937f9129bd3b8' into froyo * commit '7bc0e8e2367cc49b0ce8f1fdef3937f9129bd3b8': DO NOT MERGE Cts Feature/Profile Annotations commit 57980ae875013ccbba8ebac1bd9f9bb9cddcc47c Author: Brian Muramatsu Date: Tue Aug 24 12:24:18 2010 -0700 Cts Feature/Profile Annotations Add annotations that allow CTS to be used for multiple device profiles. Example is shown in ProfileTest.java. 1. @SupportedProfiles - run the test only if the device's profile is the one passed via the "--profile" flag to CTS like: startcts --plan CTS --profile HANDHELD startcts --plan CTS --profile STB 2. @RequiredFeatures - run the test only if the device's PackageManager reports the features needed by the test. For instance tag wifi tests with this annotation's value set to the wifi feature to only run it on devices that declare the feature. If not specified, the profile will be set to ALL, which means run all the tests. This creates an additional library for CTS test annotations, so this will require a change to the build/core/cts.mk project too. A new Makefile "CtsHostLibraryList.mk" can be used now to have the host use additional libraries. Change-Id: I69d76b65569160648020306fe14c94242d99efc1 commit 7bc0e8e2367cc49b0ce8f1fdef3937f9129bd3b8 Author: Brian Muramatsu Date: Tue Aug 24 12:24:18 2010 -0700 DO NOT MERGE Cts Feature/Profile Annotations Add annotations that allow CTS to be used for multiple device profiles. Example is shown in ProfileTest.java. 1. @SupportedProfiles - run the test only if the device's profile is the one passed via the "--profile" flag to CTS like: startcts --plan CTS --profile HANDHELD startcts --plan CTS --profile STB 2. @RequiredFeatures - run the test only if the device's PackageManager reports the features needed by the test. For instance tag wifi tests with this annotation's value set to the wifi feature to only run it on devices that declare the feature. If not specified, the profile will be set to ALL, which means run all the tests. This creates an additional library for CTS test annotations, so this will require a change to the build/core/cts.mk project too. A new Makefile "CtsHostLibraryList.mk" can be used now to have the host use additional libraries. Change-Id: I2c75a07eccf90df3bee0a87edf0d2d497e150930 commit 61fc13f17c3622fc1ccda42dc20f1a758b5cb9f4 Merge: f6495f8 0717235 Author: Brett Chabot Date: Mon Sep 27 14:37:57 2010 -0700 am 0717235e: Merge "Split CTS device setup into separate stages." into gingerbread Merge commit '0717235eb5a5b761f3549f1c2b8c94019b9d6220' into gingerbread-plus-aosp * commit '0717235eb5a5b761f3549f1c2b8c94019b9d6220': Split CTS device setup into separate stages. commit 0717235eb5a5b761f3549f1c2b8c94019b9d6220 Merge: f2e39cb 7151c22 Author: Brett Chabot Date: Mon Sep 27 14:35:54 2010 -0700 Merge "Split CTS device setup into separate stages." into gingerbread commit f6495f895df8a85092edf07feca905bcd978534e Merge: 29f90b7 f2e39cb Author: Nick Kralevich Date: Mon Sep 27 14:10:51 2010 -0700 am f2e39cb7: Merge "Verify /dev and /proc are not writable." into gingerbread Merge commit 'f2e39cb78e09b20a17afbe24a0cdf6ca4cfc7009' into gingerbread-plus-aosp * commit 'f2e39cb78e09b20a17afbe24a0cdf6ca4cfc7009': Verify /dev and /proc are not writable. commit f2e39cb78e09b20a17afbe24a0cdf6ca4cfc7009 Merge: 0c7230d 753759f Author: Nick Kralevich Date: Mon Sep 27 14:07:40 2010 -0700 Merge "Verify /dev and /proc are not writable." into gingerbread commit 29f90b78708a85d432657e9bf98aa1ff82158c3e Merge: e947362 0c7230d Author: Dianne Hackborn Date: Mon Sep 27 12:48:00 2010 -0700 am 0c7230d7: Add CTS test for calling getType() of a provider. Merge commit '0c7230d77fd0e77c724ebc7144eb3e678b5104e3' into gingerbread-plus-aosp * commit '0c7230d77fd0e77c724ebc7144eb3e678b5104e3': Add CTS test for calling getType() of a provider. commit 3f0ef587c512b19900b4d2c74f845f46815f14e1 Author: Vasu Nori Date: Mon Sep 27 12:31:11 2010 -0700 removing tests for setConnectionPoolSize() because API is removed Change-Id: Iba014b050b99640b020d4b5d2a3fa6707c575ee5 commit 0c7230d77fd0e77c724ebc7144eb3e678b5104e3 Author: Dianne Hackborn Date: Sun Sep 26 18:46:07 2010 -0700 Add CTS test for calling getType() of a provider. Change-Id: I90f5312dff62d742e56ac155baa1bfc85853e5b2 commit 7151c2212d11386fd4f2ecd12e8a0f88f3fd9072 Author: Brett Chabot Date: Fri Sep 24 17:21:37 2010 -0700 Split CTS device setup into separate stages. Change-Id: Iccbaeccc98397f95d850e206c6750050d6d28ca2 commit bc9f17789ed0b12892920646b642161cf2a279fc Merge: 29f1629 6ea671c Author: Brian Carlstrom Date: Fri Sep 24 13:59:50 2010 -0700 Merge "Tracking merge of dalvik-dev to master" commit 6ea671c79a8e4d910056e5e8f043d0c4d65c7a87 Author: Brian Carlstrom Date: Fri Sep 24 10:55:09 2010 -0700 Tracking merge of dalvik-dev to master Change-Id: I8c116913a29efeb087bc6c6666d603e237ba48f3 commit 29f162905d28f8e5e2406a1c715f01c6c1be4121 Merge: fc5849e e947362 Author: Nick Kralevich Date: Thu Sep 23 21:40:13 2010 -0700 am e9473622: am 1d5b6d70: Other program directories should not be writable. Merge commit 'e94736229be44a41d98e2e91683b5f4e84cfd4cb' * commit 'e94736229be44a41d98e2e91683b5f4e84cfd4cb': Other program directories should not be writable. commit 753759fdb87efc3e97df94144b17df96104e5df6 Author: Nick Kralevich Date: Thu Sep 23 17:08:35 2010 -0700 Verify /dev and /proc are not writable. Change-Id: I21fb946c4b19022d657ace2e363ac8e6ce36f21b commit e94736229be44a41d98e2e91683b5f4e84cfd4cb Merge: e63ca86 1d5b6d7 Author: Nick Kralevich Date: Thu Sep 23 16:53:01 2010 -0700 am 1d5b6d70: Other program directories should not be writable. Merge commit '1d5b6d70a5ac3878ad4a9b3d44a55088fcba9303' into gingerbread-plus-aosp * commit '1d5b6d70a5ac3878ad4a9b3d44a55088fcba9303': Other program directories should not be writable. commit 1d5b6d70a5ac3878ad4a9b3d44a55088fcba9303 Author: Nick Kralevich Date: Thu Sep 23 16:03:52 2010 -0700 Other program directories should not be writable. Examine all the install programs on the device, and verify that the programs don't have world writable data directories. Change-Id: I23272bc8d238df6b772abfbf7046ac8aacdf921f commit fc5849ee9db5b425b0a6178378a9ea669d5c420b Merge: d89cf30 e63ca86 Author: Nick Kralevich Date: Thu Sep 23 13:10:39 2010 -0700 am e63ca861: am d5c7cfd0: Merge "Verify /data/data is not writable." into gingerbread Merge commit 'e63ca8612da0e65ba5df8ab0ba70eb93fe159f53' * commit 'e63ca8612da0e65ba5df8ab0ba70eb93fe159f53': Verify /data/data is not writable. commit d89cf30e3cd6cddffb9a90ce707943bb50af6470 Merge: 504f315 a8f0cf7 Author: Brian Carlstrom Date: Thu Sep 23 12:33:11 2010 -0700 am a8f0cf74: am 6a244d47: Merge "Create CTS test for SSL hostname checks" into gingerbread Merge commit 'a8f0cf7460f5fff1b2a51b4efa918e552dd3dc06' * commit 'a8f0cf7460f5fff1b2a51b4efa918e552dd3dc06': Create CTS test for SSL hostname checks commit 504f31555ff51d4fc3aacc14ba398fad202ce002 Merge: c86f130 c450359 Author: Eric Laurent Date: Thu Sep 23 12:33:03 2010 -0700 am c450359d: am 1007a8dc: Merge "Fix issue 3022800." into gingerbread Merge commit 'c450359d87c082425d5c6aea0fe48e0bbb29a290' * commit 'c450359d87c082425d5c6aea0fe48e0bbb29a290': Fix issue 3022800. commit e63ca8612da0e65ba5df8ab0ba70eb93fe159f53 Merge: a8f0cf7 d5c7cfd Author: Nick Kralevich Date: Thu Sep 23 11:53:46 2010 -0700 am d5c7cfd0: Merge "Verify /data/data is not writable." into gingerbread Merge commit 'd5c7cfd0c2c349b39846c5de8031428ca6e2da08' into gingerbread-plus-aosp * commit 'd5c7cfd0c2c349b39846c5de8031428ca6e2da08': Verify /data/data is not writable. commit d5c7cfd0c2c349b39846c5de8031428ca6e2da08 Merge: 6a244d4 64056ed Author: Nick Kralevich Date: Thu Sep 23 11:49:54 2010 -0700 Merge "Verify /data/data is not writable." into gingerbread commit a8f0cf7460f5fff1b2a51b4efa918e552dd3dc06 Merge: c450359 6a244d4 Author: Brian Carlstrom Date: Thu Sep 23 11:35:52 2010 -0700 am 6a244d47: Merge "Create CTS test for SSL hostname checks" into gingerbread Merge commit '6a244d47cd9f683723d183bdb0e4fd9e0137c01e' into gingerbread-plus-aosp * commit '6a244d47cd9f683723d183bdb0e4fd9e0137c01e': Create CTS test for SSL hostname checks commit c450359d87c082425d5c6aea0fe48e0bbb29a290 Merge: 99fc8b3 1007a8d Author: Eric Laurent Date: Thu Sep 23 11:35:28 2010 -0700 am 1007a8dc: Merge "Fix issue 3022800." into gingerbread Merge commit '1007a8dc48b2f00942d1d7520aa9e82ee330676e' into gingerbread-plus-aosp * commit '1007a8dc48b2f00942d1d7520aa9e82ee330676e': Fix issue 3022800. commit 6a244d47cd9f683723d183bdb0e4fd9e0137c01e Merge: 1007a8d 9facb5d Author: Brian Carlstrom Date: Thu Sep 23 11:07:40 2010 -0700 Merge "Create CTS test for SSL hostname checks" into gingerbread commit 1007a8dc48b2f00942d1d7520aa9e82ee330676e Merge: 22b78ac df3ead7 Author: Eric Laurent Date: Thu Sep 23 11:07:34 2010 -0700 Merge "Fix issue 3022800." into gingerbread commit 64056eda9b291b7a8042146604a1c7a5a28c8d56 Author: Nick Kralevich Date: Thu Sep 23 10:29:28 2010 -0700 Verify /data/data is not writable. Change-Id: I193e7a3f9fbc0c628ca1d45986b454d05465c8de commit 9facb5d7e5750447b0beb3721f928ec03224b2eb Author: Brian Carlstrom Date: Wed Sep 22 17:13:29 2010 -0700 Create CTS test for SSL hostname checks Bug: 2807618 Change-Id: I05b051d779850e51eabea0880400273cdcc2f748 commit c86f130a3f88b450db634544183eea337fc7083d Merge: 3122e62 99fc8b3 Author: Nick Kralevich Date: Thu Sep 23 10:21:29 2010 -0700 am 99fc8b31: am 22b78ac2: Test that system directories aren\'t writable. Merge commit '99fc8b31af51ce8b2ed9855752f97190d824a630' * commit '99fc8b31af51ce8b2ed9855752f97190d824a630': Test that system directories aren't writable. commit 99fc8b31af51ce8b2ed9855752f97190d824a630 Merge: 639bfc9 22b78ac Author: Nick Kralevich Date: Thu Sep 23 10:05:55 2010 -0700 am 22b78ac2: Test that system directories aren\'t writable. Merge commit '22b78ac2326f39822696e334f1ccb0287328b59a' into gingerbread-plus-aosp * commit '22b78ac2326f39822696e334f1ccb0287328b59a': Test that system directories aren't writable. commit 22b78ac2326f39822696e334f1ccb0287328b59a Author: Nick Kralevich Date: Wed Sep 22 18:21:11 2010 -0700 Test that system directories aren't writable. Change-Id: Ibcec854ba71b67e0d2f0d750fd52334c53108bfb commit df3ead7879a0bc042ab677ef2783fdfd912c0f18 Author: Eric Laurent Date: Tue Sep 21 18:15:17 2010 -0700 Fix issue 3022800. Created sub-package android.media.audiofx for audio effects. Change-Id: I63e1b110a3a07d4eb5fe93d4c2217a0251f9b924 commit 3122e62d8717678ffe7685652dfcf2f9931ac1e7 Merge: f32af99 639bfc9 Author: Nick Kralevich Date: Wed Sep 22 15:48:18 2010 -0700 am 639bfc9d: am 15381375: Check that newly created files / directories have sane permissions. Merge commit '639bfc9d8170c272b5fe79dfe80dd8dc681825f4' * commit '639bfc9d8170c272b5fe79dfe80dd8dc681825f4': Check that newly created files / directories have sane permissions. commit 639bfc9d8170c272b5fe79dfe80dd8dc681825f4 Merge: 9b344de 1538137 Author: Nick Kralevich Date: Wed Sep 22 15:42:37 2010 -0700 am 15381375: Check that newly created files / directories have sane permissions. Merge commit '1538137549ae9baa6e4a281393079d073d718a47' into gingerbread-plus-aosp * commit '1538137549ae9baa6e4a281393079d073d718a47': Check that newly created files / directories have sane permissions. commit 1538137549ae9baa6e4a281393079d073d718a47 Author: Nick Kralevich Date: Wed Sep 22 14:55:44 2010 -0700 Check that newly created files / directories have sane permissions. When a new file is created, it should only be readable and writable to the creator's UID. Similarly, when a new directory is created, it should only be readable, writable, and executable to the creator's UID. Ensure this is the case. Change-Id: I61f3b33d2b77d8d79bbb3939e0bc092b02a65ffe commit f32af99b1cf4badf7116dd7912a8542b94588688 Merge: bcbff8d 9b344de Author: Brett Chabot Date: Tue Sep 21 16:06:40 2010 -0700 am 9b344de1: am 3add9165: Support running a CTS test plan of instrumentation tests. Merge commit '9b344de16541937e534aa1c77117a08e13a45e8b' * commit '9b344de16541937e534aa1c77117a08e13a45e8b': Support running a CTS test plan of instrumentation tests. commit 9b344de16541937e534aa1c77117a08e13a45e8b Merge: 62193c6 3add916 Author: Brett Chabot Date: Tue Sep 21 15:59:00 2010 -0700 am 3add9165: Support running a CTS test plan of instrumentation tests. Merge commit '3add9165b98f974939698f606daf5f41904ec36f' into gingerbread-plus-aosp * commit '3add9165b98f974939698f606daf5f41904ec36f': Support running a CTS test plan of instrumentation tests. commit 3add9165b98f974939698f606daf5f41904ec36f Author: Brett Chabot Date: Sun Sep 12 17:23:05 2010 -0700 Support running a CTS test plan of instrumentation tests. Change-Id: I30473d74c9d1030b22d3aad66fa1ee317681ff97 commit bcbff8d155be4685c6e9305fda3fc9760a1fddf5 Merge: f7ba1e3 62193c6 Author: Brett Chabot Date: Tue Sep 21 15:52:00 2010 -0700 am 62193c68: resolved conflicts for merge of 5e83330b to gingerbread-plus-aosp Merge commit '62193c681aa94a9ac0cb1742f249dfe85bc3c395' * commit '62193c681aa94a9ac0cb1742f249dfe85bc3c395': Yet more ddmlib api conformance updates. commit 62193c681aa94a9ac0cb1742f249dfe85bc3c395 Merge: 865bf1f 5e83330 Author: Brett Chabot Date: Tue Sep 21 15:47:33 2010 -0700 resolved conflicts for merge of 5e83330b to gingerbread-plus-aosp Change-Id: If44793ba6eb8d9a04bf41a95dee2d709d033fe8b commit 5e83330bf7d2d2128362f407ab9f32f1dec95868 Author: Brett Chabot Date: Tue Sep 21 15:12:17 2010 -0700 Yet more ddmlib api conformance updates. Change-Id: I59fa901cd04e46984b4366fdfbee32fde2a3e963 commit f7ba1e399c6e5906986beba341fe03da1177e26b Merge: af73001 865bf1f Author: Guang Zhu Date: Tue Sep 21 14:47:15 2010 -0700 am 865bf1f4: am c4975e13: dependent change for "parse instrumentation result bundles" in sdk Merge commit '865bf1f4dcc5d69793dfb7ffd71aedb6aeea37b5' * commit '865bf1f4dcc5d69793dfb7ffd71aedb6aeea37b5': dependent change for "parse instrumentation result bundles" in sdk commit af730010db9dce74598b52b322291537568320dc Merge: 4449487 b20cac5 Author: Brett Chabot Date: Tue Sep 21 14:47:10 2010 -0700 am b20cac57: am 3244e6d0: Fix CTS to use the new ddmlib API. Merge commit 'b20cac57b8bb56046b6a3a0736a42be8e3c043ee' * commit 'b20cac57b8bb56046b6a3a0736a42be8e3c043ee': Fix CTS to use the new ddmlib API. commit 44494876c49fd74155aa824789284ccc76acfaea Merge: d359ebc 9371c89 Author: Xavier Ducrohet Date: Tue Sep 21 14:47:02 2010 -0700 am 9371c89b: am 26067c2d: Make CTS use the ddmlib-prebuilt. Merge commit '9371c89ba117a51c4f3d256b397a67268f435588' * commit '9371c89ba117a51c4f3d256b397a67268f435588': Make CTS use the ddmlib-prebuilt. commit 865bf1f4dcc5d69793dfb7ffd71aedb6aeea37b5 Merge: b20cac5 c4975e1 Author: Guang Zhu Date: Tue Sep 21 14:37:07 2010 -0700 am c4975e13: dependent change for "parse instrumentation result bundles" in sdk Merge commit 'c4975e13c28cd23665052d95586d39888e56c6a1' into gingerbread-plus-aosp * commit 'c4975e13c28cd23665052d95586d39888e56c6a1': dependent change for "parse instrumentation result bundles" in sdk commit b20cac57b8bb56046b6a3a0736a42be8e3c043ee Merge: 9371c89 3244e6d Author: Brett Chabot Date: Tue Sep 21 14:37:05 2010 -0700 am 3244e6d0: Fix CTS to use the new ddmlib API. Merge commit '3244e6d045cc6467cce36f025bce6a3df78f42dd' into gingerbread-plus-aosp * commit '3244e6d045cc6467cce36f025bce6a3df78f42dd': Fix CTS to use the new ddmlib API. commit 9371c89ba117a51c4f3d256b397a67268f435588 Merge: 9bebe31 26067c2 Author: Xavier Ducrohet Date: Tue Sep 21 14:37:01 2010 -0700 am 26067c2d: Make CTS use the ddmlib-prebuilt. Merge commit '26067c2d962b06c2928ac1c233d9ba8f1252bfad' into gingerbread-plus-aosp * commit '26067c2d962b06c2928ac1c233d9ba8f1252bfad': Make CTS use the ddmlib-prebuilt. commit c4975e13c28cd23665052d95586d39888e56c6a1 Author: Guang Zhu Date: Mon Jul 12 10:21:58 2010 -0700 dependent change for "parse instrumentation result bundles" in sdk commit 3244e6d045cc6467cce36f025bce6a3df78f42dd Author: Brett Chabot Date: Tue Sep 21 11:21:56 2010 -0700 Fix CTS to use the new ddmlib API. Change-Id: Iea71fc7b3e94cd28c64920332111b5c9d1f6d883 commit 26067c2d962b06c2928ac1c233d9ba8f1252bfad Author: Xavier Ducrohet Date: Wed Jul 28 11:06:35 2010 -0700 Make CTS use the ddmlib-prebuilt. commit d359ebc7eda8a93a3b3b75292e5b061efb6d53da Merge: 9d724c2 9bebe31 Author: Adam Powell Date: Fri Sep 17 18:13:44 2010 -0700 am 9bebe311: am 346c507f: Merge "Updated for framework API changes" into gingerbread Merge commit '9bebe31160109ffec448bb45a875b363f78f35ec' * commit '9bebe31160109ffec448bb45a875b363f78f35ec': Updated for framework API changes commit 9d724c29d1e3da9586230e6b4e5e182f1fed8973 Merge: 5445691 f8648cd Author: Brian Muramatsu Date: Fri Sep 17 16:10:50 2010 -0700 am f8648cd4: (-s ours) am 40e72a87: am 8c2a6b74: (-s ours) am e9937f90: (-s ours) Merge "DO NOT MERGE Froyo CTS Version Increment to 2.2_r3" into froyo Merge commit 'f8648cd437d47b0f3c7d404cb87582dba458e6c4' * commit 'f8648cd437d47b0f3c7d404cb87582dba458e6c4': DO NOT MERGE Froyo CTS Version Increment to 2.2_r3 commit 5445691975147c56419bed63c1e14127ccec7dd1 Merge: 11e95f6 3c35f86 Author: Brian Muramatsu Date: Fri Sep 17 16:10:46 2010 -0700 am 3c35f867: am c7bfbec3: am 0615bf5c: Merge "Improve Froyo ARMEABI Test" into froyo Merge commit '3c35f867513a4810d7498d0415087d103c834c54' * commit '3c35f867513a4810d7498d0415087d103c834c54': Improve Froyo ARMEABI Test commit 9bebe31160109ffec448bb45a875b363f78f35ec Merge: f8648cd 346c507 Author: Adam Powell Date: Fri Sep 17 14:56:25 2010 -0700 am 346c507f: Merge "Updated for framework API changes" into gingerbread Merge commit '346c507f0be9b40d77f656fd5a548ba7bba1f342' into gingerbread-plus-aosp * commit '346c507f0be9b40d77f656fd5a548ba7bba1f342': Updated for framework API changes commit 346c507f0be9b40d77f656fd5a548ba7bba1f342 Merge: 40e72a8 b03cc6e Author: Adam Powell Date: Fri Sep 17 14:46:33 2010 -0700 Merge "Updated for framework API changes" into gingerbread commit b03cc6ea3ebcaf619094ba0cebda6ece7c134f94 Author: Adam Powell Date: Thu Sep 16 22:05:32 2010 -0700 Updated for framework API changes Change-Id: I0c3f42a0ab39ddd83f5e6c2a6e46666caf700659 commit f8648cd437d47b0f3c7d404cb87582dba458e6c4 Merge: 3c35f86 40e72a8 Author: Brian Muramatsu Date: Fri Sep 17 14:13:27 2010 -0700 am 40e72a87: am 8c2a6b74: (-s ours) am e9937f90: (-s ours) Merge "DO NOT MERGE Froyo CTS Version Increment to 2.2_r3" into froyo Merge commit '40e72a87126c9b28e7d6af5e2ebc6c8e485f3407' into gingerbread-plus-aosp * commit '40e72a87126c9b28e7d6af5e2ebc6c8e485f3407': DO NOT MERGE Froyo CTS Version Increment to 2.2_r3 commit 40e72a87126c9b28e7d6af5e2ebc6c8e485f3407 Merge: c7bfbec 8c2a6b7 Author: Brian Muramatsu Date: Fri Sep 17 14:09:03 2010 -0700 am 8c2a6b74: (-s ours) am e9937f90: (-s ours) Merge "DO NOT MERGE Froyo CTS Version Increment to 2.2_r3" into froyo Merge commit '8c2a6b742ef85d4fd32ce5abff21483262bea2b1' into gingerbread * commit '8c2a6b742ef85d4fd32ce5abff21483262bea2b1': DO NOT MERGE Froyo CTS Version Increment to 2.2_r3 commit 8c2a6b742ef85d4fd32ce5abff21483262bea2b1 Merge: 0615bf5 e9937f9 Author: Brian Muramatsu Date: Fri Sep 17 14:03:45 2010 -0700 am e9937f90: (-s ours) Merge "DO NOT MERGE Froyo CTS Version Increment to 2.2_r3" into froyo Merge commit 'e9937f907133c2411ff5350f050b4afd15d84080' into froyo * commit 'e9937f907133c2411ff5350f050b4afd15d84080': DO NOT MERGE Froyo CTS Version Increment to 2.2_r3 commit 3c35f867513a4810d7498d0415087d103c834c54 Merge: 443168f c7bfbec Author: Brian Muramatsu Date: Fri Sep 17 14:00:37 2010 -0700 am c7bfbec3: am 0615bf5c: Merge "Improve Froyo ARMEABI Test" into froyo Merge commit 'c7bfbec325e97bc40a46257fd89f2fb746ac5091' into gingerbread-plus-aosp * commit 'c7bfbec325e97bc40a46257fd89f2fb746ac5091': Improve Froyo ARMEABI Test commit c7bfbec325e97bc40a46257fd89f2fb746ac5091 Merge: 97afc8f 0615bf5 Author: Brian Muramatsu Date: Fri Sep 17 13:57:36 2010 -0700 am 0615bf5c: Merge "Improve Froyo ARMEABI Test" into froyo Merge commit '0615bf5c800136aa6092b1c98418b1100b19ad31' into gingerbread * commit '0615bf5c800136aa6092b1c98418b1100b19ad31': Improve Froyo ARMEABI Test commit e9937f907133c2411ff5350f050b4afd15d84080 Merge: 0615bf5 2815913 Author: Brian Muramatsu Date: Fri Sep 17 13:52:52 2010 -0700 Merge "DO NOT MERGE Froyo CTS Version Increment to 2.2_r3" into froyo commit 2815913fbf96130bd432831923911435e868261e Author: Brian Muramatsu Date: Fri Sep 17 13:50:49 2010 -0700 DO NOT MERGE Froyo CTS Version Increment to 2.2_r3 Bug 3008740 Change-Id: I5d739a50785df2543bc8d5ace472d52413bc3a75 commit ae364f9b3c2f3b6f65a8ce61132cff34f1a5edc3 Author: Brian Muramatsu Date: Fri Sep 17 13:40:49 2010 -0700 Eclair CTS Version Increment to 2.1_r5 Bug 3008740 Change-Id: I1381fcd41f55c2b2cd0f4bdea5c41a66b1137ca0 commit 0615bf5c800136aa6092b1c98418b1100b19ad31 Merge: 7315af8 285bd61 Author: Brian Muramatsu Date: Fri Sep 17 13:33:20 2010 -0700 Merge "Improve Froyo ARMEABI Test" into froyo commit 03d80ab9d3095f7e475f9a6cfdab962ef21e1628 Merge: f98dbab 39a2c0c Author: Brian Muramatsu Date: Fri Sep 17 13:11:01 2010 -0700 Merge "Fix Eclair ARMEABI Test" into eclair commit 285bd614fbd466e30a449d4a4e95a00251d545c4 Author: Brian Muramatsu Date: Thu Sep 16 14:23:32 2010 -0700 Improve Froyo ARMEABI Test Unlike the Eclair port of the test, there wasn't anything wrong with the Froyo version, because the Build.CPU_ABI2 returns Build.UNKNOWN when the property is not set. However, the test couldn't make a distinction between the property not being set and a property being set with the value "unknown." Therefore, port the same enhancements done for the Eclair test and improve the messaging. Change-Id: Ie0edfc390065da0d6c75cc6490eb9d319ad8de91 commit 39a2c0cb62070134da8629e39389f1d199c08526 Author: Brian Muramatsu Date: Thu Sep 16 12:34:21 2010 -0700 Fix Eclair ARMEABI Test The ro.product.cpu.abi2 property for non-ARMEABI_V7 devices was incorrectly being checked for "unknown." The value of "unknown" comes from the Froyo version of this test which is what the Build.CPU_ABI2 constant was if the property was not set. Fix the Eclair version by using getprop to make sure the property is not set at all. Change-Id: Ieaa22fbbc06b9349b4de0fcbb5fef55207c4728c commit 11e95f600b7fac915a820d68ddd2b4855e2a68d0 Author: Nipun Kwatra Date: Thu Sep 16 21:58:12 2010 -0700 Adding tests for time lapse. Added tests for the time lapse CamcorderProfiles. Also unified id and non-id cases. Change-Id: I413ecd7bdc25b0e145dd4847c4ec0c9ab9c54429 commit 3e73ce5b9c63e1c217c262f7e1152aefa95bfdde Merge: 3715937 443168f Author: DongseokYi Date: Thu Sep 16 17:01:44 2010 -0700 am 443168f1: am 97afc8f5: am 7315af87: Need enough time (1 sec) to read amounts of packet from /proc/stat_uid/[uid]/tcp_snd. Merge commit '443168f1cc69eec085be15fa6560f09331443542' * commit '443168f1cc69eec085be15fa6560f09331443542': Need enough time (1 sec) to read amounts of packet from /proc/stat_uid/[uid]/tcp_snd. commit 443168f1cc69eec085be15fa6560f09331443542 Merge: b5ff211 97afc8f Author: DongseokYi Date: Thu Sep 16 16:06:53 2010 -0700 am 97afc8f5: am 7315af87: Need enough time (1 sec) to read amounts of packet from /proc/stat_uid/[uid]/tcp_snd. Merge commit '97afc8f560be0b0e2e78e1d966365263ab643a72' into gingerbread-plus-aosp * commit '97afc8f560be0b0e2e78e1d966365263ab643a72': Need enough time (1 sec) to read amounts of packet from /proc/stat_uid/[uid]/tcp_snd. commit 97afc8f560be0b0e2e78e1d966365263ab643a72 Merge: 05b8357 7315af8 Author: DongseokYi Date: Thu Sep 16 16:01:32 2010 -0700 am 7315af87: Need enough time (1 sec) to read amounts of packet from /proc/stat_uid/[uid]/tcp_snd. Merge commit '7315af875fa2e7c6159d4a771518a37373b0c139' into gingerbread * commit '7315af875fa2e7c6159d4a771518a37373b0c139': Need enough time (1 sec) to read amounts of packet from /proc/stat_uid/[uid]/tcp_snd. commit 371593790e3ade4a29b948ae86ceafe595323341 Merge: 1003fba b5ff211 Author: Brett Chabot Date: Wed Sep 15 21:43:04 2010 -0700 am b5ff2116: am 05b8357d: Initial checkin for TradeFederation based CTS harness. Merge commit 'b5ff2116acd9871192aba63e54d09390a2b8da3c' * commit 'b5ff2116acd9871192aba63e54d09390a2b8da3c': Initial checkin for TradeFederation based CTS harness. commit 7315af875fa2e7c6159d4a771518a37373b0c139 Author: DongseokYi Date: Thu Sep 16 11:44:04 2010 +0900 Need enough time (1 sec) to read amounts of packet from /proc/stat_uid/[uid]/tcp_snd. Change-Id: I93fdd1bc383e8b944a76e211166e2c5fdb9707cd commit 1003fbaea61bf679b306df1e141f06a740f339c3 Merge: c6c0075 eb09a40 Author: Wu-cheng Li Date: Wed Sep 15 19:02:54 2010 -0700 am eb09a40f: am 37a6cee6: Update camera test due to API change. Merge commit 'eb09a40f05d8b45e7d0813383b27e42ccc9ee647' * commit 'eb09a40f05d8b45e7d0813383b27e42ccc9ee647': Update camera test due to API change. commit b5ff2116acd9871192aba63e54d09390a2b8da3c Merge: eb09a40 05b8357 Author: Brett Chabot Date: Wed Sep 15 19:00:19 2010 -0700 am 05b8357d: Initial checkin for TradeFederation based CTS harness. Merge commit '05b8357d9c8fe7c09f9711d929ae684b78cef85e' into gingerbread-plus-aosp * commit '05b8357d9c8fe7c09f9711d929ae684b78cef85e': Initial checkin for TradeFederation based CTS harness. commit 05b8357d9c8fe7c09f9711d929ae684b78cef85e Author: Brett Chabot Date: Tue Sep 7 18:21:57 2010 -0700 Initial checkin for TradeFederation based CTS harness. Change-Id: Ia99064ce8703ba6fd3b7edb94ef0b43ed60ccba6 commit eb09a40f05d8b45e7d0813383b27e42ccc9ee647 Merge: 0a9638f 37a6cee Author: Wu-cheng Li Date: Wed Sep 15 15:00:59 2010 -0700 am 37a6cee6: Update camera test due to API change. Merge commit '37a6cee614e7654b44b00ced591d4ce4d283fb17' into gingerbread-plus-aosp * commit '37a6cee614e7654b44b00ced591d4ce4d283fb17': Update camera test due to API change. commit 37a6cee614e7654b44b00ced591d4ce4d283fb17 Author: Wu-cheng Li Date: Wed Sep 15 14:09:58 2010 -0700 Update camera test due to API change. bug:3001395 bug:3001399 Change-Id: Ia9b40e71f5618f83af1e4af1a43f961658a378b2 commit c6c0075d27676df61c4d606673ee871b14c82cf3 Merge: 28bc94f 0a9638f Author: Brian Muramatsu Date: Wed Sep 15 11:38:12 2010 -0700 am 0a9638f2: am fa3d71ad: am 14e1cbb9: CtsVerifier Test Info Dialogs Merge commit '0a9638f20cdc8f68a69280e6734b3e6c681ca7d8' * commit '0a9638f20cdc8f68a69280e6734b3e6c681ca7d8': CtsVerifier Test Info Dialogs commit 0a9638f20cdc8f68a69280e6734b3e6c681ca7d8 Merge: 5c13c66 fa3d71a Author: Brian Muramatsu Date: Tue Sep 14 11:58:06 2010 -0700 am fa3d71ad: am 14e1cbb9: CtsVerifier Test Info Dialogs Merge commit 'fa3d71add5751d877d84bb5d4062b7d4afe4b8bc' into gingerbread-plus-aosp * commit 'fa3d71add5751d877d84bb5d4062b7d4afe4b8bc': CtsVerifier Test Info Dialogs commit fa3d71add5751d877d84bb5d4062b7d4afe4b8bc Merge: 6dbba3e 14e1cbb Author: Brian Muramatsu Date: Tue Sep 14 11:55:41 2010 -0700 am 14e1cbb9: CtsVerifier Test Info Dialogs Merge commit '14e1cbb9639929e8e5cc1ef50581944fea7bdbd8' into gingerbread * commit '14e1cbb9639929e8e5cc1ef50581944fea7bdbd8': CtsVerifier Test Info Dialogs commit 14e1cbb9639929e8e5cc1ef50581944fea7bdbd8 Author: Brian Muramatsu Date: Mon Sep 13 18:33:39 2010 -0700 CtsVerifier Test Info Dialogs Add an "Info" button in between the "Pass" and "Fail" buttons that shows a dialog with instructions about a test activity. Show the info dialog when the user visits the test activity for the first time. Use the existing content provider to keep track of this. Refactor the Suid File Scanner to be more user friendly by showing an info dialog rather than start scanning immediately. Show authorized SUID binaries with a green background and unauthorized binaries with a red background. Fix a bug where the dialog got leaked due to calling hide rather than dismiss. Change-Id: I0626dc0634a592193f5e4d820c72a1541d52a8b0 commit 28bc94f36ef40c61fd4f77d9e3a1fd1d9167eac5 Merge: 3d99544 5c13c66 Author: madan ankapura Date: Mon Sep 13 17:24:26 2010 -0700 am 5c13c665: am 6dbba3ea: am 53bd1e8f: Add WSVGA to the supported ScreenConfiguration list Merge commit '5c13c665a74003e7b6ad8eda2c4754fd1e0b2ac3' * commit '5c13c665a74003e7b6ad8eda2c4754fd1e0b2ac3': Add WSVGA to the supported ScreenConfiguration list commit 3d9954414d00e6c55566faa48b3ac09d5f96cee6 Merge: 18a6002 d074f4f Author: Mike Rieker Date: Mon Sep 13 17:24:22 2010 -0700 am d074f4f2: am ae73a9ae: am dd31e3c7: --device option sometimes ignored on start command when used with --test option Merge commit 'd074f4f23e5aa550d4072537df7d695b12dded88' * commit 'd074f4f23e5aa550d4072537df7d695b12dded88': --device option sometimes ignored on start command commit 5c13c665a74003e7b6ad8eda2c4754fd1e0b2ac3 Merge: d074f4f 6dbba3e Author: madan ankapura Date: Mon Sep 13 15:29:51 2010 -0700 am 6dbba3ea: am 53bd1e8f: Add WSVGA to the supported ScreenConfiguration list Merge commit '6dbba3ea69ae9d0951088c620cc9243044111359' into gingerbread-plus-aosp * commit '6dbba3ea69ae9d0951088c620cc9243044111359': Add WSVGA to the supported ScreenConfiguration list commit d074f4f23e5aa550d4072537df7d695b12dded88 Merge: 430bbb2 ae73a9a Author: Mike Rieker Date: Mon Sep 13 15:27:25 2010 -0700 am ae73a9ae: am dd31e3c7: --device option sometimes ignored on start command when used with --test option Merge commit 'ae73a9aea3fd116d0568b6245755631b0664eca2' into gingerbread-plus-aosp * commit 'ae73a9aea3fd116d0568b6245755631b0664eca2': --device option sometimes ignored on start command commit 6dbba3ea69ae9d0951088c620cc9243044111359 Merge: ae73a9a 53bd1e8 Author: madan ankapura Date: Mon Sep 13 15:25:41 2010 -0700 am 53bd1e8f: Add WSVGA to the supported ScreenConfiguration list Merge commit '53bd1e8fbe53e5a5cf60da4ecbe50f0f13e464eb' into gingerbread * commit '53bd1e8fbe53e5a5cf60da4ecbe50f0f13e464eb': Add WSVGA to the supported ScreenConfiguration list commit ae73a9aea3fd116d0568b6245755631b0664eca2 Merge: 462f996 dd31e3c Author: Mike Rieker Date: Mon Sep 13 15:22:07 2010 -0700 am dd31e3c7: --device option sometimes ignored on start command when used with --test option Merge commit 'dd31e3c7cf5e41fa1f978092a9e7ae775ec38342' into gingerbread * commit 'dd31e3c7cf5e41fa1f978092a9e7ae775ec38342': --device option sometimes ignored on start command commit 18a6002ea944610e698f0a332f02c13f64e246df Merge: 7a3f15c 430bbb2 Author: Brian Muramatsu Date: Mon Sep 13 15:02:06 2010 -0700 am 430bbb2f: am 462f9963: am 7c33f532: Merge "Fixing the magnetometer test." into froyo Merge commit '430bbb2f708331e805cdb6912587faba1ba00784' * commit '430bbb2f708331e805cdb6912587faba1ba00784': Fixing the magnetometer test. commit 7a3f15c52f1b76f2a6d50514e056e25d8fec6808 Merge: ed28d91 b4aeeb8 Author: Dan Morrill Date: Mon Sep 13 15:02:03 2010 -0700 am b4aeeb8f: am c20c59b8: am 8f1028fb: Initial commit of a helper stub for the Arduino code to be used in tandem with the CTS Verifier. Builds and should flash, but does nothing, currently. Merge commit 'b4aeeb8f811e31a0995d1c228214750b4d251976' * commit 'b4aeeb8f811e31a0995d1c228214750b4d251976': Initial commit of a helper stub for the Arduino code to be used in tandem with commit 53bd1e8fbe53e5a5cf60da4ecbe50f0f13e464eb Author: madan ankapura Date: Sat Sep 11 08:29:51 2010 -0700 Add WSVGA to the supported ScreenConfiguration list Change-Id: Ib927119996dbcbdaa0e9b00ff38a6391a0d061e7 commit dd31e3c7cf5e41fa1f978092a9e7ae775ec38342 Author: Mike Rieker Date: Tue Jul 20 15:39:45 2010 -0400 --device option sometimes ignored on start command when used with --test option the value fetched from the option was overridden from a value retrieved from a previous session. this change lets the --device option have the final say. Change-Id: I79a87faf6591944a082b96ffeb372214a47a04b5 commit 430bbb2f708331e805cdb6912587faba1ba00784 Merge: b4aeeb8 462f996 Author: Brian Muramatsu Date: Mon Sep 13 11:55:11 2010 -0700 am 462f9963: am 7c33f532: Merge "Fixing the magnetometer test." into froyo Merge commit '462f99634e4d94075af088997c30735748d24caa' into gingerbread-plus-aosp * commit '462f99634e4d94075af088997c30735748d24caa': Fixing the magnetometer test. commit b4aeeb8f811e31a0995d1c228214750b4d251976 Merge: e206fd4 c20c59b Author: Dan Morrill Date: Mon Sep 13 11:55:06 2010 -0700 am c20c59b8: am 8f1028fb: Initial commit of a helper stub for the Arduino code to be used in tandem with the CTS Verifier. Builds and should flash, but does nothing, currently. Merge commit 'c20c59b8a60e761b34ac01c4a429b231b7b5b731' into gingerbread-plus-aosp * commit 'c20c59b8a60e761b34ac01c4a429b231b7b5b731': Initial commit of a helper stub for the Arduino code to be used in tandem with commit 462f99634e4d94075af088997c30735748d24caa Merge: c20c59b 7c33f53 Author: Brian Muramatsu Date: Mon Sep 13 11:48:18 2010 -0700 am 7c33f532: Merge "Fixing the magnetometer test." into froyo Merge commit '7c33f53258440846eb01c5987d22cc4c3c562d50' into gingerbread * commit '7c33f53258440846eb01c5987d22cc4c3c562d50': Fixing the magnetometer test. commit c20c59b8a60e761b34ac01c4a429b231b7b5b731 Merge: ae7876c 8f1028f Author: Dan Morrill Date: Mon Sep 13 11:48:13 2010 -0700 am 8f1028fb: Initial commit of a helper stub for the Arduino code to be used in tandem with the CTS Verifier. Builds and should flash, but does nothing, currently. Merge commit '8f1028fb0e0e5bbfc64262fdb3a379335d1c45f9' into gingerbread * commit '8f1028fb0e0e5bbfc64262fdb3a379335d1c45f9': Initial commit of a helper stub for the Arduino code to be used in tandem with commit 7c33f53258440846eb01c5987d22cc4c3c562d50 Merge: 8f1028f b26cc2f Author: Brian Muramatsu Date: Mon Sep 13 11:14:07 2010 -0700 Merge "Fixing the magnetometer test." into froyo commit b26cc2f03413dde9446165ce3b31c0fbb9a4cb97 Author: Dan Morrill Date: Thu Aug 26 16:21:52 2010 -0700 Fixing the magnetometer test. Change-Id: I45a90a41c77247c5a19af0b88ef0e44f379ea516 commit 8f1028fb0e0e5bbfc64262fdb3a379335d1c45f9 Author: Dan Morrill Date: Sun Sep 12 12:02:59 2010 -0700 Initial commit of a helper stub for the Arduino code to be used in tandem with the CTS Verifier. Builds and should flash, but does nothing, currently. Change-Id: I5fc8222e18094d8c5270e34b369074ab0367101b commit ed28d9168ace88b08b7ddaff602d2827602d8024 Merge: 86db0b3 e206fd4 Author: Brian Muramatsu Date: Fri Sep 10 18:00:15 2010 -0700 am e206fd41: am ae7876c4: am 753fe8d8: Read Log Permission Test Fixes Merge commit 'e206fd41328cebae667795ce4128360a25941aae' * commit 'e206fd41328cebae667795ce4128360a25941aae': Read Log Permission Test Fixes commit 86db0b39473184ee456cac486b795d06760da3ee Merge: d632400 1ad50e5 Author: Brian Muramatsu Date: Fri Sep 10 18:00:12 2010 -0700 am 1ad50e53: am a6941e0d: am 00e9acdd: Check Contacts.CONTENT_URI Activity Support Merge commit '1ad50e5331a15f6de2e6e68e56ab6ab22c14c111' * commit '1ad50e5331a15f6de2e6e68e56ab6ab22c14c111': Check Contacts.CONTENT_URI Activity Support commit d632400bea2f24fc1788d3c906413773f2e4c618 Merge: 26252f5 f96fe1b Author: Brian Muramatsu Date: Fri Sep 10 18:00:07 2010 -0700 am f96fe1bc: am 5c4510e9: am 8b211af1: Merge "FocusFinderTest Workarounds..." into froyo Merge commit 'f96fe1bc4a63f5e01e9ce10082bc1a931079c185' * commit 'f96fe1bc4a63f5e01e9ce10082bc1a931079c185': FocusFinderTest Workarounds... commit 26252f5b2b3f3935c1aa76d098c8bf541a20ce7b Merge: eddb136 6216dca Author: Brian Muramatsu Date: Fri Sep 10 18:00:02 2010 -0700 am 6216dcac: am eb7a58f5: am f4215761: Fix TouchTest#testOnTouchEvent Test String Merge commit '6216dcacf73a18e427469a87598a017db1ac2645' * commit '6216dcacf73a18e427469a87598a017db1ac2645': Fix TouchTest#testOnTouchEvent Test String commit e206fd41328cebae667795ce4128360a25941aae Merge: 1ad50e5 ae7876c Author: Brian Muramatsu Date: Fri Sep 10 17:56:54 2010 -0700 am ae7876c4: am 753fe8d8: Read Log Permission Test Fixes Merge commit 'ae7876c47a4f7e8665919b4295020a1a2f936a58' into gingerbread-plus-aosp * commit 'ae7876c47a4f7e8665919b4295020a1a2f936a58': Read Log Permission Test Fixes commit 1ad50e5331a15f6de2e6e68e56ab6ab22c14c111 Merge: f96fe1b a6941e0 Author: Brian Muramatsu Date: Fri Sep 10 17:56:52 2010 -0700 am a6941e0d: am 00e9acdd: Check Contacts.CONTENT_URI Activity Support Merge commit 'a6941e0daa9896347ca6138103bd7a462924dbd6' into gingerbread-plus-aosp * commit 'a6941e0daa9896347ca6138103bd7a462924dbd6': Check Contacts.CONTENT_URI Activity Support commit f96fe1bc4a63f5e01e9ce10082bc1a931079c185 Merge: 6216dca 5c4510e Author: Brian Muramatsu Date: Fri Sep 10 17:56:49 2010 -0700 am 5c4510e9: am 8b211af1: Merge "FocusFinderTest Workarounds..." into froyo Merge commit '5c4510e999b9d1be8f93cffef96886c6724646d7' into gingerbread-plus-aosp * commit '5c4510e999b9d1be8f93cffef96886c6724646d7': FocusFinderTest Workarounds... commit 6216dcacf73a18e427469a87598a017db1ac2645 Merge: 77e479a eb7a58f Author: Brian Muramatsu Date: Fri Sep 10 17:56:43 2010 -0700 am eb7a58f5: am f4215761: Fix TouchTest#testOnTouchEvent Test String Merge commit 'eb7a58f51d63907effd7c2dda3e524018038ab90' into gingerbread-plus-aosp * commit 'eb7a58f51d63907effd7c2dda3e524018038ab90': Fix TouchTest#testOnTouchEvent Test String commit ae7876c47a4f7e8665919b4295020a1a2f936a58 Merge: a6941e0 753fe8d Author: Brian Muramatsu Date: Fri Sep 10 17:48:08 2010 -0700 am 753fe8d8: Read Log Permission Test Fixes Merge commit '753fe8d8ad2e6b88ab26fe405097bb3c22acca4d' into gingerbread * commit '753fe8d8ad2e6b88ab26fe405097bb3c22acca4d': Read Log Permission Test Fixes commit a6941e0daa9896347ca6138103bd7a462924dbd6 Merge: 5c4510e 00e9acd Author: Brian Muramatsu Date: Fri Sep 10 17:47:59 2010 -0700 am 00e9acdd: Check Contacts.CONTENT_URI Activity Support Merge commit '00e9acdd8d3f360b43963d5deb509239dd6be3f6' into gingerbread * commit '00e9acdd8d3f360b43963d5deb509239dd6be3f6': Check Contacts.CONTENT_URI Activity Support commit 5c4510e999b9d1be8f93cffef96886c6724646d7 Merge: eb7a58f 8b211af Author: Brian Muramatsu Date: Fri Sep 10 17:47:56 2010 -0700 am 8b211af1: Merge "FocusFinderTest Workarounds..." into froyo Merge commit '8b211af1e965f382b37da58a17ce51785b3403fb' into gingerbread * commit '8b211af1e965f382b37da58a17ce51785b3403fb': FocusFinderTest Workarounds... commit eb7a58f51d63907effd7c2dda3e524018038ab90 Merge: 53ca1aa f421576 Author: Brian Muramatsu Date: Fri Sep 10 17:47:50 2010 -0700 am f4215761: Fix TouchTest#testOnTouchEvent Test String Merge commit 'f42157612d8d9624a6ed7c9eb2a3c38f46bea0fa' into gingerbread * commit 'f42157612d8d9624a6ed7c9eb2a3c38f46bea0fa': Fix TouchTest#testOnTouchEvent Test String commit 753fe8d8ad2e6b88ab26fe405097bb3c22acca4d Author: Brian Muramatsu Date: Wed Sep 1 19:03:23 2010 -0700 Read Log Permission Test Fixes Bug 2964078 Fix a typo in the logcat command used in the test. There was an extra colon in one of the arguments. Add a test to check that log files under "/dev/log" are not world readable. Also check they are owned by user root and group log. Create a JNI library just for the permissions package. The JNI code cannot be added to the CtsTestStubs JNI library, because the tests cannot use CtsTestStubs since that acquires the permissions we are trying to negative test. I also tried compiling just the single Java source in CtsTestStubs (initially where I tried to put FileUtils) and reusing the CtsTestStubs JNI library but the VM did not like it. Thus, I take the easiest route of making a separate JNI library just for the permisions package. Change-Id: Ie32932a03590c8b50fb063387db317078ab65ba1 commit f98dbabad9d2e1f83de4b2f6d0e86c9bd97a57ea Merge: 0249e18 1d653d3 Author: Brian Muramatsu Date: Fri Sep 10 15:26:03 2010 -0700 Merge "Read Log Permission Test Fixes" into eclair commit 1d653d3c3c1defe94263639d87a6d136288a7d17 Author: Brian Muramatsu Date: Wed Sep 1 19:03:23 2010 -0700 Read Log Permission Test Fixes Bug 2964078 Fix a typo in the logcat command used in the test. There was an extra colon in one of the arguments. Add a test to check that log files under "/dev/log" are not world readable. Also check they are owned by user root and group log. Create a JNI library just for the permissions package. The JNI code cannot be added to the CtsTestStubs JNI library, because the tests cannot use CtsTestStubs since that acquires the permissions we are trying to negative test. I also tried compiling just the single Java source in CtsTestStubs (initially where I tried to put FileUtils) and reusing the CtsTestStubs JNI library but the VM did not like it. Thus, I take the easiest route of making a separate JNI library just for the permisions package. Change-Id: I6aafe9cfcdee1250f5d693cf83abb826faf63344 commit eddb136845d292d9806f514a107d492eb6b7cb73 Merge: 5d9fc5c 77e479a Author: Brett Chabot Date: Fri Sep 10 14:59:50 2010 -0700 am 77e479a9: am 7792f6bc: Update to new ddmlib prebuilt api. Merge commit '77e479a9cf467c219f66b0518b5efcc195070006' * commit '77e479a9cf467c219f66b0518b5efcc195070006': Update to new ddmlib prebuilt api. commit 0249e18a79a44f5f03aa5b24d3085d9c8491c195 Merge: b5d36ee d4d3964 Author: Brian Muramatsu Date: Fri Sep 10 14:51:09 2010 -0700 Merge "FocusFinderTest Workarounds..." into eclair commit 5d9fc5c62e6c68e37c23d6fa04f1d6d25e71306a Author: Vasu Nori Date: Fri Sep 10 14:40:39 2010 -0700 fix a minor error in cts database tests Change-Id: If8fe02e8b4d278be1a4490e772a18a0c3360fbae commit d4d396426119cbd55ce560f544ee7356a23c9d89 Author: Brian Muramatsu Date: Wed Sep 8 16:01:26 2010 -0700 FocusFinderTest Workarounds... Bug 2437360 The FocusFinder tests were failing on large width screens, because the focus model takes into account the width of the widgets. The prior layout had buttons that spanned the entire screen, and this caused the focus behavior to change across different screen sizes. This does not seem correct, but it is how the framework is coded. Create a new layout that has four equally-sized center buttons to avoid this problem. Finally, the FocusFinder#findNearestTouchables seems to not take into account the touch coordinates when calculating the delta offset for the down and right focus directions which thus makes the distance greater than the "edge slop" causing it to fail. This also does not seem correct but probably due to a lack of my understanding (Bug 2986136). Work around the problems using more simple cases that touch on the outer edges of the widgets that do not trigger that problem. (Backport from Froyo. match_parent attributes changed to fill_parent and strings added to strings.xml to get around translation errors) Change-Id: I1b33e254c4d15c29f85713758ccf61366b6071da commit b5d36ee230ffa22b4f7db88a7e780dbfeef45723 Author: Brian Muramatsu Date: Tue Sep 7 15:05:13 2010 -0700 Fix TouchTest#testOnTouchEvent Test String Bug 2437360 Fix this test to work with any display width by creating a test string that is wider than the screen rather than using a fixed size and expecting the TextView to only scroll as much as there is left to scroll. Change-Id: I578c9911b595397d44c222bdbc444382926b4acd commit 00e9acdd8d3f360b43963d5deb509239dd6be3f6 Author: Brian Muramatsu Date: Fri Sep 3 14:36:49 2010 -0700 Check Contacts.CONTENT_URI Activity Support Issue 10143 Add a test that checks ContactsContract.Contacts.CONTENT_URI activity intent is supported. (Ported from Eclair since there is no automerging to Froyo) Change-Id: I7924818f16f14423838552c9a15f39a50756d263 commit 77e479a9cf467c219f66b0518b5efcc195070006 Merge: b6c8841 7792f6b Author: Brett Chabot Date: Fri Sep 10 13:03:53 2010 -0700 am 7792f6bc: Update to new ddmlib prebuilt api. Merge commit '7792f6bc0a6dd094f23d8e3887b3bc1e486002e6' into gingerbread-plus-aosp * commit '7792f6bc0a6dd094f23d8e3887b3bc1e486002e6': Update to new ddmlib prebuilt api. commit 584c405167ca1e3b6730339df58a95ea0934de89 Author: Brian Muramatsu Date: Fri Sep 3 14:36:49 2010 -0700 Check Contacts.CONTENT_URI Activity Support Issue 10143 Add a test that checks ContactsContract.Contacts.CONTENT_URI activity intent is supported. Change-Id: I73929f3094974a18164636156672f71893f0f544 commit 8b211af1e965f382b37da58a17ce51785b3403fb Merge: f421576 4adc2b8 Author: Brian Muramatsu Date: Fri Sep 10 12:31:30 2010 -0700 Merge "FocusFinderTest Workarounds..." into froyo commit dc3523f3a7d1f9a988b62db2fe6cd938c56daa0d Merge: 9cb895d b6c8841 Author: Wu-cheng Li Date: Fri Sep 10 11:30:52 2010 -0700 am b6c88417: am 53ca1aa6: Merge "Check if camera parameters are the same as requested." into gingerbread Merge commit 'b6c8841723966b747a642807f034d3db948b42b3' * commit 'b6c8841723966b747a642807f034d3db948b42b3': Check if camera parameters are the same as requested. commit b6c8841723966b747a642807f034d3db948b42b3 Merge: 9f9c678 53ca1aa Author: Wu-cheng Li Date: Fri Sep 10 11:21:07 2010 -0700 am 53ca1aa6: Merge "Check if camera parameters are the same as requested." into gingerbread Merge commit '53ca1aa6d16e93c83ef9d80183e80af6d984a5ab' into gingerbread-plus-aosp * commit '53ca1aa6d16e93c83ef9d80183e80af6d984a5ab': Check if camera parameters are the same as requested. commit 53ca1aa6d16e93c83ef9d80183e80af6d984a5ab Merge: c1a74ce bd66262 Author: Wu-cheng Li Date: Fri Sep 10 11:17:59 2010 -0700 Merge "Check if camera parameters are the same as requested." into gingerbread commit bd66262e0f085540032c0b84d0e5144bd1869610 Author: Wu-cheng Li Date: Thu Sep 9 17:20:09 2010 -0700 Check if camera parameters are the same as requested. bug:2980818 Change-Id: I2ebb184618a2067ba000c733902ede6889c3b2d6 commit 7792f6bc0a6dd094f23d8e3887b3bc1e486002e6 Author: Brett Chabot Date: Thu Sep 9 20:40:04 2010 -0700 Update to new ddmlib prebuilt api. Change-Id: I088130db40323d31e36739676985fa5a600bf0b2 commit 9cb895db7d27702c990a60429adc1612453131f0 Merge: 9bda95d 59d210f Author: Vasu Nori Date: Thu Sep 9 16:43:33 2010 -0700 Merge "check return value from SQLiteDatabase.delete method" commit 59d210f3d89bce56d0117332ef42943916d5f994 Author: Vasu Nori Date: Thu Sep 9 16:23:52 2010 -0700 check return value from SQLiteDatabase.delete method this is in effort to reproduce bug:2989191 Change-Id: I97ea3ece2737831e8a623987d8d31f9192442281 commit 4adc2b8dd15323659f6051136b5c0aab83ed7b09 Author: Brian Muramatsu Date: Wed Sep 8 16:01:26 2010 -0700 FocusFinderTest Workarounds... Bug 2437360 The FocusFinder tests were failing on large width screens, because the focus model takes into account the width of the widgets. The prior layout had buttons that spanned the entire screen, and this caused the focus behavior to change across different screen sizes. This does not seem correct, but it is how the framework is coded. Create a new layout that has four equally-sized center buttons to avoid this problem. Finally, the FocusFinder#findNearestTouchables seems to not take into account the touch coordinates when calculating the delta offset for the down and right focus directions which thus makes the distance greater than the "edge slop" causing it to fail. This also does not seem correct but probably due to a lack of my understanding (Bug 2986136). Work around the problems using more simple cases that touch on the outer edges of the widgets that do not trigger that problem. Change-Id: I1b080b13c8e2973808ca6e4eceea2b6e599d9749 commit 9bda95de4eba6644bc33e9a1b95caa76739e4b5d Merge: 07d4640 9f9c678 Author: Eric Laurent Date: Wed Sep 8 11:53:34 2010 -0700 am 9f9c678d: am c1a74cea: Merge "Added tests for audio effects." into gingerbread Merge commit '9f9c678d2749cceb1bd18b025425e61bd9f2017e' * commit '9f9c678d2749cceb1bd18b025425e61bd9f2017e': Added tests for audio effects. commit 9f9c678d2749cceb1bd18b025425e61bd9f2017e Merge: 83ce3db c1a74ce Author: Eric Laurent Date: Wed Sep 8 11:32:49 2010 -0700 am c1a74cea: Merge "Added tests for audio effects." into gingerbread Merge commit 'c1a74cea248289a4822fe7cd0b734ddae3ba4b9f' into gingerbread-plus-aosp * commit 'c1a74cea248289a4822fe7cd0b734ddae3ba4b9f': Added tests for audio effects. commit c1a74cea248289a4822fe7cd0b734ddae3ba4b9f Merge: 72ecba2 8ff0120 Author: Eric Laurent Date: Wed Sep 8 11:13:11 2010 -0700 Merge "Added tests for audio effects." into gingerbread commit 8ff01200e79a2f59866844f0399b495d4b6b4bda Author: Eric Laurent Date: Tue Sep 7 11:57:44 2010 -0700 Added tests for audio effects. AudioEffectTest.java: tests for base AudioEffect class. BassBoostTest.java: tests for bass boost effect EnvReverbTest.java: tests for environmental reverb PresetReverbTest.java: tests for preset reverb VirtualizerTest.java: tests for virtualizer VisualizerTest.java: test for visualizer There is no requirement on the quality of audio effects or the supported parameter ranges. The tests just ensure that the platform exposes and responds to all methods in effect APIs. Change-Id: Ibdd0bf937c30ce000184e0bdf2323655ebf1d839 commit 07d46405ed04e4a4a64aa0b941ef1d1d62ee2082 Merge: 2ea5445 83ce3db Author: Brad Fitzpatrick Date: Tue Sep 7 21:11:58 2010 -0700 am 83ce3db4: am 72ecba20: Torture tests for SharedPreferences. Merge commit '83ce3db43ba31f1986735e7eef24d2f9f9ae3094' * commit '83ce3db43ba31f1986735e7eef24d2f9f9ae3094': Torture tests for SharedPreferences. commit 83ce3db43ba31f1986735e7eef24d2f9f9ae3094 Merge: 3befc77 72ecba2 Author: Brad Fitzpatrick Date: Tue Sep 7 21:07:41 2010 -0700 am 72ecba20: Torture tests for SharedPreferences. Merge commit '72ecba204328dab1a7553fc47cf638fa19232ef3' into gingerbread-plus-aosp * commit '72ecba204328dab1a7553fc47cf638fa19232ef3': Torture tests for SharedPreferences. commit 72ecba204328dab1a7553fc47cf638fa19232ef3 Author: Brad Fitzpatrick Date: Tue Sep 7 17:54:36 2010 -0700 Torture tests for SharedPreferences. Change-Id: Icc6e638a6ad90934bc0ed04d398da0c8158bc51f commit f42157612d8d9624a6ed7c9eb2a3c38f46bea0fa Author: Brian Muramatsu Date: Tue Sep 7 15:05:13 2010 -0700 Fix TouchTest#testOnTouchEvent Test String Bug 2437360 Fix this test to work with any display width by creating a test string that is wider than the screen rather than using a fixed size and expecting the TextView to only scroll as much as there is left to scroll. Change-Id: Ia60d6e17f46771ec2abaa1448b4e97b6e939f4b5 commit 2ea54452561c106074cd85956639233bd62e7e96 Merge: 06faffd bbd6c47 Author: Bjorn Bringert Date: Fri Sep 3 02:26:41 2010 -0700 Merge "CTS test for seeking in MemoryFile-backed FDs" commit 06faffdcdb544e3ba8dd7c2a9fd793e9525157bb Merge: 7ad27cf 3befc77 Author: Brian Muramatsu Date: Mon Aug 30 16:06:07 2010 -0700 am 3befc773: am faab38e3: am 82e9d207: Merge "Fix CameraTest#testAccessParameters Assertion" into froyo Merge commit '3befc7736253764ad3420f3735079e4c720efcd1' * commit '3befc7736253764ad3420f3735079e4c720efcd1': Fix CameraTest#testAccessParameters Assertion commit 7ad27cf90fac7210aba21b26cf885a191db2c2f5 Merge: 15bf09f 47d5feb Author: Wu-cheng Li Date: Mon Aug 30 16:02:18 2010 -0700 am 47d5febc: am c6b61b3c: Merge "Correct the order of expected and actual values in CameraTest." into gingerbread Merge commit '47d5febc9aad4f4d4341b260054ead93f2fa66ac' * commit '47d5febc9aad4f4d4341b260054ead93f2fa66ac': Correct the order of expected and actual values in CameraTest. commit 3befc7736253764ad3420f3735079e4c720efcd1 Merge: 47d5feb faab38e Author: Brian Muramatsu Date: Mon Aug 30 16:00:30 2010 -0700 am faab38e3: am 82e9d207: Merge "Fix CameraTest#testAccessParameters Assertion" into froyo Merge commit 'faab38e3d90f5c95652c6184e433c909a9743a20' into gingerbread-plus-aosp * commit 'faab38e3d90f5c95652c6184e433c909a9743a20': Fix CameraTest#testAccessParameters Assertion commit faab38e3d90f5c95652c6184e433c909a9743a20 Merge: c6b61b3 82e9d20 Author: Brian Muramatsu Date: Mon Aug 30 15:57:03 2010 -0700 am 82e9d207: Merge "Fix CameraTest#testAccessParameters Assertion" into froyo Merge commit '82e9d20712d96f03c3ff823a101f51d1b9d54d18' into gingerbread * commit '82e9d20712d96f03c3ff823a101f51d1b9d54d18': Fix CameraTest#testAccessParameters Assertion commit 82e9d20712d96f03c3ff823a101f51d1b9d54d18 Merge: b7f018c c4cd132 Author: Brian Muramatsu Date: Mon Aug 30 15:32:12 2010 -0700 Merge "Fix CameraTest#testAccessParameters Assertion" into froyo commit 47d5febc9aad4f4d4341b260054ead93f2fa66ac Merge: cc4f06b c6b61b3 Author: Wu-cheng Li Date: Mon Aug 30 15:30:32 2010 -0700 am c6b61b3c: Merge "Correct the order of expected and actual values in CameraTest." into gingerbread Merge commit 'c6b61b3ce45e0724275b27d479abb2cff6d7683c' into gingerbread-plus-aosp * commit 'c6b61b3ce45e0724275b27d479abb2cff6d7683c': Correct the order of expected and actual values in CameraTest. commit c6b61b3ce45e0724275b27d479abb2cff6d7683c Merge: 96773c4 489963a Author: Wu-cheng Li Date: Mon Aug 30 15:27:09 2010 -0700 Merge "Correct the order of expected and actual values in CameraTest." into gingerbread commit 489963abd1d172751b9db5cb7ae3f66fdc7b4163 Author: Wu-cheng Li Date: Mon Aug 30 12:04:08 2010 -0700 Correct the order of expected and actual values in CameraTest. Change-Id: Ia1dddcd1d8550091bbf92052fa282012eb58e028 commit c4cd1326d19c7b02bfe90e698066dd295c411bd2 Author: Brian Muramatsu Date: Thu Aug 26 15:30:02 2010 -0700 Fix CameraTest#testAccessParameters Assertion Issue 10800 Use a float assertEquals and swap expected and actual parameters around. Change-Id: I791947c78471d8fdb992843ca66e09333ba0ddec commit 15bf09ffe7fcd37ecaac6f408d0c2eb535ca3602 Merge: 2d94052 cc4f06b Author: Eric Laurent Date: Mon Aug 30 13:30:25 2010 -0700 am cc4f06b7: am 96773c4b: Added tests for Equalizer audio effect Merge commit 'cc4f06b7c84ae1480b7bbca255eda3f69b15c339' * commit 'cc4f06b7c84ae1480b7bbca255eda3f69b15c339': Added tests for Equalizer audio effect commit cc4f06b7c84ae1480b7bbca255eda3f69b15c339 Merge: 3cebbeb 96773c4 Author: Eric Laurent Date: Mon Aug 30 12:39:43 2010 -0700 am 96773c4b: Added tests for Equalizer audio effect Merge commit '96773c4b8bcb09c3d91b7d1c8053fb155d539196' into gingerbread-plus-aosp * commit '96773c4b8bcb09c3d91b7d1c8053fb155d539196': Added tests for Equalizer audio effect commit 96773c4b8bcb09c3d91b7d1c8053fb155d539196 Author: Eric Laurent Date: Thu Aug 26 17:52:58 2010 -0700 Added tests for Equalizer audio effect Change-Id: Iaa8ddbd15b3c1d3ddd14f1e626e1881a20fcf7a0 commit 2d94052d5e07818f626e4bcddbc04275a0ae1a1e Merge: 683556f 3cebbeb Author: Brian Muramatsu Date: Fri Aug 27 12:15:22 2010 -0700 am 3cebbebc: am e0644f28: am b7f018cb: Merge "CtsVerifier Share Test Results" into froyo Merge commit '3cebbebc2a7ba29039c27664c4d46f84ef99cff7' * commit '3cebbebc2a7ba29039c27664c4d46f84ef99cff7': CtsVerifier Share Test Results commit 683556ff5661aeab644a70d6f35e1806dd3e9faf Merge: 4230194 5922807 Author: Amith Yamasani Date: Fri Aug 27 12:14:40 2010 -0700 am 59228075: am 0ae6607e: Merge "Added 2 new methods to InputConnection" into gingerbread Merge commit '592280757008ece95ba971b0fde76e209c0c4f06' * commit '592280757008ece95ba971b0fde76e209c0c4f06': Added 2 new methods to InputConnection commit 4230194d36f9d2d3a04887dc4c08eda84a9de46c Merge: 713d755 73fd8d8 Author: Brian Muramatsu Date: Fri Aug 27 08:28:59 2010 -0700 am 73fd8d8a: am b3f95f26: am daefb0c6: Fix PopupWindowTest#testShowAtLocation to Support 0 Padding Merge commit '73fd8d8aa6c39650ae0552eeaaec25f5b2bdad2a' * commit '73fd8d8aa6c39650ae0552eeaaec25f5b2bdad2a': Fix PopupWindowTest#testShowAtLocation to Support 0 Padding commit bbd6c47bdce60b1ae876d814aac83b520d87ffc8 Author: Bjorn Bringert Date: Fri Aug 27 11:12:15 2010 +0100 CTS test for seeking in MemoryFile-backed FDs This will fail until https://review.source.android.com/16791 is submitted and new prebuilt kernels are checked in. Bug: 2948227 Change-Id: Ic199226f0c70dc74528d086fea267bfd818ae7df commit 3cebbebc2a7ba29039c27664c4d46f84ef99cff7 Merge: 5922807 e0644f2 Author: Brian Muramatsu Date: Thu Aug 26 15:28:08 2010 -0700 am e0644f28: am b7f018cb: Merge "CtsVerifier Share Test Results" into froyo Merge commit 'e0644f28dc51772fcd6943043e8979003647834a' into gingerbread-plus-aosp * commit 'e0644f28dc51772fcd6943043e8979003647834a': CtsVerifier Share Test Results commit e0644f28dc51772fcd6943043e8979003647834a Merge: 0ae6607 b7f018c Author: Brian Muramatsu Date: Thu Aug 26 15:21:53 2010 -0700 am b7f018cb: Merge "CtsVerifier Share Test Results" into froyo Merge commit 'b7f018cb21b030d71cf53e862b57dc1b946bff19' into gingerbread * commit 'b7f018cb21b030d71cf53e862b57dc1b946bff19': CtsVerifier Share Test Results commit b7f018cb21b030d71cf53e862b57dc1b946bff19 Merge: daefb0c ff1038f Author: Brian Muramatsu Date: Thu Aug 26 14:57:40 2010 -0700 Merge "CtsVerifier Share Test Results" into froyo commit 592280757008ece95ba971b0fde76e209c0c4f06 Merge: 73fd8d8 0ae6607 Author: Amith Yamasani Date: Thu Aug 26 14:57:25 2010 -0700 am 0ae6607e: Merge "Added 2 new methods to InputConnection" into gingerbread Merge commit '0ae6607e500d9f911bf398ab5e40a577051c7110' into gingerbread-plus-aosp * commit '0ae6607e500d9f911bf398ab5e40a577051c7110': Added 2 new methods to InputConnection commit 0ae6607e500d9f911bf398ab5e40a577051c7110 Merge: b3f95f2 b190624 Author: Amith Yamasani Date: Thu Aug 26 14:55:58 2010 -0700 Merge "Added 2 new methods to InputConnection" into gingerbread commit ff1038f44910f6f612988b78a8a04648e9147fe4 Author: Brian Muramatsu Date: Thu Aug 26 14:37:08 2010 -0700 CtsVerifier Share Test Results Add a menu item in the test list activity that allows the user to share the CtsVerifier's current test results. It uses an ACTION_SEND intent with createChooser so you can share the results via SMS, Gmail, and other activities. Change-Id: I6f2017e961f7f7ff2b0af7a4f806d56710828327 commit 73fd8d8aa6c39650ae0552eeaaec25f5b2bdad2a Merge: 08e0710 b3f95f2 Author: Brian Muramatsu Date: Thu Aug 26 14:24:44 2010 -0700 am b3f95f26: am daefb0c6: Fix PopupWindowTest#testShowAtLocation to Support 0 Padding Merge commit 'b3f95f26c81e5f3f84733f2c26c3e4f87bb31666' into gingerbread-plus-aosp * commit 'b3f95f26c81e5f3f84733f2c26c3e4f87bb31666': Fix PopupWindowTest#testShowAtLocation to Support 0 Padding commit b3f95f26c81e5f3f84733f2c26c3e4f87bb31666 Merge: afcbb78 daefb0c Author: Brian Muramatsu Date: Thu Aug 26 14:21:36 2010 -0700 am daefb0c6: Fix PopupWindowTest#testShowAtLocation to Support 0 Padding Merge commit 'daefb0c6e970967bbc50e5639bb1be75b35a8256' into gingerbread * commit 'daefb0c6e970967bbc50e5639bb1be75b35a8256': Fix PopupWindowTest#testShowAtLocation to Support 0 Padding commit b1906249ff150fbb453eb81ffc1f429fb4ca4a1f Author: Amith Yamasani Date: Thu Aug 26 13:54:02 2010 -0700 Added 2 new methods to InputConnection Change-Id: I74eda4259ff24769ea041b64eb53235fd8b5aea6 commit 92b94fcea99b79afdb30abba068bd173d7fb2d35 Author: Brian Muramatsu Date: Tue May 25 16:44:48 2010 -0700 Report CPU ABI in Eclair CTS Report Header Bug 2923901 Display Build.CPU_ABI and Build.CPU_ABI2 properties in the CTS results header like Froyo CTS. However, the internal SystemProperties API is used to read the value for CPU_ABI2. This is turn required commenting out LOCAL_SDK_VERSION := current in the Android.mk. Change-Id: If6880ddc3d37c97e4912dad479e9e0ef2ebdca5e commit 713d755608f82b30bb3ccd85f95211d7bfcd4106 Merge: 7de8b4f 08e0710 Author: Brian Muramatsu Date: Wed Aug 25 16:40:21 2010 -0700 am 08e0710d: am afcbb78d: Check Build.SERIAL for Non-telephony Devices Merge commit '08e0710d8345c355fd174cba73dfefd7caf8b786' * commit '08e0710d8345c355fd174cba73dfefd7caf8b786': Check Build.SERIAL for Non-telephony Devices commit 08e0710d8345c355fd174cba73dfefd7caf8b786 Merge: eabe9de afcbb78 Author: Brian Muramatsu Date: Wed Aug 25 15:40:36 2010 -0700 am afcbb78d: Check Build.SERIAL for Non-telephony Devices Merge commit 'afcbb78d5d182046c97b0370bec3259d8d4530c5' into gingerbread-plus-aosp * commit 'afcbb78d5d182046c97b0370bec3259d8d4530c5': Check Build.SERIAL for Non-telephony Devices commit afcbb78d5d182046c97b0370bec3259d8d4530c5 Author: Brian Muramatsu Date: Tue Aug 17 13:53:59 2010 -0700 Check Build.SERIAL for Non-telephony Devices Change-Id: I4f701ed06a9e1df999782293b313a950bc7ddd39 commit 49ed3b8174df85cdb0b319709bb31a2becb2e4b0 Author: Brian Muramatsu Date: Wed Aug 25 13:18:06 2010 -0700 Fix Eclair sim-eng Build Change-Id: I60c192b8ea347afb4ed14e621d174a844f004c11 commit e1b72eb912f2121b3e4071faf4b2eeb8c895dd36 Merge: e275b3f e4d0155 Author: Brian Muramatsu Date: Wed Aug 25 11:47:33 2010 -0700 Merge "Increment CTS Version to 2.1_r4" into eclair commit e4d0155f81509fb30146d05df1eeec3fbc676e07 Author: Brian Muramatsu Date: Wed Aug 25 11:45:46 2010 -0700 Increment CTS Version to 2.1_r4 Bug 2923901 Change-Id: I2e42eae1403eeee8e2386394a654f4a2276749a2 commit e275b3fc261f08ec6f3909e8f488c63b34626159 Merge: 88fca89 ad8a344 Author: Brian Muramatsu Date: Wed Aug 25 11:08:14 2010 -0700 Merge "Eclair CTS Test for ARM ABI Version" into eclair commit 7de8b4f19e794a13f70547cd911de6e6b00078cb Merge: 012932e eabe9de Author: Doug Zongker Date: Tue Aug 24 16:58:58 2010 -0700 am eabe9de3: am 55fe3ba9: am feb81e96: allow TelephonyManager.getDeviceId to return an ESN instead of an MEID Merge commit 'eabe9de34fff39536373265c989f70623b9345e1' * commit 'eabe9de34fff39536373265c989f70623b9345e1': allow TelephonyManager.getDeviceId to return an ESN instead of an MEID commit 012932e0e1901bcc81ce3243635b11978bb85835 Merge: 3fa38bf 9abd252 Author: Svetoslav Ganov Date: Tue Aug 24 15:20:52 2010 -0700 am 9abd2529: am e4890e55: am c55ff2ce: 2936930 Add a CTS test to check for presence of Accessibility in Settings Merge commit '9abd25295b94b1a75619246644d5fa7929adbb65' * commit '9abd25295b94b1a75619246644d5fa7929adbb65': 2936930 Add a CTS test to check for presence of Accessibility in Settings commit daefb0c6e970967bbc50e5639bb1be75b35a8256 Author: Brian Muramatsu Date: Tue Aug 24 15:03:46 2010 -0700 Fix PopupWindowTest#testShowAtLocation to Support 0 Padding Bug 2941912 Change the assertion that depended upon the popup window's theme having > 0 padding. Removing the PopupWindow theme's background to simulate a lack of padding causes this test to fail unless the assertions allow zero padding. Change-Id: I9e2aae710526182b03b9637a29c75cf01c9cbc4d commit eabe9de34fff39536373265c989f70623b9345e1 Merge: 9abd252 55fe3ba Author: Doug Zongker Date: Tue Aug 24 14:45:13 2010 -0700 am 55fe3ba9: am feb81e96: allow TelephonyManager.getDeviceId to return an ESN instead of an MEID Merge commit '55fe3ba9823f8e2cbc32799204e8f3e6bdeb8eda' into gingerbread-plus-aosp * commit '55fe3ba9823f8e2cbc32799204e8f3e6bdeb8eda': allow TelephonyManager.getDeviceId to return an ESN instead of an MEID commit 55fe3ba9823f8e2cbc32799204e8f3e6bdeb8eda Merge: e4890e5 feb81e9 Author: Doug Zongker Date: Tue Aug 24 14:41:28 2010 -0700 am feb81e96: allow TelephonyManager.getDeviceId to return an ESN instead of an MEID Merge commit 'feb81e9679e98460efe46fc578617ef0c6b85c14' into gingerbread * commit 'feb81e9679e98460efe46fc578617ef0c6b85c14': allow TelephonyManager.getDeviceId to return an ESN instead of an MEID commit feb81e9679e98460efe46fc578617ef0c6b85c14 Author: Doug Zongker Date: Tue Aug 24 13:17:13 2010 -0700 allow TelephonyManager.getDeviceId to return an ESN instead of an MEID Older CDMA networks use ESNs only, not MEIDs. Change-Id: I12f7f4df730eafc08e8923d0248ddd82bb7bde18 commit 3fa38bfa7d21c1bb4809b1c39ee2671292b2a05d Merge: 8ad6950 29ff4ce Author: Jean-Baptiste Queru Date: Tue Aug 24 11:55:29 2010 -0700 am 29ff4cec: am 6e02dc4a: merge -s ours from froyo-release so that upgrading to gingerbread is a git fast-forward Merge commit '29ff4cec5cc88ae29f17ff6ae75e7225c3a6ac06' * commit '29ff4cec5cc88ae29f17ff6ae75e7225c3a6ac06': Add unit test for SettingsProvider security. commit 9abd25295b94b1a75619246644d5fa7929adbb65 Merge: 29ff4ce e4890e5 Author: Svetoslav Ganov Date: Tue Aug 24 11:52:52 2010 -0700 am e4890e55: am c55ff2ce: 2936930 Add a CTS test to check for presence of Accessibility in Settings Merge commit 'e4890e55cc214584096d17f5624fc4574f6b83f1' into gingerbread-plus-aosp * commit 'e4890e55cc214584096d17f5624fc4574f6b83f1': 2936930 Add a CTS test to check for presence of Accessibility in Settings commit e4890e55cc214584096d17f5624fc4574f6b83f1 Merge: 6e02dc4 c55ff2c Author: Svetoslav Ganov Date: Tue Aug 24 11:45:12 2010 -0700 am c55ff2ce: 2936930 Add a CTS test to check for presence of Accessibility in Settings Merge commit 'c55ff2cedf2c29f7d6ffe89691a56c6c6e1a5e3b' into gingerbread * commit 'c55ff2cedf2c29f7d6ffe89691a56c6c6e1a5e3b': 2936930 Add a CTS test to check for presence of Accessibility in Settings commit 8ad6950d3a3d96d97e9d1ab03b02290c4ae65239 Merge: 0bebeed f06b022 Author: Kenny Root Date: Tue Aug 24 10:57:16 2010 -0700 resolved conflicts for merge of f06b022f to master Change-Id: I366d01bd591f329e015fcedf3f711518b109a708 commit 0bebeeda93f4cf24f1f08329f7951673b2d2adcf Merge: 2714016 f0e1bea Author: Brian Muramatsu Date: Tue Aug 24 10:16:11 2010 -0700 am f0e1beaf: am c7f606bd: am e1181876: CtsVerifier Pass/Fail Buttons for All Tests Merge commit 'f0e1beaf76e6080055e364d5d01065bc36056c7b' * commit 'f0e1beaf76e6080055e364d5d01065bc36056c7b': CtsVerifier Pass/Fail Buttons for All Tests commit 2714016c16f73c6c923a5f5eed56ebbc991d1c9c Merge: e30d61d 9ed6312 Author: Brian Carlstrom Date: Tue Aug 24 09:03:16 2010 -0700 am 9ed63121: am 2123e41e: Merge "Tracking merge of dalvik-dev to gingerbread" into gingerbread Merge commit '9ed63121b5beae009c63dd9112400a35b7f6ab94' * commit '9ed63121b5beae009c63dd9112400a35b7f6ab94': Tracking merge of dalvik-dev to gingerbread commit e30d61dcdd27599fe60d107d5e8cf32b8da35503 Merge: 4202865 53cdbd8 Author: Dianne Hackborn Date: Tue Aug 24 09:01:42 2010 -0700 am 53cdbd85: am 214bcdba: More permission granting security tests. Merge commit '53cdbd85b45af28400e0351d1c14a86729aed266' * commit '53cdbd85b45af28400e0351d1c14a86729aed266': More permission granting security tests. commit 4202865bdac57017a84a8a8097db57d18ac3634c Merge: 58f2413 ebce009 Author: Brian Muramatsu Date: Tue Aug 24 09:01:13 2010 -0700 am ebce0090: am d77ea9ba: am cf0c3aa8: Merge "CtsVerifier Test Result Infrastructure" into froyo Merge commit 'ebce0090aecb323b34c07fb933c9358fe8a46363' * commit 'ebce0090aecb323b34c07fb933c9358fe8a46363': CtsVerifier Test Result Infrastructure commit 29ff4cec5cc88ae29f17ff6ae75e7225c3a6ac06 Merge: f06b022 6e02dc4 Author: Jean-Baptiste Queru Date: Mon Aug 23 23:36:35 2010 -0700 am 6e02dc4a: merge -s ours from froyo-release so that upgrading to gingerbread is a git fast-forward Merge commit '6e02dc4a6cc1d353e55e05ea632183fae4a62796' into gingerbread-plus-aosp * commit '6e02dc4a6cc1d353e55e05ea632183fae4a62796': Add unit test for SettingsProvider security. commit 6e02dc4a6cc1d353e55e05ea632183fae4a62796 Merge: c7f606b b503197 Author: Jean-Baptiste Queru Date: Mon Aug 23 19:07:43 2010 -0700 merge -s ours from froyo-release so that upgrading to gingerbread is a git fast-forward Change-Id: I3372dbe960ceabe0dec5258b4eb52080bbae2fb1 commit c55ff2cedf2c29f7d6ffe89691a56c6c6e1a5e3b Author: Svetoslav Ganov Date: Fri Aug 20 15:47:24 2010 -0700 2936930 Add a CTS test to check for presence of Accessibility in Settings Froyo version copied from Eclair Change-Id: I030b543f5c144b3bd21717ebf4cc2ff02be8a0c4 commit 58f24132278eb5629a76787f7f77f1130a9029ef Merge: 9805b57 27a79a8 Author: Johan Redestig Date: Sat Aug 21 09:42:41 2010 -0700 am 27a79a8a: am db9230a3: am ead37b5c: Avoiding a race condition in testOnReceivedIcon. Merge commit '27a79a8a2a0783a80ef25b36909807640c93ebcd' * commit '27a79a8a2a0783a80ef25b36909807640c93ebcd': Avoiding a race condition in testOnReceivedIcon. commit 9805b57627fbb55a71efcdb17be2acac428cc007 Merge: f247413 169a53d Author: Brad Fitzpatrick Date: Sat Aug 21 09:36:03 2010 -0700 am 169a53d4: am 8d45c369: Merge "Some tests for SharedPreferences." into gingerbread Merge commit '169a53d401a8cebc156a12d94c682de9d7059024' * commit '169a53d401a8cebc156a12d94c682de9d7059024': Some tests for SharedPreferences. commit f24741386321de5a0b60fb24b21eec31f4033118 Merge: 5cf9e8b 2a559ec Author: Jean-Baptiste Queru Date: Sat Aug 21 09:35:35 2010 -0700 am 2a559ec9: (-s ours) am cccdd9b7: am 922ce38e: (-s ours) DO NOT MERGE - reconcile open-source variant Merge commit '2a559ec9132db6f028085541cb656218417af3bc' * commit '2a559ec9132db6f028085541cb656218417af3bc': DO NOT MERGE - reconcile open-source variant commit 5cf9e8b296853bc6b57d5886aa07b3a49d75bad3 Merge: cd890bc 3c8c37f Author: Dianne Hackborn Date: Sat Aug 21 09:34:52 2010 -0700 am 3c8c37f7: am 8c14cbb5: Tests for issue #2845673: android:exported="false" is not obeyed Merge commit '3c8c37f77da161f9a5776bb6af2f996bcc8b854a' * commit '3c8c37f77da161f9a5776bb6af2f996bcc8b854a': Tests for issue #2845673: android:exported="false" is not obeyed commit f06b022f037f112c1f640b386bfeae2c0255ea1c Merge: f0e1bea 006c1ec Author: Christian Mehlmauer Date: Fri Aug 20 18:21:03 2010 -0700 am 006c1ec4: Added Unit Tests for the new DatabaseUtils.queryNumEntries methods Merge commit '006c1ec4f29803d62909bf0df43dd3ec49215bf9' into gingerbread-plus-aosp * commit '006c1ec4f29803d62909bf0df43dd3ec49215bf9': Added Unit Tests for the new DatabaseUtils.queryNumEntries methods commit 006c1ec4f29803d62909bf0df43dd3ec49215bf9 Author: Christian Mehlmauer Date: Wed Jun 16 23:00:51 2010 +0200 Added Unit Tests for the new DatabaseUtils.queryNumEntries methods Change-Id: Ie8407946f864872b25586f7309ff5e4ee6cb7dbe commit 88fca89476813bae4bf598644849a05c40bf5845 Author: Svetoslav Ganov Date: Fri Aug 20 15:47:24 2010 -0700 2936930 Add a CTS test to check for presence of Accessibility in Settings Change-Id: I0605acaae86a5b8ca7f2842476a14f44d1022dbf commit f0e1beaf76e6080055e364d5d01065bc36056c7b Merge: 9ed6312 c7f606b Author: Brian Muramatsu Date: Fri Aug 20 15:54:57 2010 -0700 am c7f606bd: am e1181876: CtsVerifier Pass/Fail Buttons for All Tests Merge commit 'c7f606bdf71b2d6cc152867801412a4186efdd07' into gingerbread-plus-aosp * commit 'c7f606bdf71b2d6cc152867801412a4186efdd07': CtsVerifier Pass/Fail Buttons for All Tests commit c7f606bdf71b2d6cc152867801412a4186efdd07 Merge: 2123e41 e118187 Author: Brian Muramatsu Date: Fri Aug 20 15:52:55 2010 -0700 am e1181876: CtsVerifier Pass/Fail Buttons for All Tests Merge commit 'e11818767f6e7105c48d1d64afc4621a744dc822' into gingerbread * commit 'e11818767f6e7105c48d1d64afc4621a744dc822': CtsVerifier Pass/Fail Buttons for All Tests commit e11818767f6e7105c48d1d64afc4621a744dc822 Author: Brian Muramatsu Date: Fri Aug 20 12:59:39 2010 -0700 CtsVerifier Pass/Fail Buttons for All Tests Added pass/fail buttons to the rest of the tests. Create a common layout for the set of two buttons and a class containing a click handler that handles the usual case of setting the test result and finishing the activity. Change-Id: I55d1ebce0e033024ef8b7861a267e8ccc85c9896 commit 9ed63121b5beae009c63dd9112400a35b7f6ab94 Merge: 53cdbd8 2123e41 Author: Brian Carlstrom Date: Fri Aug 20 13:52:24 2010 -0700 am 2123e41e: Merge "Tracking merge of dalvik-dev to gingerbread" into gingerbread Merge commit '2123e41e40012ce604ee592bad5345dd56ad6c03' into gingerbread-plus-aosp * commit '2123e41e40012ce604ee592bad5345dd56ad6c03': Tracking merge of dalvik-dev to gingerbread commit 2123e41e40012ce604ee592bad5345dd56ad6c03 Merge: 214bcdb 52e6743 Author: Brian Carlstrom Date: Fri Aug 20 13:49:30 2010 -0700 Merge "Tracking merge of dalvik-dev to gingerbread" into gingerbread commit ad8a344c601daca5de3df9c92636a2e065c90c2a Author: Brian Muramatsu Date: Fri Aug 20 11:14:32 2010 -0700 Eclair CTS Test for ARM ABI Version Bug 2923901 This is the Eclair version of the ARMEABI test added to Froyo for http://b/2713199. Here is what needed to be tweaked to make it work: 1. I didn't see an open NDK Eclair project, so I copied the cpufeatures source code to a temporary directory under CTS. 2. There was no public SDK Java method to get the second ABI property. However, I went ahead and used the hidden API due to the importance of the test. This test already exists in Froyo and uses the proper public API. This test will not be merged into Froyo and future releases. Change-Id: I20fcc21096f468fb733fcf34842b218e41dabbc1 commit 53cdbd85b45af28400e0351d1c14a86729aed266 Merge: ebce009 214bcdb Author: Dianne Hackborn Date: Fri Aug 20 11:53:31 2010 -0700 am 214bcdba: More permission granting security tests. Merge commit '214bcdba0dd3fca2db5a69eebfd56bd453786f54' into gingerbread-plus-aosp * commit '214bcdba0dd3fca2db5a69eebfd56bd453786f54': More permission granting security tests. commit 214bcdba0dd3fca2db5a69eebfd56bd453786f54 Author: Dianne Hackborn Date: Thu Aug 19 18:10:03 2010 -0700 More permission granting security tests. Change-Id: I6a82af99d8e13cc5b03acb883ac797a8adf85f40 commit ebce0090aecb323b34c07fb933c9358fe8a46363 Merge: 27a79a8 d77ea9b Author: Brian Muramatsu Date: Fri Aug 20 11:18:30 2010 -0700 am d77ea9ba: am cf0c3aa8: Merge "CtsVerifier Test Result Infrastructure" into froyo Merge commit 'd77ea9ba42095ac336fbef72f5f638a92a7bac9f' into gingerbread-plus-aosp * commit 'd77ea9ba42095ac336fbef72f5f638a92a7bac9f': CtsVerifier Test Result Infrastructure commit d77ea9ba42095ac336fbef72f5f638a92a7bac9f Merge: db9230a cf0c3aa Author: Brian Muramatsu Date: Fri Aug 20 11:15:46 2010 -0700 am cf0c3aa8: Merge "CtsVerifier Test Result Infrastructure" into froyo Merge commit 'cf0c3aa8313c4202d5af2c879824a57f906cd96f' into gingerbread * commit 'cf0c3aa8313c4202d5af2c879824a57f906cd96f': CtsVerifier Test Result Infrastructure commit cf0c3aa8313c4202d5af2c879824a57f906cd96f Merge: ead37b5 ac00737 Author: Brian Muramatsu Date: Fri Aug 20 11:00:03 2010 -0700 Merge "CtsVerifier Test Result Infrastructure" into froyo commit cd890bccf01c05ccfbd2db81248477ec39fb8693 Merge: c75b41a e5bb6fc Author: Wu-cheng Li Date: Thu Aug 19 23:42:57 2010 -0700 am e5bb6fcd: am 7f49419f: Merge "Test zoom in each preview size." into gingerbread Merge commit 'e5bb6fcd01c38e6ab8192259689efc2a8e791c54' * commit 'e5bb6fcd01c38e6ab8192259689efc2a8e791c54': Test zoom in each preview size. commit 31db43fc3bda54444beb40456f7d72a7632fcc20 Author: Jean-Baptiste Queru Date: Thu Aug 19 20:12:42 2010 -0700 DO NOT MERGE - reconcile CTS eclair Change-Id: Ia358495af9a40ad8866451b68ff6fbf4341f3e40 commit 76a456d864a86ad39f664786523eb6bb15533677 Merge: 6bd9dd1 687bcb1 Author: Brian Muramatsu Date: Thu Aug 19 13:14:13 2010 -0700 am 687bcb1c: (-s ours) Merge "DO NOT MERGE Test for Checking OpenGL ES Version" into eclair Merge commit '687bcb1c18e9a37e71ffccc0d24b4178f4a714b8' into eclair * commit '687bcb1c18e9a37e71ffccc0d24b4178f4a714b8': DO NOT MERGE Test for Checking OpenGL ES Version commit 687bcb1c18e9a37e71ffccc0d24b4178f4a714b8 Merge: eb8362a e9cf638 Author: Brian Muramatsu Date: Thu Aug 19 13:07:09 2010 -0700 Merge "DO NOT MERGE Test for Checking OpenGL ES Version" into eclair commit ac0073708acb7a7f6060189a71c4343092a64229 Author: Brian Muramatsu Date: Wed Aug 18 11:02:28 2010 -0700 CtsVerifier Test Result Infrastructure Add a TestResult class that allows test activities to set their finishing results as either pass or fail. Reflect the pass or fail status in the TestListActivity's test list. This is done via a ContentProvider that reads and writes to a database with the TestListAdapter listening for changes. Use the new API in the SUID Files test as an example. The other activities should be able to be easily adjusted to use the API. Just call TestResult.setPassedResult or .setFailedResult during some time in the activity before you finish. Change-Id: Ia6a1f75e2ac9d03cb22ed233bedf392e3fb28f0e commit 52e6743ad25ec890408fd2c301021e37af30fbc0 Author: Brian Carlstrom Date: Thu Aug 19 12:29:31 2010 -0700 Tracking merge of dalvik-dev to gingerbread Change-Id: I3830a148cb7649877006236168dafe808220b843 commit 6bd9dd11983c31791345c4664daf53a6a403589b Merge: a60d9d7 eb8362a Author: Brian Muramatsu Date: Thu Aug 19 12:00:37 2010 -0700 am eb8362a5: (-s ours) Merge "DO NOT MERGE Include Open GL ES Version in Report Header" into eclair Merge commit 'eb8362a53173cced62453b9498377b54bba448a6' into eclair * commit 'eb8362a53173cced62453b9498377b54bba448a6': DO NOT MERGE Include Open GL ES Version in Report Header commit eb8362a53173cced62453b9498377b54bba448a6 Merge: a60d9d7 d60f466 Author: Brian Muramatsu Date: Thu Aug 19 11:47:51 2010 -0700 Merge "DO NOT MERGE Include Open GL ES Version in Report Header" into eclair commit 27a79a8a2a0783a80ef25b36909807640c93ebcd Merge: 169a53d db9230a Author: Johan Redestig Date: Thu Aug 19 11:24:24 2010 -0700 am db9230a3: am ead37b5c: Avoiding a race condition in testOnReceivedIcon. Merge commit 'db9230a3fffa563bc173f416743acf49f0d9b6b5' into gingerbread-plus-aosp * commit 'db9230a3fffa563bc173f416743acf49f0d9b6b5': Avoiding a race condition in testOnReceivedIcon. commit db9230a3fffa563bc173f416743acf49f0d9b6b5 Merge: 8d45c36 ead37b5 Author: Johan Redestig Date: Thu Aug 19 11:21:17 2010 -0700 am ead37b5c: Avoiding a race condition in testOnReceivedIcon. Merge commit 'ead37b5c59011a64e83988ddef0ffb0ed1aba9b1' into gingerbread * commit 'ead37b5c59011a64e83988ddef0ffb0ed1aba9b1': Avoiding a race condition in testOnReceivedIcon. commit ead37b5c59011a64e83988ddef0ffb0ed1aba9b1 Author: Johan Redestig Date: Thu Aug 19 09:11:39 2010 +0200 Avoiding a race condition in testOnReceivedIcon. A race condition in the android.webkit.cts.WebChromeClientTest#testOnReceivedIcon test has been avoided by putting a 250ms delay between the call to mIconDb.open(dbPath) and the call to mIconDb.removeAllIcons() in the public void testOnReceivedIcon() method of the WebChromeClientTest class in the ./cts/tests/tests/webkit/src/android/webkit/cts/WebChromeClientTest.java module. Change-Id: Iddf1c9247ccef9e62e879a7179425d4b021cc19b commit 169a53d401a8cebc156a12d94c682de9d7059024 Merge: 2a559ec 8d45c36 Author: Brad Fitzpatrick Date: Wed Aug 18 22:34:14 2010 -0700 am 8d45c369: Merge "Some tests for SharedPreferences." into gingerbread Merge commit '8d45c369d46347774e4e5176525fcc3a83579d23' into gingerbread-plus-aosp * commit '8d45c369d46347774e4e5176525fcc3a83579d23': Some tests for SharedPreferences. commit 8d45c369d46347774e4e5176525fcc3a83579d23 Merge: cccdd9b 7e9e454 Author: Brad Fitzpatrick Date: Wed Aug 18 22:32:18 2010 -0700 Merge "Some tests for SharedPreferences." into gingerbread commit 2a559ec9132db6f028085541cb656218417af3bc Merge: 3c8c37f cccdd9b Author: Jean-Baptiste Queru Date: Wed Aug 18 18:15:50 2010 -0700 am cccdd9b7: am 922ce38e: (-s ours) DO NOT MERGE - reconcile open-source variant Merge commit 'cccdd9b7acd3cc55b4735817e6f4f451d3cf75c6' into gingerbread-plus-aosp * commit 'cccdd9b7acd3cc55b4735817e6f4f451d3cf75c6': DO NOT MERGE - reconcile open-source variant commit cccdd9b7acd3cc55b4735817e6f4f451d3cf75c6 Merge: 8c14cbb 922ce38 Author: Jean-Baptiste Queru Date: Wed Aug 18 18:13:53 2010 -0700 am 922ce38e: (-s ours) DO NOT MERGE - reconcile open-source variant Merge commit '922ce38ed77e207fcf4af9be6f98ca17f3ba0b3b' into gingerbread * commit '922ce38ed77e207fcf4af9be6f98ca17f3ba0b3b': DO NOT MERGE - reconcile open-source variant commit 922ce38ed77e207fcf4af9be6f98ca17f3ba0b3b Author: Jean-Baptiste Queru Date: Wed Aug 18 18:08:42 2010 -0700 DO NOT MERGE - reconcile open-source variant Change-Id: Ib8297477936d8d6d6515f38813887f75a663a7f1 commit a60d9d7d27d2bf89bc20db0cbcda4fbb42f21f07 Author: Jean-Baptiste Queru Date: Wed Aug 18 17:35:17 2010 -0700 DO NOT MERGE - reconcile open-source variant Change-Id: Ie70d89560b252bbf4766115f5d87cf5575a4a3cc commit 3c8c37f77da161f9a5776bb6af2f996bcc8b854a Merge: e5bb6fc 8c14cbb Author: Dianne Hackborn Date: Wed Aug 18 17:10:55 2010 -0700 am 8c14cbb5: Tests for issue #2845673: android:exported="false" is not obeyed Merge commit '8c14cbb5f439c2cb71f162ecb88c9bd8dbab0251' into gingerbread-plus-aosp * commit '8c14cbb5f439c2cb71f162ecb88c9bd8dbab0251': Tests for issue #2845673: android:exported="false" is not obeyed commit 8c14cbb5f439c2cb71f162ecb88c9bd8dbab0251 Author: Dianne Hackborn Date: Wed Aug 18 16:01:06 2010 -0700 Tests for issue #2845673: android:exported="false" is not obeyed Add more tests for content provider access, including tests that granting URIs is working correctly for both permissions and private providers. Change-Id: I6e0f7f11ad19dd3866682576ad6397287edf75ec commit 7e9e454bb024b31d1145c42dfe99692d5ab6379d Author: Brad Fitzpatrick Date: Wed Aug 18 14:03:57 2010 -0700 Some tests for SharedPreferences. Notably, includes tests for new functionality I added in I7edbd0d3 to not do redundant writes to disk. Change-Id: I66be8bc49e2b059422ef269345b0c4b305b6f82e commit e5bb6fcd01c38e6ab8192259689efc2a8e791c54 Merge: 889699e 7f49419 Author: Wu-cheng Li Date: Wed Aug 18 13:39:07 2010 -0700 am 7f49419f: Merge "Test zoom in each preview size." into gingerbread Merge commit '7f49419f5d165976d401a429a64819ad0236db72' into gingerbread-plus-aosp * commit '7f49419f5d165976d401a429a64819ad0236db72': Test zoom in each preview size. commit e9cf638aedd3de79c91c6b2310276ef1c6282835 Author: Brian Muramatsu Date: Fri Jul 30 11:52:10 2010 -0700 DO NOT MERGE Test for Checking OpenGL ES Version Bug 2923901 Cherry-picked from Froyo CTS. Since there is no setEglContextClientVersion method in Eclair, I used the hello-gl2 sample code from the NDK project to switch the GLSurfaceView to use Open GL ES 2.0. Original Froyo change: https://review.source.android.com/#change,16175 Change-Id: I3483d5dd7a2a154de499089583591e7443e20d0b commit 7f49419f5d165976d401a429a64819ad0236db72 Merge: ce881e8 9a40c5c Author: Wu-cheng Li Date: Wed Aug 18 10:20:15 2010 -0700 Merge "Test zoom in each preview size." into gingerbread commit c75b41a1ea065bac4edba9de7f2ce5530e6cadba Author: Bjorn Bringert Date: Thu Apr 15 16:23:13 2010 +0100 Add CTS tests for FDs backed by DBs and byte[] The tests are partly based on code from mdodd's change I4f21bdbe22be3c09eb8732a4e9b90b90d55d4941 Bug: http://b/issue?id=2595601 Change-Id: I47ab427a45cd584f958d27e4e9ac98b670e76d74 commit d60f4662c67b093631874ad5877cff232d77f61b Author: Brian Muramatsu Date: Thu Jul 29 12:03:49 2010 -0700 DO NOT MERGE Include Open GL ES Version in Report Header Bug 2923901 Cherry-picked from Froyo to add an entry in the report header for the Open GL ES version. Change-Id: I27ca98b80c727848278dc5867db529f84bb305ee commit 581eb8dadcd66c308a7dc989bdd1f9acaed2a576 Merge: a49151d 889699e Author: Brian Muramatsu Date: Tue Aug 17 13:24:21 2010 -0700 am 889699eb: am ce881e85: am b0845b73: am bd7116f6: Merge "Group CtsVerifier Tests into Categories" into froyo Merge commit '889699eb1ed0b7d6b2bf51bf5098de4ae3209022' * commit '889699eb1ed0b7d6b2bf51bf5098de4ae3209022': Group CtsVerifier Tests into Categories commit 889699eb1ed0b7d6b2bf51bf5098de4ae3209022 Merge: 54b7c10 ce881e8 Author: Brian Muramatsu Date: Tue Aug 17 13:17:26 2010 -0700 am ce881e85: am b0845b73: am bd7116f6: Merge "Group CtsVerifier Tests into Categories" into froyo Merge commit 'ce881e85d5624c0b562ebcf4d13bb80837ae1661' into gingerbread-plus-aosp * commit 'ce881e85d5624c0b562ebcf4d13bb80837ae1661': Group CtsVerifier Tests into Categories commit ce881e85d5624c0b562ebcf4d13bb80837ae1661 Merge: 17bf250 b0845b7 Author: Brian Muramatsu Date: Tue Aug 17 13:10:04 2010 -0700 am b0845b73: am bd7116f6: Merge "Group CtsVerifier Tests into Categories" into froyo Merge commit 'b0845b736614d0d58ed288bdc77e66d3b3b96866' into gingerbread * commit 'b0845b736614d0d58ed288bdc77e66d3b3b96866': Group CtsVerifier Tests into Categories commit b0845b736614d0d58ed288bdc77e66d3b3b96866 Merge: f864ab3 bd7116f Author: Brian Muramatsu Date: Tue Aug 17 13:03:41 2010 -0700 am bd7116f6: Merge "Group CtsVerifier Tests into Categories" into froyo Merge commit 'bd7116f6d8917718675b670e41a7e6d76cf67f1c' into froyo * commit 'bd7116f6d8917718675b670e41a7e6d76cf67f1c': Group CtsVerifier Tests into Categories commit 72693ebd5c79871b866f0b277407cbb07082c10a Merge: 7379989 b2d4a89 Author: Brian Muramatsu Date: Tue Aug 17 12:59:15 2010 -0700 am b2d4a89a: (-s ours) DO NOT MERGE Eclair SystemFeatures Test Merge commit 'b2d4a89a3e004a88bdc220d824df41f2ae8f1024' into eclair * commit 'b2d4a89a3e004a88bdc220d824df41f2ae8f1024': DO NOT MERGE Eclair SystemFeatures Test commit bd7116f6d8917718675b670e41a7e6d76cf67f1c Merge: 5444c35 78d2c1d Author: Brian Muramatsu Date: Tue Aug 17 12:55:02 2010 -0700 Merge "Group CtsVerifier Tests into Categories" into froyo commit a49151d5838819e1b99a996f6fe3580821541a0c Merge: 2ec1b22 54b7c10 Author: Brian Muramatsu Date: Tue Aug 17 12:40:52 2010 -0700 am 54b7c10e: am 17bf2501: Fix Missing CTS Test Cases Merge commit '54b7c10eebb64f58dbf3e76f1ed6ae81cc01d535' * commit '54b7c10eebb64f58dbf3e76f1ed6ae81cc01d535': Fix Missing CTS Test Cases commit 54b7c10eebb64f58dbf3e76f1ed6ae81cc01d535 Merge: 61c2de6 17bf250 Author: Brian Muramatsu Date: Tue Aug 17 12:37:10 2010 -0700 am 17bf2501: Fix Missing CTS Test Cases Merge commit '17bf250135919dfd73c32e3f15ccd4e6765645c3' into gingerbread-plus-aosp * commit '17bf250135919dfd73c32e3f15ccd4e6765645c3': Fix Missing CTS Test Cases commit 9a40c5c9907f33e74e79c5fa58df8cb87a23074c Author: Wu-cheng Li Date: Tue Aug 17 12:09:37 2010 -0700 Test zoom in each preview size. Change-Id: Ibab93e90f37695737a7e8454f21bc321c1c3e7f5 commit 17bf250135919dfd73c32e3f15ccd4e6765645c3 Author: Brian Muramatsu Date: Tue Aug 17 12:07:07 2010 -0700 Fix Missing CTS Test Cases CTS uses JavaDoc to scan the source code tree for tests. Since libcore moved to a separate project, javadoc started to drop all the testcases that referenced JUnit or the Dalvik annotations leading to CTS dropping most of its test cases. It would be nice if JavaDoc failed more loudly. Change-Id: I0766e31212732c5d05d921790c849fc0e95db61e commit b2d4a89a3e004a88bdc220d824df41f2ae8f1024 Author: Brian Muramatsu Date: Mon Aug 16 17:01:07 2010 -0700 DO NOT MERGE Eclair SystemFeatures Test Bug 2923901 Copied the test from Froyo but removed the tests that used feature constants not present in Eclair. Change-Id: I8d44321b9520fb01930e9f2404a97751703464c8 commit 78d2c1d7d2051c288aca440d336f0f976b2f2fe6 Author: Brian Muramatsu Date: Mon Aug 16 15:22:30 2010 -0700 Group CtsVerifier Tests into Categories Specify a metadata attribute for "test_category" to group tests under categories. If the attribute is left out, then the test will be put under the "Other" category in the list. Change-Id: I8ac2e686ff0497b09b22ec7e9eca5ee4aedef6c5 commit 2ec1b22decc3ca701aea0f5ea52545bc0841ea6a Merge: be50139 61c2de6 Author: Brian Muramatsu Date: Mon Aug 16 15:19:41 2010 -0700 am 61c2de60: am 18faaa6e: am f864ab30: am 5444c35b: Merge "Check CtsVerifier Feature Count" into froyo Merge commit '61c2de60e6a7a68179c23e32ada1c18046791554' * commit '61c2de60e6a7a68179c23e32ada1c18046791554': Check CtsVerifier Feature Count commit be50139f3b8990e384c0dee78db38554bdb963a7 Merge: 2633a0e c4dfc59 Author: Brian Muramatsu Date: Mon Aug 16 15:19:39 2010 -0700 am c4dfc595: (-s ours) am 436af225: am 77b1b39e: (-s ours) am 2859b6f2: (-s ours) Merge "DO NOT MERGE Check "hardware_id" Property" into froyo Merge commit 'c4dfc595521d414de5eeb452e154b2b0fc590f2c' * commit 'c4dfc595521d414de5eeb452e154b2b0fc590f2c': DO NOT MERGE Check "hardware_id" Property commit 2633a0e35aa57dfaf4032e2fd3b1e76b5e082a2e Merge: c66f76a 0aed72e Author: Doug Zongker Date: Mon Aug 16 15:19:10 2010 -0700 am 0aed72ee: am ead6f835: add CTS tests for Build.DEVICE and Build.SERIAL Merge commit '0aed72eec99e079da1921d1f13977c92bb710230' * commit '0aed72eec99e079da1921d1f13977c92bb710230': add CTS tests for Build.DEVICE and Build.SERIAL commit c66f76aff0a1cad252241a08c30940581a2661fa Merge: d9cafa8 2535861 Author: Brian Muramatsu Date: Mon Aug 16 15:18:08 2010 -0700 am 25358610: am 45c029e1: am 9fbeed7c: am 7507929d: Merge "Fix Copyright Headers" into froyo Merge commit '253586101e3987d06eb95ed4f51f2c6a4d828e83' * commit '253586101e3987d06eb95ed4f51f2c6a4d828e83': Fix Copyright Headers commit d9cafa81c9a4a60717cdc7038f26ce5138d39b41 Merge: c0e9452 20a01fe Author: Brian Muramatsu Date: Mon Aug 16 15:18:05 2010 -0700 am 20a01fe7: am d5fc4619: am a4e962f4: am e591e526: Porting Unsubmitted Cupcake SAX Tests Merge commit '20a01fe70b203f6f7891ab73d21460164882f92e' * commit '20a01fe70b203f6f7891ab73d21460164882f92e': Porting Unsubmitted Cupcake SAX Tests commit 61c2de60e6a7a68179c23e32ada1c18046791554 Merge: c4dfc59 18faaa6 Author: Brian Muramatsu Date: Mon Aug 16 13:30:07 2010 -0700 am 18faaa6e: am f864ab30: am 5444c35b: Merge "Check CtsVerifier Feature Count" into froyo Merge commit '18faaa6e2fff93db7656bb32e5899a674139a7f6' into gingerbread-plus-aosp * commit '18faaa6e2fff93db7656bb32e5899a674139a7f6': Check CtsVerifier Feature Count commit c4dfc595521d414de5eeb452e154b2b0fc590f2c Merge: 0aed72e 436af22 Author: Brian Muramatsu Date: Mon Aug 16 13:30:05 2010 -0700 am 436af225: am 77b1b39e: (-s ours) am 2859b6f2: (-s ours) Merge "DO NOT MERGE Check "hardware_id" Property" into froyo Merge commit '436af22563652ac47623a5215e1cc003f45eba87' into gingerbread-plus-aosp * commit '436af22563652ac47623a5215e1cc003f45eba87': DO NOT MERGE Check "hardware_id" Property commit 18faaa6e2fff93db7656bb32e5899a674139a7f6 Merge: 436af22 f864ab3 Author: Brian Muramatsu Date: Mon Aug 16 13:28:17 2010 -0700 am f864ab30: am 5444c35b: Merge "Check CtsVerifier Feature Count" into froyo Merge commit 'f864ab302ecff6ec81974ae6ede09204d007c3bf' into gingerbread * commit 'f864ab302ecff6ec81974ae6ede09204d007c3bf': Check CtsVerifier Feature Count commit 436af22563652ac47623a5215e1cc003f45eba87 Merge: ead6f83 77b1b39 Author: Brian Muramatsu Date: Mon Aug 16 13:28:15 2010 -0700 am 77b1b39e: (-s ours) am 2859b6f2: (-s ours) Merge "DO NOT MERGE Check "hardware_id" Property" into froyo Merge commit '77b1b39ed9573a5f48ad156c9c5d94e1f08bc23f' into gingerbread * commit '77b1b39ed9573a5f48ad156c9c5d94e1f08bc23f': DO NOT MERGE Check "hardware_id" Property commit 0aed72eec99e079da1921d1f13977c92bb710230 Merge: 2535861 ead6f83 Author: Doug Zongker Date: Mon Aug 16 13:19:52 2010 -0700 am ead6f835: add CTS tests for Build.DEVICE and Build.SERIAL Merge commit 'ead6f835102c165de03f8e1bb2931a331c419672' into gingerbread-plus-aosp * commit 'ead6f835102c165de03f8e1bb2931a331c419672': add CTS tests for Build.DEVICE and Build.SERIAL commit f864ab302ecff6ec81974ae6ede09204d007c3bf Merge: 77b1b39 5444c35 Author: Brian Muramatsu Date: Mon Aug 16 13:15:36 2010 -0700 am 5444c35b: Merge "Check CtsVerifier Feature Count" into froyo Merge commit '5444c35b68d11d44d979b98eb8a493b5fa588e09' into froyo * commit '5444c35b68d11d44d979b98eb8a493b5fa588e09': Check CtsVerifier Feature Count commit 77b1b39ed9573a5f48ad156c9c5d94e1f08bc23f Merge: 9fbeed7 2859b6f Author: Brian Muramatsu Date: Mon Aug 16 13:15:32 2010 -0700 am 2859b6f2: (-s ours) Merge "DO NOT MERGE Check "hardware_id" Property" into froyo Merge commit '2859b6f20e5e9941d5d8062f328cd42c61925be6' into froyo * commit '2859b6f20e5e9941d5d8062f328cd42c61925be6': DO NOT MERGE Check "hardware_id" Property commit 5444c35b68d11d44d979b98eb8a493b5fa588e09 Merge: 2859b6f 99e17a3 Author: Brian Muramatsu Date: Mon Aug 16 12:09:44 2010 -0700 Merge "Check CtsVerifier Feature Count" into froyo commit 2859b6f20e5e9941d5d8062f328cd42c61925be6 Merge: 7507929 ebe3648 Author: Brian Muramatsu Date: Mon Aug 16 11:23:58 2010 -0700 Merge "DO NOT MERGE Check "hardware_id" Property" into froyo commit ebe3648614ebca51641eb10c9748f699e4c0c494 Author: Brian Muramatsu Date: Fri Aug 13 11:30:40 2010 -0700 DO NOT MERGE Check "hardware_id" Property Assert that the "hardware_id" property is set to something sane for non-telephony devices. Change-Id: I86fe6b4654d6710e5e7df7cd5d1d39968ddf8ee5 commit ead6f835102c165de03f8e1bb2931a331c419672 Author: Doug Zongker Date: Mon Aug 16 10:16:40 2010 -0700 add CTS tests for Build.DEVICE and Build.SERIAL Change-Id: Ib7a770c669f0f91883beb1aa98d8bc90ef51cf3a commit c0e9452eed0c134b3baa6353e332d5463627c2f4 Merge: 439c197 858e499 Author: Brian Muramatsu Date: Mon Aug 16 07:50:02 2010 -0700 am 858e499d: am bad7d125: am b6c1b29b: am 2233072b: Add Positions to Format Specifiers Merge commit '858e499dc18684e01d4d9efd3ef7ca47902e0322' * commit '858e499dc18684e01d4d9efd3ef7ca47902e0322': Add Positions to Format Specifiers commit 439c197c348cf9b3f0b22bbcd3390414a2042806 Merge: 26aa2c2 b6c49d1 Author: Brian Muramatsu Date: Mon Aug 16 07:49:07 2010 -0700 am b6c49d1b: am 3681ecff: am 91678546: am accc6844: CtsVerifier Suid File Scanner Merge commit 'b6c49d1bb017797ab13ec19db60710a4e1d15f41' * commit 'b6c49d1bb017797ab13ec19db60710a4e1d15f41': CtsVerifier Suid File Scanner commit 26aa2c2558a8f1ebe534a64fdaf565db21e11d0d Merge: ae9e371 a63e7af Author: Dan Morrill Date: Mon Aug 16 07:48:58 2010 -0700 am a63e7af5: am 7c56fc7f: am 979d6a01: am 98c56e65: Adding an improved version of the Accelerometer tester, which works more reliably. Also a first cut at a Magnetometer tester, but this requires real-world testing to make sure it actually works. Merge commit 'a63e7af54165ac47b53b6a5b85bb55eee4235b74' * commit 'a63e7af54165ac47b53b6a5b85bb55eee4235b74': Adding an improved version of the Accelerometer tester, which works more commit ae9e371e83227a310ad9f85e7aad5170f6719666 Merge: 917a579 e00123b Author: Brian Muramatsu Date: Mon Aug 16 07:48:53 2010 -0700 am e00123bd: am 3893709b: am d9d4b4c5: am 3f98f3dc: Merge "Check TelephonyManager#getDeviceId Returns Null" into froyo Merge commit 'e00123bd1e066b7fbdb75538f75c703b5189f731' * commit 'e00123bd1e066b7fbdb75538f75c703b5189f731': Check TelephonyManager#getDeviceId Returns Null commit 99e17a3cf19610a987ef1c64f8fc855bc791c348 Author: Brian Muramatsu Date: Fri Aug 13 16:56:44 2010 -0700 Check CtsVerifier Feature Count Add a quick test that will warn us when the features go out of sync. Change-Id: Ieda635fa46e417365cf64e1a735bbac8fb80f4be commit 253586101e3987d06eb95ed4f51f2c6a4d828e83 Merge: 20a01fe 45c029e Author: Brian Muramatsu Date: Fri Aug 13 17:15:53 2010 -0700 am 45c029e1: am 9fbeed7c: am 7507929d: Merge "Fix Copyright Headers" into froyo Merge commit '45c029e1fb42761280830f5d3acba49d34531316' into gingerbread-plus-aosp * commit '45c029e1fb42761280830f5d3acba49d34531316': Fix Copyright Headers commit 45c029e1fb42761280830f5d3acba49d34531316 Merge: d5fc461 9fbeed7 Author: Brian Muramatsu Date: Fri Aug 13 17:13:52 2010 -0700 am 9fbeed7c: am 7507929d: Merge "Fix Copyright Headers" into froyo Merge commit '9fbeed7c17c1156ea66b4f03caf900daadd98732' into gingerbread * commit '9fbeed7c17c1156ea66b4f03caf900daadd98732': Fix Copyright Headers commit 9fbeed7c17c1156ea66b4f03caf900daadd98732 Merge: a4e962f 7507929 Author: Brian Muramatsu Date: Fri Aug 13 17:11:40 2010 -0700 am 7507929d: Merge "Fix Copyright Headers" into froyo Merge commit '7507929d4881f099c211f8468e669be4e633b0de' into froyo * commit '7507929d4881f099c211f8468e669be4e633b0de': Fix Copyright Headers commit 7507929d4881f099c211f8468e669be4e633b0de Merge: e591e52 40bdc5e Author: Brian Muramatsu Date: Fri Aug 13 17:01:29 2010 -0700 Merge "Fix Copyright Headers" into froyo commit 20a01fe70b203f6f7891ab73d21460164882f92e Merge: 858e499 d5fc461 Author: Brian Muramatsu Date: Fri Aug 13 16:42:12 2010 -0700 am d5fc4619: am a4e962f4: am e591e526: Porting Unsubmitted Cupcake SAX Tests Merge commit 'd5fc461975d7b8654104d26c379ab3a509c2fa84' into gingerbread-plus-aosp * commit 'd5fc461975d7b8654104d26c379ab3a509c2fa84': Porting Unsubmitted Cupcake SAX Tests commit d5fc461975d7b8654104d26c379ab3a509c2fa84 Merge: bad7d12 a4e962f Author: Brian Muramatsu Date: Fri Aug 13 16:40:07 2010 -0700 am a4e962f4: am e591e526: Porting Unsubmitted Cupcake SAX Tests Merge commit 'a4e962f4bf39576576c1f5c97a1a60e1b4286d15' into gingerbread * commit 'a4e962f4bf39576576c1f5c97a1a60e1b4286d15': Porting Unsubmitted Cupcake SAX Tests commit a4e962f4bf39576576c1f5c97a1a60e1b4286d15 Merge: b6c1b29 e591e52 Author: Brian Muramatsu Date: Fri Aug 13 16:37:02 2010 -0700 am e591e526: Porting Unsubmitted Cupcake SAX Tests Merge commit 'e591e52693668ac893f2d7cc25aecc743cae7ffe' into froyo * commit 'e591e52693668ac893f2d7cc25aecc743cae7ffe': Porting Unsubmitted Cupcake SAX Tests commit e591e52693668ac893f2d7cc25aecc743cae7ffe Author: Brian Muramatsu Date: Mon Apr 26 16:50:50 2010 -0700 Porting Unsubmitted Cupcake SAX Tests Removed useless lines, renamed variables, and added additional checks to make sure listeners were being called. Squashed commit of the following: commit 10f95aa68b7738d9f0129a431f67d3ffe21e67c8 Date: Wed Nov 18 14:26:50 2009 -0800 Integrate unsubmitted cupcake change 131863: CTS: Add Testcase for android.sax package Change-Id: Id317212a57ebe5c3db62e6cbdfc8b45613a96d63 commit 40bdc5ec85d7f9c21a5473e8938ef057ed86d1ba Author: Brian Muramatsu Date: Fri Aug 13 16:20:15 2010 -0700 Fix Copyright Headers Bug 2884241 1. Change Google -> The Android Open Source Project 2. Remove the license header for Google when there was already an Android Open Source Project header. Change-Id: I90ad44d1ae96545f8a003ba39f41bc5df5c42a29 commit 858e499dc18684e01d4d9efd3ef7ca47902e0322 Merge: b6c49d1 bad7d12 Author: Brian Muramatsu Date: Fri Aug 13 15:07:59 2010 -0700 am bad7d125: am b6c1b29b: am 2233072b: Add Positions to Format Specifiers Merge commit 'bad7d12578c4037fb3d7176ecf48a37632f8a320' into gingerbread-plus-aosp * commit 'bad7d12578c4037fb3d7176ecf48a37632f8a320': Add Positions to Format Specifiers commit bad7d12578c4037fb3d7176ecf48a37632f8a320 Merge: 3681ecf b6c1b29 Author: Brian Muramatsu Date: Fri Aug 13 15:05:51 2010 -0700 am b6c1b29b: am 2233072b: Add Positions to Format Specifiers Merge commit 'b6c1b29b4584a1a16a89dcf53a80eceb7c2b47dc' into gingerbread * commit 'b6c1b29b4584a1a16a89dcf53a80eceb7c2b47dc': Add Positions to Format Specifiers commit b6c1b29b4584a1a16a89dcf53a80eceb7c2b47dc Merge: 9167854 2233072 Author: Brian Muramatsu Date: Fri Aug 13 15:04:09 2010 -0700 am 2233072b: Add Positions to Format Specifiers Merge commit '2233072b1c7b1eb62fd4c2d2629e8e3489e4b9b5' into froyo * commit '2233072b1c7b1eb62fd4c2d2629e8e3489e4b9b5': Add Positions to Format Specifiers commit 2233072b1c7b1eb62fd4c2d2629e8e3489e4b9b5 Author: Brian Muramatsu Date: Fri Aug 13 14:48:36 2010 -0700 Add Positions to Format Specifiers Change-Id: I45b76dd6bb3d9dc6ee233a0c6e4a9bd5db0f8a35 commit b6c49d1bb017797ab13ec19db60710a4e1d15f41 Merge: a63e7af 3681ecf Author: Brian Muramatsu Date: Fri Aug 13 12:40:01 2010 -0700 am 3681ecff: am 91678546: am accc6844: CtsVerifier Suid File Scanner Merge commit '3681ecffebf656e009f99cc6d7b4639f5b2ccc1f' into gingerbread-plus-aosp * commit '3681ecffebf656e009f99cc6d7b4639f5b2ccc1f': CtsVerifier Suid File Scanner commit 3681ecffebf656e009f99cc6d7b4639f5b2ccc1f Merge: 7c56fc7 9167854 Author: Brian Muramatsu Date: Fri Aug 13 12:37:51 2010 -0700 am 91678546: am accc6844: CtsVerifier Suid File Scanner Merge commit '916785461c85787f7212e0f0772643a9b2dee1ab' into gingerbread * commit '916785461c85787f7212e0f0772643a9b2dee1ab': CtsVerifier Suid File Scanner commit 916785461c85787f7212e0f0772643a9b2dee1ab Merge: 979d6a0 accc684 Author: Brian Muramatsu Date: Fri Aug 13 12:34:17 2010 -0700 am accc6844: CtsVerifier Suid File Scanner Merge commit 'accc6844267a59b122b6db7af62e0797bf2911c2' into froyo * commit 'accc6844267a59b122b6db7af62e0797bf2911c2': CtsVerifier Suid File Scanner commit accc6844267a59b122b6db7af62e0797bf2911c2 Author: Brian Muramatsu Date: Wed Aug 11 18:57:27 2010 -0700 CtsVerifier Suid File Scanner Bug 2732160 Create an activity for the CtsVerifier (a collection of manual tests) that scans for suid files. This was not made into unit test, because it is not comprehensive enough to guarantee that all suid files are found. Furthermore, there is no way to say what the official list of binaries should be permitted across all Android devices. Here is a shortcut command for developing just this activity and avoiding the welcome and manual test list screens: mmm cts/apps && adb install -r out/target/product/generic/data/app/CtsVerifier.apk && adb shell "am start -n com.android.cts.verifier/.suid.SuidFilesActivity" Change-Id: I98521bea565b9315a41c8dc005d8adfd9178621b commit a63e7af54165ac47b53b6a5b85bb55eee4235b74 Merge: e00123b 7c56fc7 Author: Dan Morrill Date: Fri Aug 13 11:58:39 2010 -0700 am 7c56fc7f: am 979d6a01: am 98c56e65: Adding an improved version of the Accelerometer tester, which works more reliably. Also a first cut at a Magnetometer tester, but this requires real-world testing to make sure it actually works. Merge commit '7c56fc7fa7d80c10662aade535c10056d2ec8422' into gingerbread-plus-aosp * commit '7c56fc7fa7d80c10662aade535c10056d2ec8422': Adding an improved version of the Accelerometer tester, which works more commit e00123bd1e066b7fbdb75538f75c703b5189f731 Merge: 8e41bfe 3893709 Author: Brian Muramatsu Date: Fri Aug 13 11:58:36 2010 -0700 am 3893709b: am d9d4b4c5: am 3f98f3dc: Merge "Check TelephonyManager#getDeviceId Returns Null" into froyo Merge commit '3893709bcb8fe19296d2631bbb9666869987de09' into gingerbread-plus-aosp * commit '3893709bcb8fe19296d2631bbb9666869987de09': Check TelephonyManager#getDeviceId Returns Null commit 7c56fc7fa7d80c10662aade535c10056d2ec8422 Merge: 3893709 979d6a0 Author: Dan Morrill Date: Fri Aug 13 11:53:58 2010 -0700 am 979d6a01: am 98c56e65: Adding an improved version of the Accelerometer tester, which works more reliably. Also a first cut at a Magnetometer tester, but this requires real-world testing to make sure it actually works. Merge commit '979d6a01c8ca7269860cebee9ad8a69c94744cca' into gingerbread * commit '979d6a01c8ca7269860cebee9ad8a69c94744cca': Adding an improved version of the Accelerometer tester, which works more commit 3893709bcb8fe19296d2631bbb9666869987de09 Merge: 763a8af d9d4b4c Author: Brian Muramatsu Date: Fri Aug 13 11:53:55 2010 -0700 am d9d4b4c5: am 3f98f3dc: Merge "Check TelephonyManager#getDeviceId Returns Null" into froyo Merge commit 'd9d4b4c5e43eeb7a2ee42e9e605f620adbb6740b' into gingerbread * commit 'd9d4b4c5e43eeb7a2ee42e9e605f620adbb6740b': Check TelephonyManager#getDeviceId Returns Null commit 979d6a01c8ca7269860cebee9ad8a69c94744cca Merge: d9d4b4c 98c56e6 Author: Dan Morrill Date: Fri Aug 13 11:49:46 2010 -0700 am 98c56e65: Adding an improved version of the Accelerometer tester, which works more reliably. Also a first cut at a Magnetometer tester, but this requires real-world testing to make sure it actually works. Merge commit '98c56e6588b5a5bb435e8e76d35ff78a242e1604' into froyo * commit '98c56e6588b5a5bb435e8e76d35ff78a242e1604': Adding an improved version of the Accelerometer tester, which works more commit d9d4b4c5e43eeb7a2ee42e9e605f620adbb6740b Merge: f32f4c5 3f98f3d Author: Brian Muramatsu Date: Fri Aug 13 11:49:44 2010 -0700 am 3f98f3dc: Merge "Check TelephonyManager#getDeviceId Returns Null" into froyo Merge commit '3f98f3dcad07d367389517812366d20593e658fc' into froyo * commit '3f98f3dcad07d367389517812366d20593e658fc': Check TelephonyManager#getDeviceId Returns Null commit 98c56e6588b5a5bb435e8e76d35ff78a242e1604 Author: Dan Morrill Date: Fri Aug 13 02:43:52 2010 -0700 Adding an improved version of the Accelerometer tester, which works more reliably. Also a first cut at a Magnetometer tester, but this requires real-world testing to make sure it actually works. Change-Id: I1e0f3ac1e25e8bdd247f9dea253d8bc2a59c673c commit 3f98f3dcad07d367389517812366d20593e658fc Merge: 3a79e94 80642df Author: Brian Muramatsu Date: Fri Aug 13 10:45:09 2010 -0700 Merge "Check TelephonyManager#getDeviceId Returns Null" into froyo commit 917a579bf74a8054a586faf23ba93dce3ed83a01 Merge: 0caed75 8e41bfe Author: Dan Morrill Date: Thu Aug 12 15:44:45 2010 -0700 am 8e41bfec: am 763a8af9: am f32f4c54: am 3a79e94f: Remove @Overrides to unbreak the CTS build. Merge commit '8e41bfec5399d472cb144900caf0eeab04bccda7' * commit '8e41bfec5399d472cb144900caf0eeab04bccda7': Remove @Overrides to unbreak the CTS build. commit 8e41bfec5399d472cb144900caf0eeab04bccda7 Merge: 275096f 763a8af Author: Dan Morrill Date: Thu Aug 12 15:42:11 2010 -0700 am 763a8af9: am f32f4c54: am 3a79e94f: Remove @Overrides to unbreak the CTS build. Merge commit '763a8af95a806f6dca1421bd5050f4fefe12f64a' into gingerbread-plus-aosp * commit '763a8af95a806f6dca1421bd5050f4fefe12f64a': Remove @Overrides to unbreak the CTS build. commit 763a8af95a806f6dca1421bd5050f4fefe12f64a Merge: a388eb2 f32f4c5 Author: Dan Morrill Date: Thu Aug 12 15:39:52 2010 -0700 am f32f4c54: am 3a79e94f: Remove @Overrides to unbreak the CTS build. Merge commit 'f32f4c5461e5fbb247a49eef7bdd74cc8094063c' into gingerbread * commit 'f32f4c5461e5fbb247a49eef7bdd74cc8094063c': Remove @Overrides to unbreak the CTS build. commit f32f4c5461e5fbb247a49eef7bdd74cc8094063c Merge: b5a9b57 3a79e94 Author: Dan Morrill Date: Thu Aug 12 15:37:21 2010 -0700 am 3a79e94f: Remove @Overrides to unbreak the CTS build. Merge commit '3a79e94f7cd1c74fe370b06ff708bf3d7c02a1ef' into froyo * commit '3a79e94f7cd1c74fe370b06ff708bf3d7c02a1ef': Remove @Overrides to unbreak the CTS build. commit 3a79e94f7cd1c74fe370b06ff708bf3d7c02a1ef Author: Dan Morrill Date: Thu Aug 12 15:29:41 2010 -0700 Remove @Overrides to unbreak the CTS build. Change-Id: I1cf5667d3c3017dd0fc179006eb384ab4fd43366 commit 0caed7554dd01897ba6431e568c27c6a4ed15ef4 Merge: 472545e 275096f Author: Dan Morrill Date: Thu Aug 12 14:56:49 2010 -0700 am 275096f2: am a388eb27: am b5a9b578: am 5df275b6: Adding a CTS Verifier activity to summarize features reported by the device. Can be used to sanity-check reported features at a glance. Merge commit '275096f2090ad3297d61c83a552b33880a237302' * commit '275096f2090ad3297d61c83a552b33880a237302': Adding a CTS Verifier activity to summarize features reported by the device. commit 275096f2090ad3297d61c83a552b33880a237302 Merge: c7d7346 a388eb2 Author: Dan Morrill Date: Thu Aug 12 14:54:02 2010 -0700 am a388eb27: am b5a9b578: am 5df275b6: Adding a CTS Verifier activity to summarize features reported by the device. Can be used to sanity-check reported features at a glance. Merge commit 'a388eb278723c9ada271c0a17ce59b717943aa3a' into gingerbread-plus-aosp * commit 'a388eb278723c9ada271c0a17ce59b717943aa3a': Adding a CTS Verifier activity to summarize features reported by the device. commit a388eb278723c9ada271c0a17ce59b717943aa3a Merge: a222a71 b5a9b57 Author: Dan Morrill Date: Thu Aug 12 14:51:55 2010 -0700 am b5a9b578: am 5df275b6: Adding a CTS Verifier activity to summarize features reported by the device. Can be used to sanity-check reported features at a glance. Merge commit 'b5a9b578b5ed849f65076d2208fa25bf77785ff3' into gingerbread * commit 'b5a9b578b5ed849f65076d2208fa25bf77785ff3': Adding a CTS Verifier activity to summarize features reported by the device. commit b5a9b578b5ed849f65076d2208fa25bf77785ff3 Merge: 4019816 5df275b Author: Dan Morrill Date: Thu Aug 12 14:49:28 2010 -0700 am 5df275b6: Adding a CTS Verifier activity to summarize features reported by the device. Can be used to sanity-check reported features at a glance. Merge commit '5df275b68095e8f19da26cb98b008fe252bf498b' into froyo * commit '5df275b68095e8f19da26cb98b008fe252bf498b': Adding a CTS Verifier activity to summarize features reported by the device. commit 80642df8103d5705c2c792ca0082c7f26f011f59 Author: Brian Muramatsu Date: Thu Aug 12 14:08:05 2010 -0700 Check TelephonyManager#getDeviceId Returns Null TelephonyManager#getDeviceId should return null for non-telephony devices. Add that assertion to the test. Leave the tests that check that Wifi is supported on a non-telephony device though, because at least one form of wireless data networking must be supported... Change-Id: If4752df120be28526d3f585d0896fb8a1e0bee81 commit 472545edf6937339f27294cbdebfe73cca52b0b6 Merge: cff3a2a c7d7346 Author: Brian Muramatsu Date: Thu Aug 12 13:31:11 2010 -0700 am c7d7346b: am a222a71e: am 40198166: am 28179d62: Merge "Some Assorted WebKit Test Fixes" into froyo Merge commit 'c7d7346be4e1f04f8ec3e0d5f2520d8f038cd4f6' * commit 'c7d7346be4e1f04f8ec3e0d5f2520d8f038cd4f6': Some Assorted WebKit Test Fixes commit cff3a2a20281d192d2d7d9c8e3d74634d8527f31 Merge: 030b403 cba7fee Author: Brian Muramatsu Date: Thu Aug 12 13:31:03 2010 -0700 am cba7feef: am 596d20d4: am f2940a9c: am 0694f755: Merge "Add Bluetooth Feature Test" into froyo Merge commit 'cba7feefd78198003fa28171785b4a551bfa8dfd' * commit 'cba7feefd78198003fa28171785b4a551bfa8dfd': Add Bluetooth Feature Test commit c7d7346be4e1f04f8ec3e0d5f2520d8f038cd4f6 Merge: cba7fee a222a71 Author: Brian Muramatsu Date: Thu Aug 12 13:26:45 2010 -0700 am a222a71e: am 40198166: am 28179d62: Merge "Some Assorted WebKit Test Fixes" into froyo Merge commit 'a222a71e181949e154e3d57fb704b5a4283f2f80' into gingerbread-plus-aosp * commit 'a222a71e181949e154e3d57fb704b5a4283f2f80': Some Assorted WebKit Test Fixes commit cba7feefd78198003fa28171785b4a551bfa8dfd Merge: cfa7dde 596d20d Author: Brian Muramatsu Date: Thu Aug 12 13:26:40 2010 -0700 am 596d20d4: am f2940a9c: am 0694f755: Merge "Add Bluetooth Feature Test" into froyo Merge commit '596d20d4995424aa2883db8b9e80a947cdc5f507' into gingerbread-plus-aosp * commit '596d20d4995424aa2883db8b9e80a947cdc5f507': Add Bluetooth Feature Test commit a222a71e181949e154e3d57fb704b5a4283f2f80 Merge: 596d20d 4019816 Author: Brian Muramatsu Date: Thu Aug 12 13:24:26 2010 -0700 am 40198166: am 28179d62: Merge "Some Assorted WebKit Test Fixes" into froyo Merge commit '40198166bfcefffdcb67828a4cc11cc635dddca8' into gingerbread * commit '40198166bfcefffdcb67828a4cc11cc635dddca8': Some Assorted WebKit Test Fixes commit 596d20d4995424aa2883db8b9e80a947cdc5f507 Merge: 171b024 f2940a9 Author: Brian Muramatsu Date: Thu Aug 12 13:24:20 2010 -0700 am f2940a9c: am 0694f755: Merge "Add Bluetooth Feature Test" into froyo Merge commit 'f2940a9c67cdbfe84b066ca012df5e35a00531bd' into gingerbread * commit 'f2940a9c67cdbfe84b066ca012df5e35a00531bd': Add Bluetooth Feature Test commit 5df275b68095e8f19da26cb98b008fe252bf498b Author: Dan Morrill Date: Wed Aug 11 12:19:19 2010 -0700 Adding a CTS Verifier activity to summarize features reported by the device. Can be used to sanity-check reported features at a glance. Change-Id: I6240e3833eb24a77a3e92dd3997e57f08b2dbb4c commit 40198166bfcefffdcb67828a4cc11cc635dddca8 Merge: f2940a9 28179d6 Author: Brian Muramatsu Date: Thu Aug 12 13:05:23 2010 -0700 am 28179d62: Merge "Some Assorted WebKit Test Fixes" into froyo Merge commit '28179d627c2ddf62cbd68c47822163b80ab12277' into froyo * commit '28179d627c2ddf62cbd68c47822163b80ab12277': Some Assorted WebKit Test Fixes commit f2940a9c67cdbfe84b066ca012df5e35a00531bd Merge: 48cae1a 0694f75 Author: Brian Muramatsu Date: Thu Aug 12 13:05:16 2010 -0700 am 0694f755: Merge "Add Bluetooth Feature Test" into froyo Merge commit '0694f75595aae761b9180e25c0d3f3c0bc84c5b1' into froyo * commit '0694f75595aae761b9180e25c0d3f3c0bc84c5b1': Add Bluetooth Feature Test commit 28179d627c2ddf62cbd68c47822163b80ab12277 Merge: 0694f75 0bb737e Author: Brian Muramatsu Date: Thu Aug 12 11:11:16 2010 -0700 Merge "Some Assorted WebKit Test Fixes" into froyo commit 0694f75595aae761b9180e25c0d3f3c0bc84c5b1 Merge: 03bf871 79a52ae Author: Brian Muramatsu Date: Thu Aug 12 10:54:39 2010 -0700 Merge "Add Bluetooth Feature Test" into froyo commit 0bb737e7aee7c30db2118ed6f52e790680c895aa Author: Brian Muramatsu Date: Tue Aug 10 17:22:48 2010 -0700 Some Assorted WebKit Test Fixes Bug 2888212 The tests call a "loadUrl" method that waits until getProgress returns 100. However, it appears that the updates returned by getProgress are not accurrate unless there is a WebChromeClient set on the WebView as seen in the code of CallbackProxy#onProgressChanged. Setting the client should fix the flakiness of the tests. Call setInitialScale in WebSettingsTest so that the testFindNext test will have to scroll to find the next instance of the word "all" since the default scaling in QVGA will zoom out to show two cases of "all" which won't require scrolling. Change-Id: I3e313794e11f303b26ebd6dc1cde2720774ab439 commit 030b403cba89616bd16bffda68b22ae095a0422e Merge: 9bd5cc6 cfa7dde Author: Brian Muramatsu Date: Tue Aug 10 16:36:42 2010 -0700 am cfa7dde8: am 171b024a: am 48cae1a0: am 03bf8716: Merge "CtsVerifier Test List Infrastructure" into froyo Merge commit 'cfa7dde8914cbf05869f00172a71a4d2b2e60345' * commit 'cfa7dde8914cbf05869f00172a71a4d2b2e60345': CtsVerifier Test List Infrastructure commit cfa7dde8914cbf05869f00172a71a4d2b2e60345 Merge: 29e71e3 171b024 Author: Brian Muramatsu Date: Tue Aug 10 16:28:49 2010 -0700 am 171b024a: am 48cae1a0: am 03bf8716: Merge "CtsVerifier Test List Infrastructure" into froyo Merge commit '171b024ad62c9f13d22051bfa699e1efeedebc8f' into gingerbread-plus-aosp * commit '171b024ad62c9f13d22051bfa699e1efeedebc8f': CtsVerifier Test List Infrastructure commit 171b024ad62c9f13d22051bfa699e1efeedebc8f Merge: 3e1c2ee 48cae1a Author: Brian Muramatsu Date: Tue Aug 10 16:23:32 2010 -0700 am 48cae1a0: am 03bf8716: Merge "CtsVerifier Test List Infrastructure" into froyo Merge commit '48cae1a07e6e0f6bb437fba8f2cf3fce050f3421' into gingerbread * commit '48cae1a07e6e0f6bb437fba8f2cf3fce050f3421': CtsVerifier Test List Infrastructure commit 48cae1a07e6e0f6bb437fba8f2cf3fce050f3421 Merge: 03dcee9 03bf871 Author: Brian Muramatsu Date: Tue Aug 10 16:16:24 2010 -0700 am 03bf8716: Merge "CtsVerifier Test List Infrastructure" into froyo Merge commit '03bf871682bacdf6e5cf4b7b324ab73605625859' into froyo * commit '03bf871682bacdf6e5cf4b7b324ab73605625859': CtsVerifier Test List Infrastructure commit 03bf871682bacdf6e5cf4b7b324ab73605625859 Merge: 85f3817 bf8790e Author: Brian Muramatsu Date: Tue Aug 10 16:02:21 2010 -0700 Merge "CtsVerifier Test List Infrastructure" into froyo commit 9bd5cc6490beb536fed83e3741abe18a8f00fae8 Merge: 91d5fa8 29e71e3 Author: Elliott Hughes Date: Tue Aug 10 15:05:38 2010 -0700 am 29e71e31: am 3e1c2eeb: Merge "Remove a bogus test that\'s accessing libcore internals." into gingerbread Merge commit '29e71e31ba704d1f80ef002722d904d1ef419232' * commit '29e71e31ba704d1f80ef002722d904d1ef419232': Remove a bogus test that's accessing libcore internals. commit 29e71e31ba704d1f80ef002722d904d1ef419232 Merge: 3dcb2ec 3e1c2ee Author: Elliott Hughes Date: Tue Aug 10 15:02:48 2010 -0700 am 3e1c2eeb: Merge "Remove a bogus test that\'s accessing libcore internals." into gingerbread Merge commit '3e1c2eeba238801ded91afba42ecd827f03d63a2' into gingerbread-plus-aosp * commit '3e1c2eeba238801ded91afba42ecd827f03d63a2': Remove a bogus test that's accessing libcore internals. commit 3e1c2eeba238801ded91afba42ecd827f03d63a2 Merge: 32d915e fa6eb9e Author: Elliott Hughes Date: Tue Aug 10 14:59:57 2010 -0700 Merge "Remove a bogus test that's accessing libcore internals." into gingerbread commit fa6eb9e0cfdb6e4af6aa1e47f271ec04162feb83 Author: Elliott Hughes Date: Tue Aug 10 14:40:46 2010 -0700 Remove a bogus test that's accessing libcore internals. This test didn't test anything useful, and accesses stuff it shouldn't. Bug: 2870945 Change-Id: I7ab6cbe054ff55c07145da99700b200ee03dab39 commit 79a52ae88905b93d7dc5de127a92c0b3de7e6ba5 Author: Brian Muramatsu Date: Tue Aug 10 14:08:15 2010 -0700 Add Bluetooth Feature Test Bug 2908388 Change-Id: I08026f07b5d32b08e6a36fcd5bf3792be68171fc commit 91d5fa8a6e4a2b4e76f598510012fcaa0f80dc78 Merge: 903482f 3dcb2ec Author: Brian Muramatsu Date: Mon Aug 9 19:57:34 2010 -0700 am 3dcb2ec6: (-s ours) am 32d915ec: am 03dcee9e: (-s ours) am 85f3817b: (-s ours) Merge "DO NOT MERGE Update CTS Version to 2.2_r2" into froyo Merge commit '3dcb2ec6d9ab5b745182d919c0ec6ceeb30d21eb' * commit '3dcb2ec6d9ab5b745182d919c0ec6ceeb30d21eb': DO NOT MERGE Update CTS Version to 2.2_r2 commit 3dcb2ec6d9ab5b745182d919c0ec6ceeb30d21eb Merge: c22afad 32d915e Author: Brian Muramatsu Date: Mon Aug 9 19:54:11 2010 -0700 am 32d915ec: am 03dcee9e: (-s ours) am 85f3817b: (-s ours) Merge "DO NOT MERGE Update CTS Version to 2.2_r2" into froyo Merge commit '32d915ec854ca7f1f26f16b0f6d04f1ecec439d4' into gingerbread-plus-aosp * commit '32d915ec854ca7f1f26f16b0f6d04f1ecec439d4': DO NOT MERGE Update CTS Version to 2.2_r2 commit 32d915ec854ca7f1f26f16b0f6d04f1ecec439d4 Merge: 4ac2b06 03dcee9 Author: Brian Muramatsu Date: Mon Aug 9 17:46:52 2010 -0700 am 03dcee9e: (-s ours) am 85f3817b: (-s ours) Merge "DO NOT MERGE Update CTS Version to 2.2_r2" into froyo Merge commit '03dcee9ec143867dc2c57ce9b18a85a30a73c083' into gingerbread * commit '03dcee9ec143867dc2c57ce9b18a85a30a73c083': DO NOT MERGE Update CTS Version to 2.2_r2 commit bf8790e8c47bad17a7c47893d0232f252b3a3693 Author: Brian Muramatsu Date: Fri Aug 6 11:42:32 2010 -0700 CtsVerifier Test List Infrastructure Bug 2732160 Add a button to the main activity that launches a list activity showing the list of manual tests that can be run. The test list activity queries for activities that support intents with the category "android.cts.intent.category.MANUAL_TEST" category. Add some simple tests using ActivityMonitor to make sure that the whole thing somewhat works. Its not entirely necessary, but it was useful to learn about ActivityMonitor and be able to play around with the AndroidManifest.xml to see what breaks. Launch emulator and use the following command to build, install, and run (out path omitted for brevity): mmm cts/apps && adb install -r out/.../CtsVerifier.apk && adb install -r out/.../CtsVerifierTests.apk && runtest -b --path cts/apps/CtsVerifier Change-Id: I915dfb64f58f6e080d14c45d07a037f7eb81dd9d commit 03dcee9ec143867dc2c57ce9b18a85a30a73c083 Merge: 6425263 85f3817 Author: Brian Muramatsu Date: Mon Aug 9 11:48:30 2010 -0700 am 85f3817b: (-s ours) Merge "DO NOT MERGE Update CTS Version to 2.2_r2" into froyo Merge commit '85f3817bfa6e17f4f43f2d643237f1ef2f1833be' into froyo * commit '85f3817bfa6e17f4f43f2d643237f1ef2f1833be': DO NOT MERGE Update CTS Version to 2.2_r2 commit 85f3817bfa6e17f4f43f2d643237f1ef2f1833be Merge: 6425263 5af9e7a Author: Brian Muramatsu Date: Mon Aug 9 11:33:53 2010 -0700 Merge "DO NOT MERGE Update CTS Version to 2.2_r2" into froyo commit 5af9e7aacb3bfc6e9d17ecece0508ca8eb7588db Author: Brian Muramatsu Date: Mon Aug 9 11:14:15 2010 -0700 DO NOT MERGE Update CTS Version to 2.2_r2 Bug 2865633 Change-Id: I24b13e0276271fef7caff1df92057c2c4c2262a5 commit 903482ff8fb25b26e820be207661febf22699efc Author: Dianne Hackborn Date: Sun Aug 8 14:21:19 2010 -0700 Update to track new ContentProvider APIs. Change-Id: Ia119ca2881ea9a2983594f4325c2a86cd0e66842 commit eac6cf4a3984ac8503794d24f54eda6282f037a5 Author: Romain Guy Date: Sun Aug 8 17:42:48 2010 -0700 Remove tests for removed methods. Change-Id: Ic80d46b1ea771e882776f07d528440f38638fc59 commit 23ada699c007cca6183b86dba8d563cc6f35e8dd Merge: 445bc34 c22afad Author: Brian Muramatsu Date: Fri Aug 6 19:07:21 2010 -0700 am c22afada: am 4ac2b06c: am 64252637: Merge "Test for Checking OpenGL ES Version" into froyo Merge commit 'c22afadad56fd1aab115ef9aacbab5c5682c9836' * commit 'c22afadad56fd1aab115ef9aacbab5c5682c9836': Test for Checking OpenGL ES Version commit 445bc347ea4fa4909565d410afbb3380686df7dc Merge: 100b387 48c8f3f Author: Brian Muramatsu Date: Fri Aug 6 19:07:18 2010 -0700 am 48c8f3f3: am b156255b: am 8185f371: Merge "Some PackageManager Feature Tests" into froyo Merge commit '48c8f3f39df60ad632f57be4b02277546bcc298b' * commit '48c8f3f39df60ad632f57be4b02277546bcc298b': Some PackageManager Feature Tests commit 100b387ae6470d5b4708ca55f8907bf7716951ab Merge: abca0eb d2de9f1 Author: Brian Muramatsu Date: Fri Aug 6 19:07:16 2010 -0700 am d2de9f19: am 7b155e38: am 14a003a3: Merge "CTS Verifier Application Skeleton" into froyo Merge commit 'd2de9f1964922ad2bc630609dc2ff095442f94cc' * commit 'd2de9f1964922ad2bc630609dc2ff095442f94cc': CTS Verifier Application Skeleton commit abca0ebff5d7e4e530ccb95acbb0a97ba5cf6e3e Merge: 4d639be c477c51 Author: Brian Muramatsu Date: Fri Aug 6 19:07:13 2010 -0700 am c477c51f: am 499d6981: am 52eb446c: Fix Dpi2 Test Cases Makefile Merge commit 'c477c51f61a14a86f93751c20f39ebb8f98a3890' * commit 'c477c51f61a14a86f93751c20f39ebb8f98a3890': Fix Dpi2 Test Cases Makefile commit c22afadad56fd1aab115ef9aacbab5c5682c9836 Merge: 48c8f3f 4ac2b06 Author: Brian Muramatsu Date: Fri Aug 6 18:59:44 2010 -0700 am 4ac2b06c: am 64252637: Merge "Test for Checking OpenGL ES Version" into froyo Merge commit '4ac2b06c8cb4128d7d6d9d6464accbb90208161b' into gingerbread-plus-aosp * commit '4ac2b06c8cb4128d7d6d9d6464accbb90208161b': Test for Checking OpenGL ES Version commit 48c8f3f39df60ad632f57be4b02277546bcc298b Merge: d2de9f1 b156255 Author: Brian Muramatsu Date: Fri Aug 6 18:59:41 2010 -0700 am b156255b: am 8185f371: Merge "Some PackageManager Feature Tests" into froyo Merge commit 'b156255b1c47acb8b07dd84b343fa0e0e11a4802' into gingerbread-plus-aosp * commit 'b156255b1c47acb8b07dd84b343fa0e0e11a4802': Some PackageManager Feature Tests commit d2de9f1964922ad2bc630609dc2ff095442f94cc Merge: c477c51 7b155e3 Author: Brian Muramatsu Date: Fri Aug 6 18:59:38 2010 -0700 am 7b155e38: am 14a003a3: Merge "CTS Verifier Application Skeleton" into froyo Merge commit '7b155e38faacc9864f4eea424f1fe56841705a06' into gingerbread-plus-aosp * commit '7b155e38faacc9864f4eea424f1fe56841705a06': CTS Verifier Application Skeleton commit c477c51f61a14a86f93751c20f39ebb8f98a3890 Merge: 03d768e 499d698 Author: Brian Muramatsu Date: Fri Aug 6 18:59:35 2010 -0700 am 499d6981: am 52eb446c: Fix Dpi2 Test Cases Makefile Merge commit '499d6981d4ffa271f56675317705de27f889e901' into gingerbread-plus-aosp * commit '499d6981d4ffa271f56675317705de27f889e901': Fix Dpi2 Test Cases Makefile commit 4ac2b06c8cb4128d7d6d9d6464accbb90208161b Merge: b156255 6425263 Author: Brian Muramatsu Date: Fri Aug 6 18:55:29 2010 -0700 am 64252637: Merge "Test for Checking OpenGL ES Version" into froyo Merge commit '64252637d0fbb78494137a94d4b4fdbe4ac339ea' into gingerbread * commit '64252637d0fbb78494137a94d4b4fdbe4ac339ea': Test for Checking OpenGL ES Version commit b156255b1c47acb8b07dd84b343fa0e0e11a4802 Merge: 7b155e3 8185f37 Author: Brian Muramatsu Date: Fri Aug 6 18:55:26 2010 -0700 am 8185f371: Merge "Some PackageManager Feature Tests" into froyo Merge commit '8185f37163027e16ad5187e014383e9c01b90e50' into gingerbread * commit '8185f37163027e16ad5187e014383e9c01b90e50': Some PackageManager Feature Tests commit 7b155e38faacc9864f4eea424f1fe56841705a06 Merge: 499d698 14a003a Author: Brian Muramatsu Date: Fri Aug 6 18:55:23 2010 -0700 am 14a003a3: Merge "CTS Verifier Application Skeleton" into froyo Merge commit '14a003a3ddfb4e47cbfbbb6b404be0d04d880fcc' into gingerbread * commit '14a003a3ddfb4e47cbfbbb6b404be0d04d880fcc': CTS Verifier Application Skeleton commit 499d6981d4ffa271f56675317705de27f889e901 Merge: 13e23f3 52eb446 Author: Brian Muramatsu Date: Fri Aug 6 18:55:19 2010 -0700 am 52eb446c: Fix Dpi2 Test Cases Makefile Merge commit '52eb446c2ce0909548ce1b4af2cb43357aac939b' into gingerbread * commit '52eb446c2ce0909548ce1b4af2cb43357aac939b': Fix Dpi2 Test Cases Makefile commit 64252637d0fbb78494137a94d4b4fdbe4ac339ea Merge: 8185f37 98ee812 Author: Brian Muramatsu Date: Fri Aug 6 15:40:04 2010 -0700 Merge "Test for Checking OpenGL ES Version" into froyo commit 8185f37163027e16ad5187e014383e9c01b90e50 Merge: 14a003a 1de7144 Author: Brian Muramatsu Date: Fri Aug 6 14:32:53 2010 -0700 Merge "Some PackageManager Feature Tests" into froyo commit 1de71445eac60f563f5098ba86b7a892be7d34cb Author: Brian Muramatsu Date: Wed Aug 4 13:31:26 2010 -0700 Some PackageManager Feature Tests Bug 2817090, 2817037, 2817010, 2817022, 2817050 Some sanity tests to check that the PackageManager is reporting the correct features. It won't catch everything, and some of the tests like for checking for the existence of WiFi or Camera don't make a whole lot of sense... Finally, test that features not defined by the SDK aren't using the android namespace. Moved feature tests for sensors and telephony into this class to centralize all these feature tests. Thanks to George for nearly all the code here. Change-Id: I67e1e3ca8ccd8bfe46422f97abf571aecd28ad06 commit 14a003a3ddfb4e47cbfbbb6b404be0d04d880fcc Merge: 52eb446 70a9e3f Author: Brian Muramatsu Date: Fri Aug 6 11:31:28 2010 -0700 Merge "CTS Verifier Application Skeleton" into froyo commit 98ee812c651119c3fcbb2a1dcd2227b1ef109571 Author: Brian Muramatsu Date: Fri Jul 30 11:52:10 2010 -0700 Test for Checking OpenGL ES Version Bug 2845550 Detect what version of OpenGL should be reported and check that the system property matches. If the device doesn't support 2, make sure the property is 1 or returning an undefined value which implies 1. If the device supports 2, set a GLSurfaceView to 2.0 and check that the version string makes sense. By default the version should be 1.0 before setting the GLSurfaceView to 2. Change-Id: I240f30fb2a19b5e168bb5ba0c0da23268895b31d commit 52eb446c2ce0909548ce1b4af2cb43357aac939b Author: Brian Muramatsu Date: Thu Aug 5 15:18:55 2010 -0700 Fix Dpi2 Test Cases Makefile It was being put into /system/apps rather than /data/apps like the other test cases. Change-Id: Iab279e3bd1bf63d2ac4ef87d8b81b77a12af9443 commit 70a9e3f902de3c570b3a4049c5d4928278e29261 Author: Brian Muramatsu Date: Fri Jun 25 15:27:09 2010 -0700 CTS Verifier Application Skeleton Create a skeletal application for the CTS Verifier and tests for the verifier itself. This is just a scaffold and doesn't include any tests yet. You should be be able to build the smoke tester and run the tests for the verifier using: runtest --path cts/apps/CtsVerifier This should leave the smoke tester installed on your device. Another way is build the app using "make cts"... adb install -r out/target/product/generic/data/app/CtsVerifier.apk Doing "make cts" will deposit the apk into the repository/testcases directory. The app will be packaged as part of the CTS zip bundle. Change-Id: Ifd0080a444a0183736d064f68feb04ee49a4a1c6 commit 4d639be351063994c5758da89f51cc3c2b2c4a50 Merge: 454fc76 03d768e Author: Brian Carlstrom Date: Thu Aug 5 13:25:08 2010 -0700 resolved conflicts for merge of 03d768e5 to master Change-Id: I05328c5d8391faa569356d26dfef25dfc9986019 commit 03d768e5ecfc411f8342a5d8717703a3a1321084 Merge: f7889b7 13e23f3 Author: Brian Carlstrom Date: Thu Aug 5 10:40:41 2010 -0700 am 13e23f3e: Tracking merge of dalvik-dev to gingerbread Merge commit '13e23f3ec94f730d0d2b24397b7a3702fcd4a91a' into gingerbread-plus-aosp * commit '13e23f3ec94f730d0d2b24397b7a3702fcd4a91a': Tracking merge of dalvik-dev to gingerbread commit 13e23f3ec94f730d0d2b24397b7a3702fcd4a91a Author: Brian Carlstrom Date: Wed Aug 4 23:42:17 2010 -0700 Tracking merge of dalvik-dev to gingerbread git cherry-pick --no-commit 147ccbe6 git cherry-pick --no-commit cedf4941 git cherry-pick --no-commit c2b4a891353b375f1220218e4b8d83738c02778d git cherry-pick --no-commit 8c7facc1cf0aa7d08ef95ec551b9a540c92e4f34 git cherry-pick --no-commit 5bb4d93f8a99243956919a6120398b8a142892f5 Change-Id: I038120573e0d2b1132c2c6a9fae0790ef74fb11a commit 454fc760ac5c90c393be2ddd61cce69757483691 Merge: a80301a f7889b7 Author: Brian Muramatsu Date: Thu Jul 29 14:38:42 2010 -0700 am f7889b79: am e6e8a8cd: am dc92005f: Merge "Test Sensor Feature Reporting" into froyo Merge commit 'f7889b794a58448596d96a8dbf48b7ee95b17507' * commit 'f7889b794a58448596d96a8dbf48b7ee95b17507': Test Sensor Feature Reporting commit f7889b794a58448596d96a8dbf48b7ee95b17507 Merge: 3d1b7f3 e6e8a8c Author: Brian Muramatsu Date: Thu Jul 29 14:36:42 2010 -0700 am e6e8a8cd: am dc92005f: Merge "Test Sensor Feature Reporting" into froyo Merge commit 'e6e8a8cd9cd39d4058747e39be9c7ad1762e108c' into gingerbread-plus-aosp * commit 'e6e8a8cd9cd39d4058747e39be9c7ad1762e108c': Test Sensor Feature Reporting commit a80301ab877dc8f8a719d86493fa855c9759c755 Merge: 8cecb54 3d1b7f3 Author: Brian Muramatsu Date: Thu Jul 29 14:36:35 2010 -0700 am 3d1b7f3f: am fe15f8c1: am d89a48b7: Include Open GL ES Version in Report Header Merge commit '3d1b7f3fb958b11c129cd0a29281791fd6158efa' * commit '3d1b7f3fb958b11c129cd0a29281791fd6158efa': Include Open GL ES Version in Report Header commit e6e8a8cd9cd39d4058747e39be9c7ad1762e108c Merge: fe15f8c dc92005 Author: Brian Muramatsu Date: Thu Jul 29 14:34:08 2010 -0700 am dc92005f: Merge "Test Sensor Feature Reporting" into froyo Merge commit 'dc92005f7fca6ee665d76bef2cf56d1e12cb5993' into gingerbread * commit 'dc92005f7fca6ee665d76bef2cf56d1e12cb5993': Test Sensor Feature Reporting commit 3d1b7f3fb958b11c129cd0a29281791fd6158efa Merge: c25c1c1 fe15f8c Author: Brian Muramatsu Date: Thu Jul 29 14:33:24 2010 -0700 am fe15f8c1: am d89a48b7: Include Open GL ES Version in Report Header Merge commit 'fe15f8c14ec9dd46687ec4d99e98fc95eef28262' into gingerbread-plus-aosp * commit 'fe15f8c14ec9dd46687ec4d99e98fc95eef28262': Include Open GL ES Version in Report Header commit fe15f8c14ec9dd46687ec4d99e98fc95eef28262 Merge: 74158f7 d89a48b Author: Brian Muramatsu Date: Thu Jul 29 14:30:02 2010 -0700 am d89a48b7: Include Open GL ES Version in Report Header Merge commit 'd89a48b7f0e26545fda79f2e3085ad97486c9041' into gingerbread * commit 'd89a48b7f0e26545fda79f2e3085ad97486c9041': Include Open GL ES Version in Report Header commit dc92005f7fca6ee665d76bef2cf56d1e12cb5993 Merge: d89a48b 7cc874e Author: Brian Muramatsu Date: Thu Jul 29 13:52:47 2010 -0700 Merge "Test Sensor Feature Reporting" into froyo commit d89a48b7f0e26545fda79f2e3085ad97486c9041 Author: Brian Muramatsu Date: Thu Jul 29 12:03:49 2010 -0700 Include Open GL ES Version in Report Header Bug 2845550 Add an entry in the report header for the Open GL ES version by calling PackageManager#getSystemAvailableFeatures and relying upon its quirky behavior of adding an empty feature with the Open GL version number... Change-Id: I11cc0d1a8b61d535f83759dede54eb037019c384 commit 7cc874e9bc13cbe1573f1eea08b79e64e59d1fa1 Author: Brian Muramatsu Date: Wed Jul 28 18:04:33 2010 -0700 Test Sensor Feature Reporting Bug 2817004 Check that the sensor features reported by PackageManager have sensors reported by SensorManager. Also check that sensor features not reported by PackageManager don't have any sensors. Change-Id: I7df2dfd055df51f5212ef0166cfeb85cdcc4ab6f commit 8cecb5478bb4bd69bef2f5c3ae5df30dc24f29f9 Merge: 935e422 c25c1c1 Author: Xavier Ducrohet Date: Wed Jul 28 15:20:18 2010 -0700 am c25c1c1a: am 5fc78b32: Make CTS use the ddmlib-prebuilt. Merge commit 'c25c1c1a50a2884e0fcbd57a82244514c3d38232' * commit 'c25c1c1a50a2884e0fcbd57a82244514c3d38232': Make CTS use the ddmlib-prebuilt. commit c25c1c1a50a2884e0fcbd57a82244514c3d38232 Merge: e77096c 5fc78b3 Author: Xavier Ducrohet Date: Wed Jul 28 15:14:53 2010 -0700 am 5fc78b32: Make CTS use the ddmlib-prebuilt. Merge commit '5fc78b32c95cddedaafed7d10788e0e904176371' into gingerbread-plus-aosp * commit '5fc78b32c95cddedaafed7d10788e0e904176371': Make CTS use the ddmlib-prebuilt. commit 5fc78b32c95cddedaafed7d10788e0e904176371 Author: Xavier Ducrohet Date: Wed Jul 28 11:06:35 2010 -0700 Make CTS use the ddmlib-prebuilt. Change-Id: Id57e0ed298beb244deb42c7bf8376a148a68b85b commit 935e42209eaf7267112cfc889f84e5488f218fa5 Merge: ea5a067 e77096c Author: Jean-Baptiste Queru Date: Tue Jul 27 16:59:30 2010 -0700 am e77096c7: am 74158f76: resolved conflicts for merge of a5ae6183 to gingerbread Merge commit 'e77096c75f2540becbbb46f05ab815ebe1903be9' * commit 'e77096c75f2540becbbb46f05ab815ebe1903be9': Add Telephony Feature Tests commit ea5a06720af8142359d945a42760ae0b2a30ca1f Merge: 112d664 062bb4a Author: Brian Muramatsu Date: Tue Jul 27 16:48:28 2010 -0700 resolved conflicts for merge of 062bb4ae to master Change-Id: Ibe75c0ad5f97ece15099a759bff5138ba1b90868 commit e77096c75f2540becbbb46f05ab815ebe1903be9 Merge: 062bb4a 74158f7 Author: Jean-Baptiste Queru Date: Tue Jul 27 16:35:16 2010 -0700 am 74158f76: resolved conflicts for merge of a5ae6183 to gingerbread Merge commit '74158f76c4ca643e093fb96584ca25468e62e50b' into gingerbread-plus-aosp * commit '74158f76c4ca643e093fb96584ca25468e62e50b': Add Telephony Feature Tests commit 062bb4aed854e7e19e5c029e2da7cec6edd3f14f Merge: b1a1231 f176eaf Author: Brian Muramatsu Date: Tue Jul 27 16:02:50 2010 -0700 resolved conflicts for merge of f176eafe to gingerbread-plus-aosp Change-Id: I4aec70a6cdbe48f3a464ccee9866722ffe794966 commit 74158f76c4ca643e093fb96584ca25468e62e50b Merge: f176eaf a5ae618 Author: Jean-Baptiste Queru Date: Tue Jul 27 15:30:02 2010 -0700 resolved conflicts for merge of a5ae6183 to gingerbread Change-Id: Iae25f795cea61a8a428f44d2459342b13b6be5d0 commit f176eafe119e8065c29f6eb99d62d01274581174 Author: Brian Muramatsu Date: Tue Jul 27 14:27:01 2010 -0700 manual cherry-pick of 45f8e6a523a096a3781f90d4fd5d54dcc0673a7e Change-Id: I770948540f3aca9d930edea7a12119ff63fe9bdf commit a5ae6183d3848804edccdb27896f0375ebf53028 Merge: 1025b50 d77a879 Author: Brian Muramatsu Date: Tue Jul 27 13:06:30 2010 -0700 Merge "Add Telephony Feature Tests" into froyo commit 112d664fed40ab22a7942e3ad92fec05502d51c7 Merge: db1bb97 b1a1231 Author: Brian Muramatsu Date: Tue Jul 27 12:17:14 2010 -0700 am b1a12313: am 7ee6163b: am 1025b50f: Merge "Remove ContactsTest GMS Dependencies" into froyo Merge commit 'b1a123131a66fe0347bf085c602918c0ddcff418' * commit 'b1a123131a66fe0347bf085c602918c0ddcff418': Remove ContactsTest GMS Dependencies commit b1a123131a66fe0347bf085c602918c0ddcff418 Merge: 9efed93 7ee6163 Author: Brian Muramatsu Date: Tue Jul 27 12:15:02 2010 -0700 am 7ee6163b: am 1025b50f: Merge "Remove ContactsTest GMS Dependencies" into froyo Merge commit '7ee6163b6a1a2cd0565f59b87c4b121df205443d' into gingerbread-plus-aosp * commit '7ee6163b6a1a2cd0565f59b87c4b121df205443d': Remove ContactsTest GMS Dependencies commit 7ee6163b6a1a2cd0565f59b87c4b121df205443d Merge: 9eeba4d 1025b50 Author: Brian Muramatsu Date: Tue Jul 27 12:12:33 2010 -0700 am 1025b50f: Merge "Remove ContactsTest GMS Dependencies" into froyo Merge commit '1025b50f4070b4e132b8aa99ad0e3a930518341e' into gingerbread * commit '1025b50f4070b4e132b8aa99ad0e3a930518341e': Remove ContactsTest GMS Dependencies commit 1025b50f4070b4e132b8aa99ad0e3a930518341e Merge: 320a7a1 40926f4 Author: Brian Muramatsu Date: Tue Jul 27 12:05:47 2010 -0700 Merge "Remove ContactsTest GMS Dependencies" into froyo commit db1bb976f1b81b813c841a1cfa56b215526b0cde Merge: 5dd0c14 9efed93 Author: Brian Muramatsu Date: Tue Jul 27 11:52:08 2010 -0700 am 9efed93a: am 9eeba4d8: am 320a7a14: Add CtsTestCaseList.mk to Build CTS Merge commit '9efed93a2de68147f6bfdae977148eafd469ce4c' * commit '9efed93a2de68147f6bfdae977148eafd469ce4c': Add CtsTestCaseList.mk to Build CTS commit 9efed93a2de68147f6bfdae977148eafd469ce4c Merge: 51c92a3 9eeba4d Author: Brian Muramatsu Date: Tue Jul 27 11:49:45 2010 -0700 am 9eeba4d8: am 320a7a14: Add CtsTestCaseList.mk to Build CTS Merge commit '9eeba4d8640dd32cb1429a6e684d4311de57a34c' into gingerbread-plus-aosp * commit '9eeba4d8640dd32cb1429a6e684d4311de57a34c': Add CtsTestCaseList.mk to Build CTS commit 9eeba4d8640dd32cb1429a6e684d4311de57a34c Merge: a978456 320a7a1 Author: Brian Muramatsu Date: Tue Jul 27 11:47:45 2010 -0700 am 320a7a14: Add CtsTestCaseList.mk to Build CTS Merge commit '320a7a1495cfeb3823c7c2877b1e00efbeb7af61' into gingerbread * commit '320a7a1495cfeb3823c7c2877b1e00efbeb7af61': Add CtsTestCaseList.mk to Build CTS commit 5dd0c14350a8e7530556b20e35ae558095d38005 Author: Adam Powell Date: Fri Jul 23 17:01:55 2010 -0700 Updated for context mode API changes Change-Id: I6ffb7378e6882fb5d92ff3c23aa19d977061ed6a commit da0dd602aba6912c89760e89fdc93d071b4e3f08 Author: Vasu Nori Date: Sun Jul 25 16:44:19 2010 -0700 fix cts tests after CL I4e93a09dc381f425c3ae6ccc331a7bf227491e22 Change-Id: I4bbf6c5fa7454d300121db87118f2d9d382243a7 commit 92a3dab248ad832714e904702f26e7a0d44560a2 Merge: 316aa9c 51c92a3 Author: Xavier Ducrohet Date: Mon Jul 26 12:00:52 2010 -0700 am 51c92a3e: am 684b5c00: Fix CTS to use the new ddmlib API. Merge commit '51c92a3e5622212ab47850ec6d6dcaa0c400365f' * commit '51c92a3e5622212ab47850ec6d6dcaa0c400365f': Fix CTS to use the new ddmlib API. commit 51c92a3e5622212ab47850ec6d6dcaa0c400365f Merge: 7e14fa9 684b5c0 Author: Xavier Ducrohet Date: Mon Jul 26 11:40:41 2010 -0700 am 684b5c00: Fix CTS to use the new ddmlib API. Merge commit '684b5c00f9a7be43e0f95004b9ef3b7a47c8fc60' into gingerbread-plus-aosp * commit '684b5c00f9a7be43e0f95004b9ef3b7a47c8fc60': Fix CTS to use the new ddmlib API. commit 684b5c00f9a7be43e0f95004b9ef3b7a47c8fc60 Author: Xavier Ducrohet Date: Thu Jul 22 10:54:10 2010 -0700 Fix CTS to use the new ddmlib API. Change-Id: I84b0e21029070ca7233df2ebd39b3a3718e173db commit d77a879ca8e78f83787bee94da28b409d1a074fc Author: Brian Muramatsu Date: Fri Jul 23 16:17:28 2010 -0700 Add Telephony Feature Tests Bug 2816994 Check that the device's getPhoneType return value makes sense with the features reported by PackageManager#getSystemAvailableFeatures and PackageManager#hasFeature. Change-Id: Ibc5137f1339d656029c1558f6783520e24bc3393 commit 316aa9cd06288c3dab1d5583b5fb576b2a0aef1a Merge: 41cee5a 7e14fa9 Author: Guang Zhu Date: Fri Jul 23 15:34:43 2010 -0700 am 7e14fa90: am ad62cdcd: dependent change for "parse instrumentation result bundles" in sdk Merge commit '7e14fa90ab33f1b3dec9771034e46373d209d5d3' * commit '7e14fa90ab33f1b3dec9771034e46373d209d5d3': dependent change for "parse instrumentation result bundles" in sdk commit 7e14fa90ab33f1b3dec9771034e46373d209d5d3 Merge: 5a77a96 ad62cdc Author: Guang Zhu Date: Fri Jul 23 15:32:42 2010 -0700 am ad62cdcd: dependent change for "parse instrumentation result bundles" in sdk Merge commit 'ad62cdcdcd98cab7e93b4c80d377b2344bf97a03' into gingerbread-plus-aosp * commit 'ad62cdcdcd98cab7e93b4c80d377b2344bf97a03': dependent change for "parse instrumentation result bundles" in sdk commit 40926f49645adfea845990027d4364fda1208419 Author: Brian Muramatsu Date: Fri Jul 23 14:04:58 2010 -0700 Remove ContactsTest GMS Dependencies Bug 2258907 Remove the assertions that relied on GMS being present. Take off the KnownFailure annotation. Change-Id: I80c326ce08161f5e79c7d4da4cd62249267d8f69 commit 41cee5a214ed765563e1fdec66e12828eec9d4fe Merge: 8f75869 5a77a96 Author: James Dong Date: Thu Jul 22 15:15:31 2010 -0700 am 5a77a966: am a978456a: Merge "Use QCIF as the default video resolution, rather than QVGA" into gingerbread Merge commit '5a77a966510b5b7522e1cad6394b9fca2b66d7d4' * commit '5a77a966510b5b7522e1cad6394b9fca2b66d7d4': Use QCIF as the default video resolution, rather than QVGA commit 5a77a966510b5b7522e1cad6394b9fca2b66d7d4 Merge: d61c64b a978456 Author: James Dong Date: Thu Jul 22 15:12:21 2010 -0700 am a978456a: Merge "Use QCIF as the default video resolution, rather than QVGA" into gingerbread Merge commit 'a978456aab1acb75b6c1445a2717779433611a6b' into gingerbread-plus-aosp * commit 'a978456aab1acb75b6c1445a2717779433611a6b': Use QCIF as the default video resolution, rather than QVGA commit a978456aab1acb75b6c1445a2717779433611a6b Merge: 9b1e0af 0b9af2b Author: James Dong Date: Thu Jul 22 15:09:25 2010 -0700 Merge "Use QCIF as the default video resolution, rather than QVGA" into gingerbread commit 320a7a1495cfeb3823c7c2877b1e00efbeb7af61 Author: Brian Muramatsu Date: Thu Jul 8 16:37:21 2010 -0700 Add CtsTestCaseList.mk to Build CTS Bug 2732160 Extract the test case list from build/core/tasks/cts.mk and put them in a CtsTestCaseList.mk file. This change will make it easier to develop CTS in the open, since adding test packages and applications will no longer require multiple project changes. Another alternative was to move the entire cts.mk file to the CTS project but since the Makefile is in flux in the master branch so much that I've decided to simplify things by only including the test case list to avoid merge issues. Also I decided to keep this in a separate Makefile rather than stuffing the definitions in the CTS Android.mk. I'm thinking its better to be more explicit with an include statement rather than being implicitly defined in the Android.mk. Change-Id: I7476ed02271d03fe1c6082e3e6f3013004d8ceae commit 8f758695eb48d3e6e686f6775ce6d78cc6ccdce5 Merge: 3ec6f71 d61c64b Author: Brian Muramatsu Date: Wed Jul 21 17:49:15 2010 -0700 am d61c64b2: am 9b1e0aff: am d2a4bab6: Merge "Add Another Delayed Check to WebSettingsTest" into froyo Merge commit 'd61c64b2695cf1c15d39fb236c1dd4629d2b0962' * commit 'd61c64b2695cf1c15d39fb236c1dd4629d2b0962': Add Another Delayed Check to WebSettingsTest commit 3ec6f71ab12f07c8c814b8e2446abf964760ca3c Merge: 21d93ad 67ca451 Author: Brian Muramatsu Date: Wed Jul 21 17:49:13 2010 -0700 am 67ca451a: am 31506f03: am 08ab3b36: Merge "Wait Properly in CacheManagerTest#testCacheFile" into froyo Merge commit '67ca451a8884f0537eaf368a39df84df73c3bf32' * commit '67ca451a8884f0537eaf368a39df84df73c3bf32': Wait Properly in CacheManagerTest#testCacheFile commit 21d93ad3a1a30fd41823fac4a81350c4cd2b2d42 Merge: 542d74c e65606f Author: Brian Muramatsu Date: Wed Jul 21 17:49:10 2010 -0700 am e65606f6: am 2fa8b0da: am 76b306d5: Merge "Specify Content Length in CtsTestServer" into froyo Merge commit 'e65606f674facceb1a0b2c93e0635e1633344556' * commit 'e65606f674facceb1a0b2c93e0635e1633344556': Specify Content Length in CtsTestServer commit 542d74c7677830fde06c2dc1e21397b241c5ca3c Author: Vasu Nori Date: Fri Jul 16 15:15:57 2010 -0700 fix cts tests after this 2 CLs in frameworks/base fixing tests after I42b2376d714a1a4091c843e245a45b882bb7fee6 and Iba87258e1c8fa18c2cc46d1d2ab56ec3e38413f2 Change-Id: Id95ebcc02aa14294194d9a7bb3f70d457b9eb4fd commit d61c64b2695cf1c15d39fb236c1dd4629d2b0962 Merge: 67ca451 9b1e0af Author: Brian Muramatsu Date: Wed Jul 21 14:55:29 2010 -0700 am 9b1e0aff: am d2a4bab6: Merge "Add Another Delayed Check to WebSettingsTest" into froyo Merge commit '9b1e0aff58dd87218b67e517f104bde01e8f526c' into gingerbread-plus-aosp * commit '9b1e0aff58dd87218b67e517f104bde01e8f526c': Add Another Delayed Check to WebSettingsTest commit 9b1e0aff58dd87218b67e517f104bde01e8f526c Merge: 31506f0 d2a4bab Author: Brian Muramatsu Date: Wed Jul 21 14:54:01 2010 -0700 am d2a4bab6: Merge "Add Another Delayed Check to WebSettingsTest" into froyo Merge commit 'd2a4bab66dc2a76a2f13864bac7df550680320af' into gingerbread * commit 'd2a4bab66dc2a76a2f13864bac7df550680320af': Add Another Delayed Check to WebSettingsTest commit 67ca451a8884f0537eaf368a39df84df73c3bf32 Merge: e65606f 31506f0 Author: Brian Muramatsu Date: Wed Jul 21 14:52:33 2010 -0700 am 31506f03: am 08ab3b36: Merge "Wait Properly in CacheManagerTest#testCacheFile" into froyo Merge commit '31506f03415cfff239912ff7e44b9798db2d0a52' into gingerbread-plus-aosp * commit '31506f03415cfff239912ff7e44b9798db2d0a52': Wait Properly in CacheManagerTest#testCacheFile commit 31506f03415cfff239912ff7e44b9798db2d0a52 Merge: 2fa8b0d 08ab3b3 Author: Brian Muramatsu Date: Wed Jul 21 14:50:01 2010 -0700 am 08ab3b36: Merge "Wait Properly in CacheManagerTest#testCacheFile" into froyo Merge commit '08ab3b36c5ab0beff70e718af73fda331c87bb1c' into gingerbread * commit '08ab3b36c5ab0beff70e718af73fda331c87bb1c': Wait Properly in CacheManagerTest#testCacheFile commit e65606f674facceb1a0b2c93e0635e1633344556 Merge: d8c602d 2fa8b0d Author: Brian Muramatsu Date: Wed Jul 21 14:48:27 2010 -0700 am 2fa8b0da: am 76b306d5: Merge "Specify Content Length in CtsTestServer" into froyo Merge commit '2fa8b0daa64607a3978b14143c01c48db296ddbe' into gingerbread-plus-aosp * commit '2fa8b0daa64607a3978b14143c01c48db296ddbe': Specify Content Length in CtsTestServer commit 2fa8b0daa64607a3978b14143c01c48db296ddbe Merge: ff08ec1 76b306d Author: Brian Muramatsu Date: Wed Jul 21 14:46:02 2010 -0700 am 76b306d5: Merge "Specify Content Length in CtsTestServer" into froyo Merge commit '76b306d57c03f860376006d8f1e23f0576145421' into gingerbread * commit '76b306d57c03f860376006d8f1e23f0576145421': Specify Content Length in CtsTestServer commit d2a4bab66dc2a76a2f13864bac7df550680320af Merge: 08ab3b3 436e925 Author: Brian Muramatsu Date: Wed Jul 21 11:14:14 2010 -0700 Merge "Add Another Delayed Check to WebSettingsTest" into froyo commit 08ab3b36c5ab0beff70e718af73fda331c87bb1c Merge: 76b306d 47ef935 Author: Brian Muramatsu Date: Wed Jul 21 11:07:57 2010 -0700 Merge "Wait Properly in CacheManagerTest#testCacheFile" into froyo commit 76b306d57c03f860376006d8f1e23f0576145421 Merge: 6825694 b43bdd0 Author: Brian Muramatsu Date: Wed Jul 21 10:50:07 2010 -0700 Merge "Specify Content Length in CtsTestServer" into froyo commit 1842a6238ce349ce5c610b43542cfc94cf6b078b Merge: 74283d1 d8c602d Author: Brian Muramatsu Date: Tue Jul 20 16:55:24 2010 -0700 am d8c602d1: am ff08ec1c: am 6825694d: Merge "Fix WebViewTest#testAccessCertificate Assertion" into froyo Merge commit 'd8c602d146c0a8c3fc32a5f8f638e125b0309e9b' * commit 'd8c602d146c0a8c3fc32a5f8f638e125b0309e9b': Fix WebViewTest#testAccessCertificate Assertion commit 74283d127991805395c235e9ac7addacf27a4f7f Merge: aff2ead eabe942 Author: Brian Muramatsu Date: Tue Jul 20 16:55:20 2010 -0700 am eabe9425: am 392154c7: am daea088e: Merge "Suppress NinePatchDrawableTest#testGetOpacity" into froyo Merge commit 'eabe94255d27f2c46f9c404b251829bc21709a9a' * commit 'eabe94255d27f2c46f9c404b251829bc21709a9a': Suppress NinePatchDrawableTest#testGetOpacity commit aff2ead69cbd18f2da95bc7227cfd04398cb728e Merge: 44adb1e bbb4cdd Author: Brian Muramatsu Date: Tue Jul 20 16:55:17 2010 -0700 am bbb4cdd6: am 38f93351: am f6fe88ba: Merge "Fix setRequestedOrientation Calls for Increased Stability" into froyo Merge commit 'bbb4cdd6feab098840ff6093bc42ec2336809ce8' * commit 'bbb4cdd6feab098840ff6093bc42ec2336809ce8': Fix setRequestedOrientation Calls for Increased Stability commit 436e9251804820724f4962b49b3dcccf682536ff Author: Brian Muramatsu Date: Tue Jul 20 15:59:48 2010 -0700 Add Another Delayed Check to WebSettingsTest Bug 2814482 Fix some more flakiness with another delayed check. Change-Id: I84077f84c67be0de4fee415f445191b39eea1065 commit 47ef935854d29586fb941c5f42697c28dfecaea9 Author: Brian Muramatsu Date: Tue Jul 20 15:43:25 2010 -0700 Wait Properly in CacheManagerTest#testCacheFile Bug 2814482 This test properly waited for the cache to be cleared, but it didn't wait to check the cache after loading the url which is an asynchronous operation. Change-Id: I4a36ab04a1695a60fc31ff6cdc891517b48768e6 commit d8c602d146c0a8c3fc32a5f8f638e125b0309e9b Merge: eabe942 ff08ec1 Author: Brian Muramatsu Date: Tue Jul 20 15:35:49 2010 -0700 am ff08ec1c: am 6825694d: Merge "Fix WebViewTest#testAccessCertificate Assertion" into froyo Merge commit 'ff08ec1c11613c7e0d6e62f786c72592796aa79c' into gingerbread-plus-aosp * commit 'ff08ec1c11613c7e0d6e62f786c72592796aa79c': Fix WebViewTest#testAccessCertificate Assertion commit eabe94255d27f2c46f9c404b251829bc21709a9a Merge: bbb4cdd 392154c Author: Brian Muramatsu Date: Tue Jul 20 15:35:46 2010 -0700 am 392154c7: am daea088e: Merge "Suppress NinePatchDrawableTest#testGetOpacity" into froyo Merge commit '392154c79e92b2bdeb802ea65ff5a3ee838beed8' into gingerbread-plus-aosp * commit '392154c79e92b2bdeb802ea65ff5a3ee838beed8': Suppress NinePatchDrawableTest#testGetOpacity commit bbb4cdd6feab098840ff6093bc42ec2336809ce8 Merge: cca3cb7 38f9335 Author: Brian Muramatsu Date: Tue Jul 20 15:35:38 2010 -0700 am 38f93351: am f6fe88ba: Merge "Fix setRequestedOrientation Calls for Increased Stability" into froyo Merge commit '38f93351af1162ae0b35dc0ecd76c8f4f0493eb3' into gingerbread-plus-aosp * commit '38f93351af1162ae0b35dc0ecd76c8f4f0493eb3': Fix setRequestedOrientation Calls for Increased Stability commit ff08ec1c11613c7e0d6e62f786c72592796aa79c Merge: 392154c 6825694 Author: Brian Muramatsu Date: Tue Jul 20 15:32:30 2010 -0700 am 6825694d: Merge "Fix WebViewTest#testAccessCertificate Assertion" into froyo Merge commit '6825694d18026680049dd6ffc61ee9bbd7859054' into gingerbread * commit '6825694d18026680049dd6ffc61ee9bbd7859054': Fix WebViewTest#testAccessCertificate Assertion commit 392154c79e92b2bdeb802ea65ff5a3ee838beed8 Merge: 38f9335 daea088 Author: Brian Muramatsu Date: Tue Jul 20 15:32:25 2010 -0700 am daea088e: Merge "Suppress NinePatchDrawableTest#testGetOpacity" into froyo Merge commit 'daea088e182f5d7c360d5c8a0c1e8b7f108ad463' into gingerbread * commit 'daea088e182f5d7c360d5c8a0c1e8b7f108ad463': Suppress NinePatchDrawableTest#testGetOpacity commit 38f93351af1162ae0b35dc0ecd76c8f4f0493eb3 Merge: ffd9297 f6fe88b Author: Brian Muramatsu Date: Tue Jul 20 15:32:20 2010 -0700 am f6fe88ba: Merge "Fix setRequestedOrientation Calls for Increased Stability" into froyo Merge commit 'f6fe88bafa074f394438c41829c9a64d04a754bd' into gingerbread * commit 'f6fe88bafa074f394438c41829c9a64d04a754bd': Fix setRequestedOrientation Calls for Increased Stability commit b43bdd06b9d9cbf8c4040981491e7e4f67ae0549 Author: Brian Muramatsu Date: Tue Jul 20 14:03:48 2010 -0700 Specify Content Length in CtsTestServer Bug 2585913 AwesomePlayer doesn't send buffering updates if it doesn't know the duration of the file...so specify a content length header to appease it. This fixes MediaPlayerTest#testPlayStream which was blocking on waiting for a buffering update. Change-Id: I85b96fcff9d6c33be170990687d1a24817a779cf commit 0b9af2bbfed89d0803a594a0ead2062521f4ef30 Author: James Dong Date: Tue Jul 20 11:38:22 2010 -0700 Use QCIF as the default video resolution, rather than QVGA - The reason behind this change is that QCIF is more widely supported than QVGA. For instance, in H263 standard, QCIF is one of the 5 standard video resolutions that all encoders support, while QVGA is one of the custom video resolution. It is not reasonable to request all encoders to support QVGA video resolution. Change-Id: I897df3265d1e75c3935c81cb7e0d91c6259f4d52 commit 6825694d18026680049dd6ffc61ee9bbd7859054 Merge: daea088 1ffbfd4 Author: Brian Muramatsu Date: Fri Jul 16 16:15:17 2010 -0700 Merge "Fix WebViewTest#testAccessCertificate Assertion" into froyo commit 1ffbfd48e1b44705e8ca2d2144af3fcb1a1cbf50 Author: Brian Muramatsu Date: Fri Jul 16 11:40:40 2010 -0700 Fix WebViewTest#testAccessCertificate Assertion Bug 2841873 setCertificate was being called twice once with a null and then with a non-null certificate. The first call though set the mHasCalledSetCertificate and then this caused the later not-null assertion to fail. Get rid of those methods and just directly use setCertificate and getCertificate to check that the certificate is set properly. Change-Id: I6710daa77e42a95f22b8ed9e7d8633fdb93e7f33 commit daea088e182f5d7c360d5c8a0c1e8b7f108ad463 Merge: f6fe88b 777ce03 Author: Brian Muramatsu Date: Fri Jul 16 10:56:23 2010 -0700 Merge "Suppress NinePatchDrawableTest#testGetOpacity" into froyo commit f6fe88bafa074f394438c41829c9a64d04a754bd Merge: 7776a10 c7e6aa6 Author: Brian Muramatsu Date: Fri Jul 16 10:55:59 2010 -0700 Merge "Fix setRequestedOrientation Calls for Increased Stability" into froyo commit 777ce03eeef393aa962e411f0343fe4f7d26798f Author: Brian Muramatsu Date: Thu Jul 15 14:28:21 2010 -0700 Suppress NinePatchDrawableTest#testGetOpacity Bug 2834281 Bitmap#hasAlpha always seems to return true even after I used an image without any transparent pixels... Change-Id: Ib81755e731337367aeb39a6b78d4b585a528ce2c commit c7e6aa6a50525ee2141ebe1295b3c869e86b11cf Author: Brian Muramatsu Date: Thu Jul 15 12:51:40 2010 -0700 Fix setRequestedOrientation Calls for Increased Stability Bug 2639189 Tens of random failures in DialogTest and InstrumentationTest seemed to occur. Commenting out the setRequestedOrientation calls in ApplicationTest seemed to remove the problem. It seems if the orientation is not restored properly, then Froyo will attempt to change the orientation on subsequent activities causing the test activities to restart and making the references to the prior activity null! Create a method that check what the current orientation is in order to switch to a new orientation and then restore the original orientation. Change-Id: I3218cb2770e70168f4785eb49800bf85293b7ad4 commit b503197440fdf617b436ed3c9ea3f3877ba97394 Author: Dianne Hackborn Date: Mon Jul 12 15:56:04 2010 -0700 Add unit test for SettingsProvider security. Change-Id: Ibc9b1f88c7de557c116656bd3ed06422beecb33a commit 44adb1eecb5bfc0490d131fbd213904e79752a9e Merge: cfb7144 cca3cb7 Author: The Android Open Source Project Date: Wed Jul 14 16:37:22 2010 -0700 am cca3cb7d: am ffd9297f: am 7776a103: merge from open-source froyo Merge commit 'cca3cb7d1569341496149baf12e7cedcc78620ba' * commit 'cca3cb7d1569341496149baf12e7cedcc78620ba': Don't Run KnownFailure Tests in CTS WebViewTest Delayed Check for savePicture DialogTest onPanelClosed Called Properly Now Removing More PackageManager Permission Tests Update GeomagneticFieldTest Fix ContentResolverTest Race Conditions Fix JNI Loading for BuildTest commit cca3cb7d1569341496149baf12e7cedcc78620ba Merge: 6bf1611 ffd9297 Author: The Android Open Source Project Date: Wed Jul 14 16:33:44 2010 -0700 am ffd9297f: am 7776a103: merge from open-source froyo Merge commit 'ffd9297f62a27c4021ca0e0273e331f410bad71e' into gingerbread-plus-aosp * commit 'ffd9297f62a27c4021ca0e0273e331f410bad71e': Don't Run KnownFailure Tests in CTS WebViewTest Delayed Check for savePicture DialogTest onPanelClosed Called Properly Now Removing More PackageManager Permission Tests Update GeomagneticFieldTest Fix ContentResolverTest Race Conditions Fix JNI Loading for BuildTest commit ffd9297f62a27c4021ca0e0273e331f410bad71e Merge: e9fbb5b 7776a10 Author: The Android Open Source Project Date: Wed Jul 14 16:29:35 2010 -0700 am 7776a103: merge from open-source froyo Merge commit '7776a103edc09f567ffc8496f6b94edbd9f9d183' into gingerbread * commit '7776a103edc09f567ffc8496f6b94edbd9f9d183': Don't Run KnownFailure Tests in CTS WebViewTest Delayed Check for savePicture DialogTest onPanelClosed Called Properly Now Removing More PackageManager Permission Tests Update GeomagneticFieldTest Fix ContentResolverTest Race Conditions Fix JNI Loading for BuildTest commit 7776a103edc09f567ffc8496f6b94edbd9f9d183 Merge: 45f8e6a b8ed316 Author: The Android Open Source Project Date: Wed Jul 14 14:51:04 2010 -0700 merge from open-source froyo Change-Id: I59f53db7ade1851d281bf9a85abb78d134369b08 commit cfb714435fa6ac07d1bb668f046ea726af3ce48e Merge: 6204387 6bf1611 Author: The Android Open Source Project Date: Wed Jul 14 11:34:25 2010 -0700 am 6bf16112: (-s ours) am e9fbb5be: am 45f8e6a5: (-s ours) merge from open-source froyo - DO NOT MERGE Merge commit '6bf16112c5454d40b439f6420832fb6a0a537a2d' * commit '6bf16112c5454d40b439f6420832fb6a0a537a2d': (45 commits) Use Reflection to Get Features for Report Header Strip Invalid Characters from XML Adjust NinePatchDrawableTest#testConstructors. Speculative fix for intermittent CTS UI test failures. Display Other Features in Report Header Update CTS version to 2.1_r3 CTS Eclipse Classpath File Generator Report Unwhitelisted Root Processes Prohibit Listening Ports on Devices Porting Unsubmitted Donut InputMethod Tests CTS would report 'too many files open' because it did not close .xml output files Add Feature List to CTS Report Header Replaced raw string arguments for Context.getSystemService() with final Improve Formatting of Locales in CTS Report Clean Up Properly in Database Tests Verify Device IMEI/MEID Ids Update CTS version to 2.1_r2. Porting Unsubmitted Cupcake CookieSyncManagerTest Further Activity Lifecycle Testing Improvements Remove SYM isPrintingKey False Check ... commit 6bf16112c5454d40b439f6420832fb6a0a537a2d Merge: b8f6196 e9fbb5b Author: The Android Open Source Project Date: Wed Jul 14 11:32:11 2010 -0700 am e9fbb5be: am 45f8e6a5: (-s ours) merge from open-source froyo - DO NOT MERGE Merge commit 'e9fbb5bef01b0e274e5f14c690c6ee6ed8c04bb2' into gingerbread-plus-aosp * commit 'e9fbb5bef01b0e274e5f14c690c6ee6ed8c04bb2': (45 commits) Use Reflection to Get Features for Report Header Strip Invalid Characters from XML Adjust NinePatchDrawableTest#testConstructors. Speculative fix for intermittent CTS UI test failures. Display Other Features in Report Header Update CTS version to 2.1_r3 CTS Eclipse Classpath File Generator Report Unwhitelisted Root Processes Prohibit Listening Ports on Devices Porting Unsubmitted Donut InputMethod Tests CTS would report 'too many files open' because it did not close .xml output files Add Feature List to CTS Report Header Replaced raw string arguments for Context.getSystemService() with final Improve Formatting of Locales in CTS Report Clean Up Properly in Database Tests Verify Device IMEI/MEID Ids Update CTS version to 2.1_r2. Porting Unsubmitted Cupcake CookieSyncManagerTest Further Activity Lifecycle Testing Improvements Remove SYM isPrintingKey False Check ... commit e9fbb5bef01b0e274e5f14c690c6ee6ed8c04bb2 Merge: a3ac0c0 45f8e6a Author: The Android Open Source Project Date: Wed Jul 14 11:29:12 2010 -0700 am 45f8e6a5: (-s ours) merge from open-source froyo - DO NOT MERGE Merge commit '45f8e6a523a096a3781f90d4fd5d54dcc0673a7e' into gingerbread * commit '45f8e6a523a096a3781f90d4fd5d54dcc0673a7e': (45 commits) Use Reflection to Get Features for Report Header Strip Invalid Characters from XML Adjust NinePatchDrawableTest#testConstructors. Speculative fix for intermittent CTS UI test failures. Display Other Features in Report Header Update CTS version to 2.1_r3 CTS Eclipse Classpath File Generator Report Unwhitelisted Root Processes Prohibit Listening Ports on Devices Porting Unsubmitted Donut InputMethod Tests CTS would report 'too many files open' because it did not close .xml output files Add Feature List to CTS Report Header Replaced raw string arguments for Context.getSystemService() with final Improve Formatting of Locales in CTS Report Clean Up Properly in Database Tests Verify Device IMEI/MEID Ids Update CTS version to 2.1_r2. Porting Unsubmitted Cupcake CookieSyncManagerTest Further Activity Lifecycle Testing Improvements Remove SYM isPrintingKey False Check ... commit 620438786ed54e048f76ddef4b06c85516228bb3 Merge: 8607af2 b8f6196 Author: Dianne Hackborn Date: Tue Jul 13 19:07:22 2010 -0700 resolved conflicts for merge of b8f61966 to master Change-Id: I8a1b2e07a8a831fbca12fa526f70235724d184aa commit b8f61966a0f093ff983123d3372deca88408ac61 Merge: d940904 a3ac0c0 Author: Dianne Hackborn Date: Tue Jul 13 18:55:48 2010 -0700 am a3ac0c0d: Update to follow API changes. Merge commit 'a3ac0c0d644fde5e4ffe38588ff8bea951c78f62' into gingerbread-plus-aosp * commit 'a3ac0c0d644fde5e4ffe38588ff8bea951c78f62': Update to follow API changes. commit a3ac0c0d644fde5e4ffe38588ff8bea951c78f62 Author: Dianne Hackborn Date: Tue Jul 13 18:43:05 2010 -0700 Update to follow API changes. Change-Id: Ifd89a6f2b1a54230a20692733cb3c6207102e82c commit 45f8e6a523a096a3781f90d4fd5d54dcc0673a7e Merge: 6b6797a 709a5cb Author: The Android Open Source Project Date: Tue Jul 13 15:26:48 2010 -0700 merge from open-source froyo - DO NOT MERGE Change-Id: I162febb47f905549c606ca6d5b52018808ccea84 commit b8ed3162600d30f6d32bdf906ebb9d5fed7a6e8b Author: Brian Muramatsu Date: Tue Jul 13 12:43:52 2010 -0700 Don't Run KnownFailure Tests in CTS Bug 2814482 Don't run tests marked with the KnownFailure annotation, because they pass/fail randomly across devices making the CTS reports noisy. The modification in CollectAllTests will throw out known failure tests for the android.core.* tests. Entries for these known failures will no longer appear in the testcase repository of xml files. The change in DescirptionGenerator throws out the known failures in the CTS tests like android.net.cts.*. These will no longer show up as well. You can still use the runtest utility to run known failures, because those do not consult the XML files to decide what test cases should be executed. If you need to exclude KnownFailures for runtest, then you can add a predicate in InstrumentationCtsTestRunner at the bottom of the file. Change-Id: Iab3433b2ab57c04f04b85d5cd95310de805482af commit 8607af27b5c4b577a91ebc78d7dc5fedc2ea288d Merge: 8e14bd4 d940904 Author: Dianne Hackborn Date: Mon Jul 12 19:10:59 2010 -0700 am d9409042: am 660a01e2: am 6b6797ae: Add unit test for SettingsProvider security. Merge commit 'd9409042615d52ce50de18590a86b8412efd37ac' * commit 'd9409042615d52ce50de18590a86b8412efd37ac': Add unit test for SettingsProvider security. commit d9409042615d52ce50de18590a86b8412efd37ac Merge: 484e038 660a01e Author: Dianne Hackborn Date: Mon Jul 12 19:08:42 2010 -0700 am 660a01e2: am 6b6797ae: Add unit test for SettingsProvider security. Merge commit '660a01e2b366139bf3b747e28f1d259780501c83' into gingerbread-plus-aosp * commit '660a01e2b366139bf3b747e28f1d259780501c83': Add unit test for SettingsProvider security. commit 660a01e2b366139bf3b747e28f1d259780501c83 Merge: 2911e8d 6b6797a Author: Dianne Hackborn Date: Mon Jul 12 19:06:27 2010 -0700 am 6b6797ae: Add unit test for SettingsProvider security. Merge commit '6b6797ae83d5ee7d55e06153e07e838b572278c6' into gingerbread * commit '6b6797ae83d5ee7d55e06153e07e838b572278c6': Add unit test for SettingsProvider security. commit 8e14bd4e5386bcf207057f9f4e99e7b03f12a4bd Merge: e2b68b9 484e038 Author: Yu Shan Emily Lau Date: Mon Jul 12 17:41:57 2010 -0700 am 484e0386: am 2911e8d1: Added the test template for the video editor. Merge commit '484e0386590f01c15141981e14087b156ff6f9c3' * commit '484e0386590f01c15141981e14087b156ff6f9c3': Added the test template for the video editor. commit 484e0386590f01c15141981e14087b156ff6f9c3 Merge: a300f5a 2911e8d Author: Yu Shan Emily Lau Date: Mon Jul 12 17:39:37 2010 -0700 am 2911e8d1: Added the test template for the video editor. Merge commit '2911e8d121d95dba6f11acb437374ae38f5b1f7b' into gingerbread-plus-aosp * commit '2911e8d121d95dba6f11acb437374ae38f5b1f7b': Added the test template for the video editor. commit 6b6797ae83d5ee7d55e06153e07e838b572278c6 Author: Dianne Hackborn Date: Mon Jul 12 15:56:04 2010 -0700 Add unit test for SettingsProvider security. Change-Id: Ibc9b1f88c7de557c116656bd3ed06422beecb33a commit ad62cdcdcd98cab7e93b4c80d377b2344bf97a03 Author: Guang Zhu Date: Mon Jul 12 10:21:58 2010 -0700 dependent change for "parse instrumentation result bundles" in sdk Change-Id: Ifc07399b633d267ff7e71e1b31c5ad614ac4bb53 commit 2911e8d121d95dba6f11acb437374ae38f5b1f7b Author: Yu Shan Emily Lau Date: Mon Jul 12 14:11:57 2010 -0700 Added the test template for the video editor. Change-Id: I766de4eea8728a1cf82740c551e385a379852d72 commit 2de502f266a64d8a64c278ddc21e5d0dac7793f4 Merge: 967e041 977aa57 Author: Brian Muramatsu Date: Fri Jul 9 15:43:30 2010 -0700 Merge "WebViewTest Delayed Check for savePicture" into froyo commit 977aa57989648fb992d0694e0d615709d78bdeff Author: Brian Muramatsu Date: Fri Jul 9 14:42:13 2010 -0700 WebViewTest Delayed Check for savePicture Bug 2814482 The file saving is done in a separate thread in WebView, so wait a bit when checking for the file's size. It probably should be noted in the JavaDoc that this is an asynchronous call. Furthermore, the method never returns false even if the file saving failed, because the saving is done in a Runnable that will fail silently... Change-Id: Ied27fbb0b09f8fd7090cbf7392d81d81a9b91ec5 commit 967e0410e79b5d39c2b9e9b13e1ec53c166dc765 Merge: f462f05 41e772a Author: Brian Muramatsu Date: Fri Jul 9 14:17:33 2010 -0700 Merge "DialogTest onPanelClosed Called Properly Now" into froyo commit e2b68b9cbabe453b1c026d306de3218c3c0e1173 Merge: 1a7c0b4 80b0625 Author: Vasu Nori Date: Fri Jul 9 14:04:30 2010 -0700 Merge "fix cts tests after modifying the way SQLiteStatement works" commit 41e772a4cdab42a5ef1800b03958fe58e6841f7f Author: Brian Muramatsu Date: Fri Jul 9 13:29:35 2010 -0700 DialogTest onPanelClosed Called Properly Now Bug 2219899 onPanelClosed is now called properly in Froyo, so undo the change: https://android.git.kernel.org/?p=platform/cts.git;a=commitdiff;h=31306603fda681ca741a0975c87533f9d05c5ff1 Change-Id: I499e61810d96d8b6d80adde3c4b1d7c660353572 commit f462f05b8471f038c9753a19831feaf23946b7b2 Merge: 3386802 622c658 Author: Brian Muramatsu Date: Fri Jul 9 13:04:26 2010 -0700 Merge "Removing More PackageManager Permission Tests" into froyo commit 33868024cdab3f80df1429610f5d0d9a12f76495 Merge: 2eaec3f b195087 Author: Brian Muramatsu Date: Fri Jul 9 12:58:49 2010 -0700 Merge "Fix ContentResolverTest Race Conditions" into froyo commit 622c658f450fa016b356756f90ab8911e6f2ab5d Author: Brian Muramatsu Date: Fri Jul 9 12:37:45 2010 -0700 Removing More PackageManager Permission Tests Bug 2750299 There was another PackageManagerTest in addition to the previously fixed PackageManagerRequiringPermissionsTest that was testing that a SecurityException should be thrown. However, it is not expected to throw that anymore. Change-Id: I2e6c2556fdaf85f8f0b7adbbac531854e958d192 commit 80b0625e9cf342c8bdc7eedb67cccc1f88131992 Author: Vasu Nori Date: Fri Jul 2 21:15:32 2010 -0700 fix cts tests after modifying the way SQLiteStatement works 2 changes caused this test to be modified: 1. SQliteProgram.getUniqueId() is deprecated and is NOT to be used any longer 2. previously, SQLiteStatement used to compile the sql statement when the SQLiteStatement object was created. now, it is compiled only when it is about to be executed. Change-Id: I00a31602e3241d5e7b25cefc23c4e2a270fa7c9a commit 2eaec3f4d25e0740d256a0e2c41357ec2c328e70 Author: Brian Muramatsu Date: Thu Jul 8 15:20:37 2010 -0700 Update GeomagneticFieldTest Bug 2557378 Squashed commit of the following: commit 24b1575f9bf6898257cdec9deb2db9ea5c8dbb52 Date: Tue Mar 30 18:37:29 2010 -0300 Fixing test Change-Id: I6724a1020c9eb0f25b64b31571f5d57f0b576fcf Change-Id: I8ecb4383b164ed6e6ea186e64df21b1d103e0ffd commit e9532898011d556124ec843b98fe8728f8e13fee Merge: 709a5cb 8c005b3 Author: Brian Muramatsu Date: Thu Jul 8 11:58:42 2010 -0700 Merge "Fix JNI Loading for BuildTest" into froyo commit b19508722d093d5b0ea6ab10a68b92c5fc87f5db Author: Brian Muramatsu Date: Wed Jul 7 18:14:32 2010 -0700 Fix ContentResolverTest Race Conditions Issue 9398 Add some DelayedCheck around some potentially asynchronous calls and add synchronization around members that are set and get by different threads. Change-Id: I4a04bfd97e899ad147f858f8a176ce704c66134f commit 8c005b3e1e9e396af6fcfa7a0dc0082f90ad676c Author: Brian Muramatsu Date: Wed Jul 7 16:43:01 2010 -0700 Fix JNI Loading for BuildTest Bug 2814482 BuildTest uses native code to check the CPU's features. When using runtest.py, the library is put into /system/lib, so the library is loaded without problems. However, running the test in CTS causes the library not to be found, because it is not installed into the system directory anymore. The CTS runner's classloader is used for tests, so the native code must be compiled into the runner's jar in order for it to be found. Change-Id: I1922d3d2e95753fb0e1dad741178e514695dc1e3 commit 1a7c0b4253e3dcec3580dfbade649b1bed45ef1b Merge: bcd6f92 a300f5a Author: Nick Kralevich Date: Wed Jul 7 13:33:34 2010 -0700 am a300f5af: am 6ff05ea6: Merge "Add __attribute__((format(printf, a, b))) to printf like functions." into gingerbread Merge commit 'a300f5af3e86087400efee930ede279fd3bd3199' * commit 'a300f5af3e86087400efee930ede279fd3bd3199': Add __attribute__((format(printf, a, b))) to printf like functions. commit bcd6f92b7ac2c378ef24eb052f4b1dcc7d4f7aa6 Author: Gilles Debunne Date: Wed Jul 7 13:00:02 2010 -0700 New tests in SpannableStringBuilder. These tests exercise a path in replace() that was not exercised before. Initially added to exhibit a bug which happened to be a feature. Change-Id: I7c9c0b266d8f1ed5675ba6fb5f537f81f40c0d28 commit 709a5cb491aaa76b96fe011934debb3b5d5ce3d7 Merge: 22cf08b 7379989 Author: Brian Muramatsu Date: Fri Jul 2 14:13:12 2010 -0700 DO NOT MERGE Merge Eclair CTS Changes into Froyo Changes to branches beyond Froyo will be done separately to avoid further merge conflicts. Change-Id: I157c687fa059f9505f5cf62b6d1348b0411bca1c commit a300f5af3e86087400efee930ede279fd3bd3199 Merge: 9fbca5b 6ff05ea Author: Nick Kralevich Date: Wed Jul 7 11:37:50 2010 -0700 am 6ff05ea6: Merge "Add __attribute__((format(printf, a, b))) to printf like functions." into gingerbread Merge commit '6ff05ea64444fa58ab3fa8a8ac34d75ed1f2b41f' into gingerbread-plus-aosp * commit '6ff05ea64444fa58ab3fa8a8ac34d75ed1f2b41f': Add __attribute__((format(printf, a, b))) to printf like functions. commit 6ff05ea64444fa58ab3fa8a8ac34d75ed1f2b41f Merge: 53e475f b7d888d Author: Nick Kralevich Date: Wed Jul 7 11:35:52 2010 -0700 Merge "Add __attribute__((format(printf, a, b))) to printf like functions." into gingerbread commit 213bcbfc082996cfd5096e6a67d3a160e0c46da1 Author: Vasu Nori Date: Thu Jul 1 16:59:26 2010 -0700 fix cts database tests annotated with "to-be-fixed" I think one shouldn't allow such annotations to be used because the submitter will never fix them and who else will HAVE to fix them - yours truly. so please don't +2 if someone says "to-be-fixed-later" ask them to fix it later and submit later-than-that-later :) Change-Id: I6db80feabb2c980858b036977bb336a3954b4d79 commit 01ea71ea202c6c7374a77907cdd73d7f4baa3ef0 Merge: 5bb4d93 9fbca5b Author: Chih-Chung Chang Date: Thu Jul 1 11:55:22 2010 -0700 am 9fbca5b3: am 53e475fc: Add tests for MediaProfiles. Merge commit '9fbca5b32e77eec0fa91d4a229c4aa32db4eb958' * commit '9fbca5b32e77eec0fa91d4a229c4aa32db4eb958': Add tests for MediaProfiles. commit 9fbca5b32e77eec0fa91d4a229c4aa32db4eb958 Merge: f29507c 53e475f Author: Chih-Chung Chang Date: Wed Jun 30 20:20:56 2010 -0700 am 53e475fc: Add tests for MediaProfiles. Merge commit '53e475fc35cf8766d2ce478d0f3d39bfd165da96' into gingerbread-plus-aosp * commit '53e475fc35cf8766d2ce478d0f3d39bfd165da96': Add tests for MediaProfiles. commit 73799893f901dd3696dea0ea78f5d49ddfacc636 Author: Brian Muramatsu Date: Wed Jun 23 17:42:52 2010 -0700 Use Reflection to Get Features for Report Header Bug 2742459 Get the list of features to check by using reflection over the PackageManager constants. These constants are guaranteed to be there due to the SignatureTest that checks the API signature on the device. Its possible that the actual value of the constants could be different, but that is up to the operator to inspect all values that appear in the report. Change-Id: Ib492708bc95e5777a388aed1c4b468ba4723cf97 commit 5bb4d93f8a99243956919a6120398b8a142892f5 Author: Brian Carlstrom Date: Wed Jun 30 00:43:49 2010 -0700 Fix cts test build for merge of libcore project from dalvik-dev branch Change-Id: I27e7b357ae1ea4db9973ce98cb0a4c69f090ae89 commit f2a831f4d00ae448f333ad83e40d617f4ab673f2 Merge: 0dbc489 e73e83d Author: Jean-Baptiste Queru Date: Tue Jun 29 16:12:16 2010 -0700 Merge "Adjust NinePatchDrawableTest#testConstructors." into eclair commit 0dbc48933f00bfe73cce68fbd90058ea5c475c21 Merge: 382962e 2b00e2f Author: Jean-Baptiste Queru Date: Tue Jun 29 16:11:20 2010 -0700 Merge "Speculative fix for intermittent CTS UI test failures." into eclair commit 382962e2d5db091babb58fa7cae4f502ef9db3e4 Author: Brian Muramatsu Date: Tue Jun 29 15:23:12 2010 -0700 Strip Invalid Characters from XML Sometimes the Dalvik tests print control characters in their exceptions for known failures. This makes the report unviewable in FireFox so strip out the control characters before writing the XML. Change-Id: Ifeb4bb5ff04c95e934f32240e9459f9a33cbd545 commit e73e83d3eea8e146b18b80622de4073ec79286eb Author: Brett Chabot Date: Thu May 6 13:59:53 2010 -0700 Adjust NinePatchDrawableTest#testConstructors. This test was failing due to a known bug which has been fixed in next platform release. Change-Id: I4143d0922faedd4271abd3c681c4e7a15eee19ec commit 2b00e2f43980bb421c3f6ac89fa55ff726f14eb6 Author: Brett Chabot Date: Wed Apr 21 11:17:14 2010 -0700 Speculative fix for intermittent CTS UI test failures. UI related tests fail if the keyguard is currently displayed. Previously, the CTS harness used a separate util app which would disable the keyguard upon receiving a broadcast. However, if the util app's process is killed by the system, the keyguard is immediately displayed. Its not known for sure, but this could explain the intermittent UI test failures. This commit adds logic to disable the keyguard in the CTS test runner itself. Bug 2342725. Change-Id: I6fbc89fb895f56527d367508f455f5cbaa1a6f46 commit b08063fd22606dc08a99d5a820b8dfee998af7cc Merge: 1913b2d 3b3a92f Author: Vasu Nori Date: Tue Jun 29 10:32:18 2010 -0700 Merge "fix a couple of CTS database tests" commit 3b3a92fec3aff9c20510b6e8703714164589ce26 Author: Vasu Nori Date: Tue Jun 29 10:07:01 2010 -0700 fix a couple of CTS database tests removed one useless and intermitently failing unittest from SQLiteCursorTest bandaid on CursorWrapperTest. Change-Id: I10883e6f8dac80d35bbf3190da4cad037ab730fc commit 53e475fc35cf8766d2ce478d0f3d39bfd165da96 Author: Chih-Chung Chang Date: Thu Jun 24 18:09:08 2010 +0800 Add tests for MediaProfiles. Change-Id: I08e5e66615e88a243d5779ae02a3a68ba15d6b29 commit 1913b2dd1410ebfb595456c3be9346eff642cfa6 Merge: 1b86c09 f29507c Author: Jeff Brown Date: Mon Jun 28 02:03:41 2010 -0700 am f29507cd: am 736576ee: Merge "Fixed a bug in the MotionEvent.recycle() test." into gingerbread Merge commit 'f29507cdce0ee2987d398a9b734a87a21dfacae0' * commit 'f29507cdce0ee2987d398a9b734a87a21dfacae0': Fixed a bug in the MotionEvent.recycle() test. commit f29507cdce0ee2987d398a9b734a87a21dfacae0 Merge: e061457 736576e Author: Jeff Brown Date: Mon Jun 28 02:02:24 2010 -0700 am 736576ee: Merge "Fixed a bug in the MotionEvent.recycle() test." into gingerbread Merge commit '736576ee763e42ceb592327fd8de4a0b61ecde8d' into gingerbread-plus-aosp * commit '736576ee763e42ceb592327fd8de4a0b61ecde8d': Fixed a bug in the MotionEvent.recycle() test. commit 736576ee763e42ceb592327fd8de4a0b61ecde8d Merge: 3e6f95c ba7e10c Author: Jeff Brown Date: Mon Jun 28 02:00:59 2010 -0700 Merge "Fixed a bug in the MotionEvent.recycle() test." into gingerbread commit 1b86c09cae66da50be564f290371fc660a542105 Merge: 0f33a08 e061457 Author: Chih-Chung Chang Date: Sun Jun 27 20:56:46 2010 -0700 am e0614576: am 3e6f95cc: Add test for multiple camera support. Merge commit 'e06145762d0c4de91abab2d381fdd658470b4cf1' * commit 'e06145762d0c4de91abab2d381fdd658470b4cf1': Add test for multiple camera support. commit e06145762d0c4de91abab2d381fdd658470b4cf1 Merge: c018d92 3e6f95c Author: Chih-Chung Chang Date: Sun Jun 27 20:51:56 2010 -0700 am 3e6f95cc: Add test for multiple camera support. Merge commit '3e6f95cc5c14bfb296a5272cdd62483cf81951bf' into gingerbread-plus-aosp * commit '3e6f95cc5c14bfb296a5272cdd62483cf81951bf': Add test for multiple camera support. commit ba7e10c008613b71aff30a7232e694fd207757b3 Author: Jeff Brown Date: Sat Jun 26 00:38:26 2010 -0700 Fixed a bug in the MotionEvent.recycle() test. Previously there was a bug in the logic of MotionEvent.recycle() which caused it to not report attempts to recycle an already recycled event. Unfortunately the corrected behavior made the CTS fail. Change-Id: I2d755475652a481bbfe3003e40d7b534f78471d6 commit 3e6f95cc5c14bfb296a5272cdd62483cf81951bf Author: Chih-Chung Chang Date: Tue Jun 15 18:06:54 2010 +0800 Add test for multiple camera support. Change-Id: Ifafd8d8be20bca85907c91044ef57e63cf370d1b commit b7d888d5451321d0cb12708167491189a64028da Author: Nick Kralevich Date: Thu Jun 24 16:31:16 2010 -0700 Add __attribute__((format(printf, a, b))) to printf like functions. Change-Id: I86b9fdba87bb34366e7b7006180e0ed0bbfbe7c1 commit 0f33a087b88c03b7b3f9fce146ae7251987936d2 Merge: 653c923 72deef9 Author: Vasu Nori Date: Thu Jun 24 13:47:37 2010 -0700 Merge "fix broken test enableWriteAheadLog.. now returns bool instead of void" commit cae0a5e42353fa2295d6f8e37a67bdd29b4f614d Merge: 0a63385 063342a Author: Brian Muramatsu Date: Thu Jun 24 11:28:20 2010 -0700 Merge "Update CTS version to 2.1_r3" into eclair commit 0a63385e6976e0de2f204d416cad30b6b8b0e8bb Merge: 4af6c4e dd80160 Author: Brian Muramatsu Date: Thu Jun 24 11:22:52 2010 -0700 Merge "CTS Eclipse Classpath File Generator" into eclair commit 4af6c4eac7b9339f965e0ca7d840ce77b7ed316d Author: Brian Muramatsu Date: Mon Jun 21 16:57:12 2010 -0700 Display Other Features in Report Header Bug 2742459 Display features that do not have corresponding "FEATURE_*" constants in PackageManager. Put them in the report header under the "Other Features" section. Change-Id: Icba60bbe931f06b2007e181f1558e942e142bde1 commit 063342ac2306956828b00e63e8156a16ec3e89e4 Author: Brian Muramatsu Date: Wed Jun 23 16:10:53 2010 -0700 Update CTS version to 2.1_r3 Change-Id: I4ca5f4ccb14c0dc0ab7b6523dabf1f0b74ace277 commit 653c92378607b306f8b888033f663d55e04f4621 Merge: 511341e c018d92 Author: Dianne Hackborn Date: Wed Jun 23 14:43:27 2010 -0700 am c018d921: am f4a9816e: Follow API changes. Merge commit 'c018d92198e743ee037e6c2f38599ca503f29362' * commit 'c018d92198e743ee037e6c2f38599ca503f29362': Follow API changes. commit c018d92198e743ee037e6c2f38599ca503f29362 Merge: b618e96 f4a9816 Author: Dianne Hackborn Date: Wed Jun 23 14:40:29 2010 -0700 am f4a9816e: Follow API changes. Merge commit 'f4a9816ed3b4df7905e8296aa982fe71d0d966b1' into gingerbread-plus-aosp * commit 'f4a9816ed3b4df7905e8296aa982fe71d0d966b1': Follow API changes. commit f4a9816ed3b4df7905e8296aa982fe71d0d966b1 Author: Dianne Hackborn Date: Wed Jun 23 14:13:05 2010 -0700 Follow API changes. Change-Id: I8944bf72642ad7de6a2f5b28dea3579b0d2b400a commit dd8016090f9ca9db84e1b009c85ca5b2402273ec Author: Brian Muramatsu Date: Tue Jun 22 18:15:40 2010 -0700 CTS Eclipse Classpath File Generator Add a script that combine the classpath under development/ide/eclipse with a .classpath file under cts/development/ide/eclipse that has the CTS packages. Run the following in your ANDROID_BUILD_TOP to generate a classpath for Eclipse that has the CTS packages: ./cts/development/ide/eclipse/genclasspath.sh > .classpath Change-Id: I0cd0cecdf594d99e52b1b78d8c50f80bbf855d0f commit 511341eccb5097f9371266805866baa76adba817 Merge: 3ff54a6 b618e96 Author: Dianne Hackborn Date: Wed Jun 23 10:32:16 2010 -0700 am b618e969: am 9b142b21: Merge "Update to follow platform." into gingerbread Merge commit 'b618e96985b44a95b56ee861f55029e5499b43b8' * commit 'b618e96985b44a95b56ee861f55029e5499b43b8': Update to follow platform. commit 72deef91c74b3f8395a5638eb5f3f2d40029f98b Author: Vasu Nori Date: Tue Jun 22 15:55:13 2010 -0700 fix broken test enableWriteAheadLog.. now returns bool instead of void Change-Id: I2c40e813861a2010e6a850339ad7d7034f08e8a3 commit 21c520d29c37afa6e24d10a8d9c7a2a8a0e78482 Merge: 3b1082b 5579039 Author: Brian Muramatsu Date: Tue Jun 22 12:06:09 2010 -0700 Merge "Report Unwhitelisted Root Processes" into eclair commit b618e96985b44a95b56ee861f55029e5499b43b8 Merge: e3e3161 9b142b2 Author: Dianne Hackborn Date: Tue Jun 22 11:24:20 2010 -0700 am 9b142b21: Merge "Update to follow platform." into gingerbread Merge commit '9b142b215920ff6df98c2d114f796476a2f8e290' into gingerbread-plus-aosp * commit '9b142b215920ff6df98c2d114f796476a2f8e290': Update to follow platform. commit 9b142b215920ff6df98c2d114f796476a2f8e290 Merge: 95c914c 5124777 Author: Dianne Hackborn Date: Tue Jun 22 11:22:56 2010 -0700 Merge "Update to follow platform." into gingerbread commit 5579039bdb1e16d1e8789b49c626ff6a3088e709 Author: Brian Muramatsu Date: Mon Jun 14 14:45:42 2010 -0700 Report Unwhitelisted Root Processes Bug 2738144 Scan for unwhitelisted root processes and report them in the CTS results device summary. This initially was designed to be part of a unit test, but the processes vary too much across devices. Change-Id: I28ee6cf563c9e7073836e3534703c33c8925458f commit 3ff54a6472b2564bd9be4b043edda2f2598cb9cc Merge: eafde66 e3e3161 Author: The Android Open Source Project Date: Mon Jun 21 11:00:51 2010 -0700 am e3e31610: merge from froyo-plus-aosp Merge commit 'e3e31610ca0ac4c92f9dd96bf302e6a4f41feb30' * commit 'e3e31610ca0ac4c92f9dd96bf302e6a4f41feb30': Added Testcases for ArrayAdapter add and addAll commit e3e31610ca0ac4c92f9dd96bf302e6a4f41feb30 Merge: 4311c96 b4f1a55 Author: The Android Open Source Project Date: Mon Jun 21 10:58:35 2010 -0700 merge from froyo-plus-aosp Change-Id: I3de2f0f454ffa39cb3d16e51b6d0bdd1ed82e700 commit 5124777d61518a179e1acdd00d2ff2384947972f Author: Dianne Hackborn Date: Fri Jun 18 18:13:19 2010 -0700 Update to follow platform. Change-Id: Ibf9db1766bc28ebc4b1d20ec5da831866bc5c77c commit 3b1082bfcac9ae36f6935d63bf9930b0d5429d52 Merge: 5912527 6b126d7 Author: Brian Muramatsu Date: Fri Jun 18 10:51:29 2010 -0700 Merge "Prohibit Listening Ports on Devices" into eclair commit eafde66521e15676b081ad712abdf37d7883e17a Merge: 90c5328 5330f43 Author: Vasu Nori Date: Thu Jun 17 13:15:08 2010 -0700 Merge "assert appropriate exception and fix spelling errors" commit 90c5328e6da975d0586bb6be37d7f20cc410d768 Merge: a938e14 4311c96 Author: Brett Chabot Date: Thu Jun 17 12:45:40 2010 -0700 am 4311c96c: am 95c914c3: am 22cf08bd: Remove permission tests for *PreferredPackages methods. Merge commit '4311c96c400e9f93b66408e8e919cdc68c2cec40' * commit '4311c96c400e9f93b66408e8e919cdc68c2cec40': Remove permission tests for *PreferredPackages methods. commit 4311c96c400e9f93b66408e8e919cdc68c2cec40 Merge: 6d05daa 95c914c Author: Brett Chabot Date: Thu Jun 17 12:42:39 2010 -0700 am 95c914c3: am 22cf08bd: Remove permission tests for *PreferredPackages methods. Merge commit '95c914c3daf4220e7f624e531857523d4091cc84' into gingerbread-plus-aosp * commit '95c914c3daf4220e7f624e531857523d4091cc84': Remove permission tests for *PreferredPackages methods. commit 95c914c3daf4220e7f624e531857523d4091cc84 Merge: 4be5ef5 22cf08b Author: Brett Chabot Date: Thu Jun 17 12:37:02 2010 -0700 am 22cf08bd: Remove permission tests for *PreferredPackages methods. Merge commit '22cf08bd0066ec45b9f49c2f3a3cdce04f88fbed' into gingerbread * commit '22cf08bd0066ec45b9f49c2f3a3cdce04f88fbed': Remove permission tests for *PreferredPackages methods. commit b4f1a557657cdc7c0210ec9180b858bce28704b7 Merge: 747f3b5 22cf08b Author: Brett Chabot Date: Thu Jun 17 12:23:30 2010 -0700 am 22cf08bd: Remove permission tests for *PreferredPackages methods. Merge commit '22cf08bd0066ec45b9f49c2f3a3cdce04f88fbed' into froyo-plus-aosp * commit '22cf08bd0066ec45b9f49c2f3a3cdce04f88fbed': Remove permission tests for *PreferredPackages methods. commit a938e14c3f62bcdf7a521def1bf73cf873fe51ff Merge: f3d6873 6d05daa Author: Brett Chabot Date: Wed Jun 16 19:41:41 2010 -0700 am 6d05daab: am 4be5ef5b: Fix build Merge commit '6d05daab2289ac488eeffe78b7246f66dc1afe17' * commit '6d05daab2289ac488eeffe78b7246f66dc1afe17': Fix build commit 5330f43e4f8c4abd48c7f0144e80d891cb79b91a Author: Vasu Nori Date: Tue Jun 15 11:34:06 2010 -0700 assert appropriate exception and fix spelling errors in this change I9a33410617ab6a00147c3ab2010ed31251983329 setConenctionPoolSize() is changed to throw IllegalArgumentException in one case (used to throw IllegalStateException). this CL changes the test accordingly Change-Id: I32c30f7d05e5bec7c6b2776ce9a80c8be61d856f commit f3d68730ed04f048ebd57a565f4a998c46aabb16 Author: Brett Chabot Date: Wed Jun 16 17:18:13 2010 -0700 Fix build - manual merge from gb Change-Id: I1455204622fe09e94c9801c14af9f5dc619a9be4 commit 6d05daab2289ac488eeffe78b7246f66dc1afe17 Merge: dce8e30 4be5ef5 Author: Brett Chabot Date: Wed Jun 16 15:46:37 2010 -0700 am 4be5ef5b: Fix build Merge commit '4be5ef5b9036da8e2961c19f5a6fafd3e5822c4c' into gingerbread-plus-aosp * commit '4be5ef5b9036da8e2961c19f5a6fafd3e5822c4c': Fix build commit 4be5ef5b9036da8e2961c19f5a6fafd3e5822c4c Author: Brett Chabot Date: Wed Jun 16 15:43:09 2010 -0700 Fix build Remove framework-tests dependency from CTS ProcessTest. Change-Id: Ifff2c77557d4b0a8120580766dd7861ef1b13c0a commit 5cc36a8dafdfde371f82d222e5026afae1188a97 Merge: 8a9af2f dce8e30 Author: Wu-cheng Li Date: Wed Jun 16 04:49:45 2010 -0700 am dce8e302: am 9f7f97f2: Test all camera preview sizes. Merge commit 'dce8e3028aae189ff4d9841046af64ab826b5857' * commit 'dce8e3028aae189ff4d9841046af64ab826b5857': Test all camera preview sizes. commit dce8e3028aae189ff4d9841046af64ab826b5857 Merge: aede076 9f7f97f Author: Wu-cheng Li Date: Wed Jun 16 04:47:04 2010 -0700 am 9f7f97f2: Test all camera preview sizes. Merge commit '9f7f97f235dcd2cf279e7b7297d37e5547410953' into gingerbread-plus-aosp * commit '9f7f97f235dcd2cf279e7b7297d37e5547410953': Test all camera preview sizes. commit 8a9af2f86eac9126cc26608b721c598b9668e83c Merge: 3e1d318 adba81e Author: Vasu Nori Date: Tue Jun 15 10:57:42 2010 -0700 Merge "fix broken tests" commit 22cf08bd0066ec45b9f49c2f3a3cdce04f88fbed Author: Brett Chabot Date: Tue Jun 15 09:25:01 2010 -0700 Remove permission tests for *PreferredPackages methods. These methods are now no-ops. Bug 2750299 Change-Id: Ic8fb034a92f94bee05e6f3e67d8c2aabbd29723c commit 9f7f97f235dcd2cf279e7b7297d37e5547410953 Author: Wu-cheng Li Date: Wed Apr 21 18:30:09 2010 +0800 Test all camera preview sizes. Change-Id: I9852fdb55b9b9ce9236c1793461b58bcb73eabec commit 3e1d31824830425868c5b5d25ea8f0dcf27e9ced Author: Vasu Nori Date: Mon Jun 14 18:44:04 2010 -0700 add cts tests for the new API in handle writeAheadLogging Change-Id: I51402ac8497c7592c9f1ae3b389f05cc2b27741b commit adba81e2fcca02ad79cbcf462d7965a232d6bbba Author: Vasu Nori Date: Mon Jun 14 17:54:31 2010 -0700 fix broken tests this test is broken by I8f0225ceff8f92e32a58f323551e5ada6df63593 Change-Id: Ie64b5adda5cb2d9f6f763d82aa8dc8ff9f89bbcc commit 6b126d7bb6e6f4b512b50685ca3f16097625028a Author: Brian Muramatsu Date: Wed Jun 2 16:12:05 2010 -0700 Prohibit Listening Ports on Devices Bug 2732034 Check that devices do not have any listening ports open by scanning files in the /proc/net directory. Change-Id: Ic6204667809b3a0c136e38f35fe536bc6d79dcad commit 747f3b56271e7ba6be48ec5f2aa1850967fbec5f Merge: 3776b0c 37cd169 Author: The Android Open Source Project Date: Mon Jun 14 14:16:30 2010 -0700 merge from open-source master Change-Id: I3485f76a8fad3b2160dbe44699c58a3cd620fada commit 51e6f1f2f1a76401dbceee85b1a7d2244fc84de6 Merge: 4e8123e aede076 Author: The Android Open Source Project Date: Mon Jun 14 11:24:58 2010 -0700 am aede076f: merge from froyo-plus-aosp Merge commit 'aede076ff79c3c232e563be1a2ad6e05b742c3a2' * commit 'aede076ff79c3c232e563be1a2ad6e05b742c3a2': commit aede076ff79c3c232e563be1a2ad6e05b742c3a2 Merge: e970329 3776b0c Author: The Android Open Source Project Date: Mon Jun 14 11:22:06 2010 -0700 merge from froyo-plus-aosp Change-Id: I0014096b79474728298e26d12c528090ef4c3ffe commit 37cd169513cc4dd9c7bd92a550707ac43780da6a Author: Christian Mehlmauer Date: Sat Jun 12 12:48:01 2010 +0200 Added Testcases for ArrayAdapter add and addAll Change-Id: I7f824889b88141ec1283a691f856034d7b4bb72c commit 591252754de77b7e8300445927d544f051074be6 Author: Brian Muramatsu Date: Tue May 18 17:33:38 2010 -0700 Porting Unsubmitted Donut InputMethod Tests Reviewed the tests and found some decent ones in BaseInputConnectionTest. Removed empty tests and unnecessary @ToBeFixed annotations. Squashed commit of the following: commit 6c2a35e50d056d69fa52d1e2fd12c7f118c7871d Date: Fri Jul 17 18:48:02 2009 -0700 Integrate unsubmitted cupcake change 130901: CTS: add test cases for input method classes Change-Id: I69b88989ae4d0fe056e9ab8d67d0a955dd10e6d9 commit b7eb1bf86f05d79b433109e1457983998e546fda Merge: 99f6e47 a04cae7 Author: Brian Muramatsu Date: Fri Jun 11 10:43:56 2010 -0700 Merge "CTS would report 'too many files open' because it did not close .xml output files" into eclair commit 4e8123e2df00bca91947f7aa80225bf252b8df86 Merge: 5ae1dbd e970329 Author: Brian Muramatsu Date: Thu Jun 10 16:13:04 2010 -0700 am e9703290: am 41e034e1: am 83a4a1c6: Don\'t Build Test Requiring cpufeatures for sim-eng commit e970329027b326a75c8c19fd4bd2bf4b43330109 Merge: b4d11c5 41e034e Author: Brian Muramatsu Date: Thu Jun 10 15:05:24 2010 -0700 am 41e034e1: am 83a4a1c6: Don\'t Build Test Requiring cpufeatures for sim-eng commit 41e034e1a57d3eaa7f50954d0831f4b2e2220502 Merge: 08776fd 83a4a1c Author: Brian Muramatsu Date: Thu Jun 10 15:02:06 2010 -0700 am 83a4a1c6: Don\'t Build Test Requiring cpufeatures for sim-eng Merge commit '83a4a1c6a6afafeddb1b4e38a012dc66b09f3a53' into kraken * commit '83a4a1c6a6afafeddb1b4e38a012dc66b09f3a53': Don't Build Test Requiring cpufeatures for sim-eng commit 3776b0c4c539d23616325767c579377141af12b0 Merge: 9f9add0 83a4a1c Author: Brian Muramatsu Date: Thu Jun 10 15:02:02 2010 -0700 am 83a4a1c6: Don\'t Build Test Requiring cpufeatures for sim-eng Merge commit '83a4a1c6a6afafeddb1b4e38a012dc66b09f3a53' into froyo-plus-aosp * commit '83a4a1c6a6afafeddb1b4e38a012dc66b09f3a53': Don't Build Test Requiring cpufeatures for sim-eng commit 83a4a1c6a6afafeddb1b4e38a012dc66b09f3a53 Author: Brian Muramatsu Date: Thu Jun 10 14:29:28 2010 -0700 Don't Build Test Requiring cpufeatures for sim-eng Bug 2713199 ...to fix the build ...AGAIN Change-Id: I132fa137bd7226144708d3f788303dfb86f35eb4 commit 5ae1dbd35d5035f94fd21353c3efc974e45053ba Merge: f00649d b4d11c5 Author: Brian Muramatsu Date: Thu Jun 10 12:08:00 2010 -0700 am b4d11c5a: am 08776fdb: am 42212879: CTS Test for ARM ABI Version commit b4d11c5a0498a26d61c55689716c255d96390785 Merge: aec0e15 08776fd Author: Brian Muramatsu Date: Thu Jun 10 12:06:10 2010 -0700 am 08776fdb: am 42212879: CTS Test for ARM ABI Version commit 08776fdb3578b35c55e74b63f00162c0b7e9d6e0 Merge: 2aa0478 4221287 Author: Brian Muramatsu Date: Thu Jun 10 12:04:09 2010 -0700 am 42212879: CTS Test for ARM ABI Version Merge commit '42212879c592798ac2bb858cb316d9fc66b28526' into kraken * commit '42212879c592798ac2bb858cb316d9fc66b28526': CTS Test for ARM ABI Version commit 9f9add0a58dd35376d7d9c50b4b0a9ad344fe65d Merge: 60cc4e2 4221287 Author: Brian Muramatsu Date: Thu Jun 10 12:03:16 2010 -0700 am 42212879: CTS Test for ARM ABI Version Merge commit '42212879c592798ac2bb858cb316d9fc66b28526' into froyo-plus-aosp * commit '42212879c592798ac2bb858cb316d9fc66b28526': CTS Test for ARM ABI Version commit 99f6e472cc7e9c5b41118e6319434d805411e645 Merge: a61d323 f5b15d8 Author: Brian Muramatsu Date: Thu Jun 10 11:44:03 2010 -0700 Merge "Porting Unsubmitted Cupcake CookieSyncManagerTest" into eclair commit 42212879c592798ac2bb858cb316d9fc66b28526 Author: Brian Muramatsu Date: Wed May 26 16:27:28 2010 -0700 CTS Test for ARM ABI Version Bug 2713199 Use the native cpufeatures API from the NDK project to make sure that if the CPU is v7 capable then it should be reported by the Build.CPU_ABI constant. Tested by changing the TARGET_CPU_ABI variable in passion-common's BoardConfigCommon.mk to armeabi and then making sure the test caught it. Change-Id: Iedc5ab663dd90a2e7be2508b3a3a7641b04e1bb4 commit f00649df5d57401676d8c95e0214f4483307aaf6 Merge: fef4375 aec0e15 Author: Wu-cheng Li Date: Wed Jun 9 19:54:25 2010 -0700 am aec0e15f: am 2aa04786: Add cts test for android.hardware.Camera.cancelAutoFocus(). commit aec0e15fb358d9491eda1aadb6a5642d323363f9 Merge: f222a09 2aa0478 Author: Wu-cheng Li Date: Wed Jun 9 19:52:19 2010 -0700 am 2aa04786: Add cts test for android.hardware.Camera.cancelAutoFocus(). commit a04cae790a43b36e678179b174c2464b147a1325 Author: Mike Rieker Date: Wed Jun 9 08:51:36 2010 -0400 CTS would report 'too many files open' because it did not close .xml output files Change-Id: I6253b04d7a6bfac02220b324f4a0f6303254d722 commit fef4375adfa7acf707180e794b8935ae39f24da4 Author: Dianne Hackborn Date: Tue Jun 8 23:12:02 2010 -0700 Update CTS to follow API change. Change-Id: Id4a9dbd7ba882d5c6f63f07b102b67db5a0898eb commit 2aa04786a9b4b6b966da751804437e7e6a4f4f2c Author: Wu-cheng Li Date: Thu Jun 3 18:06:27 2010 +0800 Add cts test for android.hardware.Camera.cancelAutoFocus(). Change-Id: Ia065eb40d66635d4b8d91ae81cd8e44e6660f9c1 commit a61d323e79fbece75bbcc8f5dc32d04ef4e5434d Author: Brian Muramatsu Date: Tue Jun 8 12:29:36 2010 -0700 Add Feature List to CTS Report Header Bug 2742459 Use the PackageManager to check which features the device has enabled. Add them to the XML in separate block like and display them in the report with ascii check boxes like "[X] android.hardware.camera". In the future the list of features could be gleamed from the XML files in frameworks/base/data/etc... Change-Id: Ife7aa1fdfa060aecbc3438eae3f7b33f70a91f80 commit db92b31e6eba30157f51274dd9e69665b96ddebf Merge: 8c7facc f222a09 Author: Brian Muramatsu Date: Wed Jun 2 22:41:35 2010 -0700 am f222a090: am 95df4115: am 60cc4e27: am 722008e0: Report CPU ABI in Report Header commit f222a090e313f19a4a7e371d35103f91fea6e244 Merge: 04b5eb0 95df411 Author: Brian Muramatsu Date: Wed Jun 2 16:42:54 2010 -0700 am 95df4115: am 60cc4e27: am 722008e0: Report CPU ABI in Report Header commit 95df411562edca437e1023b3ef09d23e57e4c977 Merge: 6eb8813 60cc4e2 Author: Brian Muramatsu Date: Wed Jun 2 16:41:27 2010 -0700 am 60cc4e27: am 722008e0: Report CPU ABI in Report Header Merge commit '60cc4e2741f6483613fbd0e9567d4a85c2a671cb' into kraken * commit '60cc4e2741f6483613fbd0e9567d4a85c2a671cb': Report CPU ABI in Report Header commit 60cc4e2741f6483613fbd0e9567d4a85c2a671cb Merge: 3d8f0d1 722008e Author: Brian Muramatsu Date: Wed Jun 2 16:40:08 2010 -0700 am 722008e0: Report CPU ABI in Report Header Merge commit '722008e05a9e011f0e51d497526aa74c2cc4a29d' into froyo-plus-aosp * commit '722008e05a9e011f0e51d497526aa74c2cc4a29d': Report CPU ABI in Report Header commit fc8dd0c7a44c91dd48192a5588522cfa02e085c8 Merge: b7c7512 eabe429 Author: Brian Muramatsu Date: Tue Jun 1 15:31:35 2010 -0700 am eabe4294: Merge "Verify Device IMEI/MEID Ids" into eclair Merge commit 'eabe42944efd3bfb6506012656df3aa68874ffe8' into eclair * commit 'eabe42944efd3bfb6506012656df3aa68874ffe8': Verify Device IMEI/MEID Ids commit eabe42944efd3bfb6506012656df3aa68874ffe8 Merge: aa87871 5eed71e Author: Brian Muramatsu Date: Tue Jun 1 14:45:53 2010 -0700 Merge "Verify Device IMEI/MEID Ids" into eclair commit b7c7512bec0d8e983be46b6e9184c619277e0b5b Merge: c8af3ba aa87871 Author: Brian Muramatsu Date: Tue Jun 1 14:37:45 2010 -0700 am aa878719: Merge "Improve Formatting of Locales in CTS Report" into eclair Merge commit 'aa878719ba3c95033f7f0e3fed850f6a048a0425' into eclair * commit 'aa878719ba3c95033f7f0e3fed850f6a048a0425': Improve Formatting of Locales in CTS Report commit c8af3ba232bcfd7385aacb7be144ffeccde466bf Merge: abfcec4 9ff90a3 Author: Christian Mehlmauer Date: Tue Jun 1 14:37:40 2010 -0700 am 9ff90a3e: Replaced raw string arguments for Context.getSystemService() with final Context variables Merge commit '9ff90a3e4ecb3d24ea8605aa8e6d5568942ad7b8' into eclair * commit '9ff90a3e4ecb3d24ea8605aa8e6d5568942ad7b8': Replaced raw string arguments for Context.getSystemService() with final commit aa878719ba3c95033f7f0e3fed850f6a048a0425 Merge: 9ff90a3 c193da8 Author: Brian Muramatsu Date: Tue Jun 1 14:18:29 2010 -0700 Merge "Improve Formatting of Locales in CTS Report" into eclair commit abfcec4205a15d3197f7cb88bf43eef87ab6253d Merge: 0c2b3a2 603a529 Author: Brian Muramatsu Date: Tue Jun 1 14:07:32 2010 -0700 am 603a5299: Merge "Clean Up Properly in Database Tests" into eclair Merge commit '603a52991a99795061030439ddbe4ef25977a30f' into eclair * commit '603a52991a99795061030439ddbe4ef25977a30f': Clean Up Properly in Database Tests commit 9ff90a3e4ecb3d24ea8605aa8e6d5568942ad7b8 Author: Christian Mehlmauer Date: Tue Jun 1 23:06:29 2010 +0200 Replaced raw string arguments for Context.getSystemService() with final Context variables Change-Id: I97bb970fdb81f8c1329d112d60d644f6225f04f1 commit 603a52991a99795061030439ddbe4ef25977a30f Merge: 8d28606 af581f5 Author: Brian Muramatsu Date: Tue Jun 1 13:55:03 2010 -0700 Merge "Clean Up Properly in Database Tests" into eclair commit 8c7facc1cf0aa7d08ef95ec551b9a540c92e4f34 Author: Brian Carlstrom Date: Fri May 28 17:46:11 2010 -0700 Addition --core-libraries flags for cts builds of libcore tests Change-Id: I9b0e2dde3b372562263898d930e4d12f373b9997 commit c2b4a891353b375f1220218e4b8d83738c02778d Author: Brian Carlstrom Date: Fri May 28 16:27:05 2010 -0700 Deleting test builds obsoleted by libcore reorg Change-Id: Ibd2d84adfb2f2ad38ff388be61001901b809d219 commit 722008e05a9e011f0e51d497526aa74c2cc4a29d Author: Brian Muramatsu Date: Tue May 25 16:44:48 2010 -0700 Report CPU ABI in Report Header Bug 2713199 Display Build.CPU_ABI and Build.CPU_ABI2 properties in the CTS results header. Change-Id: If6880ddc3d37c97e4912dad479e9e0ef2ebdca5e commit 0c2b3a2c2e3f7e18b0441caa21e3d29e7f9a0363 Merge: d89df28 8d28606 Author: Romain Guy Date: Tue May 25 17:21:28 2010 -0700 am 8d28606a: Merge "Add GLSurfaceView pause/resume tests to CTS." into eclair Merge commit '8d28606a6482e33485078d32c70353a1d751b818' into eclair * commit '8d28606a6482e33485078d32c70353a1d751b818': Add GLSurfaceView pause/resume tests to CTS. commit 8d28606a6482e33485078d32c70353a1d751b818 Merge: f2c62d5 95ebfff Author: Romain Guy Date: Tue May 25 17:08:02 2010 -0700 Merge "Add GLSurfaceView pause/resume tests to CTS." into eclair commit c193da8165d5076147a3ac1a74a0e5b4c71ccae0 Author: Brian Muramatsu Date: Mon May 24 18:36:34 2010 -0700 Improve Formatting of Locales in CTS Report Bug 2660737 Add a XLT snippet to insert a line break every 10 locales... Change-Id: I8430ca42e0b936f18735483146a35f89aa5ca18f commit af581f550447cd9225a377ac87fac7e8d252d56c Author: Brian Muramatsu Date: Fri May 21 17:09:39 2010 -0700 Clean Up Properly in Database Tests Issue 8401 Fix SQLiteTransaction exceptions that arise from enabling SQLite shared cache mode. These occur when not closing database handles properly... Change-Id: I24afaaaefe47d77cc4bba9c187bf35906e0727c3 commit 5eed71e4d54231b756e5a38bab79717a20bd320e Author: Brian Muramatsu Date: Wed May 19 15:52:03 2010 -0700 Verify Device IMEI/MEID Ids Bug 2694172 Test that TelephonyManager#getDeviceId returns either a 15 long IMEI id for GSM phones, 14 hex MEID id for CDMA, or 18 decimal MEID ids. Check the Luhn check digit for IMEI ids. Finally, check that a valid MAC address is returned by devices that are neither GSM or CDMA. Change-Id: I0a8696d76ece9802ac7c43111ed230c6a0412efb commit 673669e16b4bcfc725c59c7d7a6e0ad4b4148988 Merge: cedf494 04b5eb0 Author: Wu-cheng Li Date: Thu May 20 19:59:28 2010 -0700 am 04b5eb04: am 6eb8813b: Merge "Add cts test for camera focus distance API." into kraken commit 04b5eb04c3d1c72be818001a8b7de8158c3ce366 Merge: 031b228 6eb8813 Author: Wu-cheng Li Date: Thu May 20 19:58:14 2010 -0700 am 6eb8813b: Merge "Add cts test for camera focus distance API." into kraken commit 6eb8813b9bcf38608ace438ab112e6e76485ca8f Merge: d0cd4de 2911dcf Author: Wu-cheng Li Date: Thu May 20 19:56:36 2010 -0700 Merge "Add cts test for camera focus distance API." into kraken commit cedf4941beeded854227e00766b0d5da562629ec Author: Ying Wang Date: Thu May 20 10:22:25 2010 -0700 Junit has been moved from luni to junit. Change-Id: I3c5f38ec3b3ec1da0d776d63f2989069813ee248 commit 2911dcfb7dc47970976af742782132716168f0a4 Author: Wu-cheng Li Date: Fri May 14 15:50:10 2010 +0800 Add cts test for camera focus distance API. bug:1955650 Change-Id: Ia6c1d924b4a627c58bd4207db16a76034962e9db commit 83ebd90ab0247d0dae5058f3a28a85381000d56b Merge: cfc3760 031b228 Author: Dianne Hackborn Date: Tue May 18 18:27:59 2010 -0700 am 031b2283: am d0cd4def: Fix build. commit 031b22836efa16328af6f2cfdf4f517a02e3e8a2 Merge: 08e934b d0cd4de Author: Dianne Hackborn Date: Tue May 18 15:25:04 2010 -0700 am d0cd4def: Fix build. commit d0cd4defdd52d5097d0b009012dace779f34aabd Author: Dianne Hackborn Date: Tue May 18 15:16:18 2010 -0700 Fix build. Change-Id: Ie7c2264764ae636090f419d0d8ba8eb14b2b5200 commit d89df28d2f44f41689003908b0914ef752b37204 Merge: 12c0811 f2c62d5 Author: Brett Chabot Date: Tue May 18 13:41:15 2010 -0700 am f2c62d57: Merge "Update CTS version to 2.1_r2." into eclair Merge commit 'f2c62d57c487a21ad376cb8dad77aa8d395d442b' into eclair * commit 'f2c62d57c487a21ad376cb8dad77aa8d395d442b': Update CTS version to 2.1_r2. commit f2c62d57c487a21ad376cb8dad77aa8d395d442b Merge: db3930f 0953f33 Author: Brett Chabot Date: Tue May 18 13:36:19 2010 -0700 Merge "Update CTS version to 2.1_r2." into eclair commit 0953f332a81863b8dae3374daa24d41a5ab512a7 Author: Brett Chabot Date: Tue May 18 13:26:47 2010 -0700 Update CTS version to 2.1_r2. Change-Id: I9ce70318eb0d8443f6d23379a41f2478768abdee commit f5b15d86347c950b58e46ceb12cc8d586e34c696 Author: Brian Muramatsu Date: Tue May 11 18:02:14 2010 -0700 Porting Unsubmitted Cupcake CookieSyncManagerTest Didn't need CtsTestServer as suggested by removing dependencies on WebView. Squashed commit of the following: commit 8acc230e27549bee0dedf9fea4bf0e6789950876 Date: Wed Nov 11 12:22:11 2009 -0800 Integrate unsubmitted cupcake change 132847: CTS: add test cases for android.webkit.CookieSyncManager Change-Id: Ibcb9299c9c3a720a09027c0514fa7b23979b9a40 Change-Id: I6ff30eba69c493531212a3d344bd3f75c8e238be commit cfc3760e5298fe667072852470505c24d1bb2816 Merge: d97d17a 08e934b Author: The Android Open Source Project Date: Tue May 18 09:30:36 2010 -0700 am 08e934b8: am 7805b251: am 3d8f0d1f: merge from open-source master commit 08e934b8cd70d414cec80fb332c34ac7ab258757 Merge: d3305b3 7805b25 Author: The Android Open Source Project Date: Tue May 18 09:28:43 2010 -0700 am 7805b251: am 3d8f0d1f: merge from open-source master commit 7805b251bd50ae05c9015f63c86b587d2a7d748d Merge: c70f50b 3d8f0d1 Author: The Android Open Source Project Date: Tue May 18 09:23:29 2010 -0700 am 3d8f0d1f: merge from open-source master Merge commit '3d8f0d1f550c3bf16fe850f7affee2588933a55b' into kraken * commit '3d8f0d1f550c3bf16fe850f7affee2588933a55b': Fix some bugs in CTS telephony tests for SMS. commit 3d8f0d1f550c3bf16fe850f7affee2588933a55b Merge: 3ff2b80 52a26a0 Author: The Android Open Source Project Date: Tue May 18 09:20:10 2010 -0700 merge from open-source master Change-Id: I27139eda3bc171ae6b672b04a6cfc87fa9404b67 commit 12c081197d15348b76d201659958ae191bc8c623 Merge: f3cf69e db3930f Author: Brian Muramatsu Date: Mon May 17 16:42:49 2010 -0700 am db3930f9: Merge "Further Activity Lifecycle Testing Improvements" into eclair Merge commit 'db3930f9bd69a5cb4e51526b4be0fb66989dae6d' into eclair * commit 'db3930f9bd69a5cb4e51526b4be0fb66989dae6d': Further Activity Lifecycle Testing Improvements commit db3930f9bd69a5cb4e51526b4be0fb66989dae6d Merge: eba5061 89674de Author: Brian Muramatsu Date: Mon May 17 15:54:57 2010 -0700 Merge "Further Activity Lifecycle Testing Improvements" into eclair commit 52a26a0d3f911f9a0375b09373fd7e418a7cd743 Author: Jake Hamby Date: Mon May 10 17:58:28 2010 -0700 Fix some bugs in CTS telephony tests for SMS. - SmsManagerTest was not reporting failure on wait timeout: Fix inner SmsBroadcastReceiver class to wait for the correct time interval and to return success status in waitForCalls(). - AT&T network doesn't support SMS delivery reports, so don't wait to receive them if the SIM card operator is "310410". Other MCC/MNC codes can be added to SmsManagerTest.java if we find out that they also ignore TP-Status-Report-Request. - Device emulator also doesn't support SMS delivery reports. - Remove unnecessary cast in cts/SmsMessageTest.java. - Add @Override annotation in gsm/cts/SmsManagerTest.java. Change-Id: Ibf3372adeff6e0ee48c51ae5fcbfd117e696d9e3 commit f3cf69e39304c23174fcce1c9b933fa812bcb50b Merge: 8fdf0f3 eba5061 Author: Brian Muramatsu Date: Fri May 14 14:46:54 2010 -0700 am eba5061c: Merge "Remove SYM isPrintingKey False Check" into eclair Merge commit 'eba5061c73c4f449aae507979f2503a25f527186' into eclair * commit 'eba5061c73c4f449aae507979f2503a25f527186': Remove SYM isPrintingKey False Check commit eba5061c73c4f449aae507979f2503a25f527186 Merge: 034fce8 f26edf6 Author: Brian Muramatsu Date: Fri May 14 14:35:32 2010 -0700 Merge "Remove SYM isPrintingKey False Check" into eclair commit 89674de7bedbd28ae02a65ca7021f3c6be71a823 Author: Brian Muramatsu Date: Fri May 14 13:35:56 2010 -0700 Further Activity Lifecycle Testing Improvements Bug 2639189 2663328 2189784 The prior change ran the lifecycle checking activity and if it failed to match ran the activity again with a different expected lifecycle. However, running the activity again could cause the activity to follow the original lifecycle that failed. Thus, follow the expected lifecycle as long as possible and then switch to other possible lifecycles when running into lifecycle mismatches. Also do not check the lifecycle for onStop or onDestroy methods, because those are not guaranteed to be executed at all. Delete tests that checked onStop and onDestroy being called, because they will probably hang in the future. Change-Id: I6f721d70861cd9b22523b8aa9b883e7336daab22 commit d97d17a43f5bb2cc383224bc5bd0dc04c406a010 Author: Jeff Hamilton Date: Thu May 13 02:00:52 2010 -0500 Remove tests that cover private APIs. Change-Id: I47bdf75405610c28335df40ed3144dca8f80c397 commit c6384c5b383ba95bf39a360d2d480b0bc915c2a4 Merge: 147ccbe a8f1423 Author: Andrew Sapperstein Date: Thu May 13 18:23:09 2010 -0700 Merge "Added unit tests for GridView.getNumColumns." commit a8f14235e9460f118b676ba308666f8afeb295d2 Author: Andrew Sapperstein Date: Thu May 13 17:04:27 2010 -0700 Added unit tests for GridView.getNumColumns. Change-Id: I10d962aa08ded81fa3770501364baa017a71e811 commit f26edf6da0b1d8baed844e3620d785635e068aee Author: Brian Muramatsu Date: Thu May 13 15:04:21 2010 -0700 Remove SYM isPrintingKey False Check Bug 2586346 Some vendors desire to share the SYM key with printable characters. Therefore, take out the check that enforced that isPrintingKey returned false when given SYM. Leave the other false checks though, to make sure the method doesn't always return true. Change-Id: I51b1a19100e62d75674de71777eeb046a93f348f commit 147ccbe6ab2728cdc60edb204507980af14941b6 Author: Jesse Wilson Date: Thu May 13 00:37:29 2010 -0700 Remove TestSuiteFactory from CTS builds. Change-Id: I76da01081dd40ea7bbefc2c818591854b7d4cba1 commit f065b137ce9e968506e378f6e51efd2106ebfbf8 Merge: ea1c020 d3305b3 Author: Wu-cheng Li Date: Wed May 12 19:23:49 2010 -0700 am d3305b31: am c70f50b0: Use junit API and correct the order of parameters. commit d3305b3171334137759a1db5b6be8565390d1162 Merge: 0291390 c70f50b Author: Wu-cheng Li Date: Wed May 12 19:22:26 2010 -0700 am c70f50b0: Use junit API and correct the order of parameters. commit 8fdf0f388c06c45f58a1728dff69d214033cc145 Merge: de4deb2 034fce8 Author: Brian Muramatsu Date: Wed May 12 16:09:32 2010 -0700 am 034fce8a: View_AnimationTest QVGA Fixes Merge commit '034fce8ab87890a3800fbf1c07fbc498132e5e54' into eclair * commit '034fce8ab87890a3800fbf1c07fbc498132e5e54': View_AnimationTest QVGA Fixes commit 034fce8ab87890a3800fbf1c07fbc498132e5e54 Author: Brian Muramatsu Date: Wed May 12 14:39:48 2010 -0700 View_AnimationTest QVGA Fixes Bug 2597973 The animations time out, because the view being animated is not visible on the screen. This is because the layout being used has two views that are 400 pixels in height and push the animated view down. Just use the first view in the layout. Also incorporate a prior fix for testClearDuringAnimation which was incorrectly asserting about the animation ending. Change-Id: Icc5032131aa78a16ade0d73b0c83c2122d688ece commit c70f50b0ac3caa8c98c6aa2cdc53193752e3e94c Author: Wu-cheng Li Date: Wed May 12 14:28:37 2010 +0800 Use junit API and correct the order of parameters. Change-Id: I793840ec595bc7658b568e8aeef1269876b86c3c commit ea1c0202241abdd8460a4aa81561c61c66d28d17 Merge: f15d42f 0291390 Author: Wu-cheng Li Date: Tue May 11 21:42:55 2010 -0700 am 0291390c: am 3efbabf8: Merge "Add test for android.hardware.Camera.Parameters.removeGpsData." into kraken commit 0291390ce7c8221bcb42c603fa63c2e0152ef784 Merge: 1fddfee 3efbabf Author: Wu-cheng Li Date: Tue May 11 21:40:42 2010 -0700 am 3efbabf8: Merge "Add test for android.hardware.Camera.Parameters.removeGpsData." into kraken commit 3efbabf873562a8d40ee2f51aa02fa2974729043 Merge: e37efed e4cee2b Author: Wu-cheng Li Date: Tue May 11 21:39:24 2010 -0700 Merge "Add test for android.hardware.Camera.Parameters.removeGpsData." into kraken commit e4cee2bff0e5c2ef8f483ed88773201fc7ffe6de Author: Wu-cheng Li Date: Wed May 12 10:52:15 2010 +0800 Add test for android.hardware.Camera.Parameters.removeGpsData. bug:2672651 Change-Id: I3ddf8cac3febbd01968d8a49b9c3c2efbdc9d4f3 commit de4deb2a521f36f44e7d98a41693f1e761186849 Merge: 98f9a54 a8048b0 Author: Brian Muramatsu Date: Tue May 11 14:38:03 2010 -0700 am a8048b0e: Merge "Fix TextViewTests#testMarquee for Landscape Mode" into eclair Merge commit 'a8048b0ee20e0fce5bff081da6579548acf29c47' into eclair * commit 'a8048b0ee20e0fce5bff081da6579548acf29c47': Fix TextViewTests#testMarquee for Landscape Mode commit a8048b0ee20e0fce5bff081da6579548acf29c47 Merge: 345cf65 bed9d22 Author: Brian Muramatsu Date: Tue May 11 14:30:05 2010 -0700 Merge "Fix TextViewTests#testMarquee for Landscape Mode" into eclair commit bed9d222439713a766c3d5c91fae1526b5bc35dc Author: Brian Muramatsu Date: Mon May 10 16:28:12 2010 -0700 Fix TextViewTests#testMarquee for Landscape Mode Issue 8133 The wider landscape mode doesn't cause the text to wrap and cause a marquee. Enclose the text view in a FrameLayout and set the text view to be small enough that it should wrap to cause a marquee on any device. Change-Id: Ib3bc6dc7086fe2016230709fae85f3397654ea53 commit 98f9a54a06c61fef2dc541b30dd088a351c2e569 Merge: 8b8cad9 345cf65 Author: Brian Muramatsu Date: Tue May 11 14:26:35 2010 -0700 am 345cf65d: Merge "Fix GridLayoutAnimationControllerTest for Landscape Mode" into eclair Merge commit '345cf65d00062dc044829adb11965062836d2121' into eclair * commit '345cf65d00062dc044829adb11965062836d2121': Fix GridLayoutAnimationControllerTest for Landscape Mode commit 345cf65d00062dc044829adb11965062836d2121 Merge: 757d273c ad081cb Author: Brian Muramatsu Date: Tue May 11 14:20:57 2010 -0700 Merge "Fix GridLayoutAnimationControllerTest for Landscape Mode" into eclair commit 8b8cad9d6da57bd7d29864e7ec81d95829494a83 Merge: adb925b 757d273c Author: Brian Muramatsu Date: Tue May 11 13:23:27 2010 -0700 am 757d273c: Merge "Fix MovieTest#testGetMovieProperties" into eclair Merge commit '757d273c234f7b2861599a0b9b5c95bb074912e9' into eclair * commit '757d273c234f7b2861599a0b9b5c95bb074912e9': Fix MovieTest#testGetMovieProperties commit 757d273c234f7b2861599a0b9b5c95bb074912e9 Merge: 79e2ce1 775e1aa Author: Brian Muramatsu Date: Tue May 11 13:11:25 2010 -0700 Merge "Fix MovieTest#testGetMovieProperties" into eclair commit adb925be32858261c168bf7f2174d544ab5789f3 Merge: 11de653 79e2ce1 Author: Brian Muramatsu Date: Tue May 11 11:31:50 2010 -0700 am 79e2ce1b: Merge "Fix AbsListViewTest#testPointToPosition QVGA Landscape" into eclair Merge commit '79e2ce1b561b6514c2aa6daa803557ba25b83823' into eclair * commit '79e2ce1b561b6514c2aa6daa803557ba25b83823': Fix AbsListViewTest#testPointToPosition QVGA Landscape commit 79e2ce1b561b6514c2aa6daa803557ba25b83823 Merge: 23b11d2 870bc8c Author: Brian Muramatsu Date: Tue May 11 11:23:49 2010 -0700 Merge "Fix AbsListViewTest#testPointToPosition QVGA Landscape" into eclair commit 870bc8c445bfe9e3180fb1b368711bce956e3f5f Author: Brian Muramatsu Date: Mon May 10 17:18:06 2010 -0700 Fix AbsListViewTest#testPointToPosition QVGA Landscape Bug 8135 Use the height of the first item of the ListView to calculate the position of the second item and use the value in the pointToPosition call rather than using a hard coded value. Change-Id: Ifee653f7ade261022b7d9a6422edb0ef9bdb3717 commit ad081cb42fc92ade283a2ff6a2e02ff87bd7a1c7 Author: Brian Muramatsu Date: Mon May 10 16:26:50 2010 -0700 Fix GridLayoutAnimationControllerTest for Landscape Mode Issue 8132 Make the number of columns fixed so that animation delays work in whatever mode the phone is in. Change-Id: I73697fcfd31f009ef0b0cd5c48d19187ed443643 commit 95ebfff0d5dbc41dd2ef5176aa7ca494008f3041 Author: Jamie Gennis Date: Mon Apr 5 16:50:40 2010 -0700 Add GLSurfaceView pause/resume tests to CTS. This change adds two new tests that repeatedly call the onPause() and onResume() methods of a GLSurfaceView object. One of the tests has a delay between the pause/resume and runs fewer iterations, while the other test has no delay and runs more iterations. These tests simply verify that the system is able to perform multiple pause/resume sequences without crashing. Bug: 2550745 Change-Id: I276db62dc4ff7539392ee55e52ab20057d0b3d1e commit 775e1aaa9e8fe85ae814d5249895baf58b77259a Author: Brian Muramatsu Date: Mon May 10 14:14:14 2010 -0700 Fix MovieTest#testGetMovieProperties Issue 2663463 Drawable#getIntrinsicWidth() returns scaled pixels, but Drawable#width() does not. Scale the return values from width() and height(). Most of the time the API returns pixels, but it seems that getIntrinsicWidth has returned scaled dimensions even from Donut. Change-Id: Iab1d22b2b3df84771777e0b2c247a193c01589dc commit f15d42fdd998dc214d5657e52dae554e163e3f47 Merge: 2f6b6db 1fddfee Author: Ray Chen Date: Mon May 10 11:50:01 2010 -0700 am 1fddfee2: am e37efed2: am 3ff2b80f: am e48113b9: Merge "Fix issue 2586129: CTS test fails for testQueryExternalMiniThumbnails." into froyo commit 1fddfee2c4f28cd8a4df872b447dafbf131dab3e Merge: d926ddc e37efed Author: Ray Chen Date: Mon May 10 11:48:59 2010 -0700 am e37efed2: am 3ff2b80f: am e48113b9: Merge "Fix issue 2586129: CTS test fails for testQueryExternalMiniThumbnails." into froyo commit e37efed21487a3beb9f711e33f5b017bd94fc946 Merge: ebf5ef3 3ff2b80 Author: Ray Chen Date: Mon May 10 11:47:29 2010 -0700 am 3ff2b80f: am e48113b9: Merge "Fix issue 2586129: CTS test fails for testQueryExternalMiniThumbnails." into froyo Merge commit '3ff2b80f7f5457ec5c9e418f38b618bdd15e0b4e' into kraken * commit '3ff2b80f7f5457ec5c9e418f38b618bdd15e0b4e': Fix issue 2586129: CTS test fails for testQueryExternalMiniThumbnails. commit 3ff2b80f7f5457ec5c9e418f38b618bdd15e0b4e Merge: d32da42 e48113b Author: Ray Chen Date: Mon May 10 11:45:43 2010 -0700 am e48113b9: Merge "Fix issue 2586129: CTS test fails for testQueryExternalMiniThumbnails." into froyo Merge commit 'e48113b9c8e2117086eb9107f28af48443eba1bc' into froyo-plus-aosp * commit 'e48113b9c8e2117086eb9107f28af48443eba1bc': Fix issue 2586129: CTS test fails for testQueryExternalMiniThumbnails. commit e48113b9c8e2117086eb9107f28af48443eba1bc Merge: 87cdb82 4bd07a6 Author: Ray Chen Date: Mon May 10 11:44:49 2010 -0700 Merge "Fix issue 2586129: CTS test fails for testQueryExternalMiniThumbnails." into froyo commit 11de6534e0e180d43034c9b767937a29dfdd8949 Merge: a1fc4f0 23b11d2 Author: Brian Muramatsu Date: Mon May 10 11:26:32 2010 -0700 am 23b11d29: Support Multiple Lifecycles in Tests Merge commit '23b11d29ae588c229a1890f0742e0f6b3531ba42' into eclair * commit '23b11d29ae588c229a1890f0742e0f6b3531ba42': Support Multiple Lifecycles in Tests commit 4bd07a687f0c20879b3894c6949febd30ae59a96 Author: Ray Chen Date: Wed May 5 18:23:19 2010 -0700 Fix issue 2586129: CTS test fails for testQueryExternalMiniThumbnails. Change-Id: Ifada9dd6d570da6ec3e1b3a1ee24de2e2c9f79af http://b/2586129 commit 23b11d29ae588c229a1890f0742e0f6b3531ba42 Author: Brian Muramatsu Date: Fri May 7 14:16:14 2010 -0700 Support Multiple Lifecycles in Tests Bug 2639189 2663328 Many of the lifecycle tests expected onStop to be called. However, there is no guarantee that onStop will be called, since that app may be killed in that situation. Enhance the tests to support multiple lifecycles by adding a runMultipleLaunchpads method. Change-Id: I87d031b2ab0bc92554d8208e0c3f000eac1f6cf9 commit 2f6b6db8a58816fa1b0203813f4f25bc0c515262 Merge: 76ca81d d926ddc Author: Jesse Wilson Date: Thu May 6 17:10:06 2010 -0700 am d926ddcd: am ebf5ef3d: am d32da42b: am 87cdb824: Fixing expectations for an XML test. commit d926ddcdc1d9b53e3ae8d185a81c04784241ad7a Merge: c8ff2aa ebf5ef3 Author: Jesse Wilson Date: Thu May 6 16:34:35 2010 -0700 am ebf5ef3d: am d32da42b: am 87cdb824: Fixing expectations for an XML test. commit ebf5ef3de572ffd3c22a13f25237afe360191b9d Merge: a5a2ec9 d32da42 Author: Jesse Wilson Date: Thu May 6 16:31:08 2010 -0700 am d32da42b: am 87cdb824: Fixing expectations for an XML test. Merge commit 'd32da42b6302053d5be6d03ddb3af39e4aa72e8c' into kraken * commit 'd32da42b6302053d5be6d03ddb3af39e4aa72e8c': Fixing expectations for an XML test. commit d32da42b6302053d5be6d03ddb3af39e4aa72e8c Merge: faf3b1b 87cdb82 Author: Jesse Wilson Date: Thu May 6 16:12:18 2010 -0700 am 87cdb824: Fixing expectations for an XML test. Merge commit '87cdb82423b5fb4cd43f7d73337809c4320112d4' into froyo-plus-aosp * commit '87cdb82423b5fb4cd43f7d73337809c4320112d4': Fixing expectations for an XML test. commit a1fc4f0e8c1ffed0264fc1deae159c512aceedb0 Merge: 140fcff d2c8cdf Author: Brett Chabot Date: Thu May 6 15:07:06 2010 -0700 am d2c8cdf8: (-s ours) Merge "DO NOT MERGE. Adjust NinePatchDrawableTest#testConstructors." into eclair Merge commit 'd2c8cdf8cec38f9cd772103233a8ec6bbe80bd4e' into eclair * commit 'd2c8cdf8cec38f9cd772103233a8ec6bbe80bd4e': DO NOT MERGE. Adjust NinePatchDrawableTest#testConstructors. commit d2c8cdf8cec38f9cd772103233a8ec6bbe80bd4e Merge: 057067c ca2699d Author: Brett Chabot Date: Thu May 6 14:09:16 2010 -0700 Merge "DO NOT MERGE. Adjust NinePatchDrawableTest#testConstructors." into eclair commit ca2699d58f5110e9eb2c2e125eb23ca8199069fa Author: Brett Chabot Date: Thu May 6 13:59:53 2010 -0700 DO NOT MERGE. Adjust NinePatchDrawableTest#testConstructors. This test was failing due to a known bug which has been fixed in next platform release. Change-Id: I708fe153421ae1ded516bf25d5452d8fb4b577f9 commit 140fcff5f3130d47e7750a1061a061cc23da29ea Merge: 2f3192c 057067c Author: Brett Chabot Date: Thu May 6 12:47:19 2010 -0700 am 057067c9: (-s ours) DO NOT MERGE - Speculative fix for intermittent CTS UI test failures. Merge commit '057067c9c690384bab6be5af7d897d104976d663' into eclair * commit '057067c9c690384bab6be5af7d897d104976d663': DO NOT MERGE - Speculative fix for intermittent CTS UI test failures. commit 057067c9c690384bab6be5af7d897d104976d663 Author: Brett Chabot Date: Wed Apr 21 11:17:14 2010 -0700 DO NOT MERGE - Speculative fix for intermittent CTS UI test failures. UI related tests fail if the keyguard is currently displayed. Previously, the CTS harness used a separate util app which would disable the keyguard upon receiving a broadcast. However, if the util app's process is killed by the system, the keyguard is immediately displayed. Its not known for sure, but this could explain the intermittent UI test failures. This commit adds logic to disable the keyguard in the CTS test runner itself. Bug 2342725. Change-Id: I87659e5e3547296dc0e4bd549c979aef325fc90e commit 87cdb82423b5fb4cd43f7d73337809c4320112d4 Author: Jesse Wilson Date: Thu May 6 12:13:47 2010 -0700 Fixing expectations for an XML test. The SAX API is permitted to pass either empty strings or values for qnames, but the test only expected empty strings. Change-Id: I2b5677eae32c15fb0798d0a72180661821f4aa5d commit 2f3192c1547ef6eacda8e95c78c33fb002ba694c Merge: dc48f43 489888b Author: Brian Muramatsu Date: Wed May 5 14:21:32 2010 -0700 Merge "Porting Unsubmitted Cupcake Debug.InstructionCount Tests" into eclair commit dc48f43b0063fbc8f63e32a0f4be0deb4801159d Merge: e32a57d e265666 Author: Brian Muramatsu Date: Wed May 5 11:19:03 2010 -0700 Merge "Increase cts-app Test Stability" into eclair commit 76ca81d2fba67686101a2d754b1d0eda684bed91 Merge: 4070fb4 64b6310 Author: Brian Muramatsu Date: Wed May 5 11:06:50 2010 -0700 am 64b63103: (-s ours) am 7d47f925: am 508830b9: (-s ours) am 905aa07b: am ca47c103: (-s ours) am 25c264de: (-s ours) Merge "DO NOT MERGE Suppress NinePatchTest testHasAlpha" into froyo commit 4070fb4337885ca5b5fdbb4e77bb857c5d405cac Merge: a9051c7 c8ff2aa Author: Jean-Baptiste Queru Date: Wed May 5 11:06:47 2010 -0700 am c8ff2aaa: manual merge from kraken commit e26566646736a129ba4b54e427b2742744f99ce5 Author: Brian Muramatsu Date: Tue May 4 18:09:30 2010 -0700 Increase cts-app Test Stability Bug 2639189 Many cts-app tests start LaunchpadActivity which in turn calls startActivityForResult and expects onActivityResult to setResult to SUCCESS. Other tests don't use startActivityForResult and are coded to depend on onDestroy to send back a result which defaults to cancelled! When ActivityManagerService decides to change the configuration for some reason, onDestroy terminates and never gets back the result. It ends up setting cancelled and causes the tests to fail! Thus, fix LaunchpadActivity to ignore configuration changes that ActivityManagerService to prevent it from being destroyed. Change-Id: Iea2944f66b4dd1ecdfccfcc4bcdc9354de2eb623 commit a9051c768f6864b32235aff63a2e2a21cb9bb833 Merge: 9bcf65b 462bd58 Author: Jean-Baptiste Queru Date: Tue May 4 17:45:54 2010 -0700 am 462bd580: am 0d765aa8: am 014b85cd: manual merge from froyo commit 9bcf65b28782e1b669497f09204ce15f5aea4b70 Merge: 1a22d98 e5280cb Author: Leon Clarke Date: Tue May 4 17:45:49 2010 -0700 am e5280cb8: am 59903a04: am 690c7012: am 6b7df807: Bug:2558977 Use the mock WebViewClient to accept the certificate, since the certificate isn\'t added to the WebView until it has been validated, and since we don\'t accept the invalid cert, it won\'t be validated. Al commit 1a22d981df2822db4fe402b1aeb7e02de228586e Merge: 9040262 a1350e5 Author: The Android Open Source Project Date: Tue May 4 17:45:46 2010 -0700 am a1350e5d: am 799b3ecd: am 8ddb1843: am fb9499e2: am 516e6222: am c3bcf6d6: am 1e7272ed: merge from open-source master commit 90402629ea80e7142dc0bac08f28617831fff5f7 Merge: 25520e5 986e5bd Author: Brian Carlstrom Date: Tue May 4 17:45:43 2010 -0700 am 986e5bde: am a31b0f1e: am ce2ccee4: am ea4fd404: am 405531fc: am e792397f: am 21fb726a: am 59d754d5: Merge "Fix CtsTestServer Socket Deadlocks" into froyo commit 25520e5aff6373d3a1d3a6ff8a87dfbb3b866e49 Merge: f6c7785 82bc5ae Author: Jean-Baptiste Queru Date: Tue May 4 17:45:39 2010 -0700 am 82bc5ae8: am 596f262e: am ee1f2600: am 400d9efb: am 841cdc1e: am 52e95310: am c87cbf06: Adapt to new location of libcore commit f6c7785206d77f28446820adaaa2dbbfd65acabf Merge: b930150 4ede3a9 Author: Jean-Baptiste Queru Date: Tue May 4 17:45:36 2010 -0700 am 4ede3a92: am b2f5a647: am c8cbbae0: am 015c3eae: am 4fe15948: am 93ae9451: Adapt to new location of libcore commit b930150b7a064b5970fc54a29c7586c1dc752d2d Merge: ba4fd25 a4fd6db Author: Jean-Baptiste Queru Date: Tue May 4 17:45:33 2010 -0700 am a4fd6db1: am d10ff247: am b82803f3: am ac96b9ba: am b423aded: Adapt to new location of libcore commit ba4fd256c6a8428a1f64ca9c8ef447200a993d0b Merge: 5de095c 6cd821c Author: Daniel Sandler Date: Tue May 4 17:45:30 2010 -0700 am 6cd821cb: am e5901341: am b02874ff: am 5fdb2f49: am 77dade30: am 6f9ee6ec: am b8a24bdd: Merge "Update CTS to reflect recent vibration fixes." into froyo commit 5de095c063289825f556f2fd985e2140666c2f19 Merge: d16867d 70ac0bf Author: Jean-Baptiste Queru Date: Tue May 4 17:45:27 2010 -0700 am 70ac0bf0: am f5018e7a: am 1c2117d0: am f58b7253: Adapt to new location of libcore commit d16867d78b8f0f0d5995219610c50a84a226fc55 Merge: db6c623 d1d7f62 Author: Dianne Hackborn Date: Tue May 4 17:45:24 2010 -0700 am d1d7f62d: am 780781e3: am 4e9eef1a: am f4106a43: am 9e357fa6: New CTS tests for screen size config selection. commit db6c6238668b53ca30b23dee76ca862dfccad20d Merge: fe860b4 f764795 Author: Brett Chabot Date: Tue May 4 17:45:20 2010 -0700 am f764795d: am 53c8ac50: am e517c509: am 6f5d369f: am c3448b2a: am 4eed4048: am 830e9985: Update CTS version numbers to 2.2. commit fe860b42c2f85f189989b841a7d43b1b16fd2826 Merge: 25d0132 3e483de Author: Brett Chabot Date: Tue May 4 17:45:17 2010 -0700 am 3e483de3: am 99d88042: am 91067868: am 94a16cda: Merge "2604272 Add CTS tests for the accessibility APIs. - I file I missed" commit 25d0132ff42d182911a0bdf22d21fcf11af80c0c Merge: 23379f5 52fa5b8 Author: Wu-cheng Li Date: Tue May 4 17:45:14 2010 -0700 am 52fa5b8b: am 2b57f6a1: am b8f3c75d: am 0055cf7c: am 2aa35f27: am f97a56dc: am a6e803e9: Fix intermittent testZoom failure. commit 23379f5575d2c5d650e1119f1407b2178071da90 Merge: 1062101 3eff758 Author: Brett Chabot Date: Tue May 4 17:45:11 2010 -0700 am 3eff7584: am a372b616: am 519a121a: am a576102e: Merge "Add CTS tests for the accessibility APIs." commit 1062101ec6691329e9c60f8828ea6f3494a8fbbd Merge: d4e9377 55eb655 Author: Gilles Debunne Date: Tue May 4 17:45:08 2010 -0700 am 55eb6557: am 064c81ff: am bfd0061c: am cc203b10: More precise exceptions in LayoutInflaterTest commit 64b631039250475f0f31c336e051a1101a04b853 Merge: c8ff2aa 7d47f92 Author: Brian Muramatsu Date: Tue May 4 14:52:39 2010 -0700 am 7d47f925: am 508830b9: (-s ours) am 905aa07b: am ca47c103: (-s ours) am 25c264de: (-s ours) Merge "DO NOT MERGE Suppress NinePatchTest testHasAlpha" into froyo commit e32a57d413f4946ee9e5b813da27b6d8f02b8b4a Merge: 02b0405 67f8aad Author: Jean-Baptiste Queru Date: Tue May 4 14:50:13 2010 -0700 Merge "2636275 Add CTS tests for the accessibility APIs - Eclair" into eclair commit c8ff2aaa3fae7f542c6e9d512d43872d7724d371 Merge: 516e622 a5a2ec9 Author: Jean-Baptiste Queru Date: Tue May 4 13:54:54 2010 -0700 manual merge from kraken Change-Id: I0da0cdf03e700e15d69f54e0bd73bc55ae519abb commit a5a2ec9a59efc2dbe99b6ba5fc3b77ef7fd4f8d6 Merge: e792397 faf3b1b Author: Jean-Baptiste Queru Date: Tue May 4 13:35:53 2010 -0700 manual merge from froyo-plus-aosp Change-Id: Id9c4cc6954592db660f526ea6623bb18383121fc commit faf3b1b89a157a3642188eaa44f8e6ceb1dce88a Merge: 1e7272e d46dcc3 Author: Jean-Baptiste Queru Date: Tue May 4 13:24:03 2010 -0700 manual merge from froyo Change-Id: Ia2b22b1c211a80d7e13d97900786081a5a9da2f0 commit d4e937733f31479e0eade08b950c4a2a6b5cb693 Merge: 03d0725 ee083b7 Author: Brian Muramatsu Date: Tue May 4 13:08:40 2010 -0700 am ee083b73: am fd965de1: am b170d48f: am 9237c21d: Porting Unsubmitted Cupcake SearchRecentSuggestionsTest commit 03d072532a43662f3ef4ecf3e9fca99c13f7eec9 Merge: b920049 af48cf4 Author: Brett Chabot Date: Tue May 4 13:08:32 2010 -0700 am af48cf4d: am 1764d263: am 614a8b8d: am d26cd945: am 55716471: am 988a48b7: am 57441528: Speculative fix for intermittent CTS UI test failures. commit b920049a6d30c8ef7a96473593786932e575af32 Merge: 19bfa30 20d11d6 Author: Kenny Root Date: Tue May 4 13:08:26 2010 -0700 am 20d11d6d: am 84025476: am 1a72cbc7: am 6929be6c: am 26635162: am 117420e5: am db4ee458: Merge "Update TextView and PasswordTransformation tests" into froyo commit 19bfa307f4d9f02ee5c93dd61c5d0d6ea4528163 Merge: 07c530d 3dc6009 Author: Chih-Chung Chang Date: Tue May 4 13:08:19 2010 -0700 am 3dc60090: am 7323d8a2: am 2fcde6fc: am 1ecbd612: am 3d6a3387: am f9a863ba: am 017dd301: Merge "The new test done not work on all devices yet. Bug: 2597554" into froyo commit 07c530de72e3b36eb502f6a1e43094d46dd8aae3 Merge: e2c9c2c 9464ee2 Author: Brett Chabot Date: Tue May 4 13:08:12 2010 -0700 am 9464ee21: am 889b65f8: am 209f0a06: am dbb18aae: am ade10558: am 271f6945: am 9371b0d4: Merge "Fix expected user agent string for new WebKit version." into froyo commit e2c9c2cd4e0d6f828d673ff67a44f2851e4ec8f5 Merge: e8df71c 0ae6ed4 Author: Glenn Kasten Date: Tue May 4 13:08:04 2010 -0700 am 0ae6ed49: am b6a974a4: am 91035f6b: am 4c99ae78: am c5bedbaa: am d97e33c2: am 90c418e8: Merge "Try to fix test null pointer bug." into froyo commit e8df71cec237216b47d270925d1fe3f39e90b57c Merge: cd77ecb 76adbac Author: Brett Chabot Date: Tue May 4 13:07:57 2010 -0700 am 76adbac1: am 6156c38a: am e777e399: am 4b1052a4: am 4dc6953e: am 71a131f4: am 2daf9e40: Merge "Adjust PackageManagerTest for the SET_PREFERRED_APPLICATIONS permission changes and associated cleanup." into froyo commit cd77ecb9b76eee742b23dd714f1e9d75aa7a4d62 Merge: 4f9fb69 74afb80 Author: Wu-cheng Li Date: Tue May 4 13:07:47 2010 -0700 am 74afb804: am 26e7a625: am 26b10435: am d4baad36: am 5def400f: am bd8af255: am c3f6be44: Add more CTS tests for Camera.autoFocus. commit 4f9fb691ee6624191e307039ea4871505c2eff5a Merge: 7e18626 2fe30fd Author: The Android Open Source Project Date: Tue May 4 13:07:39 2010 -0700 am 2fe30fd4: am b78d0570: am fd45f19b: am c2c8ca8c: am 69621456: am 995e7359: merge from open-source master commit 7e18626ecbea90d7e811fcabb4d538e25507654e Merge: 43f2411 b8f9b7e Author: Wu-cheng Li Date: Tue May 4 13:07:31 2010 -0700 am b8f9b7e8: am 0f590cf0: am 03e8388f: am 460c6ef0: am 0a77694e: am 22896463: am b3e3c793: Run Camera tests in UI thread. commit 43f2411cae3dc71e551a09ac6d412c33900ef34d Merge: b8cd5ca a7c94f5 Author: Gilles Debunne Date: Tue May 4 13:07:23 2010 -0700 am a7c94f56: am a901d894: am f8fb8c1d: am 2b52a898: Revert "Revert "Merge "New tests for the new MipmapDrawable class.""" commit b8cd5ca5cadd0986f49463b6b9586c31fe45333c Merge: 0b93fab 3b0e1ef Author: Wink Saville Date: Tue May 4 13:07:14 2010 -0700 am 3b0e1ef5: am b406596d: am 1e362155: am a202fccb: Revert "Merge "New tests for the new MipmapDrawable class."" commit 0b93fab4f37a6a63329fb7b68dfc7cd7fc043e41 Merge: 19e251c f88174b Author: Brett Chabot Date: Tue May 4 13:07:05 2010 -0700 am f88174b7: am b95e724f: am 567545bc: am a9629dbc: am 0c52d321: am 0f69f9ef: am 0caaba05: Merge "Update AppSecurityTests#testSharedUidDifferentCerts to check new error message returned when installing a package with a shared user id." into froyo commit 19e251ce3f978ea08c912eaed9e671ac60930cae Merge: 683f1d4 88e86bc Author: Brett Chabot Date: Tue May 4 13:06:48 2010 -0700 am 88e86bc5: am 5cbf696b: am 824c0c8e: am 81e9be6b: am 7b677a4d: am 61e572fc: am ee92f3fe: Cleanup ApplicationInfoTest. commit 683f1d42442b4094aca9116100bb1277fbb10f8d Merge: 5def158 3191ac0 Author: Gilles Debunne Date: Tue May 4 13:06:39 2010 -0700 am 3191ac0c: am f7bead20: am 7e37dcac: am c7490c80: Merge "New tests for the new MipmapDrawable class." commit 5def158f25fdb68d2bc31b84c4fa0e797b860da2 Merge: ee6412f 879117b Author: Dan Egnor Date: Tue May 4 13:06:27 2010 -0700 am 879117b4: am cf7569d8: am fd9b0324: am 31820be4: am 04e6be56: am 4be76eb3: am 4bfdf82e: Merge "CTS test for android.net.TrafficStats" into froyo commit ee6412f9e42d7577d2785d6c55cda9ee967432f1 Merge: f19622d bf16989 Author: The Android Open Source Project Date: Tue May 4 13:06:12 2010 -0700 am bf169892: am 5e731f46: am 1eeedce0: am 42effdd0: am a8ac5306: am e4793e4a: merge from open-source master commit f19622d198f811ad72c5007c350e547a6fdfdb74 Merge: 97c21d3 2d89905 Author: Wu-cheng Li Date: Tue May 4 13:06:02 2010 -0700 am 2d89905e: am ce3cac6e: am d9f222b0: am 8b6e1264: am 2cd23bc8: am 86efb382: am 22af928e: Merge "Update the code due to API change." into froyo commit 97c21d3f54154c124ae9305cc0a45a62163d187e Merge: be96cf9 a8e27dd Author: Gilles Debunne Date: Tue May 4 13:05:41 2010 -0700 am a8e27dd7: am 25970f37: am 8e4d02ce: am 30840f24: New CTS ExpandableListView tests moved from framework. commit be96cf929efd01822e4569b2c671c86fbf6b7ed1 Merge: 79b4aaa 185ad4b Author: Kenny Root Date: Tue May 4 13:05:22 2010 -0700 am 185ad4b3: am 44763dfc: am bd11488b: am 3fca7751: am b2895ab1: am 41b4dfbd: am 4a242f98: Merge "Revise Rfc822Tokenizer test\'s expected results" into froyo commit 79b4aaa978f496f73a139bf6819ec182decfff86 Merge: 79c2b95 3e3c6b4 Author: Brian Muramatsu Date: Tue May 4 13:05:12 2010 -0700 am 3e3c6b4b: am 455e6672: am ce2b2ca8: am 18de2b24: am 694a76f1: am 3fe646e1: am 92f85eab: Merge "Fix KnownFailure TypefaceTest" into froyo commit 79c2b95e80e87801a5e4924c019920471a8b4e2b Merge: a522a8e 476b016 Author: Brian Muramatsu Date: Tue May 4 13:05:01 2010 -0700 am 476b016d: am 3a9f81e2: am afec2ec9: am c3f7328c: am 6ba74d92: am 9fccb0d9: am b00b01fa: Merge "Fix PopupWindowTest testUpdateDimension..." into froyo commit a522a8e94a0b59bcc8129dd65f8bd36f02a19a3e Merge: 21e09d6 289ec96 Author: Jeff Brown Date: Tue May 4 13:04:33 2010 -0700 am 289ec966: am 7528562c: am 815db3f0: am aaeb4a43: am 92e5e059: am b1c8417f: am 284abbbc: Merge "Add a test for alarms with negative wakeup times." into froyo commit 21e09d6471f91a2ed4954a9e724d066a4ba76864 Merge: 1fec933 ec003f1 Author: Ray Chen Date: Tue May 4 13:04:17 2010 -0700 am ec003f13: am 2ec86175: am fb6d4277: am daa2fd25: am 3b7a1b48: am c2330190: am 55025acb: Merge "Fix issue#2557727 android.provider.cts.MediaStore_Images_MediaTest#testInsertImageWithImagePath is flaky. http://b/2557727" into froyo commit 1fec93361e69c7184c43fb8529cb8ced70a0c9a2 Merge: b3cf9d5 758c308 Author: Jesse Wilson Date: Tue May 4 13:04:00 2010 -0700 am 758c3087: am 98989b1c: am e78b1847: am bccf9790: am 0bd50a4e: am ac0668b8: am a362c7ec: Merge "Fix XmlEncodingTest to succeed when optional fields are supplied." into froyo commit b3cf9d58a45fcc64cbbc45aa917da8caa8b45901 Merge: 02d27a2 0b8ed2d Author: Brett Chabot Date: Tue May 4 13:03:48 2010 -0700 am 0b8ed2d5: (-s ours) am 0a3aed43: am 4c1deecc: (-s ours) am 658a709d: am 6b17e7ae: (-s ours) am 1c0cfadc: (-s ours) DO NOT MERGE. cherry pick cts change from master to fix build commit 02d27a2c09705844ace60212597d87785ad1616c Merge: 1959ed2 e40c158 Author: Brett Chabot Date: Tue May 4 13:03:34 2010 -0700 am e40c158d: (-s ours) am 1dde7c15: am 50bc489b: (-s ours) am a01dab5b: am 757ca14f: (-s ours) DO NOT MERGE. cherry pick cts change from master to fix build commit 1959ed23347728875406e7dff12be1297bb012ea Merge: f2bbc7e eef5c84 Author: Adam Powell Date: Tue May 4 13:03:16 2010 -0700 am eef5c849: am d8424244: am e438775e: am 29a71f10: am 2e939114: am 20622a8f: Merge "Fix bug 2557891 - incorrect cts test." into froyo commit f2bbc7e764ad1b12b49813ed8efa28841e973e9e Merge: 6bb4883 479a408 Author: Brett Chabot Date: Tue May 4 13:02:58 2010 -0700 am 479a408e: am cdd106e5: am f8a5b7a2: am 00303b0b: Merge "Adjust cts tests to ddms testrunner IOException API change." commit 6bb4883a485b388c5914478e1ac1a7f9a42238a3 Merge: ac5f41f f809153 Author: Glenn Kasten Date: Tue May 4 13:02:45 2010 -0700 am f809153e: am d0385666: am af008976: am 60631fe2: am 68376ce4: am b4423a9d: Merge "Use a fixed ringtone provided with the test case in resource folder. Bug: 2557533" into froyo commit ac5f41f7b16b3454f9559e5919dfd197597b874d Merge: fb9499e 08578d8 Author: Brian Muramatsu Date: Tue May 4 13:02:30 2010 -0700 am 08578d89: (-s ours) am 7d47f925: am 508830b9: (-s ours) am 905aa07b: am ca47c103: (-s ours) am 25c264de: (-s ours) Merge "DO NOT MERGE Suppress NinePatchTest testHasAlpha" into froyo commit 462bd580b6e725ec405de56a067665eb25e284d5 Merge: e5280cb 0d765aa Author: Jean-Baptiste Queru Date: Tue May 4 12:54:24 2010 -0700 am 0d765aa8: am 014b85cd: manual merge from froyo commit e5280cb838b5f7096fd46cace4bd3c3c9039395a Merge: a1350e5 59903a0 Author: Leon Clarke Date: Tue May 4 12:54:21 2010 -0700 am 59903a04: am 690c7012: am 6b7df807: Bug:2558977 Use the mock WebViewClient to accept the certificate, since the certificate isn\'t added to the WebView until it has been validated, and since we don\'t accept the invalid cert, it won\'t be validated. Also, remove a commit a1350e5d433558fa9bdc1670eb76a647012a85ea Merge: 986e5bd 799b3ec Author: The Android Open Source Project Date: Tue May 4 12:54:18 2010 -0700 am 799b3ecd: am 8ddb1843: am fb9499e2: am 516e6222: am c3bcf6d6: am 1e7272ed: merge from open-source master commit 986e5bdeb2cec1ed5b534743b09feb4646988421 Merge: 82bc5ae a31b0f1 Author: Brian Carlstrom Date: Tue May 4 12:54:15 2010 -0700 am a31b0f1e: am ce2ccee4: am ea4fd404: am 405531fc: am e792397f: am 21fb726a: am 59d754d5: Merge "Fix CtsTestServer Socket Deadlocks" into froyo commit 82bc5ae80b958b317421a469900037bd086a4713 Merge: 4ede3a9 596f262 Author: Jean-Baptiste Queru Date: Tue May 4 12:54:12 2010 -0700 am 596f262e: am ee1f2600: am 400d9efb: am 841cdc1e: am 52e95310: am c87cbf06: Adapt to new location of libcore commit 4ede3a928df27c610d3a2d846a4f8c02956ef3bc Merge: a4fd6db b2f5a64 Author: Jean-Baptiste Queru Date: Tue May 4 12:54:08 2010 -0700 am b2f5a647: am c8cbbae0: am 015c3eae: am 4fe15948: am 93ae9451: Adapt to new location of libcore commit a4fd6db10b32b0b605de1beb435fa76160418a0e Merge: 6cd821c d10ff24 Author: Jean-Baptiste Queru Date: Tue May 4 12:53:58 2010 -0700 am d10ff247: am b82803f3: am ac96b9ba: am b423aded: Adapt to new location of libcore commit 6cd821cb353a7e106fcd501ba64e3d7997d8bed7 Merge: 70ac0bf e590134 Author: Daniel Sandler Date: Tue May 4 12:53:54 2010 -0700 am e5901341: am b02874ff: am 5fdb2f49: am 77dade30: am 6f9ee6ec: am b8a24bdd: Merge "Update CTS to reflect recent vibration fixes." into froyo commit 70ac0bf0501abe3251ee17422cc2569cc03d4274 Merge: d1d7f62 f5018e7 Author: Jean-Baptiste Queru Date: Tue May 4 12:53:39 2010 -0700 am f5018e7a: am 1c2117d0: am f58b7253: Adapt to new location of libcore commit d1d7f62de270206c17e2d252a499e5ac795fc2af Merge: f764795 780781e Author: Dianne Hackborn Date: Tue May 4 12:53:27 2010 -0700 am 780781e3: am 4e9eef1a: am f4106a43: am 9e357fa6: New CTS tests for screen size config selection. commit f764795de237487e4e62ebf5e9e4ca82c32ca591 Merge: 3e483de 53c8ac5 Author: Brett Chabot Date: Tue May 4 12:53:21 2010 -0700 am 53c8ac50: am e517c509: am 6f5d369f: am c3448b2a: am 4eed4048: am 830e9985: Update CTS version numbers to 2.2. commit 3e483de3d35ee50dc963c1ec2e34e282c14a4d2e Merge: 52fa5b8 99d8804 Author: Brett Chabot Date: Tue May 4 12:53:15 2010 -0700 am 99d88042: am 91067868: am 94a16cda: Merge "2604272 Add CTS tests for the accessibility APIs. - I file I missed" commit 52fa5b8b5ea4f65874ce7f337644ac3bb2d3af44 Merge: 3eff758 2b57f6a Author: Wu-cheng Li Date: Tue May 4 12:53:05 2010 -0700 am 2b57f6a1: am b8f3c75d: am 0055cf7c: am 2aa35f27: am f97a56dc: am a6e803e9: Fix intermittent testZoom failure. commit 3eff75844594eef72bbb4d245d2aec74eac39857 Merge: 55eb655 a372b61 Author: Brett Chabot Date: Tue May 4 12:52:59 2010 -0700 am a372b616: am 519a121a: am a576102e: Merge "Add CTS tests for the accessibility APIs." commit 55eb65577d417e217cbbb9fdc797f1c5529212c9 Merge: ee083b7 064c81f Author: Gilles Debunne Date: Tue May 4 12:52:53 2010 -0700 am 064c81ff: am bfd0061c: am cc203b10: More precise exceptions in LayoutInflaterTest commit ee083b73be72742d8875d53813823c5fd078c084 Merge: af48cf4 fd965de Author: Brian Muramatsu Date: Tue May 4 12:51:18 2010 -0700 am fd965de1: am b170d48f: am 9237c21d: Porting Unsubmitted Cupcake SearchRecentSuggestionsTest commit af48cf4da34b49640a172a5928076d61c4179b1e Merge: 20d11d6 1764d26 Author: Brett Chabot Date: Tue May 4 12:51:12 2010 -0700 am 1764d263: am 614a8b8d: am d26cd945: am 55716471: am 988a48b7: am 57441528: Speculative fix for intermittent CTS UI test failures. commit 20d11d6dee86784b34324139a27f0d8ab1fcafa7 Merge: 3dc6009 8402547 Author: Kenny Root Date: Tue May 4 12:51:05 2010 -0700 am 84025476: am 1a72cbc7: am 6929be6c: am 26635162: am 117420e5: am db4ee458: Merge "Update TextView and PasswordTransformation tests" into froyo commit 3dc600905e5963c6379eb5e248e9238fb54e30dc Merge: 9464ee2 7323d8a Author: Chih-Chung Chang Date: Tue May 4 12:50:59 2010 -0700 am 7323d8a2: am 2fcde6fc: am 1ecbd612: am 3d6a3387: am f9a863ba: am 017dd301: Merge "The new test done not work on all devices yet. Bug: 2597554" into froyo commit 9464ee21b830373c644f432bd0148dc938ba1af2 Merge: 0ae6ed4 889b65f Author: Brett Chabot Date: Tue May 4 12:50:51 2010 -0700 am 889b65f8: am 209f0a06: am dbb18aae: am ade10558: am 271f6945: am 9371b0d4: Merge "Fix expected user agent string for new WebKit version." into froyo commit 0ae6ed49e4dfdc434ead8b595226d7f5ef14c4b2 Merge: 76adbac b6a974a Author: Glenn Kasten Date: Tue May 4 12:50:44 2010 -0700 am b6a974a4: am 91035f6b: am 4c99ae78: am c5bedbaa: am d97e33c2: am 90c418e8: Merge "Try to fix test null pointer bug." into froyo commit 76adbac13a83f49a3770d9a82b38797e6025120f Merge: 74afb80 6156c38 Author: Brett Chabot Date: Tue May 4 12:50:36 2010 -0700 am 6156c38a: am e777e399: am 4b1052a4: am 4dc6953e: am 71a131f4: am 2daf9e40: Merge "Adjust PackageManagerTest for the SET_PREFERRED_APPLICATIONS permission changes and associated cleanup." into froyo commit 74afb804d24ba22101f93038ea2f9f98f2317165 Merge: 2fe30fd 26e7a62 Author: Wu-cheng Li Date: Tue May 4 12:50:28 2010 -0700 am 26e7a625: am 26b10435: am d4baad36: am 5def400f: am bd8af255: am c3f6be44: Add more CTS tests for Camera.autoFocus. commit 2fe30fd4d0fcb148245b126253c472d27f844967 Merge: b8f9b7e b78d057 Author: The Android Open Source Project Date: Tue May 4 12:50:20 2010 -0700 am b78d0570: am fd45f19b: am c2c8ca8c: am 69621456: am 995e7359: merge from open-source master commit b8f9b7e8923d4bd25cfad138b9238e8b75734aed Merge: a7c94f5 0f590cf Author: Wu-cheng Li Date: Tue May 4 12:50:12 2010 -0700 am 0f590cf0: am 03e8388f: am 460c6ef0: am 0a77694e: am 22896463: am b3e3c793: Run Camera tests in UI thread. commit a7c94f5678f9b306f7bda642c5676e40f1ce50d1 Merge: 3b0e1ef a901d89 Author: Gilles Debunne Date: Tue May 4 12:50:03 2010 -0700 am a901d894: am f8fb8c1d: am 2b52a898: Revert "Revert "Merge "New tests for the new MipmapDrawable class.""" commit 3b0e1ef54926ad91a63685859c375ce7bb99ec1f Merge: f88174b b406596 Author: Wink Saville Date: Tue May 4 12:49:54 2010 -0700 am b406596d: am 1e362155: am a202fccb: Revert "Merge "New tests for the new MipmapDrawable class."" commit f88174b7fcfee8140b7061631ee9eb6f998553f1 Merge: 88e86bc b95e724 Author: Brett Chabot Date: Tue May 4 12:49:45 2010 -0700 am b95e724f: am 567545bc: am a9629dbc: am 0c52d321: am 0f69f9ef: am 0caaba05: Merge "Update AppSecurityTests#testSharedUidDifferentCerts to check new error message returned when installing a package with a shared user id." into froyo commit 88e86bc510875a5aa0198c97473c8ecd474c6a64 Merge: 3191ac0 5cbf696 Author: Brett Chabot Date: Tue May 4 12:49:36 2010 -0700 am 5cbf696b: am 824c0c8e: am 81e9be6b: am 7b677a4d: am 61e572fc: am ee92f3fe: Cleanup ApplicationInfoTest. commit 3191ac0cf0a4f7f5bb9b97587798b622e578b40b Merge: 879117b f7bead2 Author: Gilles Debunne Date: Tue May 4 12:49:22 2010 -0700 am f7bead20: am 7e37dcac: am c7490c80: Merge "New tests for the new MipmapDrawable class." commit 879117b436734539c2087b578c031bbf1c74409a Merge: bf16989 cf7569d Author: Dan Egnor Date: Tue May 4 12:49:11 2010 -0700 am cf7569d8: am fd9b0324: am 31820be4: am 04e6be56: am 4be76eb3: am 4bfdf82e: Merge "CTS test for android.net.TrafficStats" into froyo commit bf16989253b0e082e6167c4e64689f854eef6acf Merge: 2d89905 5e731f4 Author: The Android Open Source Project Date: Tue May 4 12:49:02 2010 -0700 am 5e731f46: am 1eeedce0: am 42effdd0: am a8ac5306: am e4793e4a: merge from open-source master commit 2d89905e4b240e202837c7dfbcf231b4ca3b6efc Merge: a8e27dd ce3cac6 Author: Wu-cheng Li Date: Tue May 4 12:48:52 2010 -0700 am ce3cac6e: am d9f222b0: am 8b6e1264: am 2cd23bc8: am 86efb382: am 22af928e: Merge "Update the code due to API change." into froyo commit a8e27dd766062dc1f61aa230c49a669512a86899 Merge: 185ad4b 25970f3 Author: Gilles Debunne Date: Tue May 4 12:48:41 2010 -0700 am 25970f37: am 8e4d02ce: am 30840f24: New CTS ExpandableListView tests moved from framework. commit 185ad4b3d0573a18e9a68495e29699c83f474fcc Merge: 3e3c6b4 44763df Author: Kenny Root Date: Tue May 4 12:48:30 2010 -0700 am 44763dfc: am bd11488b: am 3fca7751: am b2895ab1: am 41b4dfbd: am 4a242f98: Merge "Revise Rfc822Tokenizer test\'s expected results" into froyo commit 3e3c6b4b48e40139b4ad55ec7051191255ebe051 Merge: 476b016 455e667 Author: Brian Muramatsu Date: Tue May 4 12:48:19 2010 -0700 am 455e6672: am ce2b2ca8: am 18de2b24: am 694a76f1: am 3fe646e1: am 92f85eab: Merge "Fix KnownFailure TypefaceTest" into froyo commit 476b016dd8cc905a8300034f2d4358c1d3f2a442 Merge: 289ec96 3a9f81e Author: Brian Muramatsu Date: Tue May 4 12:48:07 2010 -0700 am 3a9f81e2: am afec2ec9: am c3f7328c: am 6ba74d92: am 9fccb0d9: am b00b01fa: Merge "Fix PopupWindowTest testUpdateDimension..." into froyo commit 289ec966a3aadc05c02419fd86d759ea795a61d6 Merge: ec003f1 7528562 Author: Jeff Brown Date: Tue May 4 12:47:56 2010 -0700 am 7528562c: am 815db3f0: am aaeb4a43: am 92e5e059: am b1c8417f: am 284abbbc: Merge "Add a test for alarms with negative wakeup times." into froyo commit ec003f1322c5857794e92c7007d0e07a3ab42b27 Merge: 758c308 2ec8617 Author: Ray Chen Date: Tue May 4 12:47:44 2010 -0700 am 2ec86175: am fb6d4277: am daa2fd25: am 3b7a1b48: am c2330190: am 55025acb: Merge "Fix issue#2557727 android.provider.cts.MediaStore_Images_MediaTest#testInsertImageWithImagePath is flaky. http://b/2557727" into froyo commit 758c308731e35ba5534840d614803a1ba97121bb Merge: 0b8ed2d 98989b1 Author: Jesse Wilson Date: Tue May 4 12:47:32 2010 -0700 am 98989b1c: am e78b1847: am bccf9790: am 0bd50a4e: am ac0668b8: am a362c7ec: Merge "Fix XmlEncodingTest to succeed when optional fields are supplied." into froyo commit 0b8ed2d59bae24b8b95ace76a510c277032cb0d8 Merge: e40c158 0a3aed4 Author: Brett Chabot Date: Tue May 4 12:47:20 2010 -0700 am 0a3aed43: am 4c1deecc: (-s ours) am 658a709d: am 6b17e7ae: (-s ours) am 1c0cfadc: (-s ours) DO NOT MERGE. cherry pick cts change from master to fix build commit e40c158de0926479ae026d94024fb4c0c0a0be05 Merge: eef5c84 1dde7c1 Author: Brett Chabot Date: Tue May 4 12:47:08 2010 -0700 am 1dde7c15: am 50bc489b: (-s ours) am a01dab5b: am 757ca14f: (-s ours) DO NOT MERGE. cherry pick cts change from master to fix build commit eef5c849edbb62c59f2fbbc337b5c8b947e087fe Merge: 479a408 d842424 Author: Adam Powell Date: Tue May 4 12:46:55 2010 -0700 am d8424244: am e438775e: am 29a71f10: am 2e939114: am 20622a8f: Merge "Fix bug 2557891 - incorrect cts test." into froyo commit 479a408e8ee0ff8c4fcc0f46cecdb023f8125e08 Merge: f809153 cdd106e Author: Brett Chabot Date: Tue May 4 12:46:43 2010 -0700 am cdd106e5: am f8a5b7a2: am 00303b0b: Merge "Adjust cts tests to ddms testrunner IOException API change." commit f809153e2b74d8ff9dcc4f075cea6157516e52cc Merge: 08578d8 d038566 Author: Glenn Kasten Date: Tue May 4 12:46:30 2010 -0700 am d0385666: am af008976: am 60631fe2: am 68376ce4: am b4423a9d: Merge "Use a fixed ringtone provided with the test case in resource folder. Bug: 2557533" into froyo commit 08578d89d9c53f43071a80ef9380c45bd02ddd5a Merge: 516e622 7d47f92 Author: Brian Muramatsu Date: Tue May 4 12:46:17 2010 -0700 am 7d47f925: am 508830b9: (-s ours) am 905aa07b: am ca47c103: (-s ours) am 25c264de: (-s ours) Merge "DO NOT MERGE Suppress NinePatchTest testHasAlpha" into froyo commit 0d765aa89fed049b52640ff3aa29ac85cec17116 Merge: 59903a0 014b85c Author: Jean-Baptiste Queru Date: Tue May 4 12:43:47 2010 -0700 am 014b85cd: manual merge from froyo Merge commit '014b85cdd916062086b3dcd74043fa17ce4e4f75' into kraken * commit '014b85cdd916062086b3dcd74043fa17ce4e4f75': Bug:2558977 commit 59903a04219fe3f5e44b2d2fb7510c9b628f7b66 Merge: 799b3ec 690c701 Author: Leon Clarke Date: Tue May 4 12:43:45 2010 -0700 am 690c7012: am 6b7df807: Bug:2558977 Use the mock WebViewClient to accept the certificate, since the certificate isn\'t added to the WebView until it has been validated, and since we don\'t accept the invalid cert, it won\'t be validated. Also, remove a comment claim Merge commit '690c7012b48027340b2981f4908c0f1f885f17b4' into kraken * commit '690c7012b48027340b2981f4908c0f1f885f17b4': Bug:2558977 commit 799b3ecdfc5757937d989fcbae27fa8abf542c73 Merge: a31b0f1 8ddb184 Author: The Android Open Source Project Date: Tue May 4 12:43:42 2010 -0700 am 8ddb1843: am fb9499e2: am 516e6222: am c3bcf6d6: am 1e7272ed: merge from open-source master Merge commit '8ddb18436afed0a04a204ecec7a77b3831b70cb2' into kraken * commit '8ddb18436afed0a04a204ecec7a77b3831b70cb2': commit a31b0f1e739420be082ad27272531df27ac801ad Merge: 596f262 ce2ccee Author: Brian Carlstrom Date: Tue May 4 12:43:40 2010 -0700 am ce2ccee4: am ea4fd404: am 405531fc: am e792397f: am 21fb726a: am 59d754d5: Merge "Fix CtsTestServer Socket Deadlocks" into froyo Merge commit 'ce2ccee49085d78836f627d5a00290ce8b5fab36' into kraken * commit 'ce2ccee49085d78836f627d5a00290ce8b5fab36': commit 596f262e13e0951862d12efe9e5e211a26aebe1f Merge: b2f5a64 ee1f260 Author: Jean-Baptiste Queru Date: Tue May 4 12:43:36 2010 -0700 am ee1f2600: am 400d9efb: am 841cdc1e: am 52e95310: am c87cbf06: Adapt to new location of libcore Merge commit 'ee1f2600e5a74cf1a72c956c9bf753dc5083ace4' into kraken * commit 'ee1f2600e5a74cf1a72c956c9bf753dc5083ace4': commit b2f5a64799259f74362efa163f817e3ff1cb6f30 Merge: d10ff24 c8cbbae Author: Jean-Baptiste Queru Date: Tue May 4 12:43:32 2010 -0700 am c8cbbae0: am 015c3eae: am 4fe15948: am 93ae9451: Adapt to new location of libcore Merge commit 'c8cbbae0a8aa4ceccc383e72aa5ae4bb08cdca56' into kraken * commit 'c8cbbae0a8aa4ceccc383e72aa5ae4bb08cdca56': commit d10ff247952c19ce2c2f7497ccb835e4c737c431 Merge: e590134 b82803f Author: Jean-Baptiste Queru Date: Tue May 4 12:43:29 2010 -0700 am b82803f3: am ac96b9ba: am b423aded: Adapt to new location of libcore Merge commit 'b82803f379854f56f16eb0a7ee823942788bd26b' into kraken * commit 'b82803f379854f56f16eb0a7ee823942788bd26b': Adapt to new location of libcore commit e590134159732732b2f28175dce221aeb282e395 Merge: f5018e7 b02874f Author: Daniel Sandler Date: Tue May 4 12:43:25 2010 -0700 am b02874ff: am 5fdb2f49: am 77dade30: am 6f9ee6ec: am b8a24bdd: Merge "Update CTS to reflect recent vibration fixes." into froyo Merge commit 'b02874ffdf56e973d11526860872c6ff7d1638a3' into kraken * commit 'b02874ffdf56e973d11526860872c6ff7d1638a3': commit f5018e7a8096e6e0941599f7c245865b1c180cd7 Merge: 780781e 1c2117d Author: Jean-Baptiste Queru Date: Tue May 4 12:43:21 2010 -0700 am 1c2117d0: am f58b7253: Adapt to new location of libcore Merge commit '1c2117d038b3097ffe72056a8635a7791c662d23' into kraken * commit '1c2117d038b3097ffe72056a8635a7791c662d23': Adapt to new location of libcore commit 780781e3a4a6672d923c5ff6e151d49d17df817c Merge: 53c8ac5 4e9eef1 Author: Dianne Hackborn Date: Tue May 4 12:43:15 2010 -0700 am 4e9eef1a: am f4106a43: am 9e357fa6: New CTS tests for screen size config selection. Merge commit '4e9eef1ab5313c0cbd5a91ce3a3df8e1cae1085e' into kraken * commit '4e9eef1ab5313c0cbd5a91ce3a3df8e1cae1085e': commit 53c8ac501fafd12aa4e925edcac124a880552ff2 Merge: 99d8804 e517c50 Author: Brett Chabot Date: Tue May 4 12:43:11 2010 -0700 am e517c509: am 6f5d369f: am c3448b2a: am 4eed4048: am 830e9985: Update CTS version numbers to 2.2. Merge commit 'e517c5094e2ca9cce1734590b230159ce9faf97b' into kraken * commit 'e517c5094e2ca9cce1734590b230159ce9faf97b': commit 99d88042ce04c7d4f2d828149447b7bd48a470d4 Merge: 2b57f6a 9106786 Author: Brett Chabot Date: Tue May 4 12:43:06 2010 -0700 am 91067868: am 94a16cda: Merge "2604272 Add CTS tests for the accessibility APIs. - I file I missed" Merge commit '91067868cf2ff6eab4b55e9021510d3c9ba48617' into kraken * commit '91067868cf2ff6eab4b55e9021510d3c9ba48617': 2604272 Add CTS tests for the accessibility APIs. - I file I missed commit 2b57f6a10e580bcea8d02e68a94b49224a9d9492 Merge: a372b61 b8f3c75 Author: Wu-cheng Li Date: Tue May 4 12:43:01 2010 -0700 am b8f3c75d: am 0055cf7c: am 2aa35f27: am f97a56dc: am a6e803e9: Fix intermittent testZoom failure. Merge commit 'b8f3c75d06ba7469b0242efba59c369b2b06550a' into kraken * commit 'b8f3c75d06ba7469b0242efba59c369b2b06550a': commit a372b61654b9999c350630c96c0c3aeccd2ebdcd Merge: 064c81f 519a121 Author: Brett Chabot Date: Tue May 4 12:42:50 2010 -0700 am 519a121a: am a576102e: Merge "Add CTS tests for the accessibility APIs." Merge commit '519a121a972c66f7652aeaecb8f6e338f61c47b8' into kraken * commit '519a121a972c66f7652aeaecb8f6e338f61c47b8': Add CTS tests for the accessibility APIs. commit 064c81ff648786d358b8bc2f2023e133cc054b43 Merge: fd965de bfd0061 Author: Gilles Debunne Date: Tue May 4 12:42:44 2010 -0700 am bfd0061c: am cc203b10: More precise exceptions in LayoutInflaterTest Merge commit 'bfd0061c09f85284a6ad13fee21cf911354b4fc7' into kraken * commit 'bfd0061c09f85284a6ad13fee21cf911354b4fc7': More precise exceptions in LayoutInflaterTest commit fd965de1c0d1987bfb5b6a0eac770a679e5e2352 Merge: 1764d26 b170d48 Author: Brian Muramatsu Date: Tue May 4 12:42:39 2010 -0700 am b170d48f: am 9237c21d: Porting Unsubmitted Cupcake SearchRecentSuggestionsTest Merge commit 'b170d48f5975d22490b81b688b8d7f4cf57f4cbe' into kraken * commit 'b170d48f5975d22490b81b688b8d7f4cf57f4cbe': Porting Unsubmitted Cupcake SearchRecentSuggestionsTest commit 1764d2632100475dc5b835b9cba11dcdfcebf913 Merge: 8402547 614a8b8 Author: Brett Chabot Date: Tue May 4 12:42:31 2010 -0700 am 614a8b8d: am d26cd945: am 55716471: am 988a48b7: am 57441528: Speculative fix for intermittent CTS UI test failures. Merge commit '614a8b8d06ddc583360c472cde53af1dad5112ef' into kraken * commit '614a8b8d06ddc583360c472cde53af1dad5112ef': commit 84025476048094f9c102b46bb121619662101db4 Merge: 7323d8a 1a72cbc Author: Kenny Root Date: Tue May 4 12:42:25 2010 -0700 am 1a72cbc7: am 6929be6c: am 26635162: am 117420e5: am db4ee458: Merge "Update TextView and PasswordTransformation tests" into froyo Merge commit '1a72cbc7e64faf71cf932dcf4a7791e1be5f5537' into kraken * commit '1a72cbc7e64faf71cf932dcf4a7791e1be5f5537': commit 7323d8a2f8be55546d10ea827124d040d4c887c8 Merge: 889b65f 2fcde6f Author: Chih-Chung Chang Date: Tue May 4 12:42:18 2010 -0700 am 2fcde6fc: am 1ecbd612: am 3d6a3387: am f9a863ba: am 017dd301: Merge "The new test done not work on all devices yet. Bug: 2597554" into froyo Merge commit '2fcde6fc38bd8217d1283501ebfd8d4d0408d6dd' into kraken * commit '2fcde6fc38bd8217d1283501ebfd8d4d0408d6dd': commit 889b65f8c757306dd70a701c457cb596c0e9b59b Merge: b6a974a 209f0a0 Author: Brett Chabot Date: Tue May 4 12:42:12 2010 -0700 am 209f0a06: am dbb18aae: am ade10558: am 271f6945: am 9371b0d4: Merge "Fix expected user agent string for new WebKit version." into froyo Merge commit '209f0a0608a18ec973638d386a6a76de7c784f29' into kraken * commit '209f0a0608a18ec973638d386a6a76de7c784f29': commit b6a974a414f9be113968f4a7afbe39b7e96ee6bc Merge: 6156c38 91035f6 Author: Glenn Kasten Date: Tue May 4 12:42:05 2010 -0700 am 91035f6b: am 4c99ae78: am c5bedbaa: am d97e33c2: am 90c418e8: Merge "Try to fix test null pointer bug." into froyo Merge commit '91035f6bbfd39c8606681528c1374324e2dbba02' into kraken * commit '91035f6bbfd39c8606681528c1374324e2dbba02': commit 6156c38a6cf40e74ebae7a689ca0a4eae5eda72c Merge: 26e7a62 e777e39 Author: Brett Chabot Date: Tue May 4 12:41:52 2010 -0700 am e777e399: am 4b1052a4: am 4dc6953e: am 71a131f4: am 2daf9e40: Merge "Adjust PackageManagerTest for the SET_PREFERRED_APPLICATIONS permission changes and associated cleanup." into froyo Merge commit 'e777e39970dc15e4135f9f1d3645151e13ea42fd' into kraken * commit 'e777e39970dc15e4135f9f1d3645151e13ea42fd': commit 26e7a6251c3db7468141cb2c44ccf63977726ac3 Merge: b78d057 26b1043 Author: Wu-cheng Li Date: Tue May 4 12:41:45 2010 -0700 am 26b10435: am d4baad36: am 5def400f: am bd8af255: am c3f6be44: Add more CTS tests for Camera.autoFocus. Merge commit '26b10435de4cb4bf1b4521b61c50210ac9e62ddc' into kraken * commit '26b10435de4cb4bf1b4521b61c50210ac9e62ddc': commit b78d0570318f45ff805f9801ddcdeac5b5de00bb Merge: 0f590cf fd45f19 Author: The Android Open Source Project Date: Tue May 4 12:41:38 2010 -0700 am fd45f19b: am c2c8ca8c: am 69621456: am 995e7359: merge from open-source master Merge commit 'fd45f19b1b903e27acfbc0d48560cbf9a136eeca' into kraken * commit 'fd45f19b1b903e27acfbc0d48560cbf9a136eeca': commit 0f590cf0f2c995da68a06724a7479dc4c8d40a5c Merge: a901d89 03e8388 Author: Wu-cheng Li Date: Tue May 4 12:41:30 2010 -0700 am 03e8388f: am 460c6ef0: am 0a77694e: am 22896463: am b3e3c793: Run Camera tests in UI thread. Merge commit '03e8388f6f82b44dee48a989b81de1eac9802b35' into kraken * commit '03e8388f6f82b44dee48a989b81de1eac9802b35': commit a901d894001bd989e4964bb6d1745abb4cfc2fc4 Merge: b406596 f8fb8c1 Author: Gilles Debunne Date: Tue May 4 12:41:20 2010 -0700 am f8fb8c1d: am 2b52a898: Revert "Revert "Merge "New tests for the new MipmapDrawable class.""" Merge commit 'f8fb8c1db9e815a80e4be3d996c3ab616093eb31' into kraken * commit 'f8fb8c1db9e815a80e4be3d996c3ab616093eb31': Revert "Revert "Merge "New tests for the new MipmapDrawable class.""" commit b406596d51cbf327e5aa303f88fa13916ae7499d Merge: b95e724 1e36215 Author: Wink Saville Date: Tue May 4 12:41:12 2010 -0700 am 1e362155: am a202fccb: Revert "Merge "New tests for the new MipmapDrawable class."" Merge commit '1e36215503a0b00ba65e81660bf393c8c8dadf68' into kraken * commit '1e36215503a0b00ba65e81660bf393c8c8dadf68': Revert "Merge "New tests for the new MipmapDrawable class."" commit b95e724f381ef62a3aca2a2e3e7be5cf6528bbfb Merge: 5cbf696 567545b Author: Brett Chabot Date: Tue May 4 12:41:04 2010 -0700 am 567545bc: am a9629dbc: am 0c52d321: am 0f69f9ef: am 0caaba05: Merge "Update AppSecurityTests#testSharedUidDifferentCerts to check new error message returned when installing a package with a shared user id." into froyo Merge commit '567545bc4c243250c26b2c74a8351d6079b3c98b' into kraken * commit '567545bc4c243250c26b2c74a8351d6079b3c98b': commit 5cbf696b1e57e5e53fd31884b93bb06355fcd3d6 Merge: f7bead2 824c0c8 Author: Brett Chabot Date: Tue May 4 12:40:55 2010 -0700 am 824c0c8e: am 81e9be6b: am 7b677a4d: am 61e572fc: am ee92f3fe: Cleanup ApplicationInfoTest. Merge commit '824c0c8e2b844c45bb17e60cf131c8dcb6c4e671' into kraken * commit '824c0c8e2b844c45bb17e60cf131c8dcb6c4e671': commit f7bead201ea9aa8c53dc198f0cf152348a4898ef Merge: cf7569d 7e37dca Author: Gilles Debunne Date: Tue May 4 12:40:44 2010 -0700 am 7e37dcac: am c7490c80: Merge "New tests for the new MipmapDrawable class." Merge commit '7e37dcacc415f57d685cff6f584f5543daa704da' into kraken * commit '7e37dcacc415f57d685cff6f584f5543daa704da': New tests for the new MipmapDrawable class. commit cf7569d83b39b713db70aa4fe52dacf847b90aa7 Merge: 5e731f4 fd9b032 Author: Dan Egnor Date: Tue May 4 12:40:35 2010 -0700 am fd9b0324: am 31820be4: am 04e6be56: am 4be76eb3: am 4bfdf82e: Merge "CTS test for android.net.TrafficStats" into froyo Merge commit 'fd9b0324106e4ebb7550a546ff4984bb0430d819' into kraken * commit 'fd9b0324106e4ebb7550a546ff4984bb0430d819': commit 5e731f461bbccd818747d0948e3e9def426bcc4e Merge: ce3cac6 1eeedce Author: The Android Open Source Project Date: Tue May 4 12:40:25 2010 -0700 am 1eeedce0: am 42effdd0: am a8ac5306: am e4793e4a: merge from open-source master Merge commit '1eeedce062d21e5a4f97dadba148331fba2c9efe' into kraken * commit '1eeedce062d21e5a4f97dadba148331fba2c9efe': commit ce3cac6e947f0a93b9c2d3d1568fbbca3f833b42 Merge: 25970f3 d9f222b Author: Wu-cheng Li Date: Tue May 4 12:40:15 2010 -0700 am d9f222b0: am 8b6e1264: am 2cd23bc8: am 86efb382: am 22af928e: Merge "Update the code due to API change." into froyo Merge commit 'd9f222b0b96f29f82f0c00a1776608171ceeaa69' into kraken * commit 'd9f222b0b96f29f82f0c00a1776608171ceeaa69': commit 25970f37bab4353fd0232edf010597f313ad7166 Merge: 44763df 8e4d02c Author: Gilles Debunne Date: Tue May 4 12:40:00 2010 -0700 am 8e4d02ce: am 30840f24: New CTS ExpandableListView tests moved from framework. Merge commit '8e4d02ce6e13613b3cfd26fac1432b89340b8182' into kraken * commit '8e4d02ce6e13613b3cfd26fac1432b89340b8182': New CTS ExpandableListView tests moved from framework. commit 44763dfcc391f24d55b39808a9366cbd8fdb6455 Merge: 455e667 bd11488 Author: Kenny Root Date: Tue May 4 12:39:46 2010 -0700 am bd11488b: am 3fca7751: am b2895ab1: am 41b4dfbd: am 4a242f98: Merge "Revise Rfc822Tokenizer test\'s expected results" into froyo Merge commit 'bd11488bb383ea197e53887928356f73a7e23382' into kraken * commit 'bd11488bb383ea197e53887928356f73a7e23382': commit 455e66725123a922d36a77c9a00f8b998ffc1555 Merge: 3a9f81e ce2b2ca Author: Brian Muramatsu Date: Tue May 4 12:39:35 2010 -0700 am ce2b2ca8: am 18de2b24: am 694a76f1: am 3fe646e1: am 92f85eab: Merge "Fix KnownFailure TypefaceTest" into froyo Merge commit 'ce2b2ca882f2ada511e348e5c94fee0c507066fc' into kraken * commit 'ce2b2ca882f2ada511e348e5c94fee0c507066fc': commit 3a9f81e296073ef85154e9653076f02793fcd055 Merge: 7528562 afec2ec Author: Brian Muramatsu Date: Tue May 4 12:39:25 2010 -0700 am afec2ec9: am c3f7328c: am 6ba74d92: am 9fccb0d9: am b00b01fa: Merge "Fix PopupWindowTest testUpdateDimension..." into froyo Merge commit 'afec2ec974950b8991f84696925cbbece5b89b0e' into kraken * commit 'afec2ec974950b8991f84696925cbbece5b89b0e': commit 7528562c909e64691116a8a45113ace512e818bd Merge: 2ec8617 815db3f Author: Jeff Brown Date: Tue May 4 12:39:14 2010 -0700 am 815db3f0: am aaeb4a43: am 92e5e059: am b1c8417f: am 284abbbc: Merge "Add a test for alarms with negative wakeup times." into froyo Merge commit '815db3f0efa20f6b382bfb9e515f88c47a778d98' into kraken * commit '815db3f0efa20f6b382bfb9e515f88c47a778d98': commit 2ec861752517e0583daef267dbbcc1b8b8077db1 Merge: 98989b1 fb6d427 Author: Ray Chen Date: Tue May 4 12:39:03 2010 -0700 am fb6d4277: am daa2fd25: am 3b7a1b48: am c2330190: am 55025acb: Merge "Fix issue#2557727 android.provider.cts.MediaStore_Images_MediaTest#testInsertImageWithImagePath is flaky. http://b/2557727" into froyo Merge commit 'fb6d427760c01401e18a26bc6d1a9c53caf1dfea' into kraken * commit 'fb6d427760c01401e18a26bc6d1a9c53caf1dfea': commit 98989b1c9a570408eb091184c66c94c2d3b70ba2 Merge: 0a3aed4 e78b184 Author: Jesse Wilson Date: Tue May 4 12:38:44 2010 -0700 am e78b1847: am bccf9790: am 0bd50a4e: am ac0668b8: am a362c7ec: Merge "Fix XmlEncodingTest to succeed when optional fields are supplied." into froyo Merge commit 'e78b1847a08459feaab233978d4f8b4e9cbf5f9b' into kraken * commit 'e78b1847a08459feaab233978d4f8b4e9cbf5f9b': commit 0a3aed4350854e1610a9894a7988931486ad1517 Merge: 1dde7c1 4c1deec Author: Brett Chabot Date: Tue May 4 12:38:33 2010 -0700 am 4c1deecc: (-s ours) am 658a709d: am 6b17e7ae: (-s ours) am 1c0cfadc: (-s ours) DO NOT MERGE. cherry pick cts change from master to fix build Merge commit '4c1deecc818bedfed75c0bf01d2eaf677cb74b0f' into kraken * commit '4c1deecc818bedfed75c0bf01d2eaf677cb74b0f': commit 1dde7c15b9b871b0ddfa31dc31da71835494e706 Merge: d842424 50bc489 Author: Brett Chabot Date: Tue May 4 12:38:07 2010 -0700 am 50bc489b: (-s ours) am a01dab5b: am 757ca14f: (-s ours) DO NOT MERGE. cherry pick cts change from master to fix build Merge commit '50bc489b1fbad28fc0359c8c92eaf6391346abd7' into kraken * commit '50bc489b1fbad28fc0359c8c92eaf6391346abd7': commit d8424244813f3be509eb3c5ed5012b8ee86d18bc Merge: cdd106e e438775 Author: Adam Powell Date: Tue May 4 12:37:55 2010 -0700 am e438775e: am 29a71f10: am 2e939114: am 20622a8f: Merge "Fix bug 2557891 - incorrect cts test." into froyo Merge commit 'e438775eb295aa7bc56c0d2c4e6c64ed42043dba' into kraken * commit 'e438775eb295aa7bc56c0d2c4e6c64ed42043dba': commit cdd106e597eac73119a48b175cefc3457c11a4a1 Merge: d038566 f8a5b7a Author: Brett Chabot Date: Tue May 4 12:37:34 2010 -0700 am f8a5b7a2: am 00303b0b: Merge "Adjust cts tests to ddms testrunner IOException API change." Merge commit 'f8a5b7a27b70fc7f1fa752709595e390b1868bd0' into kraken * commit 'f8a5b7a27b70fc7f1fa752709595e390b1868bd0': Adjust cts tests to ddms testrunner IOException API change. commit d0385666c788badc1c9d18a792ada3cc5eb419db Merge: 7d47f92 af00897 Author: Glenn Kasten Date: Tue May 4 12:37:20 2010 -0700 am af008976: am 60631fe2: am 68376ce4: am b4423a9d: Merge "Use a fixed ringtone provided with the test case in resource folder. Bug: 2557533" into froyo Merge commit 'af008976e924ee5752c633922d50c20cf4a83632' into kraken * commit 'af008976e924ee5752c633922d50c20cf4a83632': commit 7d47f925b180165d14cb77268788149c52a1fc3c Merge: c3bcf6d 508830b Author: Brian Muramatsu Date: Tue May 4 12:37:06 2010 -0700 am 508830b9: (-s ours) am 905aa07b: am ca47c103: (-s ours) am 25c264de: (-s ours) Merge "DO NOT MERGE Suppress NinePatchTest testHasAlpha" into froyo Merge commit '508830b9b4a37a34f850a0e03fdedbc79b27b730' into kraken * commit '508830b9b4a37a34f850a0e03fdedbc79b27b730': commit 014b85cdd916062086b3dcd74043fa17ce4e4f75 Merge: 690c701 d46dcc3 Author: Jean-Baptiste Queru Date: Tue May 4 11:05:48 2010 -0700 manual merge from froyo Change-Id: I4cda98c00565d4844ca072248937b3a48152b4c1 commit d46dcc34acdf869f2c089de14483ce341a8e0a46 Author: Leon Clarke Date: Thu Apr 1 13:09:26 2010 +0100 Bug:2558977 Use the mock WebViewClient to accept the certificate, since the certificate isn't added to the WebView until it has been validated, and since we don't accept the invalid cert, it won't be validated. Also, remove a comment claiming that onReceivedSslError is hidden and can't be called since it is no longer hidden and it's needed. commit 690c7012b48027340b2981f4908c0f1f885f17b4 Merge: 8ddb184 6b7df80 Author: Leon Clarke Date: Tue May 4 10:22:58 2010 -0700 am 6b7df807: Bug:2558977 Use the mock WebViewClient to accept the certificate, since the certificate isn\'t added to the WebView until it has been validated, and since we don\'t accept the invalid cert, it won\'t be validated. Also, remove a comment claiming that onRecei Merge commit '6b7df8078e560312037c40b5107a761d2a3c2556' into froyo-plus-aosp * commit '6b7df8078e560312037c40b5107a761d2a3c2556': Bug:2558977 commit 8ddb18436afed0a04a204ecec7a77b3831b70cb2 Merge: ce2ccee fb9499e Author: The Android Open Source Project Date: Tue May 4 10:22:55 2010 -0700 am fb9499e2: am 516e6222: am c3bcf6d6: am 1e7272ed: merge from open-source master Merge commit 'fb9499e23e7eaa9f101f5ccbea624af8c6b8f735' into froyo-plus-aosp * commit 'fb9499e23e7eaa9f101f5ccbea624af8c6b8f735': commit ce2ccee49085d78836f627d5a00290ce8b5fab36 Merge: ee1f260 ea4fd40 Author: Brian Carlstrom Date: Tue May 4 10:22:48 2010 -0700 am ea4fd404: am 405531fc: am e792397f: am 21fb726a: am 59d754d5: Merge "Fix CtsTestServer Socket Deadlocks" into froyo Merge commit 'ea4fd4049187e6bce40674a0fc4168a58e7eec88' into froyo-plus-aosp * commit 'ea4fd4049187e6bce40674a0fc4168a58e7eec88': commit ee1f2600e5a74cf1a72c956c9bf753dc5083ace4 Merge: c8cbbae 400d9ef Author: Jean-Baptiste Queru Date: Tue May 4 10:22:44 2010 -0700 am 400d9efb: am 841cdc1e: am 52e95310: am c87cbf06: Adapt to new location of libcore Merge commit '400d9efb57388c4a42cca3559ff43f06d60d16d7' into froyo-plus-aosp * commit '400d9efb57388c4a42cca3559ff43f06d60d16d7': commit c8cbbae0a8aa4ceccc383e72aa5ae4bb08cdca56 Merge: b82803f 015c3ea Author: Jean-Baptiste Queru Date: Tue May 4 10:22:41 2010 -0700 am 015c3eae: am 4fe15948: am 93ae9451: Adapt to new location of libcore Merge commit '015c3eaefb9fd9e1aff82bac580567146074d624' into froyo-plus-aosp * commit '015c3eaefb9fd9e1aff82bac580567146074d624': Adapt to new location of libcore commit b82803f379854f56f16eb0a7ee823942788bd26b Merge: b02874f ac96b9b Author: Jean-Baptiste Queru Date: Tue May 4 10:22:38 2010 -0700 am ac96b9ba: am b423aded: Adapt to new location of libcore Merge commit 'ac96b9baa68aecd6e590b216642640a2f4dc6272' into froyo-plus-aosp * commit 'ac96b9baa68aecd6e590b216642640a2f4dc6272': Adapt to new location of libcore commit b02874ffdf56e973d11526860872c6ff7d1638a3 Merge: 1c2117d 5fdb2f4 Author: Daniel Sandler Date: Tue May 4 10:22:33 2010 -0700 am 5fdb2f49: am 77dade30: am 6f9ee6ec: am b8a24bdd: Merge "Update CTS to reflect recent vibration fixes." into froyo Merge commit '5fdb2f49d4d0d353f68d3a631924bbe8da1ea9e9' into froyo-plus-aosp * commit '5fdb2f49d4d0d353f68d3a631924bbe8da1ea9e9': commit 1c2117d038b3097ffe72056a8635a7791c662d23 Merge: 4e9eef1 f58b725 Author: Jean-Baptiste Queru Date: Tue May 4 10:22:29 2010 -0700 am f58b7253: Adapt to new location of libcore Merge commit 'f58b72532d5a49fcab1cc0df5c6a36d6e13b062e' into froyo-plus-aosp * commit 'f58b72532d5a49fcab1cc0df5c6a36d6e13b062e': Adapt to new location of libcore commit 4e9eef1ab5313c0cbd5a91ce3a3df8e1cae1085e Merge: e517c50 f4106a4 Author: Dianne Hackborn Date: Tue May 4 10:22:25 2010 -0700 am f4106a43: am 9e357fa6: New CTS tests for screen size config selection. Merge commit 'f4106a434c14e5e9d3e2d12d61a4f02e964354d4' into froyo-plus-aosp * commit 'f4106a434c14e5e9d3e2d12d61a4f02e964354d4': New CTS tests for screen size config selection. commit e517c5094e2ca9cce1734590b230159ce9faf97b Merge: 9106786 6f5d369 Author: Brett Chabot Date: Tue May 4 10:22:19 2010 -0700 am 6f5d369f: am c3448b2a: am 4eed4048: am 830e9985: Update CTS version numbers to 2.2. Merge commit '6f5d369f6e0a6b28d99a275f2b7e75c5f66defd4' into froyo-plus-aosp * commit '6f5d369f6e0a6b28d99a275f2b7e75c5f66defd4': commit 91067868cf2ff6eab4b55e9021510d3c9ba48617 Merge: b8f3c75 94a16cd Author: Brett Chabot Date: Tue May 4 10:22:15 2010 -0700 am 94a16cda: Merge "2604272 Add CTS tests for the accessibility APIs. - I file I missed" Merge commit '94a16cda5a2c0d2dfde0872535fff72e0c9c99da' into froyo-plus-aosp * commit '94a16cda5a2c0d2dfde0872535fff72e0c9c99da': 2604272 Add CTS tests for the accessibility APIs. - I file I missed commit b8f3c75d06ba7469b0242efba59c369b2b06550a Merge: 519a121 0055cf7 Author: Wu-cheng Li Date: Tue May 4 10:22:09 2010 -0700 am 0055cf7c: am 2aa35f27: am f97a56dc: am a6e803e9: Fix intermittent testZoom failure. Merge commit '0055cf7ce48209b35ae5972e85a9a7a68e060038' into froyo-plus-aosp * commit '0055cf7ce48209b35ae5972e85a9a7a68e060038': commit 519a121a972c66f7652aeaecb8f6e338f61c47b8 Merge: bfd0061 a576102 Author: Brett Chabot Date: Tue May 4 10:22:04 2010 -0700 am a576102e: Merge "Add CTS tests for the accessibility APIs." Merge commit 'a576102e0fac22150d601966c972305777449de4' into froyo-plus-aosp * commit 'a576102e0fac22150d601966c972305777449de4': Add CTS tests for the accessibility APIs. commit bfd0061c09f85284a6ad13fee21cf911354b4fc7 Merge: b170d48 cc203b1 Author: Gilles Debunne Date: Tue May 4 10:21:59 2010 -0700 am cc203b10: More precise exceptions in LayoutInflaterTest Merge commit 'cc203b10fbf772804b550a0e1b4b38a0f99bf69f' into froyo-plus-aosp * commit 'cc203b10fbf772804b550a0e1b4b38a0f99bf69f': More precise exceptions in LayoutInflaterTest commit b170d48f5975d22490b81b688b8d7f4cf57f4cbe Merge: 614a8b8 9237c21 Author: Brian Muramatsu Date: Tue May 4 10:21:52 2010 -0700 am 9237c21d: Porting Unsubmitted Cupcake SearchRecentSuggestionsTest Merge commit '9237c21dbecf3765a9a9f999c66d7f1cc08795d9' into froyo-plus-aosp * commit '9237c21dbecf3765a9a9f999c66d7f1cc08795d9': Porting Unsubmitted Cupcake SearchRecentSuggestionsTest commit 614a8b8d06ddc583360c472cde53af1dad5112ef Merge: 1a72cbc d26cd94 Author: Brett Chabot Date: Tue May 4 10:21:46 2010 -0700 am d26cd945: am 55716471: am 988a48b7: am 57441528: Speculative fix for intermittent CTS UI test failures. Merge commit 'd26cd9451950dad9faf9192f36d338c453652081' into froyo-plus-aosp * commit 'd26cd9451950dad9faf9192f36d338c453652081': commit 1a72cbc7e64faf71cf932dcf4a7791e1be5f5537 Merge: 2fcde6f 6929be6 Author: Kenny Root Date: Tue May 4 10:21:40 2010 -0700 am 6929be6c: am 26635162: am 117420e5: am db4ee458: Merge "Update TextView and PasswordTransformation tests" into froyo Merge commit '6929be6ce4b9080db3bdbdaccf64a139305a0ef5' into froyo-plus-aosp * commit '6929be6ce4b9080db3bdbdaccf64a139305a0ef5': commit 2fcde6fc38bd8217d1283501ebfd8d4d0408d6dd Merge: 209f0a0 1ecbd61 Author: Chih-Chung Chang Date: Tue May 4 10:21:34 2010 -0700 am 1ecbd612: am 3d6a3387: am f9a863ba: am 017dd301: Merge "The new test done not work on all devices yet. Bug: 2597554" into froyo Merge commit '1ecbd612a541ba877d42dd1a3cd45b7f46dc0ba8' into froyo-plus-aosp * commit '1ecbd612a541ba877d42dd1a3cd45b7f46dc0ba8': commit 209f0a0608a18ec973638d386a6a76de7c784f29 Merge: 91035f6 dbb18aa Author: Brett Chabot Date: Tue May 4 10:21:28 2010 -0700 am dbb18aae: am ade10558: am 271f6945: am 9371b0d4: Merge "Fix expected user agent string for new WebKit version." into froyo Merge commit 'dbb18aae08086953d2c1ad1499503f38536c4f5c' into froyo-plus-aosp * commit 'dbb18aae08086953d2c1ad1499503f38536c4f5c': commit 91035f6bbfd39c8606681528c1374324e2dbba02 Merge: e777e39 4c99ae7 Author: Glenn Kasten Date: Tue May 4 10:21:21 2010 -0700 am 4c99ae78: am c5bedbaa: am d97e33c2: am 90c418e8: Merge "Try to fix test null pointer bug." into froyo Merge commit '4c99ae78726b17b62368ebbf21accead9cf388d9' into froyo-plus-aosp * commit '4c99ae78726b17b62368ebbf21accead9cf388d9': commit e777e39970dc15e4135f9f1d3645151e13ea42fd Merge: 26b1043 4b1052a Author: Brett Chabot Date: Tue May 4 10:21:15 2010 -0700 am 4b1052a4: am 4dc6953e: am 71a131f4: am 2daf9e40: Merge "Adjust PackageManagerTest for the SET_PREFERRED_APPLICATIONS permission changes and associated cleanup." into froyo Merge commit '4b1052a485903676cc83b35978818f82ec1ee35b' into froyo-plus-aosp * commit '4b1052a485903676cc83b35978818f82ec1ee35b': commit 26b10435de4cb4bf1b4521b61c50210ac9e62ddc Merge: fd45f19 d4baad3 Author: Wu-cheng Li Date: Tue May 4 10:21:06 2010 -0700 am d4baad36: am 5def400f: am bd8af255: am c3f6be44: Add more CTS tests for Camera.autoFocus. Merge commit 'd4baad36261b0418d246010ccc77c71b17ee5b61' into froyo-plus-aosp * commit 'd4baad36261b0418d246010ccc77c71b17ee5b61': commit fd45f19b1b903e27acfbc0d48560cbf9a136eeca Merge: 03e8388 c2c8ca8 Author: The Android Open Source Project Date: Tue May 4 10:20:59 2010 -0700 am c2c8ca8c: am 69621456: am 995e7359: merge from open-source master Merge commit 'c2c8ca8cb282aa59b6ad751d7d1991037d6dcab2' into froyo-plus-aosp * commit 'c2c8ca8cb282aa59b6ad751d7d1991037d6dcab2': commit 03e8388f6f82b44dee48a989b81de1eac9802b35 Merge: f8fb8c1 460c6ef Author: Wu-cheng Li Date: Tue May 4 10:20:51 2010 -0700 am 460c6ef0: am 0a77694e: am 22896463: am b3e3c793: Run Camera tests in UI thread. Merge commit '460c6ef00efe28ab4d44d7c3f7c311e6f6fd751c' into froyo-plus-aosp * commit '460c6ef00efe28ab4d44d7c3f7c311e6f6fd751c': commit f8fb8c1db9e815a80e4be3d996c3ab616093eb31 Merge: 1e36215 2b52a89 Author: Gilles Debunne Date: Tue May 4 10:20:44 2010 -0700 am 2b52a898: Revert "Revert "Merge "New tests for the new MipmapDrawable class.""" Merge commit '2b52a8981d439e34c08c7b96bae58f79bcaf1390' into froyo-plus-aosp * commit '2b52a8981d439e34c08c7b96bae58f79bcaf1390': Revert "Revert "Merge "New tests for the new MipmapDrawable class.""" commit 1e36215503a0b00ba65e81660bf393c8c8dadf68 Merge: 567545b a202fcc Author: Wink Saville Date: Tue May 4 10:20:36 2010 -0700 am a202fccb: Revert "Merge "New tests for the new MipmapDrawable class."" Merge commit 'a202fccb97a003b35cf66f525d4963511614dae1' into froyo-plus-aosp * commit 'a202fccb97a003b35cf66f525d4963511614dae1': Revert "Merge "New tests for the new MipmapDrawable class."" commit 567545bc4c243250c26b2c74a8351d6079b3c98b Merge: 824c0c8 a9629db Author: Brett Chabot Date: Tue May 4 10:20:28 2010 -0700 am a9629dbc: am 0c52d321: am 0f69f9ef: am 0caaba05: Merge "Update AppSecurityTests#testSharedUidDifferentCerts to check new error message returned when installing a package with a shared user id." into froyo Merge commit 'a9629dbcc8eadddde0d4a2af6d9620bd293d2ec8' into froyo-plus-aosp * commit 'a9629dbcc8eadddde0d4a2af6d9620bd293d2ec8': commit 824c0c8e2b844c45bb17e60cf131c8dcb6c4e671 Merge: 7e37dca 81e9be6 Author: Brett Chabot Date: Tue May 4 10:20:19 2010 -0700 am 81e9be6b: am 7b677a4d: am 61e572fc: am ee92f3fe: Cleanup ApplicationInfoTest. Merge commit '81e9be6b64df067314136c4dba3faca8f64a6616' into froyo-plus-aosp * commit '81e9be6b64df067314136c4dba3faca8f64a6616': commit 7e37dcacc415f57d685cff6f584f5543daa704da Merge: fd9b032 c7490c8 Author: Gilles Debunne Date: Tue May 4 10:20:11 2010 -0700 am c7490c80: Merge "New tests for the new MipmapDrawable class." Merge commit 'c7490c80290f3b01754963a818af4d618001a9f8' into froyo-plus-aosp * commit 'c7490c80290f3b01754963a818af4d618001a9f8': New tests for the new MipmapDrawable class. commit fd9b0324106e4ebb7550a546ff4984bb0430d819 Merge: 1eeedce 31820be Author: Dan Egnor Date: Tue May 4 10:20:02 2010 -0700 am 31820be4: am 04e6be56: am 4be76eb3: am 4bfdf82e: Merge "CTS test for android.net.TrafficStats" into froyo Merge commit '31820be43c3003b0ad32b5f7e83b1dcff87ffd0e' into froyo-plus-aosp * commit '31820be43c3003b0ad32b5f7e83b1dcff87ffd0e': commit 1eeedce062d21e5a4f97dadba148331fba2c9efe Merge: d9f222b 42effdd Author: The Android Open Source Project Date: Tue May 4 10:19:52 2010 -0700 am 42effdd0: am a8ac5306: am e4793e4a: merge from open-source master Merge commit '42effdd092fb429791e668306ad0bc9cd7ba889a' into froyo-plus-aosp * commit '42effdd092fb429791e668306ad0bc9cd7ba889a': commit d9f222b0b96f29f82f0c00a1776608171ceeaa69 Merge: 8e4d02c 8b6e126 Author: Wu-cheng Li Date: Tue May 4 10:19:43 2010 -0700 am 8b6e1264: am 2cd23bc8: am 86efb382: am 22af928e: Merge "Update the code due to API change." into froyo Merge commit '8b6e12648964c5e06813de86f04f079d5f5d7891' into froyo-plus-aosp * commit '8b6e12648964c5e06813de86f04f079d5f5d7891': commit 8e4d02ce6e13613b3cfd26fac1432b89340b8182 Merge: bd11488 30840f2 Author: Gilles Debunne Date: Tue May 4 10:19:33 2010 -0700 am 30840f24: New CTS ExpandableListView tests moved from framework. Merge commit '30840f2473bdd33bddc66e648877f2f23996f53e' into froyo-plus-aosp * commit '30840f2473bdd33bddc66e648877f2f23996f53e': New CTS ExpandableListView tests moved from framework. commit bd11488bb383ea197e53887928356f73a7e23382 Merge: ce2b2ca 3fca775 Author: Kenny Root Date: Tue May 4 10:19:23 2010 -0700 am 3fca7751: am b2895ab1: am 41b4dfbd: am 4a242f98: Merge "Revise Rfc822Tokenizer test\'s expected results" into froyo Merge commit '3fca7751dcba65f7b42b5f3081e380b3121eda31' into froyo-plus-aosp * commit '3fca7751dcba65f7b42b5f3081e380b3121eda31': commit ce2b2ca882f2ada511e348e5c94fee0c507066fc Merge: afec2ec 18de2b2 Author: Brian Muramatsu Date: Tue May 4 10:19:13 2010 -0700 am 18de2b24: am 694a76f1: am 3fe646e1: am 92f85eab: Merge "Fix KnownFailure TypefaceTest" into froyo Merge commit '18de2b24d3a013cd342f8fd73991bc617b979821' into froyo-plus-aosp * commit '18de2b24d3a013cd342f8fd73991bc617b979821': commit afec2ec974950b8991f84696925cbbece5b89b0e Merge: 815db3f c3f7328 Author: Brian Muramatsu Date: Tue May 4 10:19:01 2010 -0700 am c3f7328c: am 6ba74d92: am 9fccb0d9: am b00b01fa: Merge "Fix PopupWindowTest testUpdateDimension..." into froyo Merge commit 'c3f7328c9c4d1e9df2faa8c48ce69ebc69fee7c7' into froyo-plus-aosp * commit 'c3f7328c9c4d1e9df2faa8c48ce69ebc69fee7c7': commit 815db3f0efa20f6b382bfb9e515f88c47a778d98 Merge: fb6d427 aaeb4a4 Author: Jeff Brown Date: Tue May 4 10:18:51 2010 -0700 am aaeb4a43: am 92e5e059: am b1c8417f: am 284abbbc: Merge "Add a test for alarms with negative wakeup times." into froyo Merge commit 'aaeb4a431ce496c6b3c4602541723cfd2ed8de69' into froyo-plus-aosp * commit 'aaeb4a431ce496c6b3c4602541723cfd2ed8de69': commit fb6d427760c01401e18a26bc6d1a9c53caf1dfea Merge: e78b184 daa2fd2 Author: Ray Chen Date: Tue May 4 10:18:41 2010 -0700 am daa2fd25: am 3b7a1b48: am c2330190: am 55025acb: Merge "Fix issue#2557727 android.provider.cts.MediaStore_Images_MediaTest#testInsertImageWithImagePath is flaky. http://b/2557727" into froyo Merge commit 'daa2fd25eea6d55243cf7c8af3c0f8066fbccc56' into froyo-plus-aosp * commit 'daa2fd25eea6d55243cf7c8af3c0f8066fbccc56': commit e78b1847a08459feaab233978d4f8b4e9cbf5f9b Merge: 4c1deec bccf979 Author: Jesse Wilson Date: Tue May 4 10:18:30 2010 -0700 am bccf9790: am 0bd50a4e: am ac0668b8: am a362c7ec: Merge "Fix XmlEncodingTest to succeed when optional fields are supplied." into froyo Merge commit 'bccf97904725dd1eb07e96f456fbdaba71881594' into froyo-plus-aosp * commit 'bccf97904725dd1eb07e96f456fbdaba71881594': commit 4c1deecc818bedfed75c0bf01d2eaf677cb74b0f Merge: 50bc489 658a709 Author: Brett Chabot Date: Tue May 4 10:18:19 2010 -0700 am 658a709d: am 6b17e7ae: (-s ours) am 1c0cfadc: (-s ours) DO NOT MERGE. cherry pick cts change from master to fix build Merge commit '658a709d4ed9045cc29090d4ad218d7b6ed8a627' into froyo-plus-aosp * commit '658a709d4ed9045cc29090d4ad218d7b6ed8a627': commit 50bc489b1fbad28fc0359c8c92eaf6391346abd7 Merge: e438775 a01dab5 Author: Brett Chabot Date: Tue May 4 10:18:08 2010 -0700 am a01dab5b: am 757ca14f: (-s ours) DO NOT MERGE. cherry pick cts change from master to fix build Merge commit 'a01dab5bf7a10850cddc521565cf26cc7a566dbc' into froyo-plus-aosp * commit 'a01dab5bf7a10850cddc521565cf26cc7a566dbc': DO NOT MERGE. cherry pick cts change from master to fix build commit e438775eb295aa7bc56c0d2c4e6c64ed42043dba Merge: f8a5b7a 29a71f1 Author: Adam Powell Date: Tue May 4 10:17:56 2010 -0700 am 29a71f10: am 2e939114: am 20622a8f: Merge "Fix bug 2557891 - incorrect cts test." into froyo Merge commit '29a71f10098f4957d1ec7c44be81165ab24eb02d' into froyo-plus-aosp * commit '29a71f10098f4957d1ec7c44be81165ab24eb02d': commit f8a5b7a27b70fc7f1fa752709595e390b1868bd0 Merge: af00897 00303b0 Author: Brett Chabot Date: Tue May 4 10:17:32 2010 -0700 am 00303b0b: Merge "Adjust cts tests to ddms testrunner IOException API change." Merge commit '00303b0b71c23d2c4b4399c173c1fea48fed2a9a' into froyo-plus-aosp * commit '00303b0b71c23d2c4b4399c173c1fea48fed2a9a': Adjust cts tests to ddms testrunner IOException API change. commit af008976e924ee5752c633922d50c20cf4a83632 Merge: 508830b 60631fe Author: Glenn Kasten Date: Tue May 4 10:17:10 2010 -0700 am 60631fe2: am 68376ce4: am b4423a9d: Merge "Use a fixed ringtone provided with the test case in resource folder. Bug: 2557533" into froyo Merge commit '60631fe201ca77a6a997f672de10c6bede72174c' into froyo-plus-aosp * commit '60631fe201ca77a6a997f672de10c6bede72174c': commit 508830b9b4a37a34f850a0e03fdedbc79b27b730 Merge: 1e7272e 905aa07 Author: Brian Muramatsu Date: Tue May 4 10:16:57 2010 -0700 am 905aa07b: am ca47c103: (-s ours) am 25c264de: (-s ours) Merge "DO NOT MERGE Suppress NinePatchTest testHasAlpha" into froyo Merge commit '905aa07b9c8ac30f2e5d2369f56c5f46ffe01b22' into froyo-plus-aosp * commit '905aa07b9c8ac30f2e5d2369f56c5f46ffe01b22': commit 6b7df8078e560312037c40b5107a761d2a3c2556 Author: Leon Clarke Date: Thu Apr 1 13:09:26 2010 +0100 Bug:2558977 Use the mock WebViewClient to accept the certificate, since the certificate isn't added to the WebView until it has been validated, and since we don't accept the invalid cert, it won't be validated. Also, remove a comment claiming that onReceivedSslError is hidden and can't be called since it is no longer hidden and it's needed. commit 489888b39e9f503cad164a1b1067371d2a193341 Author: Brian Muramatsu Date: Mon May 3 18:37:13 2010 -0700 Porting Unsubmitted Cupcake Debug.InstructionCount Tests Removed some useless lines and fixed some formatting: Squashed commit of the following: commit 0b1924fe27e8a432cc6b961d02221d605e971b2f Author: Phil Dubach Date: Fri Jul 17 16:44:58 2009 -0700 Integrate unsubmitted cupcake change 122275: CTS: add test cases for android.os.Debug.InstructionCount Change-Id: I9a3f25f3a77b0ebde94ded77481330dea4a29fbc commit fb9499e23e7eaa9f101f5ccbea624af8c6b8f735 Merge: ea4fd40 516e622 Author: The Android Open Source Project Date: Mon May 3 16:19:16 2010 -0700 am 516e6222: am c3bcf6d6: am 1e7272ed: merge from open-source master commit 516e62222a27f64c8dbe7c2a5cb2fe532f3d89ab Merge: 405531f c3bcf6d Author: The Android Open Source Project Date: Mon May 3 16:17:39 2010 -0700 am c3bcf6d6: am 1e7272ed: merge from open-source master commit c3bcf6d639b010ad34efbc58e3af976584670d21 Merge: e792397 1e7272e Author: The Android Open Source Project Date: Mon May 3 16:16:18 2010 -0700 am 1e7272ed: merge from open-source master Merge commit '1e7272ed5317baf6aa685da2b9056aab4417b864' into kraken * commit '1e7272ed5317baf6aa685da2b9056aab4417b864': Adapt to new location of libcore commit 1e7272ed5317baf6aa685da2b9056aab4417b864 Merge: 21fb726 43579bb Author: The Android Open Source Project Date: Mon May 3 16:14:38 2010 -0700 merge from open-source master Change-Id: Ib463dd1289974874c6e8501017b980b83b4cf378 commit 02b0405a4743fcf5c8d6ce13a91f299d0228bd37 Author: Nick Pelly Date: Mon May 3 15:20:38 2010 -0700 Checkpoint: adding more Bluetooth CTS tests. BluetoothAdapter.enable() BluetoothAdapter.disable() BluetoothAdapter.getState() BluetoothAdapter.isEnabled() BluetoothAdapter.getName() BluetoothAdapter.getAddress() BluetoothAdapter.listeningUsingRfcommWithServiceRecord() BluetoothAdapter.getRemoteDevice() BluetoothAdapter.getBondedDevice() Note this test case now takes ~50 seconds to complete because of the BT off/on stress test. Change-Id: I4474a9392490f45833c03cab5a121bbe677a85b1 commit ea4fd4049187e6bce40674a0fc4168a58e7eec88 Merge: 400d9ef 405531f Author: Brian Carlstrom Date: Mon May 3 15:28:27 2010 -0700 am 405531fc: am e792397f: am 21fb726a: am 59d754d5: Merge "Fix CtsTestServer Socket Deadlocks" into froyo commit 405531fc0290f45a7ee043a602d268b556c9b45d Merge: 841cdc1 e792397 Author: Brian Carlstrom Date: Mon May 3 15:26:59 2010 -0700 am e792397f: am 21fb726a: am 59d754d5: Merge "Fix CtsTestServer Socket Deadlocks" into froyo commit e792397f940e4e5ff325a07f17d928e3f6c2359e Merge: 52e9531 21fb726 Author: Brian Carlstrom Date: Mon May 3 15:24:54 2010 -0700 am 21fb726a: am 59d754d5: Merge "Fix CtsTestServer Socket Deadlocks" into froyo Merge commit '21fb726a84d628f596c38c69fce0fa07cd548851' into kraken * commit '21fb726a84d628f596c38c69fce0fa07cd548851': Fix CtsTestServer Socket Deadlocks commit 21fb726a84d628f596c38c69fce0fa07cd548851 Merge: c87cbf0 59d754d Author: Brian Carlstrom Date: Mon May 3 15:23:25 2010 -0700 am 59d754d5: Merge "Fix CtsTestServer Socket Deadlocks" into froyo Merge commit '59d754d5c165921cc674fac0010954aa0491a338' into froyo-plus-aosp * commit '59d754d5c165921cc674fac0010954aa0491a338': Fix CtsTestServer Socket Deadlocks commit 59d754d5c165921cc674fac0010954aa0491a338 Merge: b8a24bd ca76c2c Author: Brian Carlstrom Date: Mon May 3 15:16:05 2010 -0700 Merge "Fix CtsTestServer Socket Deadlocks" into froyo commit dc4fcb2f0b734c9e5ca03a97429bf3bd9b189aba Author: Brian Muramatsu Date: Thu Apr 22 14:37:31 2010 -0700 Key Character Map Compatibility Fixes Bug 2183699 Several CTS tests expect the keyboard character map to be QWERTY. Fix the tests so they are keyboard character map agnostic by replacing the sendKey calls to sendStringSync calls which load the key character map and figure out what the real keys need to be pressed. Avoid using literal A and try to figure out what the real key would be needed to produce an A. Change-Id: Ie2592a22e28e9cbad429403e276ef32f4799d203 commit ca76c2c8c866ce988b2d350d374dea9b8d8ae207 Author: Brian Muramatsu Date: Mon May 3 14:21:06 2010 -0700 Fix CtsTestServer Socket Deadlocks Bug 2558977 When one thread was blocking on socket.accept() and another thread was trying to call socket.close(), there would be a deadlock that would cause the WebView tests to hang. Instead of having another thread call socket.close(), issue a request to a shutdown url that the socket.accept() thread will recognize and subsequently call socket.close() in the same thread to fix the issue. Change-Id: I9152b5bf39893998ea44fcb31e18699652f94e57 commit 43579bb2d025fe377be0ae12a15de2530c7345aa Author: Jean-Baptiste Queru Date: Mon May 3 09:54:44 2010 -0700 Adapt to new location of libcore Change-Id: I04c381c73afd035e1ec40f571555caf059ab5dce commit 400d9efb57388c4a42cca3559ff43f06d60d16d7 Merge: 015c3ea 841cdc1 Author: Jean-Baptiste Queru Date: Sun May 2 16:15:49 2010 -0700 am 841cdc1e: am 52e95310: am c87cbf06: Adapt to new location of libcore commit 841cdc1e0103df1b7b11734eaa2bba3f7a7502b4 Merge: 4fe1594 52e9531 Author: Jean-Baptiste Queru Date: Sun May 2 16:13:47 2010 -0700 am 52e95310: am c87cbf06: Adapt to new location of libcore commit 52e95310e52eca1ec83c212bf21de934fca97294 Merge: 93ae945 c87cbf0 Author: Jean-Baptiste Queru Date: Sun May 2 16:11:28 2010 -0700 am c87cbf06: Adapt to new location of libcore Merge commit 'c87cbf06e2c44b5b1a6216110059c1ddee32cce6' into kraken * commit 'c87cbf06e2c44b5b1a6216110059c1ddee32cce6': Adapt to new location of libcore commit 015c3eaefb9fd9e1aff82bac580567146074d624 Merge: ac96b9b 4fe1594 Author: Jean-Baptiste Queru Date: Fri Apr 30 15:08:53 2010 -0700 am 4fe15948: am 93ae9451: Adapt to new location of libcore commit ac96b9baa68aecd6e590b216642640a2f4dc6272 Merge: 5fdb2f4 b423ade Author: Jean-Baptiste Queru Date: Fri Apr 30 15:08:29 2010 -0700 am b423aded: Adapt to new location of libcore commit 5fdb2f49d4d0d353f68d3a631924bbe8da1ea9e9 Merge: f58b725 77dade3 Author: Daniel Sandler Date: Fri Apr 30 15:07:31 2010 -0700 am 77dade30: am 6f9ee6ec: am b8a24bdd: Merge "Update CTS to reflect recent vibration fixes." into froyo commit c87cbf06e2c44b5b1a6216110059c1ddee32cce6 Author: Jean-Baptiste Queru Date: Fri Apr 30 10:13:34 2010 -0700 Adapt to new location of libcore Change-Id: I83a1c9585e0cbcfadb6bd81a5d9fcaa5f31aaf19 commit 4fe15948dd0a540841cb993dc0b756506539d497 Merge: b423ade 93ae945 Author: Jean-Baptiste Queru Date: Fri Apr 30 13:20:44 2010 -0700 am 93ae9451: Adapt to new location of libcore commit 93ae945110ec25ef4a25ec5bf3b879793558fc95 Author: Jean-Baptiste Queru Date: Fri Apr 30 10:13:34 2010 -0700 Adapt to new location of libcore Change-Id: Iaabc2a22e6e47c46ab287dfdf6c3d648fd2bd3a7 commit b423adedfb047bc0531d7f44dc088ea0d5077646 Author: Jean-Baptiste Queru Date: Fri Apr 30 10:13:34 2010 -0700 Adapt to new location of libcore Change-Id: I6c2e4b8362c7dab44a597bf43dc1e34199c0dee5 commit f58b72532d5a49fcab1cc0df5c6a36d6e13b062e Author: Jean-Baptiste Queru Date: Fri Apr 30 10:13:34 2010 -0700 Adapt to new location of libcore Change-Id: Ie250f70f974eb7e27a017d9d529e7ff3cadc7f72 commit 77dade305767814fb29a8e40db9fbe43eff75b95 Merge: 9e357fa 6f9ee6e Author: Daniel Sandler Date: Fri Apr 30 11:33:37 2010 -0700 am 6f9ee6ec: am b8a24bdd: Merge "Update CTS to reflect recent vibration fixes." into froyo Merge commit '6f9ee6ecade42ba1a8f1a149037d1174ed39df20' into kraken * commit '6f9ee6ecade42ba1a8f1a149037d1174ed39df20': Update CTS to reflect recent vibration fixes. commit 6f9ee6ecade42ba1a8f1a149037d1174ed39df20 Merge: 4eed404 b8a24bd Author: Daniel Sandler Date: Fri Apr 30 11:30:12 2010 -0700 am b8a24bdd: Merge "Update CTS to reflect recent vibration fixes." into froyo Merge commit 'b8a24bdd9e702d7cad6bf5eb9ac2e1cd923c0816' into froyo-plus-aosp * commit 'b8a24bdd9e702d7cad6bf5eb9ac2e1cd923c0816': Update CTS to reflect recent vibration fixes. commit b8a24bdd9e702d7cad6bf5eb9ac2e1cd923c0816 Merge: 830e998 81e4759 Author: Daniel Sandler Date: Fri Apr 30 10:54:57 2010 -0700 Merge "Update CTS to reflect recent vibration fixes." into froyo commit 81e47592b89cb19993852e244e0992c15c992035 Author: Daniel Sandler Date: Thu Apr 29 09:23:43 2010 -0400 Update CTS to reflect recent vibration fixes. Pre-Froyo, if you set VIBRATE_TYPE_RINGER to VIBRATE_SETTING_OFF, incoming calls would still vibrate if the device was in RINGER_MODE_VIBRATE. This was fixed in https://android-git.corp.google.com/g/#change,48440 so that VIBRATE_TYPE_RINGER trumps; this is because we're now properly treating RINGER_MODE_VIBRATE as sort of an upper bound: vibrations are *permitted* but not *required*. Bug: 2639299 Change-Id: I44401d4a9d73fa43e9152da9ffefc6706aa59429 commit f4106a434c14e5e9d3e2d12d61a4f02e964354d4 Merge: 6f5d369 9e357fa Author: Dianne Hackborn Date: Wed Apr 28 17:02:03 2010 -0700 am 9e357fa6: New CTS tests for screen size config selection. commit 9e357fa63f60e01c61fc11ce304398233b779558 Author: Dianne Hackborn Date: Wed Apr 28 12:57:38 2010 -0700 New CTS tests for screen size config selection. Change-Id: I1feeab3ee5cc3afc18233ed66a992fdcc53a543f commit 67f8aaded23022a679e246cf2021f1c0657f1db7 Author: Svetoslav Ganov Date: Wed Apr 28 16:23:32 2010 -0700 2636275 Add CTS tests for the accessibility APIs - Eclair Change-Id: I3c472b5a67e4298ee2cf8fbde1df354f40645195 commit 6f5d369f6e0a6b28d99a275f2b7e75c5f66defd4 Merge: 94a16cd c3448b2 Author: Brett Chabot Date: Wed Apr 28 14:03:38 2010 -0700 am c3448b2a: am 4eed4048: am 830e9985: Update CTS version numbers to 2.2. commit 94a16cda5a2c0d2dfde0872535fff72e0c9c99da Merge: 0055cf7 7cb2b7b Author: Brett Chabot Date: Wed Apr 28 13:56:48 2010 -0700 Merge "2604272 Add CTS tests for the accessibility APIs. - I file I missed" commit c3448b2a1dfc29470a5ca5d2cac330355ee6440e Merge: 2aa35f2 4eed404 Author: Brett Chabot Date: Wed Apr 28 13:56:31 2010 -0700 am 4eed4048: am 830e9985: Update CTS version numbers to 2.2. Merge commit '4eed4048cb101fd3225d3c4fc23489205b65e9da' into kraken * commit '4eed4048cb101fd3225d3c4fc23489205b65e9da': Update CTS version numbers to 2.2. commit 4eed4048cb101fd3225d3c4fc23489205b65e9da Merge: f97a56d 830e998 Author: Brett Chabot Date: Wed Apr 28 13:51:51 2010 -0700 am 830e9985: Update CTS version numbers to 2.2. Merge commit '830e9985cdb2897bea02b9fd0c3820af5a40be67' into froyo-plus-aosp * commit '830e9985cdb2897bea02b9fd0c3820af5a40be67': Update CTS version numbers to 2.2. commit 830e9985cdb2897bea02b9fd0c3820af5a40be67 Author: Brett Chabot Date: Wed Apr 28 13:28:28 2010 -0700 Update CTS version numbers to 2.2. Change-Id: I7105f54348364e45b08deee0d8971d62a94dd080 commit 0055cf7ce48209b35ae5972e85a9a7a68e060038 Merge: a576102 2aa35f2 Author: Wu-cheng Li Date: Wed Apr 28 09:56:27 2010 -0700 am 2aa35f27: am f97a56dc: am a6e803e9: Fix intermittent testZoom failure. commit 2aa35f277ebf92e74d2892fb16b682d315a4ee89 Merge: 5571647 f97a56d Author: Wu-cheng Li Date: Wed Apr 28 09:46:56 2010 -0700 am f97a56dc: am a6e803e9: Fix intermittent testZoom failure. Merge commit 'f97a56dcb3add555b062f55de64dd304843fcc66' into kraken * commit 'f97a56dcb3add555b062f55de64dd304843fcc66': Fix intermittent testZoom failure. commit f97a56dcb3add555b062f55de64dd304843fcc66 Merge: 988a48b a6e803e Author: Wu-cheng Li Date: Wed Apr 28 09:32:45 2010 -0700 am a6e803e9: Fix intermittent testZoom failure. Merge commit 'a6e803e990d2011e592a80f7dbfe483343e7ee93' into froyo-plus-aosp * commit 'a6e803e990d2011e592a80f7dbfe483343e7ee93': Fix intermittent testZoom failure. commit a6e803e990d2011e592a80f7dbfe483343e7ee93 Author: Wu-cheng Li Date: Wed Apr 28 12:23:17 2010 +0800 Fix intermittent testZoom failure. testZoom runs after testTakePicture. testTakePicture allocates more memory. so GC is more likely to happen in testZoom. The extra GC time causes timeout. bug:2637118 Change-Id: Ibf01da21c38bc3475fa1b9785d3a4920b781ca07 commit 7cb2b7b0caa40c800df8612631d2d9c25afb98a1 Author: Svetoslav Ganov Date: Tue Apr 27 17:37:15 2010 -0700 2604272 Add CTS tests for the accessibility APIs. - I file I missed Change-Id: Iafe7b36b2ffc5dc4a9c37daadb7f2092dd8ab469 commit a576102e0fac22150d601966c972305777449de4 Merge: cc203b1 fdeb86e Author: Brett Chabot Date: Tue Apr 27 15:46:41 2010 -0700 Merge "Add CTS tests for the accessibility APIs." commit fdeb86eebd7cf123970bb26d14b1b6e880d9da29 Author: Svetoslav Ganov Date: Fri Apr 23 15:12:21 2010 -0700 Add CTS tests for the accessibility APIs. Change-Id: Ie1d9e8cd2ddc975eb9de6763e4f22908ae68817f commit cc203b10fbf772804b550a0e1b4b38a0f99bf69f Author: Gilles Debunne Date: Tue Apr 27 15:11:53 2010 -0700 More precise exceptions in LayoutInflaterTest Change-Id: Ifc1889e3a350257482a5346dce9a68977a367898 commit 620d253aed18e0621645fc32cd3827f7170a8bac Author: Brian Muramatsu Date: Mon Apr 26 14:10:44 2010 -0700 Fix ConfigurationTest#writeToParcelTest Bug 2455171 Update ConfigurationTest's writeToParcelTest that has fallen out of date with changes to Configuration. It still passes on the emulator, because it was testing the defaults which are all zeros. Change the test case a bit to test alternating zeros and non-zero constants to make it fail when things get out of date. Furthermore, test null and non-null Locales too. Change-Id: Idfbb8a200cf3e5f73209d3381a40c6bbeebb6102 commit 9237c21dbecf3765a9a9f999c66d7f1cc08795d9 Author: Brian Muramatsu Date: Fri Apr 23 15:52:47 2010 -0700 Porting Unsubmitted Cupcake SearchRecentSuggestionsTest No additional changes were made for the test to work. Squashed commit of the following: commit bd1360986b5114f881533580a4f4307940d991fe Author: Phil Dubach Date: Fri Jul 17 16:57:42 2009 -0700 Integrate unsubmitted cupcake change 124116: CTS: add test cases for provider.SearchRecentSuggestions Change-Id: I1bcf42d2d82188ad391b91772ca09d3c55ca2911 commit c363ba4f68e22356f2a6bd77a4e01127e9eec0b6 Merge: 6f7233e 6abfea6 Author: Brian Muramatsu Date: Fri Apr 23 11:31:05 2010 -0700 Merge "Remove SurfaceViewTest Race Condition" into eclair commit d26cd9451950dad9faf9192f36d338c453652081 Merge: 6929be6 5571647 Author: Brett Chabot Date: Thu Apr 22 14:09:30 2010 -0700 am 55716471: am 988a48b7: am 57441528: Speculative fix for intermittent CTS UI test failures. commit 5571647110d759f8fb74bb0f7b3939eacb294b1c Merge: 2663516 988a48b Author: Brett Chabot Date: Thu Apr 22 14:00:36 2010 -0700 am 988a48b7: am 57441528: Speculative fix for intermittent CTS UI test failures. Merge commit '988a48b7fdf9c90b0babecdc66be9ff94184499a' into kraken * commit '988a48b7fdf9c90b0babecdc66be9ff94184499a': Speculative fix for intermittent CTS UI test failures. commit 988a48b7fdf9c90b0babecdc66be9ff94184499a Merge: 117420e 5744152 Author: Brett Chabot Date: Thu Apr 22 13:56:43 2010 -0700 am 57441528: Speculative fix for intermittent CTS UI test failures. Merge commit '57441528f6687779e50f2067b96dc924f8627ad3' into froyo-plus-aosp * commit '57441528f6687779e50f2067b96dc924f8627ad3': Speculative fix for intermittent CTS UI test failures. commit 57441528f6687779e50f2067b96dc924f8627ad3 Author: Brett Chabot Date: Wed Apr 21 11:17:14 2010 -0700 Speculative fix for intermittent CTS UI test failures. UI related tests fail if the keyguard is currently displayed. Previously, the CTS harness used a separate util app which would disable the keyguard upon receiving a broadcast. However, if the util app's process is killed by the system, the keyguard is immediately displayed. Its not known for sure, but this could explain the intermittent UI test failures. This commit adds logic to disable the keyguard in the CTS test runner itself. Bug 2342725. Change-Id: I87659e5e3547296dc0e4bd549c979aef325fc90e commit 6929be6ce4b9080db3bdbdaccf64a139305a0ef5 Merge: 1ecbd61 2663516 Author: Kenny Root Date: Mon Apr 19 14:22:28 2010 -0700 am 26635162: am 117420e5: am db4ee458: Merge "Update TextView and PasswordTransformation tests" into froyo commit 266351623420485537d0bdf09d1fb8c57f8b0e4f Merge: 3d6a338 117420e Author: Kenny Root Date: Mon Apr 19 14:11:46 2010 -0700 am 117420e5: am db4ee458: Merge "Update TextView and PasswordTransformation tests" into froyo Merge commit '117420e5b7452f19947f2fc5724573126c4db83d' into kraken * commit '117420e5b7452f19947f2fc5724573126c4db83d': Update TextView and PasswordTransformation tests commit 117420e5b7452f19947f2fc5724573126c4db83d Merge: f9a863b db4ee45 Author: Kenny Root Date: Mon Apr 19 14:07:46 2010 -0700 am db4ee458: Merge "Update TextView and PasswordTransformation tests" into froyo Merge commit 'db4ee4587852872cd716eb740e04a7bfa14be7d9' into froyo-plus-aosp * commit 'db4ee4587852872cd716eb740e04a7bfa14be7d9': Update TextView and PasswordTransformation tests commit db4ee4587852872cd716eb740e04a7bfa14be7d9 Merge: 017dd30 22d40a1 Author: Kenny Root Date: Mon Apr 19 14:03:23 2010 -0700 Merge "Update TextView and PasswordTransformation tests" into froyo commit 6abfea6447dee981c35c090480d7014e4d08e22c Author: Brian Muramatsu Date: Mon Apr 19 13:57:11 2010 -0700 Remove SurfaceViewTest Race Condition Issue 7187 Don't create a separate thread to call the draw method, because the thread may not be executed by the time the test asserts that the draw method was called. Change-Id: I6796d03d798de38a168ae476145012cf88d86fbe commit 6f7233e74fc56381b599c02ba111a4575d4df0d5 Author: Brian Muramatsu Date: Fri Apr 16 15:39:14 2010 -0700 Fix ViewTest#testGet*VisibleRect* for QVGA Bug 2447678 Instead of resizing the test view to 200x300 resize the widget to a size that will be visible on the screen by setting it to half te size of the window. This works in both portrait and landscape as well. Change-Id: Ic30bc7c396e39f64ccc89eb4a1a853390883a89e commit 1ecbd612a541ba877d42dd1a3cd45b7f46dc0ba8 Merge: dbb18aa 3d6a338 Author: Chih-Chung Chang Date: Thu Apr 15 23:38:09 2010 -0700 am 3d6a3387: am f9a863ba: am 017dd301: Merge "The new test done not work on all devices yet. Bug: 2597554" into froyo commit 3d6a33874ad3ad142fb738f701f6ed530ff4214c Merge: ade1055 f9a863b Author: Chih-Chung Chang Date: Thu Apr 15 23:30:40 2010 -0700 am f9a863ba: am 017dd301: Merge "The new test done not work on all devices yet. Bug: 2597554" into froyo Merge commit 'f9a863ba6dc69a8a2d96631fa126784c2c381671' into kraken * commit 'f9a863ba6dc69a8a2d96631fa126784c2c381671': The new test done not work on all devices yet. commit f9a863ba6dc69a8a2d96631fa126784c2c381671 Merge: 271f694 017dd30 Author: Chih-Chung Chang Date: Thu Apr 15 23:26:32 2010 -0700 am 017dd301: Merge "The new test done not work on all devices yet. Bug: 2597554" into froyo Merge commit '017dd3016dc2f20db75bb861dca5a4e589f963e2' into froyo-plus-aosp * commit '017dd3016dc2f20db75bb861dca5a4e589f963e2': The new test done not work on all devices yet. commit 017dd3016dc2f20db75bb861dca5a4e589f963e2 Merge: 9371b0d 2980da2 Author: Chih-Chung Chang Date: Thu Apr 15 23:22:24 2010 -0700 Merge "The new test done not work on all devices yet. Bug: 2597554" into froyo commit dbb18aae08086953d2c1ad1499503f38536c4f5c Merge: 4c99ae7 ade1055 Author: Brett Chabot Date: Thu Apr 15 16:59:53 2010 -0700 am ade10558: am 271f6945: am 9371b0d4: Merge "Fix expected user agent string for new WebKit version." into froyo commit 0b786da149415db895fde48107ad4cd28161a7cf Author: Brian Muramatsu Date: Thu Apr 15 15:22:57 2010 -0700 Fix ListViewTest#testGetMaxScrollAmount Issue 7425 The test depends on the device's screen size. The SDK comments on the method and our goal not to depend on device screen size forces us to reduce the test to testing no scrolling for an empty adapter and some scrolling for a non-empty adapter. Change-Id: I5a5d5a5d643f139edc74fc09af8a897e1999f93e commit ade1055831ef82ea3909a4a90763cc0fe99527d6 Merge: c5bedba 271f694 Author: Brett Chabot Date: Thu Apr 15 15:17:05 2010 -0700 am 271f6945: am 9371b0d4: Merge "Fix expected user agent string for new WebKit version." into froyo Merge commit '271f6945358c10a86e8f9cebc7e7522edee23fd4' into kraken * commit '271f6945358c10a86e8f9cebc7e7522edee23fd4': Fix expected user agent string for new WebKit version. commit 271f6945358c10a86e8f9cebc7e7522edee23fd4 Merge: d97e33c 9371b0d Author: Brett Chabot Date: Thu Apr 15 15:12:01 2010 -0700 am 9371b0d4: Merge "Fix expected user agent string for new WebKit version." into froyo Merge commit '9371b0d4e0b5334dcf4ad59c89931d1a8e0053b3' into froyo-plus-aosp * commit '9371b0d4e0b5334dcf4ad59c89931d1a8e0053b3': Fix expected user agent string for new WebKit version. commit 9371b0d4e0b5334dcf4ad59c89931d1a8e0053b3 Merge: 90c418e 57bc72b Author: Brett Chabot Date: Thu Apr 15 15:07:38 2010 -0700 Merge "Fix expected user agent string for new WebKit version." into froyo commit 57bc72b4e16467df4e65fa6c5bc991d37157aeef Author: Brett Chabot Date: Thu Apr 15 14:46:23 2010 -0700 Fix expected user agent string for new WebKit version. Bug 2586289 Change-Id: Id7d4e9404183ea3a887b6c0979d07ab56368f1ee commit 4c99ae78726b17b62368ebbf21accead9cf388d9 Merge: 4b1052a c5bedba Author: Glenn Kasten Date: Thu Apr 15 12:33:17 2010 -0700 am c5bedbaa: am d97e33c2: am 90c418e8: Merge "Try to fix test null pointer bug." into froyo commit 4b1052a485903676cc83b35978818f82ec1ee35b Merge: d4baad3 4dc6953 Author: Brett Chabot Date: Thu Apr 15 06:39:07 2010 -0700 am 4dc6953e: am 71a131f4: am 2daf9e40: Merge "Adjust PackageManagerTest for the SET_PREFERRED_APPLICATIONS permission changes and associated cleanup." into froyo commit 2980da2061f1ae72280bcf5074888cbea4132fc1 Author: Chih-Chung Chang Date: Thu Apr 15 17:55:19 2010 +0800 The new test done not work on all devices yet. Bug: 2597554 Change-Id: Ibc8c99a4de417a4f86df03727a3c22da6844554a commit c5bedbaadb9d36850f290b01027e087c8e2fb8df Merge: 4dc6953 d97e33c Author: Glenn Kasten Date: Wed Apr 14 16:33:01 2010 -0700 am d97e33c2: am 90c418e8: Merge "Try to fix test null pointer bug." into froyo Merge commit 'd97e33c2f80a5241b06a0d0e9a023017399132ab' into kraken * commit 'd97e33c2f80a5241b06a0d0e9a023017399132ab': Try to fix test null pointer bug. commit d97e33c2f80a5241b06a0d0e9a023017399132ab Merge: 71a131f 90c418e Author: Glenn Kasten Date: Wed Apr 14 16:26:35 2010 -0700 am 90c418e8: Merge "Try to fix test null pointer bug." into froyo Merge commit '90c418e81f9deb7408f5927c39ca241685b2a2dd' into froyo-plus-aosp * commit '90c418e81f9deb7408f5927c39ca241685b2a2dd': Try to fix test null pointer bug. commit 90c418e81f9deb7408f5927c39ca241685b2a2dd Merge: 2daf9e4 746550f Author: Glenn Kasten Date: Wed Apr 14 15:51:13 2010 -0700 Merge "Try to fix test null pointer bug." into froyo commit 4dc6953e2141aba31076cfa244ed2c403b7c030d Merge: 5def400 71a131f Author: Brett Chabot Date: Wed Apr 14 12:15:13 2010 -0700 am 71a131f4: am 2daf9e40: Merge "Adjust PackageManagerTest for the SET_PREFERRED_APPLICATIONS permission changes and associated cleanup." into froyo Merge commit '71a131f49e9bbbaaa523af39611bb80e46ba859a' into kraken * commit '71a131f49e9bbbaaa523af39611bb80e46ba859a': Adjust PackageManagerTest for the SET_PREFERRED_APPLICATIONS permission changes commit 71a131f49e9bbbaaa523af39611bb80e46ba859a Merge: bd8af25 2daf9e4 Author: Brett Chabot Date: Wed Apr 14 12:09:48 2010 -0700 am 2daf9e40: Merge "Adjust PackageManagerTest for the SET_PREFERRED_APPLICATIONS permission changes and associated cleanup." into froyo Merge commit '2daf9e404f9a41aa5067292ea978ae3812caed39' into froyo-plus-aosp * commit '2daf9e404f9a41aa5067292ea978ae3812caed39': Adjust PackageManagerTest for the SET_PREFERRED_APPLICATIONS permission changes commit 2daf9e404f9a41aa5067292ea978ae3812caed39 Merge: c3f6be4 0ad4bf4 Author: Brett Chabot Date: Wed Apr 14 11:41:57 2010 -0700 Merge "Adjust PackageManagerTest for the SET_PREFERRED_APPLICATIONS permission changes and associated cleanup." into froyo commit 746550f20e2d212a6207cb87282524e44269ab81 Author: Glenn Kasten Date: Tue Apr 13 07:55:52 2010 -0700 Try to fix test null pointer bug. Change-Id: Ie221af8f47b1e6449528a90ce2de3313ad8cc525 commit d4baad36261b0418d246010ccc77c71b17ee5b61 Merge: c2c8ca8 5def400 Author: Wu-cheng Li Date: Tue Apr 13 10:37:39 2010 -0700 am 5def400f: am bd8af255: am c3f6be44: Add more CTS tests for Camera.autoFocus. commit 5def400fd4db8da3fb88616d84cf8fdda2ad927e Merge: 6962145 bd8af25 Author: Wu-cheng Li Date: Tue Apr 13 07:33:03 2010 -0700 am bd8af255: am c3f6be44: Add more CTS tests for Camera.autoFocus. Merge commit 'bd8af2553c73b6cdc02cbd4fd019c0e298c43d84' into kraken * commit 'bd8af2553c73b6cdc02cbd4fd019c0e298c43d84': Add more CTS tests for Camera.autoFocus. commit bd8af2553c73b6cdc02cbd4fd019c0e298c43d84 Merge: 995e735 c3f6be4 Author: Wu-cheng Li Date: Tue Apr 13 07:29:09 2010 -0700 am c3f6be44: Add more CTS tests for Camera.autoFocus. Merge commit 'c3f6be44cf37b33bdf0e4f66d734f73ed69c1176' into froyo-plus-aosp * commit 'c3f6be44cf37b33bdf0e4f66d734f73ed69c1176': Add more CTS tests for Camera.autoFocus. commit c3f6be44cf37b33bdf0e4f66d734f73ed69c1176 Author: Wu-cheng Li Date: Tue Apr 13 00:00:20 2010 +0800 Add more CTS tests for Camera.autoFocus. bug:2573802 Change-Id: Ia73309e3c326af157a0618d33713481293e58060 commit c2c8ca8cb282aa59b6ad751d7d1991037d6dcab2 Merge: 460c6ef 6962145 Author: The Android Open Source Project Date: Mon Apr 12 17:01:21 2010 -0700 am 69621456: am 995e7359: merge from open-source master commit 460c6ef00efe28ab4d44d7c3f7c311e6f6fd751c Merge: 2b52a89 0a77694 Author: Wu-cheng Li Date: Mon Apr 12 17:01:18 2010 -0700 am 0a77694e: am 22896463: am b3e3c793: Run Camera tests in UI thread. commit 69621456a395e10016126bb43d819724586e0c92 Merge: 0a77694 995e735 Author: The Android Open Source Project Date: Mon Apr 12 13:35:20 2010 -0700 am 995e7359: merge from open-source master Merge commit '995e7359fbf2434a5c0da71421090e6ded0866a4' into kraken * commit '995e7359fbf2434a5c0da71421090e6ded0866a4': Cherry pick cts change to fix build commit 995e7359fbf2434a5c0da71421090e6ded0866a4 Merge: 2289646 8777225 Author: The Android Open Source Project Date: Mon Apr 12 13:31:55 2010 -0700 merge from open-source master Change-Id: Ia86b18a7eac57e5dfe1cf055377da20f6a8aaedc commit 99ebd866204159cdacf5e0ebc15f2b0e34f62460 Merge: 924b350 25ef500 Author: Brian Muramatsu Date: Mon Apr 12 12:51:45 2010 -0700 Merge "Use Dips in Some Tests" into eclair commit 2b52a8981d439e34c08c7b96bae58f79bcaf1390 Author: Gilles Debunne Date: Mon Apr 12 11:41:21 2010 -0700 Revert "Revert "Merge "New tests for the new MipmapDrawable class.""" This reverts commit a202fccb97a003b35cf66f525d4963511614dae1. Change-Id: I63d6625f14dbe657015c2c8cdba941173e8dad31 commit 0a77694ea398456f07874f4d7be0d52adbad0bc6 Merge: 0c52d32 2289646 Author: Wu-cheng Li Date: Mon Apr 12 08:54:26 2010 -0700 am 22896463: am b3e3c793: Run Camera tests in UI thread. Merge commit '22896463d0fd563edf2376ff6398ccfd6e048770' into kraken * commit '22896463d0fd563edf2376ff6398ccfd6e048770': Run Camera tests in UI thread. commit 22896463d0fd563edf2376ff6398ccfd6e048770 Merge: 0f69f9e b3e3c79 Author: Wu-cheng Li Date: Mon Apr 12 08:50:55 2010 -0700 am b3e3c793: Run Camera tests in UI thread. Merge commit 'b3e3c7938d7e9e1753a592570ba3dd16ac85c799' into froyo-plus-aosp * commit 'b3e3c7938d7e9e1753a592570ba3dd16ac85c799': Run Camera tests in UI thread. commit a202fccb97a003b35cf66f525d4963511614dae1 Author: Wink Saville Date: Sat Apr 10 12:56:32 2010 -0700 Revert "Merge "New tests for the new MipmapDrawable class."" This reverts commit c7490c80290f3b01754963a818af4d618001a9f8, reversing changes made to 31820be43c3003b0ad32b5f7e83b1dcff87ffd0e. To fix the build commit a9629dbcc8eadddde0d4a2af6d9620bd293d2ec8 Merge: 81e9be6 0c52d32 Author: Brett Chabot Date: Sat Apr 10 11:58:10 2010 -0700 am 0c52d321: am 0f69f9ef: am 0caaba05: Merge "Update AppSecurityTests#testSharedUidDifferentCerts to check new error message returned when installing a package with a shared user id." into froyo commit 81e9be6b64df067314136c4dba3faca8f64a6616 Merge: c7490c8 7b677a4 Author: Brett Chabot Date: Sat Apr 10 11:58:07 2010 -0700 am 7b677a4d: am 61e572fc: am ee92f3fe: Cleanup ApplicationInfoTest. commit 0c52d321a9fa0c6875dab0c87bc0db0a56c1348b Merge: 7b677a4 0f69f9e Author: Brett Chabot Date: Sat Apr 10 11:47:05 2010 -0700 am 0f69f9ef: am 0caaba05: Merge "Update AppSecurityTests#testSharedUidDifferentCerts to check new error message returned when installing a package with a shared user id." into froyo Merge commit '0f69f9ef0be33987e30322c65de97f372626ff30' into kraken * commit '0f69f9ef0be33987e30322c65de97f372626ff30': Update AppSecurityTests#testSharedUidDifferentCerts to check new error message commit 7b677a4d6a4e13a9d904378081711d2e4d788e1c Merge: 04e6be5 61e572f Author: Brett Chabot Date: Sat Apr 10 11:47:03 2010 -0700 am 61e572fc: am ee92f3fe: Cleanup ApplicationInfoTest. Merge commit '61e572fc2bdf231ba12c0f5e84ae7178fc55c1ec' into kraken * commit '61e572fc2bdf231ba12c0f5e84ae7178fc55c1ec': Cleanup ApplicationInfoTest. commit 0f69f9ef0be33987e30322c65de97f372626ff30 Merge: 61e572f 0caaba0 Author: Brett Chabot Date: Sat Apr 10 11:40:53 2010 -0700 am 0caaba05: Merge "Update AppSecurityTests#testSharedUidDifferentCerts to check new error message returned when installing a package with a shared user id." into froyo Merge commit '0caaba0594a06fc11d3cf6bbbfc2df89c18701b4' into froyo-plus-aosp * commit '0caaba0594a06fc11d3cf6bbbfc2df89c18701b4': Update AppSecurityTests#testSharedUidDifferentCerts to check new error message commit 61e572fc2bdf231ba12c0f5e84ae7178fc55c1ec Merge: 4be76eb ee92f3f Author: Brett Chabot Date: Sat Apr 10 11:40:48 2010 -0700 am ee92f3fe: Cleanup ApplicationInfoTest. Merge commit 'ee92f3fe21bde9c5e69935e736791db3e2ab3473' into froyo-plus-aosp * commit 'ee92f3fe21bde9c5e69935e736791db3e2ab3473': Cleanup ApplicationInfoTest. commit b3e3c7938d7e9e1753a592570ba3dd16ac85c799 Author: Wu-cheng Li Date: Sat Apr 10 15:30:32 2010 +0800 Run Camera tests in UI thread. If tests are not run in UI thread, surface may be changed during test and it causes failure. Also, release camera in tear down. Otherwise, it will fail to connect to camera if any test fails. bug:2573823 Change-Id: Ia909c99bd476e6411f624b620b65487292c6da66 commit c7490c80290f3b01754963a818af4d618001a9f8 Merge: 31820be 4e19452 Author: Gilles Debunne Date: Fri Apr 9 21:51:47 2010 -0700 Merge "New tests for the new MipmapDrawable class." commit 22d40a1fcc078329a7e5a34ff5eeadeca9c70d49 Author: Kenny Root Date: Fri Apr 9 16:58:07 2010 -0700 Update TextView and PasswordTransformation tests TextView's tests were trying to run some things on a non-UI thread. Also hang onto a reference to the text transformation instead of trying to get the reference every time to simulate how TextView actually works. Change-Id: I9a6e55b21abdf6619a917707b0359d61787515ae commit 0caaba0594a06fc11d3cf6bbbfc2df89c18701b4 Merge: ee92f3f 9fb6bbf Author: Brett Chabot Date: Fri Apr 9 17:53:02 2010 -0700 Merge "Update AppSecurityTests#testSharedUidDifferentCerts to check new error message returned when installing a package with a shared user id." into froyo commit 0ad4bf40b2f105f372485b8fc5b83ed3c65b1ee7 Author: Brett Chabot Date: Fri Apr 9 14:02:29 2010 -0700 Adjust PackageManagerTest for the SET_PREFERRED_APPLICATIONS permission changes and associated cleanup. Break up test methods into finer grain tests. Remove deprecated TestTarget annotations from modified methods. Add checks to verify SecurityExceptions are thrown where appropriate. Bug 2541351 Change-Id: Ifcfdce1b7e7ccd90e82b20bd9b67e318feeb6427 commit 9fb6bbf5e0e726701273e313c4f307ec113bc92c Author: Brett Chabot Date: Fri Apr 9 17:22:47 2010 -0700 Update AppSecurityTests#testSharedUidDifferentCerts to check new error message returned when installing a package with a shared user id. Bug 2586449 Change-Id: I8b0fd22a8caca88cdc34d717abe464d183471c37 commit 4e19452bb42984178390f65028afe38e2cf55cf0 Author: Gilles Debunne Date: Fri Apr 9 15:46:28 2010 -0700 New tests for the new MipmapDrawable class. Change-Id: If445b8a7a218dce83e02a85538a0fcee64a04800 https://android-git.corp.google.com/g/#change,48350 commit ee92f3fe21bde9c5e69935e736791db3e2ab3473 Author: Brett Chabot Date: Fri Apr 9 13:27:25 2010 -0700 Cleanup ApplicationInfoTest. Bug 2585642 Change-Id: Ie2f4f3041da122e747b59b24d99b91583e7bbba6 commit 924b350299f1425fd16b9328b6e9894f440059e7 Merge: 78d43a1 52249ab Author: Brett Chabot Date: Fri Apr 9 12:26:05 2010 -0700 Merge "Adjust testInstrumentationDiffCert to test that startInstrumentation throws SecurityException directly." into eclair commit 25ef500492c17701bb5cea1930278cd7bbed6f91 Author: Brian Muramatsu Date: Thu Apr 8 13:08:28 2010 -0700 Use Dips in Some Tests Issue 7124 6953 Use dips rather than pixels so that the tests scale across different dpi devices. Using dips in HorizontalScrollviewTest so that less pixels are required to fling on ldpi devices. ScrollingMovementMethodTest needs to use dips, so that the view will only be scrolled twice before hitting the edge. Change-Id: I6cec524d780692ee3193be0a5a7b9718edcb17c1 commit 52249ab3ace98024eef38a0c06d954355aa36813 Author: Brett Chabot Date: Thu Apr 8 16:34:05 2010 -0700 Adjust testInstrumentationDiffCert to test that startInstrumentation throws SecurityException directly. Previously it tested for 'adb shell am instrument' failing, which can be indeterministic. internal bug 2476321 Change-Id: I4da274143d51ca7970bf0ff657cb1a7e7599abc0 commit 78d43a1ccb3c902ff7dde941f1a9fee79e019a6e Merge: 5ff5614 94b366e Author: Brian Muramatsu Date: Fri Apr 9 11:19:50 2010 -0700 Merge "Fix Invalid Namespace CTS Issue" into eclair commit 8777225c9c10f0ee95c916f8609df3e5a45505df Author: Brett Chabot Date: Fri Mar 26 18:03:59 2010 -0700 Cherry pick cts change to fix build Adjust cts tests to ddms testrunner IOException API change. Change-Id: I9f4c1b12608a3570ff45b90c53004cdbbc0b8b27 commit 31820be43c3003b0ad32b5f7e83b1dcff87ffd0e Merge: 42effdd 04e6be5 Author: Dan Egnor Date: Thu Apr 8 15:03:36 2010 -0700 am 04e6be56: am 4be76eb3: am 4bfdf82e: Merge "CTS test for android.net.TrafficStats" into froyo commit 04e6be56d4644e7409e1dfd5ec532ee498008e9c Merge: a8ac530 4be76eb Author: Dan Egnor Date: Thu Apr 8 14:54:44 2010 -0700 am 4be76eb3: am 4bfdf82e: Merge "CTS test for android.net.TrafficStats" into froyo Merge commit '4be76eb3b25267c45c840853b4720f3dae68fc57' into kraken * commit '4be76eb3b25267c45c840853b4720f3dae68fc57': CTS test for android.net.TrafficStats commit 4be76eb3b25267c45c840853b4720f3dae68fc57 Merge: e4793e4 4bfdf82 Author: Dan Egnor Date: Thu Apr 8 14:50:31 2010 -0700 am 4bfdf82e: Merge "CTS test for android.net.TrafficStats" into froyo Merge commit '4bfdf82ee70de8e6fb674929cf973186d90a427c' into froyo-plus-aosp * commit '4bfdf82ee70de8e6fb674929cf973186d90a427c': CTS test for android.net.TrafficStats commit 4bfdf82ee70de8e6fb674929cf973186d90a427c Merge: 22af928 0275e90 Author: Dan Egnor Date: Thu Apr 8 14:46:59 2010 -0700 Merge "CTS test for android.net.TrafficStats" into froyo commit 0275e907e15fb3510cdfeef6cb1690b0f80e1a36 Author: Dan Egnor Date: Thu Apr 8 14:02:54 2010 -0700 CTS test for android.net.TrafficStats Change-Id: I35fecea2a343fe2483d8c723b7f3a2d9916d47f2 commit 5ff5614db695d778805b44dec8e389ea27a5f48e Merge: 2202104 df56b8f Author: Brian Muramatsu Date: Thu Apr 8 13:22:23 2010 -0700 Merge "Remove internal.R References from AlertDialogBuilderTest" into eclair commit 42effdd092fb429791e668306ad0bc9cd7ba889a Merge: 8b6e126 a8ac530 Author: The Android Open Source Project Date: Thu Apr 8 11:02:44 2010 -0700 am a8ac5306: am e4793e4a: merge from open-source master commit a8ac530653944acb4620249597b8c8f1e88ee443 Merge: 2cd23bc e4793e4 Author: The Android Open Source Project Date: Thu Apr 8 10:54:32 2010 -0700 am e4793e4a: merge from open-source master Merge commit 'e4793e4a26a012ec7ff9562189f87eb3ff9f3528' into kraken * commit 'e4793e4a26a012ec7ff9562189f87eb3ff9f3528': Fixing test commit e4793e4a26a012ec7ff9562189f87eb3ff9f3528 Merge: 86efb38 24b1575 Author: The Android Open Source Project Date: Thu Apr 8 10:47:05 2010 -0700 merge from open-source master Change-Id: Ia742ce876792cc4a7f411c2576fa4662c8182431 commit 8b6e12648964c5e06813de86f04f079d5f5d7891 Merge: 30840f2 2cd23bc Author: Wu-cheng Li Date: Wed Apr 7 22:10:13 2010 -0700 am 2cd23bc8: am 86efb382: am 22af928e: Merge "Update the code due to API change." into froyo commit 2cd23bc8e10b72bd822632379eeda2f7e2dc4abe Merge: b2895ab 86efb38 Author: Wu-cheng Li Date: Wed Apr 7 22:01:50 2010 -0700 am 86efb382: am 22af928e: Merge "Update the code due to API change." into froyo Merge commit '86efb382624e18e17631d927b9574dcbe8a4d802' into kraken * commit '86efb382624e18e17631d927b9574dcbe8a4d802': Update the code due to API change. commit 86efb382624e18e17631d927b9574dcbe8a4d802 Merge: 41b4dfb 22af928 Author: Wu-cheng Li Date: Wed Apr 7 21:58:17 2010 -0700 am 22af928e: Merge "Update the code due to API change." into froyo Merge commit '22af928e8dd42aa0b8e9efdbfdac80efe67c7d54' into froyo-plus-aosp * commit '22af928e8dd42aa0b8e9efdbfdac80efe67c7d54': Update the code due to API change. commit 22af928e8dd42aa0b8e9efdbfdac80efe67c7d54 Merge: 4a242f9 a9a6e57 Author: Wu-cheng Li Date: Wed Apr 7 21:55:11 2010 -0700 Merge "Update the code due to API change." into froyo commit 22021043781055e02391dc779d767570d901d509 Merge: 11bb384 6a7ec58 Author: Brian Muramatsu Date: Wed Apr 7 10:38:40 2010 -0700 Merge "Remove @BrokenTest MovieTest Annotations" into eclair commit 30840f2473bdd33bddc66e648877f2f23996f53e Author: Gilles Debunne Date: Tue Apr 6 17:05:21 2010 -0700 New CTS ExpandableListView tests moved from framework. The CTS tests were duplicates of the ones in framework, and were missing some recent additions. Everything has been merged in CTS. Change-Id: I735d87b4aaa750b76da24ece3d684f126b831fe8 http://b/issue?id=2541389 commit 94b366e5dac5062f9b51449f0e5f1df97d012deb Author: Brian Muramatsu Date: Tue Apr 6 15:41:41 2010 -0700 Fix Invalid Namespace CTS Issue Issue 6953 Add appNameSpace attributes so that individual tests of SignatureTest and ApiDemosTest can be run. Change-Id: I8b6b53d9a1231634ac7fae31a81faafe941e0b41 commit df56b8fd6e80dc2d9d487b86f5b71c54314ad475 Author: Brian Muramatsu Date: Thu Apr 1 14:18:22 2010 -0700 Remove internal.R References from AlertDialogBuilderTest Use methods on AlertDialog to get the buttons and the list view. Unfortunately delete the tests that use internal R resources that can't be replaced with any public calls like to get the resulting dialog's title... Change-Id: I98dfe298202802b162036a1ae6170efeff9e325f commit 3fca7751dcba65f7b42b5f3081e380b3121eda31 Merge: 18de2b2 b2895ab Author: Kenny Root Date: Mon Apr 5 16:21:11 2010 -0700 am b2895ab1: am 41b4dfbd: am 4a242f98: Merge "Revise Rfc822Tokenizer test\'s expected results" into froyo commit b2895ab1ad9248d13bbe34d520f684dbbbd21311 Merge: 694a76f 41b4dfb Author: Kenny Root Date: Mon Apr 5 16:07:38 2010 -0700 am 41b4dfbd: am 4a242f98: Merge "Revise Rfc822Tokenizer test\'s expected results" into froyo Merge commit '41b4dfbdda47e9b6794bd40181e61bc98615c86b' into kraken * commit '41b4dfbdda47e9b6794bd40181e61bc98615c86b': Revise Rfc822Tokenizer test's expected results commit 41b4dfbdda47e9b6794bd40181e61bc98615c86b Merge: 3fe646e 4a242f9 Author: Kenny Root Date: Mon Apr 5 16:00:08 2010 -0700 am 4a242f98: Merge "Revise Rfc822Tokenizer test\'s expected results" into froyo Merge commit '4a242f98fcf1dd0da11c1e6c0e865ca05bf5aa01' into froyo-plus-aosp * commit '4a242f98fcf1dd0da11c1e6c0e865ca05bf5aa01': Revise Rfc822Tokenizer test's expected results commit 4a242f98fcf1dd0da11c1e6c0e865ca05bf5aa01 Merge: 92f85ea 7cb2164 Author: Kenny Root Date: Mon Apr 5 15:53:00 2010 -0700 Merge "Revise Rfc822Tokenizer test's expected results" into froyo commit 7cb21642db80a53c07e9d23c2dc14127e8ade813 Author: Kenny Root Date: Mon Apr 5 15:41:08 2010 -0700 Revise Rfc822Tokenizer test's expected results Rfc822Tokenizer test was testing for incorrect results, but something was fixed that caused it to start working correctly. Changing the CTS test to reflect what the results should be. Bug: 2527655 Change-Id: I94f84aba20010bb8d82d55cd36332beac4769e6d commit 11bb3847c1a3bc94ef16daf8905f65efb4ce0e79 Author: Brian Muramatsu Date: Mon Apr 5 14:51:58 2010 -0700 Remove NinePatchDrawableTest NPE Checks The test was failing due to not throwing an exception for null padding. Remove other NPE checks since developers should not be passing nulls into them anyway. Change-Id: Ie024b5d5984e60bd7a83407e020525af3aa6e359 commit 18de2b24d3a013cd342f8fd73991bc617b979821 Merge: c3f7328 694a76f Author: Brian Muramatsu Date: Mon Apr 5 14:43:45 2010 -0700 am 694a76f1: am 3fe646e1: am 92f85eab: Merge "Fix KnownFailure TypefaceTest" into froyo commit c3f7328c9c4d1e9df2faa8c48ce69ebc69fee7c7 Merge: aaeb4a4 6ba74d9 Author: Brian Muramatsu Date: Mon Apr 5 14:43:40 2010 -0700 am 6ba74d92: am 9fccb0d9: am b00b01fa: Merge "Fix PopupWindowTest testUpdateDimension..." into froyo commit aaeb4a431ce496c6b3c4602541723cfd2ed8de69 Merge: daa2fd2 92e5e05 Author: Jeff Brown Date: Mon Apr 5 14:37:28 2010 -0700 am 92e5e059: am b1c8417f: am 284abbbc: Merge "Add a test for alarms with negative wakeup times." into froyo commit 694a76f114e9e50ec665c0e7f0fbe3b4e6df9539 Merge: 6ba74d9 3fe646e Author: Brian Muramatsu Date: Mon Apr 5 14:29:17 2010 -0700 am 3fe646e1: am 92f85eab: Merge "Fix KnownFailure TypefaceTest" into froyo Merge commit '3fe646e175c16779867ba3560f699496428bc732' into kraken * commit '3fe646e175c16779867ba3560f699496428bc732': Fix KnownFailure TypefaceTest commit 6ba74d92cad59cb91fd90107ce321fe49ebfcb42 Merge: 92e5e05 9fccb0d Author: Brian Muramatsu Date: Mon Apr 5 14:29:14 2010 -0700 am 9fccb0d9: am b00b01fa: Merge "Fix PopupWindowTest testUpdateDimension..." into froyo Merge commit '9fccb0d95fd5fbec3439a570ed8f8c8134cc7938' into kraken * commit '9fccb0d95fd5fbec3439a570ed8f8c8134cc7938': Fix PopupWindowTest testUpdateDimension... commit 92e5e05970a37941f4e0c144a2bebd98120805d2 Merge: 3b7a1b4 b1c8417 Author: Jeff Brown Date: Mon Apr 5 14:20:55 2010 -0700 am b1c8417f: am 284abbbc: Merge "Add a test for alarms with negative wakeup times." into froyo Merge commit 'b1c8417f14805d6f3f68a0ccb4d1bf3b63b25e17' into kraken * commit 'b1c8417f14805d6f3f68a0ccb4d1bf3b63b25e17': Add a test for alarms with negative wakeup times. commit 3fe646e175c16779867ba3560f699496428bc732 Merge: 9fccb0d 92f85ea Author: Brian Muramatsu Date: Mon Apr 5 14:20:52 2010 -0700 am 92f85eab: Merge "Fix KnownFailure TypefaceTest" into froyo Merge commit '92f85eabb498786d682eb9e8a0b8cf1be64a5778' into froyo-plus-aosp * commit '92f85eabb498786d682eb9e8a0b8cf1be64a5778': Fix KnownFailure TypefaceTest commit 9fccb0d95fd5fbec3439a570ed8f8c8134cc7938 Merge: b1c8417 b00b01f Author: Brian Muramatsu Date: Mon Apr 5 14:20:50 2010 -0700 am b00b01fa: Merge "Fix PopupWindowTest testUpdateDimension..." into froyo Merge commit 'b00b01fa66a6b93a0842b33f88bd63a66f2978eb' into froyo-plus-aosp * commit 'b00b01fa66a6b93a0842b33f88bd63a66f2978eb': Fix PopupWindowTest testUpdateDimension... commit 92f85eabb498786d682eb9e8a0b8cf1be64a5778 Merge: b00b01f 3766ebc Author: Brian Muramatsu Date: Mon Apr 5 14:16:50 2010 -0700 Merge "Fix KnownFailure TypefaceTest" into froyo commit b00b01fa66a6b93a0842b33f88bd63a66f2978eb Merge: 284abbb 171130b Author: Brian Muramatsu Date: Mon Apr 5 14:15:47 2010 -0700 Merge "Fix PopupWindowTest testUpdateDimension..." into froyo commit b1c8417f14805d6f3f68a0ccb4d1bf3b63b25e17 Merge: c233019 284abbb Author: Jeff Brown Date: Mon Apr 5 14:15:06 2010 -0700 am 284abbbc: Merge "Add a test for alarms with negative wakeup times." into froyo Merge commit '284abbbc82a36f0b0104f63fe0ca6d45ea7b64d7' into froyo-plus-aosp * commit '284abbbc82a36f0b0104f63fe0ca6d45ea7b64d7': Add a test for alarms with negative wakeup times. commit 284abbbc82a36f0b0104f63fe0ca6d45ea7b64d7 Merge: 55025ac be4b69b Author: Jeff Brown Date: Mon Apr 5 14:07:35 2010 -0700 Merge "Add a test for alarms with negative wakeup times." into froyo commit daa2fd25eea6d55243cf7c8af3c0f8066fbccc56 Merge: bccf979 3b7a1b4 Author: Ray Chen Date: Mon Apr 5 13:37:44 2010 -0700 am 3b7a1b48: am c2330190: am 55025acb: Merge "Fix issue#2557727 android.provider.cts.MediaStore_Images_MediaTest#testInsertImageWithImagePath is flaky. http://b/2557727" into froyo commit 3b7a1b48a42245b3336a559f69374af6517166f2 Merge: 0bd50a4 c233019 Author: Ray Chen Date: Mon Apr 5 13:26:11 2010 -0700 am c2330190: am 55025acb: Merge "Fix issue#2557727 android.provider.cts.MediaStore_Images_MediaTest#testInsertImageWithImagePath is flaky. http://b/2557727" into froyo Merge commit 'c2330190f0cf59bc5b42694a226f56270609eb22' into kraken * commit 'c2330190f0cf59bc5b42694a226f56270609eb22': Fix issue#2557727 android.provider.cts.MediaStore_Images_MediaTest#testInsertImageWithImagePath is flaky. commit c2330190f0cf59bc5b42694a226f56270609eb22 Merge: ac0668b 55025ac Author: Ray Chen Date: Mon Apr 5 13:20:18 2010 -0700 am 55025acb: Merge "Fix issue#2557727 android.provider.cts.MediaStore_Images_MediaTest#testInsertImageWithImagePath is flaky. http://b/2557727" into froyo Merge commit '55025acb6e492a8c260a45525f62b808f9280ecc' into froyo-plus-aosp * commit '55025acb6e492a8c260a45525f62b808f9280ecc': Fix issue#2557727 android.provider.cts.MediaStore_Images_MediaTest#testInsertImageWithImagePath is flaky. commit 55025acb6e492a8c260a45525f62b808f9280ecc Merge: a362c7e a19621d Author: Ray Chen Date: Mon Apr 5 13:14:27 2010 -0700 Merge "Fix issue#2557727 android.provider.cts.MediaStore_Images_MediaTest#testInsertImageWithImagePath is flaky. http://b/2557727" into froyo commit bccf97904725dd1eb07e96f456fbdaba71881594 Merge: 658a709 0bd50a4 Author: Jesse Wilson Date: Mon Apr 5 11:51:33 2010 -0700 am 0bd50a4e: am ac0668b8: am a362c7ec: Merge "Fix XmlEncodingTest to succeed when optional fields are supplied." into froyo commit 0bd50a4e6db07197aa8abdffcf052edc92181156 Merge: 6b17e7a ac0668b Author: Jesse Wilson Date: Mon Apr 5 11:38:13 2010 -0700 am ac0668b8: am a362c7ec: Merge "Fix XmlEncodingTest to succeed when optional fields are supplied." into froyo Merge commit 'ac0668b8a0d1ff8c1816bfd1e6525b929ce5572f' into kraken * commit 'ac0668b8a0d1ff8c1816bfd1e6525b929ce5572f': Fix XmlEncodingTest to succeed when optional fields are supplied. commit ac0668b8a0d1ff8c1816bfd1e6525b929ce5572f Merge: 1c0cfad a362c7e Author: Jesse Wilson Date: Mon Apr 5 11:31:57 2010 -0700 am a362c7ec: Merge "Fix XmlEncodingTest to succeed when optional fields are supplied." into froyo Merge commit 'a362c7ec64cb24fa1be47790a930b608c8e8bb5a' into froyo-plus-aosp * commit 'a362c7ec64cb24fa1be47790a930b608c8e8bb5a': Fix XmlEncodingTest to succeed when optional fields are supplied. commit a362c7ec64cb24fa1be47790a930b608c8e8bb5a Merge: 20622a8 60a3331 Author: Jesse Wilson Date: Mon Apr 5 11:27:24 2010 -0700 Merge "Fix XmlEncodingTest to succeed when optional fields are supplied." into froyo commit 658a709d4ed9045cc29090d4ad218d7b6ed8a627 Merge: a01dab5 6b17e7a Author: Brett Chabot Date: Mon Apr 5 11:10:31 2010 -0700 am 6b17e7ae: (-s ours) am 1c0cfadc: (-s ours) DO NOT MERGE. cherry pick cts change from master to fix build commit 6b17e7ae5b47542a46da81d20c45a9975237612e Merge: 757ca14 1c0cfad Author: Brett Chabot Date: Mon Apr 5 10:57:45 2010 -0700 am 1c0cfadc: (-s ours) DO NOT MERGE. cherry pick cts change from master to fix build Merge commit '1c0cfadc909d1931b309b1a7d1d182b700fc1eab' into kraken * commit '1c0cfadc909d1931b309b1a7d1d182b700fc1eab': DO NOT MERGE. cherry pick cts change from master to fix build commit 1c0cfadc909d1931b309b1a7d1d182b700fc1eab Author: Brett Chabot Date: Fri Mar 26 18:03:59 2010 -0700 DO NOT MERGE. cherry pick cts change from master to fix build Adjust cts tests to ddms testrunner IOException API change. Change-Id: I0257c253538afc3f0135efdaa708211bf0f517fb commit a9a6e570a21f388319d608353dfaccf8a57051b7 Author: Wu-cheng Li Date: Sun Apr 4 15:07:54 2010 +0800 Update the code due to API change. bug:2553570 Change-Id: I139797c4233827fcc84103f9bf463ecd0263bc65 commit a01dab5bf7a10850cddc521565cf26cc7a566dbc Merge: 29a71f1 757ca14 Author: Brett Chabot Date: Fri Apr 2 12:58:27 2010 -0700 am 757ca14f: (-s ours) DO NOT MERGE. cherry pick cts change from master to fix build commit 757ca14f4b58b2e3f2a98aaaf0577439aecb4e03 Author: Brett Chabot Date: Fri Mar 26 18:03:59 2010 -0700 DO NOT MERGE. cherry pick cts change from master to fix build Adjust cts tests to ddms testrunner IOException API change. Change-Id: I02516a858a1fb5de41f979ead4b77b9780c03294 commit 29a71f10098f4957d1ec7c44be81165ab24eb02d Merge: 00303b0 2e93911 Author: Adam Powell Date: Fri Apr 2 11:32:45 2010 -0700 am 2e939114: am 20622a8f: Merge "Fix bug 2557891 - incorrect cts test." into froyo commit 00303b0b71c23d2c4b4399c173c1fea48fed2a9a Merge: 60631fe ff2ecad Author: Brett Chabot Date: Fri Apr 2 11:29:54 2010 -0700 Merge "Adjust cts tests to ddms testrunner IOException API change." commit 2e9391148f83bc7bbacbbda71266ed13cc9df6f5 Merge: 68376ce 20622a8 Author: Adam Powell Date: Fri Apr 2 11:21:19 2010 -0700 am 20622a8f: Merge "Fix bug 2557891 - incorrect cts test." into froyo Merge commit '20622a8f2a2a29d2ff81e02aa28c0cf37b34ea56' into kraken * commit '20622a8f2a2a29d2ff81e02aa28c0cf37b34ea56': Fix bug 2557891 - incorrect cts test. commit 20622a8f2a2a29d2ff81e02aa28c0cf37b34ea56 Merge: b4423a9 15a4e0f Author: Adam Powell Date: Fri Apr 2 11:11:42 2010 -0700 Merge "Fix bug 2557891 - incorrect cts test." into froyo commit 15a4e0f277547b4e036cdcfcd3a5902c057bd256 Author: Adam Powell Date: Thu Apr 1 13:15:39 2010 -0700 Fix bug 2557891 - incorrect cts test. Change-Id: I531d07453567d8a01c73224c76a5b397422b8c44 commit 60631fe201ca77a6a997f672de10c6bede72174c Merge: 905aa07 68376ce Author: Glenn Kasten Date: Thu Apr 1 23:48:22 2010 -0700 am 68376ce4: am b4423a9d: Merge "Use a fixed ringtone provided with the test case in resource folder. Bug: 2557533" into froyo commit 6a7ec58bf4b1e916704c4896d2aef659664ad763 Author: Brian Muramatsu Date: Thu Apr 1 18:59:40 2010 -0700 Remove @BrokenTest MovieTest Annotations Bug 1790416 Remove the annotations because the tests work now. Change-Id: Ib01416ea66a31a81884b9dfb196de21ed8c64041 commit 68376ce4e764fcf8889477ab9d864208992962e5 Merge: ca47c10 b4423a9 Author: Glenn Kasten Date: Thu Apr 1 17:50:57 2010 -0700 am b4423a9d: Merge "Use a fixed ringtone provided with the test case in resource folder. Bug: 2557533" into froyo Merge commit 'b4423a9d661ba6f2707270bdac0208a006a8b161' into kraken * commit 'b4423a9d661ba6f2707270bdac0208a006a8b161': Use a fixed ringtone provided with the test case in resource folder. commit 60a33317b302b394c1dcce296e8901717c08a72e Author: Jesse Wilson Date: Thu Apr 1 16:36:05 2010 -0700 Fix XmlEncodingTest to succeed when optional fields are supplied. Change-Id: I50ec88f3d40884c4be0329a38d0e43b926b36024 commit b4423a9d661ba6f2707270bdac0208a006a8b161 Merge: 25c264d cc01a6b Author: Glenn Kasten Date: Thu Apr 1 15:22:37 2010 -0700 Merge "Use a fixed ringtone provided with the test case in resource folder. Bug: 2557533" into froyo commit a19621d5989837f7e988d6bfc6304895998aa18b Author: Ray Chen Date: Tue Mar 30 16:11:26 2010 -0700 Fix issue#2557727 android.provider.cts.MediaStore_Images_MediaTest#testInsertImageWithImagePath is flaky. http://b/2557727 Change-Id: Ia0375a14fba6c3b329687b6a4b4d7cb95a19c932 commit 905aa07b9c8ac30f2e5d2369f56c5f46ffe01b22 Merge: 88599e8 ca47c10 Author: Brian Muramatsu Date: Thu Apr 1 14:28:34 2010 -0700 am ca47c103: (-s ours) am 25c264de: (-s ours) Merge "DO NOT MERGE Suppress NinePatchTest testHasAlpha" into froyo commit ca47c103977f4e2de07668d953d5d02bf6bfc7a3 Merge: 88599e8 25c264d Author: Brian Muramatsu Date: Thu Apr 1 14:16:40 2010 -0700 am 25c264de: (-s ours) Merge "DO NOT MERGE Suppress NinePatchTest testHasAlpha" into froyo Merge commit '25c264de6d349acd3a8fe257d0d3ee9ad1fa3bde' into kraken * commit '25c264de6d349acd3a8fe257d0d3ee9ad1fa3bde': DO NOT MERGE Suppress NinePatchTest testHasAlpha commit 25c264de6d349acd3a8fe257d0d3ee9ad1fa3bde Merge: 88599e8 1d81d26 Author: Brian Muramatsu Date: Thu Apr 1 14:06:45 2010 -0700 Merge "DO NOT MERGE Suppress NinePatchTest testHasAlpha" into froyo commit 88599e89bb0af3a5dbb860a6e5f47ca787ecf6af Merge: ccda68a 1998be0 Author: Kristian Monsen Date: Thu Apr 1 11:45:03 2010 -0700 Merge "Fix for b 2558942" into froyo commit 1d81d26df9fb4223c33dc54d74f21dbd9f8c286b Author: Brian Muramatsu Date: Thu Apr 1 11:16:44 2010 -0700 DO NOT MERGE Suppress NinePatchTest testHasAlpha Suppress the test for just this release. Change-Id: If713eac142a7513edd93e8c997e845611b1b75d6 commit 1998be04880030dfa5a8ba80237155b3c394a56e Author: Kristian Monsen Date: Wed Mar 31 18:56:22 2010 +0100 Fix for b 2558942 Updated the test instead of fixing webview. I think there can be many reasons why some pixels are a bit off since this has been rendered to a real display. This should check that the image is mostly the same, but allowing for some error. Also improved the logic a bit. Change-Id: I9d7f412f7109d4854f34556e38a3b4f3b460710b commit cc01a6b7c70150a6609908fbd225c4feda5b78a9 Author: Glenn Kasten Date: Thu Apr 1 11:11:20 2010 -0700 Use a fixed ringtone provided with the test case in resource folder. Bug: 2557533 The file was created using the command: "sox -n -r 8000 -c 1 john_cage.ogg trim 0 433". This solves the problem of being dependent on the current OEM ringtone in position 0, and the length is long enough that isPlaying() should still be true. Change-Id: Ic7e304cf3892fee6de02707bf57efc1b00c7e152 commit ccda68add1ff13ff0a6a069314a311ea114dd5ad Merge: 146abb8 799b051 Author: Brian Muramatsu Date: Thu Apr 1 10:50:51 2010 -0700 Merge "Delete AutoCompleteTextViewTest testOnWindowFocusChanged" into froyo commit 146abb85ce5bba7e2f91adef4aa060a1a01f3789 Merge: afd6bd0 06514aa Author: Glenn Kasten Date: Thu Apr 1 09:41:32 2010 -0700 Merge "Change test case to match new API behavior. Bug: 2557533" into froyo commit afd6bd084035ff815445e42e5d89fc8a0a2f04d8 Merge: 8ac9cae 2ea6918 Author: Kristian Monsen Date: Thu Apr 1 02:46:34 2010 -0700 Merge "Fix for b 2558949" into froyo commit 171130b522afb7b2729c93a93d8e9978fb918cb8 Author: Brian Muramatsu Date: Wed Mar 31 17:25:44 2010 -0700 Fix PopupWindowTest testUpdateDimension... Bug 2558723 The test was calling PopupWindow.update(4, 6, -1, -1) and expected it not change the location because width and height are being set to -1. Fix the test to make sure the location is actually changed as described in the JavaDoc. Change-Id: Ibcb5063ffc88d0425e6c26cabd3d9b76a0c40035 commit 799b05108a00f86f3e05292972a2e308b2b19c84 Author: Brian Muramatsu Date: Wed Mar 31 16:18:43 2010 -0700 Delete AutoCompleteTextViewTest testOnWindowFocusChanged Bug 2558459 onWindowFocusedChanged does not invoke the validator so remove the test. Another test case in this test covers performing validation when the view loses focus. Change-Id: Ia93f9122391c26f6e8deaab22cb5d4551b6572f5 commit 06514aa859d54f3f1560345a0d7c839189d9c901 Author: Glenn Kasten Date: Wed Mar 31 15:46:10 2010 -0700 Change test case to match new API behavior. Bug: 2557533 Change-Id: I4eadb1fc9d4418c3d7a19a236dce1839bc315cd2 commit be4b69b91438b79a58e90030a1b9b93e545d94f0 Author: Jeff Brown Date: Wed Mar 31 15:35:24 2010 -0700 Add a test for alarms with negative wakeup times. This is a regression test to ensure that alarms with negative wakeup times are immediately triggered. Bug: b/2558820 Change-Id: I811096cbdf2ed91f0b3b6f2a3bd53e25dc592795 commit 8ac9cae79f735bef473520c4675e666eb99f6820 Merge: 516eed5 9c3b459 Author: Brian Muramatsu Date: Wed Mar 31 15:24:56 2010 -0700 Merge "Fix TextViewText for QVGA Screens" into froyo commit 516eed552ac2de13fe1009910cbc910669e3754b Merge: c73b93e f7301da Author: Brett Chabot Date: Wed Mar 31 15:19:07 2010 -0700 Merge "Add cts hardware to tests build and annotate tests." into froyo commit c73b93ea4616ba697e2daab64b48664d72ff1560 Merge: 7073540 e9ff54a Author: Brian Muramatsu Date: Wed Mar 31 15:07:10 2010 -0700 Merge "Fix View_AnimationTest testClearDuringAnimation" into froyo commit 7073540391ee1b9b2e480d2ba08f50d7340fef27 Merge: 9aeea64 719bcd0 Author: Brian Muramatsu Date: Wed Mar 31 15:04:05 2010 -0700 Merge "Delete RatingBarTest OnMeasureSpec Test" into froyo commit 9aeea64eecba82619a029e18ad98d2223184c071 Merge: ca57b5c ffa439b Author: Brian Muramatsu Date: Wed Mar 31 15:00:27 2010 -0700 Merge "Delete Gallery testDispatchSetSelected" into froyo commit 2ea69180d26ceaff405a3c7c79378cda8900facd Author: Kristian Monsen Date: Wed Mar 31 20:12:46 2010 +0100 Fix for b 2558949 When we are loading a url history being null, we give the default name about:blank. This is due to change I832351ce1e0016b00e924a2f9b0097ae15fba34a, which was to fix bug 2522457. Change-Id: Id7c09af51510e7e30bd07efd278d126e9433b40e commit ca57b5c4d8165443bcb26939021bd96df3a4a3f4 Merge: 3e7d06f fb2a5c8 Author: Brett Chabot Date: Wed Mar 31 10:24:31 2010 -0700 Merge "Add more debug info to user agent string test." into froyo commit 3e7d06f254fddeaa43ebc2d25def50bbd10754d8 Merge: e5a5a3c d377363 Author: Brett Chabot Date: Wed Mar 31 10:24:26 2010 -0700 Merge "Remove more CTS checks for null args in constructors." into froyo commit e5a5a3cd1ad72fe8417b373e243ff3a28a03dcee Merge: 5da787c f4cd3ff Author: Brett Chabot Date: Wed Mar 31 10:24:21 2010 -0700 Merge "Fix ScrollViewTest testSmoothScrollBy and testSmoothScrollTo." into froyo commit 5da787cef41ba4229dccd7c0dd75d2bb9d48d225 Merge: 919e2f9 5e61b7f Author: Brett Chabot Date: Wed Mar 31 10:24:15 2010 -0700 Merge "Fix TimePickerTest#testOnSaveInstanceStateAndOnRestoreInstanceState." into froyo commit 919e2f9050b33d87cbf3853deec0a56ba58a7797 Merge: 346e02e cde5f64 Author: Brett Chabot Date: Wed Mar 31 10:24:09 2010 -0700 Merge "Fix ImageViewTest#testClearColorFilte" into froyo commit 346e02e33a2e1ff837a89a0b787a9d0293fcee05 Merge: 6630a02 db8830c Author: Brett Chabot Date: Wed Mar 31 10:23:57 2010 -0700 Merge "Remove null argument constructor checks from AbsoluteLayoutTest." into froyo commit 6630a029b63d70a2fe9219042b1bfdddef1ef7e8 Author: Leon Clarke Date: Wed Mar 31 16:42:56 2010 +0100 Bug:2558169 Initialise the new window to allow javascript, or we aren't able to manipulate it from javascript. We've changed the behavior of focus requests; we now only allow javascript to generate focus requests in response to user gestures. As a result, we no longer expect the focus request in this test to be allowed. commit f7301dad2df504ab0ac0a1303469d5d06552daa4 Author: Brett Chabot Date: Tue Mar 30 19:48:41 2010 -0700 Add cts hardware to tests build and annotate tests. Bug 2557864 Change-Id: I5bb406c9504149950c52c949dd7e28013db28fb0 commit fb2a5c836ab6b7db9d5088507dd33d8dd1a1acf8 Author: Brett Chabot Date: Tue Mar 30 19:32:55 2010 -0700 Add more debug info to user agent string test. Change-Id: I67bd63d48e31ad2e530d39bfb326454b70d9dc92 commit d377363e70b1f3d4a49b4e57d6fcd5a62eaf93c3 Author: Brett Chabot Date: Tue Mar 30 19:31:22 2010 -0700 Remove more CTS checks for null args in constructors. Change-Id: Iaaa49d0ddd6a9eaf34178c725007516e9a963301 commit f4cd3ffc5f94cb9e96cb84c3b608c8ceaddd5614 Author: Brett Chabot Date: Tue Mar 30 19:28:17 2010 -0700 Fix ScrollViewTest testSmoothScrollBy and testSmoothScrollTo. Change test to expect the X position to not scroll. Bug 2558855 Change-Id: If4bb8a1370209361c64a747f208246f009af2131 commit 5e61b7f2aad3f051e5521235220605e6453e94a0 Author: Brett Chabot Date: Tue Mar 30 18:06:06 2010 -0700 Fix TimePickerTest#testOnSaveInstanceStateAndOnRestoreInstanceState. Wrap hour and minute values to avoid overflows. Bug 2558891 Change-Id: I2f5dc70ec6423b8c5ea6d2ab32a349c533a6d654 commit cde5f64db8bc01d77577b69176419e61c8822c17 Author: Brett Chabot Date: Tue Mar 30 17:04:50 2010 -0700 Fix ImageViewTest#testClearColorFilte Bug 2558669 Change-Id: I6de5ed3ef25877bc518cfd97a8d5bbb88324d9c3 commit ffa439bfca7d15ee4d9e203d39e87a1cc0432dd1 Author: Brian Muramatsu Date: Tue Mar 30 16:59:37 2010 -0700 Delete Gallery testDispatchSetSelected Bug 2558585 Delete testDispatchSetSelected since it is testing a no-op method. Change-Id: I1fa72f5b027c36ba292f6397a6d29851ba269ad2 commit 719bcd0dfdbe2c015746dc9738390c59c53f8268 Author: Brian Muramatsu Date: Tue Mar 30 10:51:22 2010 -0700 Delete RatingBarTest OnMeasureSpec Test Bug 2467320 The test checked that the rating bar was a certain width and height, which caused problems on some LDPI devices. Just delete the test, because the width and height is something that depends on what images the device uses for ratings. Change-Id: Ida3f9598f3438c3fadef212122712a7993bbba2e commit e9ff54a036a3d9491cda9d5d7af6e17c9f26cc50 Author: Brian Muramatsu Date: Tue Mar 30 16:07:40 2010 -0700 Fix View_AnimationTest testClearDuringAnimation Calling view.clearAnimation calls Animation.detach which sets the Animation's mEnd member to true. Thus, assert that Animation.hasEnded returns true rather than false. Also check that getAnimation returns null as part of calling clearAnimation... Change-Id: I0db1900e890f7aadc931c2579c42eb003f3aba0d commit db8830c76071504148154304a902033c690a6df9 Author: Brett Chabot Date: Tue Mar 30 16:04:41 2010 -0700 Remove null argument constructor checks from AbsoluteLayoutTest. Change-Id: Ic29e418ff9776658aba25a3730e56d32d690e1b3 commit ae137b928fb217887f4f60eb96b12e24018ebf24 Merge: fd71039 54e1a89 Author: Vasu Nori Date: Tue Mar 30 15:55:19 2010 -0700 Merge "fix cts test breakage after recent change re: cursor materializationo" into froyo commit 54e1a89d79d348b5a3762ac4a81761792ef46a90 Author: Vasu Nori Date: Tue Mar 30 15:38:14 2010 -0700 fix cts test breakage after recent change re: cursor materializationo bug:2557336 bug:2557324 Change-Id: Ic76cd4d36d8f6c798dcda78b816987ce6c8cf178 commit 24b1575f9bf6898257cdec9deb2db9ea5c8dbb52 Author: Rodrigo Damazio Bovendorp Date: Tue Mar 30 18:37:29 2010 -0300 Fixing test Change-Id: I6724a1020c9eb0f25b64b31571f5d57f0b576fcf commit fd710390ffd1ce240271d3f14e61ebb8c11dca14 Merge: f87fdb1 aa34046 Author: Brett Chabot Date: Tue Mar 30 14:27:45 2010 -0700 Merge "Remove View(null) checks from ViewTest." into froyo commit aa34046a29b9f6ff98d86c0d85e7d161bcce0c53 Author: Brett Chabot Date: Tue Mar 30 13:59:21 2010 -0700 Remove View(null) checks from ViewTest. Bug 2557829 Change-Id: Ic8fe675236f7a1c191473778f4a94cfc2aa32cdf commit f87fdb1e3311199555709b61c8ad526691a49791 Merge: 410ea07 f6e0aac Author: Brian Muramatsu Date: Tue Mar 30 13:59:21 2010 -0700 Merge "Clean Up ViewStubTest" into froyo commit 9c3b459233e30a88d24e7178cc7514731fa56f55 Author: Brian Muramatsu Date: Mon Mar 29 17:40:48 2010 -0700 Fix TextViewText for QVGA Screens Bug 2493228 Delete the useless tests that used Integer.MAX when setting widths and heights which were causing overflows for QVGA devices. Also took out the -1 test cases since their behavior is not defined in the SDK at all. Change-Id: Ic9c88772d9def271d755c11f3b967f46373a4079 commit f6e0aac2f1cfa1a6c56dd38bcbb1b0f8d767ed5d Author: Brian Muramatsu Date: Mon Mar 29 11:22:06 2010 -0700 Clean Up ViewStubTest Remove some more null constructor checks to get rid of @ToBeFixed. Get rid of testDispatchDraw which doesn't test anything. Get rid of another @KnownFailure as it is now fixed. Change-Id: Ic3b6465fee970c44078db0a32e9db0830c8f78d0 commit 3766ebc3cfb718ea57f35e18b2c7c36867bc5dbf Author: Brian Muramatsu Date: Mon Mar 29 10:58:57 2010 -0700 Fix KnownFailure TypefaceTest This test was failing due to the generated image not matching the expected image. It is very difficult to see any difference between the two images though, because the generated one differs by 1 pixel in certain areas. Replace the expected image with the current one being generated and remove the KnownFailure annotation. Change-Id: Iac4f14ef23f4f3edc5a78de6165ebfe1a3c9036a commit 410ea0765730bd258220348c336a267ac2931611 Author: Wu-cheng Li Date: Mon Mar 29 16:43:36 2010 +0800 Add cts test for zoom. bug:2458926 Change-Id: I37d414ef4f1caadd3e4799dca1bcb022a31b7d8f commit ff2ecad5e3e5ac77204570c4cfc1160083301663 Author: Brett Chabot Date: Fri Mar 26 18:03:59 2010 -0700 Adjust cts tests to ddms testrunner IOException API change. Change-Id: I4465e28d7415038864e8ce78325d7f64a6592973 commit e458cce47ae52437ab2c476fe4b62d6146a4d5fe Merge: 0652681 2110df9 Author: Amith Yamasani Date: Thu Mar 25 15:57:39 2010 -0700 Merge "Fix CTS test for system settings. Bug: 2527622" commit 2110df92d23236b79573dbb8a114502fe75b8c9a Author: Amith Yamasani Date: Thu Mar 25 14:43:15 2010 -0700 Fix CTS test for system settings. Bug: 2527622 There's no guarantee that the font_scale property is already present in the db. Test the config change separately from the count test. commit 06526819255f826aee8935256661d36e90dece31 Merge: 55ebb6a f5cebe5 Author: Brian Muramatsu Date: Thu Mar 25 10:40:27 2010 -0700 Merge "Fix buildCts.py Source Path" commit 55ebb6a2f4ebb32784e01eb323414a99d8fc1117 Author: Wu-cheng Li Date: Thu Mar 25 17:34:41 2010 +0800 Fix a potential bug of CameraTest. Looper.quit() is asynchronous. The looper may still has some preview callbacks in the queue after quit is called. The preview callback still uses the camera object (setHasPreviewCallback). After camera is released, RuntimeException will be thrown from the method. So we need to join the looper thread here. bug:2521202 Change-Id: I0ab74f657e3df3ff624a10763cb0a71cc07c691f commit 11b14f8220ddc529aaa506d883d1e44ff06c6f95 Merge: 71a3752 06d1224 Author: Gilles Debunne Date: Wed Mar 24 18:18:37 2010 -0700 Merge "Fix in ScrollerTest testGetDuration." commit 71a3752e04437f140f28bf8cedb3d10ffeb2c4bc Merge: af893b5 5129aca Author: Vasu Nori Date: Wed Mar 24 18:16:41 2010 -0700 Merge "reduce data inserted/selected in long tests to 1/4th" commit f5cebe5104283c12929b65c60882ef56e32cb0f5 Author: Brian Muramatsu Date: Wed Mar 24 18:09:57 2010 -0700 Fix buildCts.py Source Path The buildCts.py script runs a JavaDoc command over the Android java packages with a custom doclet that generates XML files that CTS uses to create its test plans. Unfortunately, JavaDoc decides to ignore a class if one of the classes in its inheritance hierarchy is not found. Since the source path for frameworks/base/test-runner was incorrect, all ActivityInstrumentationTestCases were being excluded from the build. Fixing the source path should add roughly 1500 tests back into the CTS. Change-Id: I4f7c0c9d4a25c45b46390254ca94e0806a8e43cd commit 5129acac83c6328501111432dae75c542065224f Author: Vasu Nori Date: Wed Mar 24 18:06:29 2010 -0700 reduce data inserted/selected in long tests to 1/4th to address bug:2541403 change the datasize to 1/4th so that the test execute within the 5 min limit observed by CTS test runner. Change-Id: I95e1a3c4188c9265ece940fc6a4faa2d21552056 commit 06d1224e5c892e7f62cfec1b611e050f98639447 Author: Gilles Debunne Date: Wed Mar 24 17:43:44 2010 -0700 Fix in ScrollerTest testGetDuration. Increased max and reduced speed to prevent a zero duration due to rounding. Change-Id: I22502171906534e405398901066ee48628d939a6 http://b/issue?id=2541454 commit af893b569c805e0b1fcefe4353ed598ec708d86f Author: Gilles Debunne Date: Wed Mar 24 15:41:42 2010 -0700 Fixed ScrollerTest testGetDuration. The duration is actually now 0 when min and max are equal. Changed max to 1 on x. Change-Id: Iea721e126e041664fccef13ba52dd854caa5b048 http://b/issue?id=2541454 commit 9494eb2770f8b89248d1da3957190e039bd34b8a Merge: 30e770d da6dfe6 Author: Gilles Debunne Date: Wed Mar 24 16:02:59 2010 -0700 Merge "Fixed HeaderViewListAdapterTest" commit da6dfe603f8e6aa245a6e72e9eee60d5e5db0cb1 Author: Gilles Debunne Date: Wed Mar 24 15:41:42 2010 -0700 Fixed HeaderViewListAdapterTest Tests on invalid positions removed since the behavior is undefined. Change-Id: I01e9756685d746af0c39acf275b279b42a2204e0 http://b/issue?id=2527753 commit 30e770d7d03f67c6ac00512570ad2057e21997d2 Author: Gilles Debunne Date: Tue Mar 23 17:35:00 2010 -0700 Fixed CTS ExpandableListView position test. The test was using invalid positions in getExpandableListPosition. These now return PACKED_POSITION_VALUE_NULL. The hardcoded long encoding of the packed position has also been replaced by a call to ExpandableListView.getPackedPositionForChild http://b/issue?id=2527704 Change-Id: I7ce7d43908ca48cc1e4ab3c127af95b71785e759 commit d128d7b79db6c6c44c1b383fe58da12dc90a7ef9 Merge: bb96d37 c6aa732 Author: Brian Muramatsu Date: Wed Mar 24 12:39:32 2010 -0700 Merge "Catch RunTimeExceptions in SignatureTest" commit bb96d37dd68867c7d5ce159e5709bfaf0d15704e Merge: 3ab33b7 4d18f0e Author: Brett Chabot Date: Wed Mar 24 12:33:24 2010 -0700 Merge "Remove KnownFailure tag from AvoidXfermodeTest:testAvoidXfermode." commit 4d18f0e3b81e77f0f4a49c15563ae5e7ea2c978c Author: Brett Chabot Date: Wed Mar 24 12:28:15 2010 -0700 Remove KnownFailure tag from AvoidXfermodeTest:testAvoidXfermode. Bug 2136225 Change-Id: I9ffb5c0551d5f0bc2e1228a76ce07b172d7ead5a commit 3ab33b7014b952307dc2b1bd5085686cd843842f Author: Mike Reed Date: Wed Mar 24 15:27:37 2010 -0400 fix 2 indices for rotating about axis 1, and use the tolerance test when comparing floats Change-Id: Ida48b52bcd9a101cf2585fa33bd0602022ffae91 commit 33d66d69997986ee55b19ab216756e6df04b8fe1 Author: Jean-Baptiste Queru Date: Wed Mar 24 09:48:46 2010 -0700 test (no-op) Change-Id: I8658d17743b20dd7193b7700052acef58129dc6c commit 965baa36312f4bfcb8bde32974e3eea379b322a6 Author: Wu-cheng Li Date: Tue Mar 23 15:28:36 2010 +0800 Add cts tests for PreviewCallbackWithBuffer. bug:2358064 Change-Id: Ib163b2bb712831ba540f93c025f6c5bf9c5fd9e5 commit c6aa7328eedd4f17b42da801ac97aa2f8e1c4dde Author: Brian Muramatsu Date: Mon Mar 22 18:23:26 2010 -0700 Catch RunTimeExceptions in SignatureTest SignatureTest was throwing a RunTimeException, because the current.xml has a private class. The exception caused SignatureTestActivity to not return a result bundle, which then caused CTS to claim the test timed out. Thus, catch the exceptions and classify them under the existing CAUGHT_EXCEPTION failure type. Add an extra parameter to the load methods so that the error messages give some sort've clue as to where the problem in the XML is. Change-Id: I7006031420fc9901e11c0e5b400ab1ec2f0012e2 commit 650c603ff4b496aadd9780d788bdfee35dda4195 Author: Patrick Scott Date: Fri Mar 19 15:38:13 2010 -0400 Remove log statement. Change-Id: Ib5531f4629f64220823b301d313e9bc23d946427 commit a3c96ef7e373003b271be3ffe58a27f92eee1051 Merge: 0538d1f b85a106 Author: Brett Chabot Date: Thu Mar 18 19:56:48 2010 -0700 Merge "Omit passive provider from testReplaceRealProvidersWithMocks test." commit 0538d1fdd5bc6f07f512a2787036426f8acd5701 Author: Brett Chabot Date: Thu Mar 18 14:50:58 2010 -0700 Adjust AudioManagerTest#testVolume to check for new silent vs vibrate behavior. Since System.VIBRATE_IN_SILENT is not part of public API, test has been changed to check that either vibrate or silent mode is active when volume is adjusted to zero. Related framework changes: I14cf91b0 Change-Id: I4e61705c7177601c6251a1a13198ce0f4f19bf69 commit b85a106b167f1270a64ddeb9c9d91c5c6810c4b5 Author: Brett Chabot Date: Thu Mar 18 14:23:54 2010 -0700 Omit passive provider from testReplaceRealProvidersWithMocks test. Bug 2483674 Change-Id: I552263e25e148c5911249e8cbf897840bc03b41a commit 640f28b198f8edbc9fb0e2c0c3b383b389a9e4da Merge: 6ea21cf ecf0797 Author: Brian Muramatsu Date: Wed Mar 17 14:54:09 2010 -0700 Merge "Fix ViewAnimatorTest's testConstructor Test" commit ecf0797261e5152c3e804b8dbf7f99eab5518c5c Author: Brian Muramatsu Date: Tue Mar 16 15:35:47 2010 -0700 Fix ViewAnimatorTest's testConstructor Test Remove a line in the test that expected the constructor to work with a null Context. Also remove the subsequent line that tried to test two null arguments, since throwing a NPE is not a behavior that needs to be expected and enforced. Leave the remaining tests, since they do test that nothing blows up when given all non-null arguments. Change-Id: I0ae638310970fca061c9e6145f5a2b2e05d464e3 commit 6ea21cf48ab80b60ca057f6b647fa868e5e01721 Merge: 2e0fcd8 42a7d80 Author: Fabrice Di Meglio Date: Mon Mar 15 16:54:55 2010 -0700 Merge "Add unit tests for AccountManager.hasFeatures()" commit 42a7d8079bd8bcbbe32a7a0c5326b1591cbbf594 Author: Fabrice Di Meglio Date: Mon Mar 15 12:39:03 2010 -0700 Add unit tests for AccountManager.hasFeatures() Change-Id: I0cdf9759526ed78f5e67b6981ad88c219271f2dd commit 2e0fcd8ce58120fac16c3ea18e686f64c2a0dac7 Merge: fee699e a2fa521 Author: Ray Chen Date: Mon Mar 15 10:49:31 2010 -0700 Merge "Add assertion for GPSProcessingMethod EXIF tag." commit fee699e35d25db52e20948f1b13c3e323dd8295a Author: Dianne Hackborn Date: Fri Mar 12 10:53:01 2010 -0800 Fix (and extend) some broken tests. Remaining fixes for issue #2483335: android.content.res.cts.ConfigurationTest test's are failing Change-Id: I3f68255a0ec5687e87e0b9950528792ffb3c9e98 commit a2fa521caf65926ed68a8d280df30ce0a1639864 Author: Ray Chen Date: Wed Mar 10 15:07:22 2010 -0800 Add assertion for GPSProcessingMethod EXIF tag. Change-Id: Ib6e55efa1079c9b267f000d6279b3bfb3b8d934e commit 26d49be7708dae2d53f29ec5c166ef6c75566a84 Author: Bjorn Bringert Date: Wed Mar 10 15:44:24 2010 +0000 Fix failing and disabled SearchManager CTS tests The tests were really messy, and used fixed timeouts and Thread.sleep(). Rewrote them to use a Handler to postpone checks until after the search dialog has had time to show / hide. This fixes the failing testSetOnCancelListener test, and reinstates the disabled testStopSearch test. Fixes http://b/issue?id=2483047 Change-Id: If2b6d6645f6380fefffa4ac018dfb773d012a0b1 commit dfb26176839bc0727c4eec422f7579d9af2df948 Merge: ba4429a 3067232 Author: Fabrice Di Meglio Date: Tue Mar 9 15:40:29 2010 -0800 Merge "Fix bug #2483073 (cts.ContentResolverSyncTestCase#testCancelSync is failing)" commit 3067232c69840451d9646e2ff2f14daf433288e0 Author: Fabrice Di Meglio Date: Tue Mar 9 13:40:07 2010 -0800 Fix bug #2483073 (cts.ContentResolverSyncTestCase#testCancelSync is failing) Change-Id: I9c8d372a80c9e592e3b895660d1ec7bc1d02f6d4 commit ba4429a79e4a9075fc0947eb86ec7c820429d302 Merge: 103f2bf dba4d44 Author: Brett Chabot Date: Tue Mar 9 10:44:08 2010 -0800 Merge "Remove NoLocationPermissionTest:testGetProviderNetwork from small test suite." commit dba4d444c037f4f1787abaa6454d9ac5c8edb83d Author: Brett Chabot Date: Tue Mar 9 10:30:30 2010 -0800 Remove NoLocationPermissionTest:testGetProviderNetwork from small test suite. Temporary until the continuous system can auto-enable network location on test devices. Bug 2431360 Change-Id: Idf84786d091cfbedeeb9b16289ed4554e6d0fdc7 commit 103f2bf15aaf5f160c7f563642f3ea3595c9da79 Merge: 87d0fbc 4199748 Author: Fred Quintana Date: Tue Mar 9 09:45:50 2010 -0800 Merge "- fix a test that is now broken after a change to filter the authtoken from the result of any call but getAuthToken - made the tests distinguish between the different types of options - test the authtoken result in a couple places where it wasn't tested before" commit 87d0fbc63491e4f76152dd405037632adf886759 Author: Jean-Baptiste Queru Date: Mon Mar 8 18:04:04 2010 -0800 Add an empty CleanSpec.mk Change-Id: I8d4c24789a66cbfdc6e7f4e27d08bb3990b630d7 commit 2b0faec9200aaa367976b3df9bc9703c17ebed89 Merge: ffef11f 7903cf0 Author: Wu-cheng Li Date: Mon Mar 8 15:18:09 2010 -0800 Merge "Add initial cts test for zoom." commit 4199748c926b40c0a43cef0670030e71d7be6ab1 Author: Fred Quintana Date: Mon Mar 8 12:50:31 2010 -0800 - fix a test that is now broken after a change to filter the authtoken from the result of any call but getAuthToken - made the tests distinguish between the different types of options - test the authtoken result in a couple places where it wasn't tested before commit ffef11f9bbb3accf38f2628bded9efac99faed36 Author: Dan Egnor Date: Fri Mar 5 14:20:18 2010 -0800 Add CTS test for Debug.dumpService() commit 7903cf03f5262a0042c3dbecfdbbaf466a6b41f2 Author: Wu-cheng Li Date: Mon Mar 8 11:20:07 2010 -0800 Add initial cts test for zoom. bug:2458926 Change-Id: If2cf5674ff8fa79085e4e3bac76d717f64176d89 commit 1c722c1b48467a4c9f5faf1112e8f19f953588b7 Author: James Dong Date: Fri Mar 5 18:44:40 2010 -0800 Fix a CTS test case where MediaRecorder.setMaxFileSize() assumes that the output file size never exceeds the specified/target max size. The fix is to give a tolerance to the target max file size. - fix a typo - rebased bug - 2492800 Change-Id: I661a843c59f4250ce1dadada1c8f68d55de2487a commit d914fb3bef33e8bfdefe69a2186e08944ccdc7e9 Author: Patrick Scott Date: Fri Mar 5 12:28:33 2010 -0500 Add a test for parsing cookies with null or empty values. Bug: 2487245 commit 5a46fbc81c2b9aa929c49e5cbafa26c4ef63f334 Merge: 54335ef bcf9ee7 Author: Wei-Ta Chen Date: Fri Mar 5 16:20:16 2010 -0800 Merge "Add CTS tests for YuvImage." commit bcf9ee72c594ecd9fda409f8417395f98573d6a7 Author: Wei-Ta Chen Date: Mon Mar 1 15:23:10 2010 -0800 Add CTS tests for YuvImage. Bug: 2194764 commit 54335efffff17681d5ee0cf4c02bb64e95b60ec8 Merge: d84b845 51114f3 Author: Brad Fitzpatrick Date: Fri Mar 5 11:42:05 2010 -0800 Merge "Update CTS for new call() method on IContentProvider." commit d84b845c1ac783b1227e98f10a89975219841c69 Merge: 6690e7c e4a2ddf Author: Jesse Wilson Date: Fri Mar 5 11:31:45 2010 -0800 Merge "Fixing the archive CTS build to exclude java/util/archive classes." commit e4a2ddf413c2951d9ee5cc120c230aea3b995b41 Author: Jesse Wilson Date: Fri Mar 5 11:23:17 2010 -0800 Fixing the archive CTS build to exclude java/util/archive classes. commit 51114f385b8c631b1afd5535b089c8ad5925f458 Author: Brad Fitzpatrick Date: Fri Mar 5 11:10:22 2010 -0800 Update CTS for new call() method on IContentProvider. commit 6690e7cbd4885cd4c6bd3dc6279fc94b17a39edd Merge: c39c4a9 318dde9 Author: Brett Chabot Date: Thu Mar 4 13:22:02 2010 -0800 Merge "Fix NetworkInfoTest#testAccessNetworkInfoProperties" commit c39c4a9ff2bad1829925566de3af176d9685ea8e Merge: 9b686e1 cef42bf Author: Brett Chabot Date: Thu Mar 4 10:25:44 2010 -0800 Merge "Remove obsolete NPE checks from cts drawable tests." commit 9b686e11743f6058a2d819da9011efac13607eaf Merge: 6509084 7745fc6 Author: Brett Chabot Date: Thu Mar 4 10:25:11 2010 -0800 Merge "Fix android.text.cts.TextUtilsTest" commit 65090844d1d709938eba97f79a74404e5e8a605e Merge: 7f3a64d 3a11685 Author: Brett Chabot Date: Thu Mar 4 10:22:18 2010 -0800 Merge "Remove obsolete and unnecessary checks from cts view and widget tests." commit 3a11685ac0bfae98dc0ec369dfd81403d6755196 Author: Brett Chabot Date: Wed Mar 3 19:21:05 2010 -0800 Remove obsolete and unnecessary checks from cts view and widget tests. Bugs 2486822, 2487257, 2487299 Change-Id: Ie59b4084e13b143f8593052d72985ce175e4c7dc commit 7745fc6a9ead88802ca58160c66a43b3ea062927 Author: Brett Chabot Date: Wed Mar 3 19:17:54 2010 -0800 Fix android.text.cts.TextUtilsTest Bug 2483911 Change-Id: I19f0aa9a02243f039a09e96d62f3d4d708b3c65e commit 318dde92b773ff9b270a657d5559d39eca39e872 Author: Brett Chabot Date: Wed Mar 3 19:16:18 2010 -0800 Fix NetworkInfoTest#testAccessNetworkInfoProperties Bug 2483701 Change-Id: I98c0fc74471d9a7a9511c224d5eaa52542a8d68f commit cef42bf4834db684c98ba63625ac97cf145b2e1e Author: Brett Chabot Date: Wed Mar 3 19:13:30 2010 -0800 Remove obsolete NPE checks from cts drawable tests. Bugs 2483524, 2483567 Change-Id: I770c80b98cdf9bd991a46b0767e11b6e54c54c45 commit 7f3a64d733e7351db6e279830f075a57c3efa25a Author: Brett Chabot Date: Wed Mar 3 19:05:05 2010 -0800 Fix CTS content tests that were hardcoding package paths, and empty dB paths. Bugs 2483113, 2483226 Change-Id: I25bd44996bf3588aea5f43daa4619995bf3febe6 commit 04da4784d06d0517e80bc3a86763a9d490e0f686 Merge: f177888 8b3a631 Author: Vasu Nori Date: Tue Mar 2 17:02:54 2010 -0800 Merge "fix broken cts tests" commit 8b3a6319a9921eba18231371bbcfd787a2bb5f20 Author: Vasu Nori Date: Tue Mar 2 16:59:37 2010 -0800 fix broken cts tests bug:2483348 commit f177888aa964be1839d6d1b89ebb13342a560b7d Author: Dan Egnor Date: Tue Mar 2 16:11:55 2010 -0800 Fix test -- crashData is a deprecated field and is always null now. Bug: 2483027 commit 534bf72ba4fbd584b72ee8cb3a8571b1b612d7eb Merge: fd24209 00b810c Author: Brian Carlstrom Date: Tue Mar 2 11:09:42 2010 -0800 Merge "SslCertificate should provide Date interface" commit 00b810cd4a97b33e081a3ef09851e6953848435c Author: Brian Carlstrom Date: Tue Mar 2 10:01:45 2010 -0800 SslCertificate should provide Date interface While working on out openssl code, I found a Y2k bug that the dates from invalidate certificates could be shown as 1909 instead of 2009. The reason was because SslCertificate/BrowserActivity passed the values around as Strings even though the started as Dates (from X509Certificate) and were converted backed to Dates before presentation by BrowserActivity's reformatCertificateDate. SslCertificate now maintains date fields internally as Date objects without converting them to Strings. The constructor and String accessors, which are now @deprecated, now specify the format as an ISO 8601 date string which uses 4 digit years. BrowserActivity now reformatCertificateDate is now simply formatCertificateDate and no longer has to convert from String to Date and back to String to get proper Locale formatting. CTS SslCertificateTest also updated. commit fd24209d2d83006e6de0a85e54539a922858dc4a Author: Ying Wang Date: Fri Feb 19 18:44:26 2010 -0800 Fix proguard flags. commit d87bbdb28c3e68dd6b7226432be5f2f0f56478ea Author: Wu-cheng Li Date: Sun Feb 28 12:19:09 2010 -0800 Fix testJpegThumbnailSize test. Set mJpegPictureCallbackResult to true after image is stored. Otherwise, the picture will be tested before it is stored. Also increase the snapshot wait time. In some builds, the snapshot time is more than 4s. bug:2375986 commit 6c6a27695a78f187698e363205d2ce6a230f553a Author: Bjorn Bringert Date: Thu Feb 25 11:24:50 2010 +0000 CTS tests for CharSequence list+array in Bundle+Intent This tests the methods added in Id82686f6ca8c9501f6db8a07018278a78ddacd05 I also added a Parcel roundtrip to most of the tests, since that's what Bundles are mostly used for. Without that, the tests are prety trivial, since they just test that the HashMap in the Bundle is not insane. See http://b/issue?id=2468093 Change-Id: Ia945b96f29a3014df4685531c94da8956443f3ab commit a9b2033d60f6f97fe636280fe9772d3d5a849a4f Author: Wu-cheng Li Date: Sat Feb 20 23:47:39 2010 +0800 Add cts test for exposure compensation parameters. bug:2375993 commit ab1920bf7ab39fdedc5bfdff049e47f09ebda33f Author: Dianne Hackborn Date: Wed Feb 24 20:04:34 2010 -0800 Update to reflect android-common no longer in framework. commit 68882274c35556a67c1ea724e707c8789d1236c7 Author: Elliott Hughes Date: Fri Feb 19 22:15:11 2010 -0800 Remove external/jsr305, external/guava, and external/caliper. commit f7b9802503400b5356f0fd922119a58375bc5c7e Merge: 95fc978 3f0ee2f Author: Mathias Agopian Date: Thu Feb 18 15:33:33 2010 -0800 Merge "update cts tests to reflect the PixelFormat changes" commit 3f0ee2f66f47052612f2bc0b28a43096f6e77adc Author: Mathias Agopian Date: Wed Feb 17 18:01:32 2010 -0800 update cts tests to reflect the PixelFormat changes commit 95fc978cb13066b2658a336dc5c73e5aabfcf00b Author: Kenny Root Date: Tue Feb 16 21:49:26 2010 -0800 Test failure cases in AndroidCharacter Add failure test cases. Also correct a test case for mirror that started failing after recent array bounds checking change in the code being tested revealed the test to be invalid. Change-Id: I83d4679b550ddffcb3a6231d6d2dc0b5ee5c31f6 commit 6c40d8e579409b7354dbeb0e977eb1a485ec8605 Author: Kenny Root Date: Sat Feb 13 00:06:29 2010 -0800 Add tests for AndroidCharacter.getEastAsianWidth[s] Change-Id: Ifdf56e994aee7fb79ac461fedda107016c38a595 commit 504f056f3415604314668d01a659151086cf72c7 Merge: 9ab726d ddc67a3 Author: Fabrice Di Meglio Date: Mon Feb 15 09:47:12 2010 -0800 Merge "Fix for bug 2410236 (Phone always runtime restart while adding secondary account)" commit ddc67a32b2ecfc282017ca254472266716f9e8c5 Author: Fabrice Di Meglio Date: Fri Feb 12 12:21:09 2010 -0800 Fix for bug 2410236 (Phone always runtime restart while adding secondary account) Change-Id: I8bcf301d23b59e337c884b648dbd5ca1c7fd270d commit 9ab726de2072385128274d559dbd18ae9e10e7ed Author: Eric Laurent Date: Fri Feb 12 09:10:56 2010 -0800 Fix issue 2087828: AudioTrackTest uses harcoded frame count value. Do not compare getNativeFrameCount() to a hardcoded value but to actual frame count requested when the AudioTrack is opened. commit 5a06282f2cb2559c5c594a92fc39977d4c3753b8 Merge: e2ad441 d2ecc30 Author: Brett Chabot Date: Thu Feb 11 13:03:18 2010 -0800 am d2ecc30d: am 639b823b: Merge "Fix build." into eclair Merge commit 'd2ecc30d8cc4b4f18ea2e0a026b58285a073a7fe' * commit 'd2ecc30d8cc4b4f18ea2e0a026b58285a073a7fe': Fix build. commit e2ad4418633633efa0f12500385024ef2d1db679 Merge: d133ac4 bdac11d Author: Brett Chabot Date: Thu Feb 11 12:59:47 2010 -0800 resolved conflicts for merge of bdac11d3 to master commit d2ecc30d8cc4b4f18ea2e0a026b58285a073a7fe Merge: bdac11d 639b823 Author: Brett Chabot Date: Thu Feb 11 12:32:00 2010 -0800 am 639b823b: Merge "Fix build." into eclair Merge commit '639b823b287211a67e525238c5f2f4e2a9ebc0c6' into eclair-plus-aosp * commit '639b823b287211a67e525238c5f2f4e2a9ebc0c6': Fix build. commit 639b823b287211a67e525238c5f2f4e2a9ebc0c6 Merge: 8bbe558 5d7d62c Author: Brett Chabot Date: Thu Feb 11 12:27:59 2010 -0800 Merge "Fix build." into eclair commit 5d7d62cd294ece842fd5a9cd9abd5a628a5c1a11 Author: Brett Chabot Date: Thu Feb 11 12:27:08 2010 -0800 Fix build. Change-Id: I3748a703aa9f254a2542886123302cbf525a7801 commit bdac11d35980047d5a606b0310fb4508bf51ef7f Merge: e416653 8bbe558 Author: Brett Chabot Date: Thu Feb 11 11:33:10 2010 -0800 am 8bbe558c: Merge "Remove hardcoded references to /sdcard from cts." into eclair Merge commit '8bbe558c4fbff327dcb91acd42f4c927079c7359' into eclair-plus-aosp * commit '8bbe558c4fbff327dcb91acd42f4c927079c7359': Remove hardcoded references to /sdcard from cts. commit 8bbe558c4fbff327dcb91acd42f4c927079c7359 Merge: 3955421 9056e26 Author: Brett Chabot Date: Thu Feb 11 11:28:08 2010 -0800 Merge "Remove hardcoded references to /sdcard from cts." into eclair commit 9056e267c8a77e847d388d33f0c30019677f0747 Author: Brett Chabot Date: Wed Feb 10 20:08:32 2010 -0800 Remove hardcoded references to /sdcard from cts. Bug 2435377 Change-Id: Ia0b3388d00f3cd6c51d95da3925f001de5159bb6 commit d133ac4d942fbf39418fd7c2a3f2803424c97605 Merge: 34f1e06 e416653 Author: Brett Chabot Date: Wed Feb 10 16:53:58 2010 -0800 am e416653f: am 3955421d: Another fix for checking emergency numbers. Merge commit 'e416653f2f7edb04f2388a4b489e3701c103f4af' * commit 'e416653f2f7edb04f2388a4b489e3701c103f4af': Another fix for checking emergency numbers. commit e416653f2f7edb04f2388a4b489e3701c103f4af Merge: bd2813e 3955421 Author: Brett Chabot Date: Wed Feb 10 15:32:44 2010 -0800 am 3955421d: Another fix for checking emergency numbers. Merge commit '3955421d483cbce38b1d9c3d3e6f3afdd7c7348c' into eclair-plus-aosp * commit '3955421d483cbce38b1d9c3d3e6f3afdd7c7348c': Another fix for checking emergency numbers. commit 3955421d483cbce38b1d9c3d3e6f3afdd7c7348c Author: Brett Chabot Date: Wed Feb 10 13:02:26 2010 -0800 Another fix for checking emergency numbers. Bug 2248501 Change-Id: I71f5d2dffd9f3192a3ea86971085c6eb1cbf318f commit 34f1e060155eff635de0c6396de2b2403906e52b Merge: 739c45f b5bdee4 Author: Wu-cheng Li Date: Tue Feb 9 20:49:19 2010 -0800 Merge "Add cts tests for Camera.lock() and unlock()." commit b5bdee4fb0e68983be03f890bb8e883e5e246162 Author: Wu-cheng Li Date: Tue Feb 9 19:23:59 2010 +0800 Add cts tests for Camera.lock() and unlock(). bug:2194756 commit 739c45f2c65efac0763e9e22fe2046d06cf57d01 Merge: f009b21 bd2813e Author: Brett Chabot Date: Tue Feb 9 12:00:23 2010 -0800 am bd2813ef: am f8c1bcf4: Merge "Update CTS version to 2.1_r1." into eclair Merge commit 'bd2813ef532bc5fdbb5fc7bc51850ebd5a43aed9' * commit 'bd2813ef532bc5fdbb5fc7bc51850ebd5a43aed9': Update CTS version to 2.1_r1. commit bd2813ef532bc5fdbb5fc7bc51850ebd5a43aed9 Merge: 8003ddb f8c1bcf Author: Brett Chabot Date: Tue Feb 9 11:55:15 2010 -0800 am f8c1bcf4: Merge "Update CTS version to 2.1_r1." into eclair Merge commit 'f8c1bcf4c53890a07908342b59ba9d392449ce90' into eclair-plus-aosp * commit 'f8c1bcf4c53890a07908342b59ba9d392449ce90': Update CTS version to 2.1_r1. commit f8c1bcf4c53890a07908342b59ba9d392449ce90 Merge: a0c2404 b9c5692 Author: Brett Chabot Date: Tue Feb 9 11:49:33 2010 -0800 Merge "Update CTS version to 2.1_r1." into eclair commit b9c569214d7631f9926ee99f25769af10f02faf1 Author: Brett Chabot Date: Tue Feb 9 11:31:42 2010 -0800 Update CTS version to 2.1_r1. Change-Id: Ie04c86708b21d9bb21057e77b0931e2f6087a241 commit f009b2181962e3d4d9e5c06981c9e6f4aa81943a Merge: d55f4f3 8003ddb Author: Brett Chabot Date: Tue Feb 9 11:16:42 2010 -0800 am 8003ddb3: am a0c24046: Merge "Mark InsetDrawableTest#testGetOpacity as a BrokenTest." into eclair Merge commit '8003ddb312bda25f3e83eb7f045688746993e47c' * commit '8003ddb312bda25f3e83eb7f045688746993e47c': Mark InsetDrawableTest#testGetOpacity as a BrokenTest. commit 8003ddb312bda25f3e83eb7f045688746993e47c Merge: 28656d8 a0c2404 Author: Brett Chabot Date: Tue Feb 9 11:12:33 2010 -0800 am a0c24046: Merge "Mark InsetDrawableTest#testGetOpacity as a BrokenTest." into eclair Merge commit 'a0c24046b7557155e1dec8b607c4dd0b4140016e' into eclair-plus-aosp * commit 'a0c24046b7557155e1dec8b607c4dd0b4140016e': Mark InsetDrawableTest#testGetOpacity as a BrokenTest. commit a0c24046b7557155e1dec8b607c4dd0b4140016e Merge: a63efa5 b5edc69 Author: Brett Chabot Date: Tue Feb 9 11:08:21 2010 -0800 Merge "Mark InsetDrawableTest#testGetOpacity as a BrokenTest." into eclair commit b5edc69943d5ed4eee956d75c55a5f7339e4b818 Author: Brett Chabot Date: Tue Feb 9 11:01:05 2010 -0800 Mark InsetDrawableTest#testGetOpacity as a BrokenTest. Bug 2397630 Change-Id: Ibf707a528a565a776c920cd994ba530b18d23ca1 commit d55f4f3bf02ac8ff7c911d4abd99ea2adba56e3c Author: Wu-cheng Li Date: Mon Feb 8 16:24:06 2010 +0800 Improve testTakePicture and test more parameters. bug:2194756 commit 32b9417bc99f34103bb89efea7391d0b48674b2d Author: Wu-cheng Li Date: Mon Feb 8 15:18:38 2010 +0800 Speed-up CameraTest. commit fcd394e51c9e6bff1e7238a4e8cf25cc5eb355a2 Merge: 24458ab 28656d8 Author: The Android Open Source Project Date: Fri Feb 5 14:20:38 2010 -0800 am 28656d87: am a63efa5c: reconcile main tree with open-source eclair Merge commit '28656d8707fa4e953f3934088792e2ee1158ce03' * commit '28656d8707fa4e953f3934088792e2ee1158ce03': android-2.1_r1 snapshot commit 24458abbcace20bb97541d2cf838dfb15487d940 Merge: 7da048d 93db35d Author: Gloria Wang Date: Fri Feb 5 14:20:28 2010 -0800 am 93db35d2: am d86b2b73: Merge "Fix for NullPointerException in CTS media test." into eclair Merge commit '93db35d207dfc43e45bd2388548d432cb85ab81f' * commit '93db35d207dfc43e45bd2388548d432cb85ab81f': Fix for NullPointerException in CTS media test. commit 28656d8707fa4e953f3934088792e2ee1158ce03 Merge: 93db35d a63efa5 Author: The Android Open Source Project Date: Fri Feb 5 08:47:30 2010 -0800 am a63efa5c: reconcile main tree with open-source eclair Merge commit 'a63efa5cd15b125d7683cc5afb904e13503557a3' into eclair-plus-aosp * commit 'a63efa5cd15b125d7683cc5afb904e13503557a3': android-2.1_r1 snapshot commit 93db35d207dfc43e45bd2388548d432cb85ab81f Merge: 6c0cf72 d86b2b7 Author: Gloria Wang Date: Fri Feb 5 08:47:26 2010 -0800 am d86b2b73: Merge "Fix for NullPointerException in CTS media test." into eclair Merge commit 'd86b2b7356154a5b783d7029b239ea8188f707a6' into eclair-plus-aosp * commit 'd86b2b7356154a5b783d7029b239ea8188f707a6': Fix for NullPointerException in CTS media test. commit a63efa5cd15b125d7683cc5afb904e13503557a3 Merge: d86b2b7 cc7f609 Author: The Android Open Source Project Date: Fri Feb 5 08:09:32 2010 -0800 reconcile main tree with open-source eclair commit 7da048d31f348d27abc0067a94e5b43efdfd718d Merge: ddc1396 b33ecf2 Author: Wu-cheng Li Date: Thu Feb 4 00:27:32 2010 -0800 Merge "Add Jpeg exif tests." commit ddc1396d2b9fdfb2f2de1793640f3f180f2d6440 Merge: 8159b92 6c0cf72 Author: Brett Chabot Date: Wed Feb 3 15:56:52 2010 -0800 am 6c0cf728: am f8604d33: Merge "Remove hardcode of PAUSE/WAIT in PhoneNumberUtilsTest." into eclair Merge commit '6c0cf728b9d03462bbf3133f29b6fc8982af057a' * commit '6c0cf728b9d03462bbf3133f29b6fc8982af057a': Remove hardcode of PAUSE/WAIT in PhoneNumberUtilsTest. commit d86b2b7356154a5b783d7029b239ea8188f707a6 Merge: f8604d3 d1225c0 Author: Gloria Wang Date: Wed Feb 3 15:53:12 2010 -0800 Merge "Fix for NullPointerException in CTS media test." into eclair commit 6c0cf728b9d03462bbf3133f29b6fc8982af057a Merge: 4565d93 f8604d3 Author: Brett Chabot Date: Wed Feb 3 15:50:54 2010 -0800 am f8604d33: Merge "Remove hardcode of PAUSE/WAIT in PhoneNumberUtilsTest." into eclair Merge commit 'f8604d33dfa9e128be87bbf06a3addc2e39fb9ac' into eclair-plus-aosp * commit 'f8604d33dfa9e128be87bbf06a3addc2e39fb9ac': Remove hardcode of PAUSE/WAIT in PhoneNumberUtilsTest. commit f8604d33dfa9e128be87bbf06a3addc2e39fb9ac Merge: cb9dfb7 a6e9230 Author: Brett Chabot Date: Wed Feb 3 15:35:26 2010 -0800 Merge "Remove hardcode of PAUSE/WAIT in PhoneNumberUtilsTest." into eclair commit b33ecf2d45319c665cdb0a937738494c3da62559 Author: Wu-cheng Li Date: Sun Jan 31 17:12:41 2010 +0800 Add Jpeg exif tests. bug:2375989 commit 8159b9237be15ba96e2fd997ec70f2a8d79b4fb5 Author: Vasu Nori Date: Tue Feb 2 16:16:24 2010 -0800 add unittests to make sure schema changes behave in sqlite 3.6.22 in 3.5.9, android added some changes to make sure sqlite behaves when schema changes occur while prepared-statements are in memory. but those changes were NOT ported to 3.6.22, when I upgraded to sqlite 3.6.22 these tests make sure sqlite behaves correctly without those changes added in. commit d1225c04b8c096720de081272bcb2da052ceeb4b Author: Gloria Wang Date: Tue Feb 2 17:32:51 2010 -0800 Fix for NullPointerException in CTS media test. commit 6ec72791b81d3bb087f4bcc105246adc2e5b3094 Merge: f8cc5ad 4565d93 Author: Brett Chabot Date: Tue Feb 2 06:21:37 2010 -0800 am 4565d938: am cb9dfb78: Merge "Update CTS version check." into eclair Merge commit '4565d938895167ec49afd78949cd3c524f15d884' * commit '4565d938895167ec49afd78949cd3c524f15d884': Update CTS version check. commit f8cc5adb5efc08cedac34c549f9aed388035a92f Merge: a084ec6 1bda28c Author: Brett Chabot Date: Tue Feb 2 06:21:33 2010 -0800 am 1bda28ca: Update CTS version check. Merge commit '1bda28ca2d24484c8704b98fdec538a427574fe3' * commit '1bda28ca2d24484c8704b98fdec538a427574fe3': Update CTS version check. commit 4565d938895167ec49afd78949cd3c524f15d884 Merge: 1bda28c cb9dfb7 Author: Brett Chabot Date: Mon Feb 1 11:42:33 2010 -0800 am cb9dfb78: Merge "Update CTS version check." into eclair Merge commit 'cb9dfb78d80572952de63d8ddcd1c29d6f69b944' into eclair-plus-aosp * commit 'cb9dfb78d80572952de63d8ddcd1c29d6f69b944': Update CTS version check. commit 1bda28ca2d24484c8704b98fdec538a427574fe3 Author: Brett Chabot Date: Fri Jan 29 16:59:33 2010 -0800 Update CTS version check. Change-Id: I450b6e2dc47c505d18c21228a8fa43d5a8391bc1 commit cb9dfb78d80572952de63d8ddcd1c29d6f69b944 Merge: 9bb039c 75c851d Author: Brett Chabot Date: Mon Feb 1 10:58:55 2010 -0800 Merge "Update CTS version check." into eclair commit a084ec639d7411f436e4cf51ffddcc1addc6938e Author: Wu-cheng Li Date: Fri Jan 29 17:11:29 2010 +0800 Add focal length and view angle cts tests. bug:2375989 bug:2375987 commit ed8ad77ac50226e6561310f08fcbcf7309bd7c3a Author: Wu-cheng Li Date: Mon Jan 25 14:50:18 2010 +0800 Add cts test for JPEG EXIF thumbnail sizes. bug:2375986 commit 75c851d80e95784bf94977c63ccd0a1d32e824eb Author: Brett Chabot Date: Fri Jan 29 16:59:33 2010 -0800 Update CTS version check. Change-Id: I450b6e2dc47c505d18c21228a8fa43d5a8391bc1 commit cc7f609a42733c55c96304d1271cde9b0baf9f4d Merge: f872bb1 3da7534 Author: The Android Open Source Project Date: Fri Jan 29 14:07:35 2010 -0800 reconcile android-2.1_r1 snapshot commit 2550e7cbf910232f06c945ff55f943dc094197ca Merge: 5c840bb 3631121 Author: Chih-Chung Chang Date: Thu Jan 28 18:18:33 2010 -0800 Merge "Add test for Camera's setDisplayOrientation." commit 5c840bbd77bcb6a0dc83f83c3415be7038f75a65 Merge: 123bb37 3c1b146 Author: Brett Chabot Date: Thu Jan 28 15:30:45 2010 -0800 am 3c1b1460: am 9bb039cb: Merge "Mark flaky test ListActivityTest as broken." into eclair Merge commit '3c1b1460559e9d9b5f3404de18260ec70cb596df' * commit '3c1b1460559e9d9b5f3404de18260ec70cb596df': Mark flaky test ListActivityTest as broken. commit 123bb3737900df4c1d764791120621e0786b4994 Merge: ac69bb7 655c9dc Author: Brett Chabot Date: Thu Jan 28 15:30:37 2010 -0800 am 655c9dca: (-s ours) am 4f1484f4: Mark DateSorterTest as broken. DO NOT MERGE Merge commit '655c9dca478258a17c265dccf6fed190bfcd1705' * commit '655c9dca478258a17c265dccf6fed190bfcd1705': Mark DateSorterTest as broken. DO NOT MERGE commit ac69bb79929f2af6091fe5c0dc133d649b3875eb Merge: 792d2fa e4185be Author: Kenny Root Date: Thu Jan 28 13:33:55 2010 -0800 resolved conflicts for merge of e4185bea to master commit 792d2faf2c333d28587ad73dec3ceb61b97f19d1 Merge: c2575e7 9a5c515 Author: Brett Chabot Date: Thu Jan 28 10:47:43 2010 -0800 am 9a5c5152: am 0c466d71: Fix DateUtilsTest that are dependent on current year. Merge commit '9a5c5152c17bb7f29a7981778e2a22de449a8216' * commit '9a5c5152c17bb7f29a7981778e2a22de449a8216': Fix DateUtilsTest that are dependent on current year. commit 36311211c2bd990519c899521064b6794f0f0242 Author: Chih-Chung Chang Date: Wed Jan 27 12:00:51 2010 -0800 Add test for Camera's setDisplayOrientation. commit c2575e7ef8749c42fa8a2066edaeb62d72b7d0d5 Merge: ee6e9cf bc14e5d Author: Vasu Nori Date: Wed Jan 27 17:57:51 2010 -0800 Merge "remove usage of dir sqlite_stmt_journals to store temp files in tests." commit bc14e5df74928a2f6afeacfed50e0a56510a1762 Author: Vasu Nori Date: Wed Jan 27 17:50:39 2010 -0800 remove usage of dir sqlite_stmt_journals to store temp files in tests. commit ee6e9cfcfe94e80fbabf33ec75ca677f2d675ac6 Merge: 5023865 57a4937 Author: The Android Open Source Project Date: Wed Jan 27 16:15:38 2010 -0800 am 57a49373: merge from open-source master Merge commit '57a493737513a1084b2606aba9c29d31f1d6a346' * commit '57a493737513a1084b2606aba9c29d31f1d6a346': empty initial commit commit 3c1b1460559e9d9b5f3404de18260ec70cb596df Merge: 655c9dc 9bb039c Author: Brett Chabot Date: Wed Jan 27 16:00:40 2010 -0800 am 9bb039cb: Merge "Mark flaky test ListActivityTest as broken." into eclair Merge commit '9bb039cb2249cc3237a3ade0fea37d01b72f28e5' into eclair-plus-aosp * commit '9bb039cb2249cc3237a3ade0fea37d01b72f28e5': Mark flaky test ListActivityTest as broken. commit 9bb039cb2249cc3237a3ade0fea37d01b72f28e5 Merge: 4f1484f bdd4fc1 Author: Brett Chabot Date: Wed Jan 27 15:56:31 2010 -0800 Merge "Mark flaky test ListActivityTest as broken." into eclair commit a6e92300480325290f8fe2eb904125bf4cd3e4f0 Author: Brett Chabot Date: Wed Jan 27 15:44:46 2010 -0800 Remove hardcode of PAUSE/WAIT in PhoneNumberUtilsTest. Bug 2258220 Change-Id: I704e0f346d4d172faa95d1a67edb367672a576e4 commit bdd4fc1ca711165509f344196dab341a99063a42 Author: Brett Chabot Date: Wed Jan 27 15:43:14 2010 -0800 Mark flaky test ListActivityTest as broken. Bug 2334738 Change-Id: I34da4368a2ef67bdf90bb5a7015ebfac79101b8a commit 655c9dca478258a17c265dccf6fed190bfcd1705 Merge: e4185be 4f1484f Author: Brett Chabot Date: Wed Jan 27 14:32:03 2010 -0800 am 4f1484f4: Mark DateSorterTest as broken. DO NOT MERGE Merge commit '4f1484f45514c1a86248deda7b1fa408f964801d' into eclair-plus-aosp * commit '4f1484f45514c1a86248deda7b1fa408f964801d': Mark DateSorterTest as broken. DO NOT MERGE commit 4f1484f45514c1a86248deda7b1fa408f964801d Author: Brett Chabot Date: Wed Jan 27 14:08:42 2010 -0800 Mark DateSorterTest as broken. DO NOT MERGE Bug 2361382 Change-Id: I8c3cf84640f09cc6ee6aa76bedacd72e984f8db6 commit 5023865797874944d603701a6c3e3c9c77d38715 Merge: 66955ec 23f1683 Author: Chih-Chung Chang Date: Wed Jan 27 13:43:41 2010 -0800 Merge "Fix synchronization in camera test." commit 23f16838d1b9f7fde092b8775da9c90c1a895002 Author: Chih-Chung Chang Date: Wed Jan 27 11:34:20 2010 -0800 Fix synchronization in camera test. commit 66955ec37f5883afe20f36d6e1c6f263f46a026b Author: Vasu Nori Date: Tue Jan 26 22:25:38 2010 -0800 dont use sqlite_stmt_journals dir. commit a8910fd345eb644bcfa691e372e57bc391296cdf Author: Vasu Nori Date: Mon Jan 25 22:46:12 2010 -0800 add unittest for group_concat built-in func in sqlite after CL# 38176 after CL https://android-git.corp.google.com/g/#change,38176, behavior of sqlite func group_concat changed. add a unittest to test that. commit 716f08850ea8c2a7beef50e662c91803b31b6506 Merge: 7bb713f f72c636 Author: Brett Chabot Date: Mon Jan 25 18:10:24 2010 -0800 am f72c6368: Merge "Increment CTS version to 2.1_pre_r2." into eclair Merge commit 'f72c636841a85c54b963343f3703be60a8709224' * commit 'f72c636841a85c54b963343f3703be60a8709224': Increment CTS version to 2.1_pre_r2. commit e4185bea3d31f18e596f2e34997870ed726032ae Merge: 9a5c515 0ee870b Author: Brett Chabot Date: Sat Jan 23 19:22:24 2010 -0800 am 0ee870b7: Merge "Fix broken cts content tests." into eclair Merge commit '0ee870b74c0a81eaa3474d38d5ac1b4f6b123bb3' into eclair-plus-aosp * commit '0ee870b74c0a81eaa3474d38d5ac1b4f6b123bb3': Fix broken cts content tests. commit 0ee870b74c0a81eaa3474d38d5ac1b4f6b123bb3 Merge: 0c466d7 dcdc3af Author: Brett Chabot Date: Sat Jan 23 19:15:57 2010 -0800 Merge "Fix broken cts content tests." into eclair commit dcdc3af46b6ebbba71d9f746f6b5ebfd7ea3b1bc Author: Brett Chabot Date: Wed Jan 20 19:23:56 2010 -0800 Fix broken cts content tests. Renamed content package and target to original values. Mock sync test mocks to the stub package. Bug 2386277 Change-Id: I7e98054174f174c6b9f2c7ced47ea06386db8171 commit 9a5c5152c17bb7f29a7981778e2a22de449a8216 Merge: 57a4937 0c466d7 Author: Brett Chabot Date: Fri Jan 22 13:23:07 2010 -0800 am 0c466d71: Fix DateUtilsTest that are dependent on current year. Merge commit '0c466d7151697555747eed8a56c8972cd3d19c3d' into eclair-plus-aosp * commit '0c466d7151697555747eed8a56c8972cd3d19c3d': Fix DateUtilsTest that are dependent on current year. commit 7bb713f946be7b66f40009f95e785418041e9f8e Merge: cea8cda 36b433e Author: Evan Millar Date: Fri Jan 22 11:59:03 2010 -0800 am 36b433ef: Add CTS test for ContactsContract#Data and ContactsContract#CommonDataKinds#Photo Merge commit '36b433efa06bbaf273064d309e1335a3bfb46b83' * commit '36b433efa06bbaf273064d309e1335a3bfb46b83': Add CTS test for ContactsContract#Data and ContactsContract#CommonDataKinds#Photo commit cea8cda0e4f66c1abc4f3f616ed8c953a20a96bb Merge: 96b7570 e4ce7a4 Author: Fabrice Di Meglio Date: Thu Jan 21 17:37:19 2010 -0800 am e4ce7a43: Add CTS for SyncManager / ContentResolver - fix imports - took care of Ken feedbak - fixed variables naming - fixed comments and copyright year and trailing whitespace - fixed some other redundant whitespaces - took care of Fred feedback - code formatt Merge commit 'e4ce7a43606042093b8b810c239e78d1a2c1ef6c' * commit 'e4ce7a43606042093b8b810c239e78d1a2c1ef6c': Add CTS for SyncManager / ContentResolver commit 57a493737513a1084b2606aba9c29d31f1d6a346 Merge: f72c636 16a5fa3 Author: The Android Open Source Project Date: Thu Jan 21 11:20:48 2010 -0800 merge from open-source master commit 0c466d7151697555747eed8a56c8972cd3d19c3d Author: Brett Chabot Date: Wed Jan 20 19:23:56 2010 -0800 Fix DateUtilsTest that are dependent on current year. Bug 2362120 Change-Id: Ic3b447f5dc6a433b5b122642902eeda239c146dc commit f72c636841a85c54b963343f3703be60a8709224 Merge: 36b433e c81b90d Author: Brett Chabot Date: Wed Jan 20 17:16:39 2010 -0800 Merge "Increment CTS version to 2.1_pre_r2." into eclair commit c81b90d89b8eed7340e6bb86d1ea4f7029cafc9b Author: Brett Chabot Date: Wed Jan 20 16:55:25 2010 -0800 Increment CTS version to 2.1_pre_r2. Change-Id: I4f81653001281e902263f049b47839673d1734cd commit 96b7570a25bb02f251e5d8c751d7063043722ee5 Merge: e0813c9 915bd6a Author: Patrick Scott Date: Wed Jan 20 10:24:07 2010 -0800 Merge "Remove onTooManyRedirects test as the method is deprecated." commit 36b433efa06bbaf273064d309e1335a3bfb46b83 Author: Evan Millar Date: Fri Jan 15 11:49:53 2010 -0800 Add CTS test for ContactsContract#Data and ContactsContract#CommonDataKinds#Photo commit e4ce7a43606042093b8b810c239e78d1a2c1ef6c Author: Fabrice Di Meglio Date: Tue Jan 12 18:36:24 2010 -0800 Add CTS for SyncManager / ContentResolver - fix imports - took care of Ken feedbak - fixed variables naming - fixed comments and copyright year and trailing whitespace - fixed some other redundant whitespaces - took care of Fred feedback - code formatting - changed MockSyncAdapter so that it does not use SyncAdapter class anymore - suppress non needed assert on extra Bundle when init in startSync Change-Id: I49de8e101d86e5a3ed59eb3b34a5f6aa4bd580b0 commit e0813c97e57f53d5ef10c69a28a8d9bb2e1f5415 Merge: 546d4a4 af9e9b6 Author: Fred Quintana Date: Thu Jan 14 15:00:17 2010 -0800 Merge "allow + in usernames" commit 546d4a4eefe8e99ab30e12c6914781bec8beb350 Merge: 80d6460 11ef4ca Author: Vasu Nori Date: Thu Jan 14 14:59:11 2010 -0800 Merge "fix cts-tests broken by my CL 36706" commit af9e9b6564697f56c89ea908af29befc1b3c5c1f Author: Fred Quintana Date: Thu Jan 14 14:58:28 2010 -0800 allow + in usernames commit 11ef4caff62219aedb606c44183712ff2f5458ab Author: Vasu Nori Date: Thu Jan 14 14:23:49 2010 -0800 fix cts-tests broken by my CL 36706 removed a public API SqliteDatabase.setMaxCacheSqlSize. this broke some cts tests. fixing them in this CL. commit 80d6460e184394d754c166786427927fb988fdb4 Merge: 9cbcc60 793a25b Author: Ken Shirriff Date: Wed Jan 13 15:27:03 2010 -0800 am 793a25b7: Fix build. Revert "Add CTS for SyncManager / ContentResolver" Merge commit '793a25b7730144e53176a19b84af426597a91d28' * commit '793a25b7730144e53176a19b84af426597a91d28': Fix build. Revert "Add CTS for SyncManager / ContentResolver" commit 793a25b7730144e53176a19b84af426597a91d28 Author: Ken Shirriff Date: Wed Jan 13 14:30:29 2010 -0800 Fix build. Revert "Add CTS for SyncManager / ContentResolver" This reverts commit 9a553cc7dfa712abadfb05e72a66b3b39abfbc99. commit 9cbcc601aa639622afc78e2a09120456096467a9 Merge: 380e469 9a553cc Author: Fabrice Di Meglio Date: Wed Jan 13 12:17:18 2010 -0800 am 9a553cc7: Add CTS for SyncManager / ContentResolver - fix imports - took care of Ken feedbak - fixed variables naming - fixed comments and copyright year and trailing whitespace - fixed some other redundant whitespaces - took care of Fred feedback - code formatt Merge commit '9a553cc7dfa712abadfb05e72a66b3b39abfbc99' * commit '9a553cc7dfa712abadfb05e72a66b3b39abfbc99': Add CTS for SyncManager / ContentResolver commit 9a553cc7dfa712abadfb05e72a66b3b39abfbc99 Author: Fabrice Di Meglio Date: Tue Jan 12 18:36:24 2010 -0800 Add CTS for SyncManager / ContentResolver - fix imports - took care of Ken feedbak - fixed variables naming - fixed comments and copyright year and trailing whitespace - fixed some other redundant whitespaces - took care of Fred feedback - code formatting Change-Id: Ib5ca091cc37e13be4ff0c56d88059297f640ea8b commit 3da7534f2880068b90b88585c45be62751dbfd6b Author: The Android Open Source Project Date: Tue Jan 12 15:18:07 2010 -0800 android-2.1_r1 snapshot commit 380e469cfffc2448f1c7890bc0a57818210aa97a Merge: ac48191 58222cb Author: Dmitri Plotnikov Date: Tue Jan 12 11:57:12 2010 -0800 am 58222cb4: Merge "Seeding CTS tests for ContactsContract." into eclair Merge commit '58222cb4b19f67340b5119719632b1e31a46e1c9' * commit '58222cb4b19f67340b5119719632b1e31a46e1c9': Seeding CTS tests for ContactsContract. commit 58222cb4b19f67340b5119719632b1e31a46e1c9 Merge: cc712ee 09db55c Author: Dmitri Plotnikov Date: Tue Jan 12 11:11:45 2010 -0800 Merge "Seeding CTS tests for ContactsContract." into eclair commit 09db55c7b089e0b90c4e66f52a86232b5713996f Author: Dmitri Plotnikov Date: Tue Jan 12 10:42:45 2010 -0800 Seeding CTS tests for ContactsContract. This CL introduces a mini-ORM framework that makes it incredibly easy and fun to write these tests. Inspired by work done by tomo in GlobalSearchSupportTest. Change-Id: Id8461e3b644d58d6d7d45a60b283c74ac621818a commit ac48191873770c2f2652e41bb176e88fced6ac9a Merge: 368340a cc712ee Author: Fabrice Di Meglio Date: Tue Jan 12 09:43:16 2010 -0800 am cc712ee0: Merge "Second step to CTS account manager" into eclair Merge commit 'cc712ee0fb8f98d9cce21b52c5f6f2a8272104d0' * commit 'cc712ee0fb8f98d9cce21b52c5f6f2a8272104d0': Second step to CTS account manager commit cc712ee0fb8f98d9cce21b52c5f6f2a8272104d0 Merge: b9ffcb6 aecd087 Author: Fabrice Di Meglio Date: Tue Jan 12 09:34:09 2010 -0800 Merge "Second step to CTS account manager" into eclair commit 16a5fa3ce2d3585d3f15b316e40262f3fa38f54f Author: The Android Open Source Project Date: Mon Jan 11 14:33:36 2010 -0800 empty initial commit commit aecd08721007e2cb5c8ebff166d701799fba22b7 Author: Fabrice Di Meglio Date: Tue Dec 8 09:19:33 2009 -0800 Second step to CTS account manager - rework the tests strategy with Fred feedback. Now we test passing parameters and giving back results. - some code refactoring for improving reusability - add tests for addAccountExplicitly() and removeAccount() - add test for getAccounts() and getAccountsByType() - add test for getAuthenticatorTypes() - take care of Fred second review (except the one with the callback parameter): - final for all constants - use of mX for member definition - improve "if" spacing - eliminate reference of the MockAuthenticator into the MockAuthenticatorService - add test for addAccount() with a callback - add test for removeAccount() with a callback - fix non cleaned state for testGetAccountsAndGetAccountsByType() - improve readability - add test for setPassword() and getPassword() and clearPassword() - add test for getUserData() and setUserData() - add test for getAccountsByTypeAndFeatures() - suppress non needed interface for constants and migrate them to the test itself - fix typo - rework test for getAccountsByTypeAndFeatures() - fix typo - add test for setAuthToken() and peekAuthToken() and invalidateAuthToken() - add test for blockingGetAuthToken() - improve addAccount() test with checking Options - add more tests for both getAuthToken() signatures - add test for confirmCredentials() - add test for updateCredential() - add test for editProperties() - add test for addOnAccountsUpdatedListener() - add test for removeOnAccountsUpdatedListener() - code refactoring for suppressing redundencies - fix missing parenthesis - take care of Brett second review: - use of @Override when needed - do not catch exception so that the JUnit runner can deal with them (except for callback as we cannot change the API - add Javadoc for public methods - HAVE NOT changed package name to "com.android.cts.accounts" as Brett and I could not find why the tests where blocking - suppress non needed dumpsys-packages.txt - add super.setUp() and super.tearDown() calls - suppressing trailing whitespaces - take care of Fred second review: - renamed LATCH_TIMEOUT to LATCH_TIMEOUT_MS - renamed validateAccount() to validateAccountAndAuthTokenType() - do not rethrow exceptions when not needed (because taken care by the test framework) - confirmed that some retrieved accounts are correct - no need to confirm that the callback is called because of the latch itself - suppress trailing whitespaces again - fix bug #2342468 (android.accounts.cts.AccountManagerTest#testAddAndRemoveAccount fails if another account is present) - refactor tests to take care about handlers - add test for UpdateCredentials() with callback and handler - take care of Fred third review - method renaming - code formatting - use of array instead of list - the comment was correct. - add one missing assert - suppressed duplicate comment - fix label and change account authenticator icon for using the Android standard one Change-Id: I84661fdc108943693947f807dd3f97837cac2a0f commit 368340aaf721323470b093393df36cedb168cb01 Merge: 06be085 b9ffcb6 Author: Brett Chabot Date: Fri Jan 8 17:04:20 2010 -0800 am b9ffcb60: Merge "Remove KeyEventTest testGetMatch2." into eclair Merge commit 'b9ffcb6072c77d637dafe83fc201d01ee16376c4' * commit 'b9ffcb6072c77d637dafe83fc201d01ee16376c4': Remove KeyEventTest testGetMatch2. commit b9ffcb6072c77d637dafe83fc201d01ee16376c4 Merge: 331849a d7af06f Author: Brett Chabot Date: Fri Jan 8 16:57:50 2010 -0800 Merge "Remove KeyEventTest testGetMatch2." into eclair commit 06be0856bfd154c41e142abaf81065fad0ba11f2 Merge: 0cbe49a 331849a Author: Brett Chabot Date: Fri Jan 8 16:37:28 2010 -0800 am 331849a1: Fix TimeTest:testSet0. Merge commit '331849a177c2c7c6346eb3d3a5526b7e41fd7916' * commit '331849a177c2c7c6346eb3d3a5526b7e41fd7916': Fix TimeTest:testSet0. commit d7af06ff44ee93a819dfa560fb6669e6c5e1d218 Author: Brett Chabot Date: Fri Jan 8 16:24:13 2010 -0800 Remove KeyEventTest testGetMatch2. Test was dependent on a specific key layout map, and was of limited value. Bug 1950790 Change-Id: I31b1208494772c68c53a78ebe7ec9675c1829182 commit 331849a177c2c7c6346eb3d3a5526b7e41fd7916 Author: Brett Chabot Date: Fri Jan 8 16:09:03 2010 -0800 Fix TimeTest:testSet0. Use the same timezone when comparing Time and Calendar instances. Bug 2139172 Change-Id: I415dbeff4821c4ebcf6600338355cba45e187d3e commit 0cbe49a83ac10de466b8efa8d8775d8686353186 Author: Romain Guy Date: Fri Jan 8 15:05:22 2010 -0800 Deprecate fill_parent and introduce match_parent. Bug: #2361749. commit 915bd6accb19cc43c295a313a556c0c9316a8259 Author: Patrick Scott Date: Fri Jan 8 10:07:17 2010 -0500 Remove onTooManyRedirects test as the method is deprecated. commit ab65750eb76c0dd78220896f0942146f7a675aeb Merge: b5e916b 06c817e Author: Leon Scroggins Date: Fri Jan 8 06:50:13 2010 -0800 am 06c817ee: Do not check beyond the last boundary. Merge commit '06c817ee27052a931e0edb272c4ce641cfe43a9c' * commit '06c817ee27052a931e0edb272c4ce641cfe43a9c': Do not check beyond the last boundary. commit 06c817ee27052a931e0edb272c4ce641cfe43a9c Author: Leon Scroggins Date: Fri Jan 8 09:20:39 2010 -0500 Do not check beyond the last boundary. Fixes http://b/issue?id=2361382 commit b5e916bc4402ba3fa3411c4c52fc4af73ea61a43 Author: Dan Egnor Date: Wed Jan 6 23:10:13 2010 -0800 CTS test for EventLog (which is being published into the SDK) commit dd812e1487c8adea09fd443f9b56f5147aff6a2a Author: Paul Westbrook Date: Wed Jan 6 13:58:17 2010 -0800 Bug 2194752 Add some CTS tests for SQLiteDatabase.beginTransactionWithListener() commit 4f80af760875102c7c02d47ed57bffe70123451a Merge: d28d398 110cf56 Author: Paul Westbrook Date: Wed Jan 6 15:15:04 2010 -0800 Merge "Bug 2194752" commit 110cf56e600670fcd24bcefdf7a6cfb363bc623b Author: Paul Westbrook Date: Wed Jan 6 13:24:08 2010 -0800 Bug 2194752 Fix some test errors in android.database cts tests.. Some of the tests cases explicitly orphan some SQLiteStatements that have been compiled. When the tests are cleaned up, closing the database would throw a SQLiteException that there are some unfinalized statements. Now the the tests that leave these orphaned statements explicitly close the database, and eat that particular exception. The database file will be unlinked, and a new one is created for the next test, so if the file is not close cleanly, this shoudln't be a problem Ideally, SQLiteDatabase.removeSQLiteClosable() would be accessible by unit tests, to clean up better, but this would either require the package that the unit tests belong in to change or to make that method public commit d28d3988eea71757d24b2b4cc39d9ee653748387 Merge: 141f89d 199ed6a Author: Dan Egnor Date: Wed Jan 6 12:50:43 2010 -0800 Merge "EventLogTags is now gutted, remove its CTS test. (Will add EventLogTest in a separate change.)" commit 199ed6a44ac161ab32cbab3f69c0fe5fdf3401c5 Author: Dan Egnor Date: Wed Jan 6 12:32:15 2010 -0800 EventLogTags is now gutted, remove its CTS test. (Will add EventLogTest in a separate change.) commit 141f89d972995cbe7e2eacedac1d69157d45ad06 Author: Doug Zongker Date: Tue Jan 5 12:38:59 2010 -0800 add CTS test for RecoverySystem Change-Id: Ic00fae46d79ea9af294d00726b3a831e96d8156b commit fb4736d7c9c802a16705843dfafd4c775a4f2226 Merge: 9415973 ec61146 Author: Brett Chabot Date: Tue Dec 22 16:33:06 2009 -0800 am ec611467: More CTS test cleanup. Merge commit 'ec611467d3133d3c38af549a3cafa70567d5ec83' * commit 'ec611467d3133d3c38af549a3cafa70567d5ec83': More CTS test cleanup. commit ec611467d3133d3c38af549a3cafa70567d5ec83 Author: Brett Chabot Date: Tue Dec 22 15:54:34 2009 -0800 More CTS test cleanup. Omit broken tests, and fix race condition in TelephonyManagerTes#@testListen. Bugs 2342468, 2189784, 2323047, 2342606 Change-Id: I8193b3130248ade8a2ede5f997d9522a1b2a5529 commit 9415973d4cdd83a2fa86eb2b779dccc41005d177 Merge: 151e8c0 38b2b54 Author: Tom Taylor Date: Mon Dec 21 17:24:46 2009 -0800 am 38b2b545: Update imports to android-common Merge commit '38b2b54517f0288b162380b88b4f7973051df769' * commit '38b2b54517f0288b162380b88b4f7973051df769': Update imports to android-common commit 151e8c0f17d674fff999bace5373e444b85232c6 Author: Jean-Baptiste Queru Date: Mon Dec 21 14:56:14 2009 -0800 Add dependency on LOCAL_BUILT_MODULE, not LOCAL_INSTALLED_MODULE That's because the timestamp of LOCAL_INSTALLED_MODULE is copied from that of LOCAL_BUILT_MODULE, so if LOCAL_BUILT_MODULE is old copying it to LOCAL_INSTALLED_MODULE will create an old file that'll never be up-to-date Also, use an explicit timestamp file instead of a directory: directories' timestamps aren't reliable enough to use with make, as they get updated as side effects of other rules. Change-Id: Icee1887e0e274eee5184ebfcff614ce3285f3403 commit 38b2b54517f0288b162380b88b4f7973051df769 Author: Tom Taylor Date: Mon Dec 21 14:06:10 2009 -0800 Update imports to android-common Several files were moved to android-common. Update all the references to import those files from the new location. commit de6bc370bc33f9251a875641e2f329bcc02a5a1f Author: Jean-Baptiste Queru Date: Mon Dec 21 13:54:18 2009 -0800 Re-generate fake_resource_check immediately Because it's stored in the same location as the generated resources, it gets deleted when the resources get deleted (for cleanup), and if it's not re-generated immediately, it's missing the next time around and causes another build. Change-Id: I86c73efff3f13c0677a861f97191729f831218ef commit 48b10c448a34980707cf6c959bf3777b73923f24 Merge: 0bdac48 390333f Author: Gloria Wang Date: Fri Dec 18 23:05:43 2009 -0800 am 390333f9: Merge change Ica3f8d46 into eclair Merge commit '390333f9a2e0cc97b1844bb3747aab71f1b42165' * commit '390333f9a2e0cc97b1844bb3747aab71f1b42165': Register a callback for video size change in testPlayVideo. commit 390333f9a2e0cc97b1844bb3747aab71f1b42165 Merge: 6f00d46 0c88aba Author: Android (Google) Code Review Date: Fri Dec 18 22:58:51 2009 -0800 Merge change Ica3f8d46 into eclair * changes: Register a callback for video size change in testPlayVideo. commit 0bdac48d0f45beeff030089db0acb2592615ac44 Merge: 88c24e6 6f00d46 Author: Brett Chabot Date: Fri Dec 18 16:44:49 2009 -0800 am 6f00d466: Merge change I45a73c96 into eclair Merge commit '6f00d466f0edeefbfcf04f3db2ac40079733249c' * commit '6f00d466f0edeefbfcf04f3db2ac40079733249c': Remove duplicate and brittle ResourcesTests. commit 6f00d466f0edeefbfcf04f3db2ac40079733249c Merge: f872bb1 9fe411b Author: Android (Google) Code Review Date: Fri Dec 18 16:37:18 2009 -0800 Merge change I45a73c96 into eclair * changes: Remove duplicate and brittle ResourcesTests. commit 0c88aba34a61e2638a2cfe9345b437dd1d9a1fd3 Author: Gloria Wang Date: Fri Dec 18 15:33:45 2009 -0800 Register a callback for video size change in testPlayVideo. commit 88c24e65c053f7c06657a449045360aeeb309443 Merge: 23b097b f872bb1 Author: Brett Chabot Date: Thu Dec 17 17:51:34 2009 -0800 am f872bb1a: Merge change I9da3b25b into eclair Merge commit 'f872bb1ac1c0317f07406201df51a9af1b5412b8' * commit 'f872bb1ac1c0317f07406201df51a9af1b5412b8': CTS test cleanup: mark known failures. commit f872bb1ac1c0317f07406201df51a9af1b5412b8 Merge: 0baaf4c 68897e4 Author: Android (Google) Code Review Date: Thu Dec 17 17:45:02 2009 -0800 Merge change I9da3b25b into eclair * changes: CTS test cleanup: mark known failures. commit 68897e40ea2b6cd1203aea4c65a804217dde8515 Author: Brett Chabot Date: Thu Dec 17 17:35:01 2009 -0800 CTS test cleanup: mark known failures. Bugs 218978 2136225 2136234 2258907 2323405 2323433 2323459 2250024 Change-Id: I9da3b25b4ccdd3df4c6b00456d0e42133e35ccaf commit 23b097b9b980839fd862a2d715e73e878b01eee5 Merge: ecfbaeb 0baaf4c Author: Brett Chabot Date: Thu Dec 17 17:31:10 2009 -0800 am 0baaf4cf: Attempt to fix GridViewTest#testScroll to work on different resolutions. Merge commit '0baaf4cfb95f3d99bd0ce9c4657667b72b49a8f7' * commit '0baaf4cfb95f3d99bd0ce9c4657667b72b49a8f7': Attempt to fix GridViewTest#testScroll to work on different resolutions. commit 0baaf4cfb95f3d99bd0ce9c4657667b72b49a8f7 Author: Brett Chabot Date: Thu Dec 17 16:55:50 2009 -0800 Attempt to fix GridViewTest#testScroll to work on different resolutions. Bug 2299472 Change-Id: Ie9ece9e2259c23d0f085fd13bf48995c0fc373f4 commit ecfbaeb3d5d44d45ce673051d3cf897f31c44750 Merge: b542d16 dc07473 Author: Brett Chabot Date: Thu Dec 17 14:01:26 2009 -0800 am dc07473b: Merge change I2e929f5a into eclair Merge commit 'dc07473bcb7c2b52c75a2a4ad54405bef7d20b59' * commit 'dc07473bcb7c2b52c75a2a4ad54405bef7d20b59': Fix flaky CTS test ListActivityTest#testListActivity. commit dc07473bcb7c2b52c75a2a4ad54405bef7d20b59 Merge: c9728b3 c7ec5e2 Author: Android (Google) Code Review Date: Thu Dec 17 13:45:56 2009 -0800 Merge change I2e929f5a into eclair * changes: Fix flaky CTS test ListActivityTest#testListActivity. commit b542d164c87fa130b0c2d3857eb1cf255817f040 Merge: 5e6c02b c9728b3 Author: Brett Chabot Date: Thu Dec 17 12:54:28 2009 -0800 am c9728b32: Attempt to fix ContextWrapperTest. Merge commit 'c9728b328c3da6b687146f59471e2d40eb627750' * commit 'c9728b328c3da6b687146f59471e2d40eb627750': Attempt to fix ContextWrapperTest. commit 9fe411b2080259f227fbc90621bc2061572c8de4 Author: Brett Chabot Date: Thu Dec 17 12:32:31 2009 -0800 Remove duplicate and brittle ResourcesTests. Bug 2135117 Change-Id: I45a73c9686039bea7218d6b6e61fedb094f37225 commit c9728b328c3da6b687146f59471e2d40eb627750 Author: Brett Chabot Date: Thu Dec 17 12:26:56 2009 -0800 Attempt to fix ContextWrapperTest. Make test independent of the number of existing files present in private dir. Remove unnecessary and destructive 'delete all files' logic. Bug 2323047 Change-Id: I194e3179c5d44ced5a02a193d233a3e3c293fc85 commit c7ec5e217181a4fa5c2601328bbeba9d69130f1b Author: Brett Chabot Date: Thu Dec 17 12:01:21 2009 -0800 Fix flaky CTS test ListActivityTest#testListActivity. Bug 2334738 Change-Id: I2e929f5a7594bfb6fea796717138f48a75ee3347 commit 5e6c02b57ab64a3f2af7843210106debc5df4d27 Merge: e71a021 455061f Author: Brett Chabot Date: Thu Dec 17 10:28:38 2009 -0800 am 455061f0: Merge change Id5692b00 into eclair Merge commit '455061f0b4c594e796084b7ee0afd7b98248d8aa' * commit '455061f0b4c594e796084b7ee0afd7b98248d8aa': Adjust CTS WebSettingsTests for new no-op behaviour. commit 455061f0b4c594e796084b7ee0afd7b98248d8aa Merge: a9aff9c aed9945 Author: Android (Google) Code Review Date: Thu Dec 17 10:20:14 2009 -0800 Merge change Id5692b00 into eclair * changes: Adjust CTS WebSettingsTests for new no-op behaviour. commit e71a021fe6868c3c2f219362b4817471d3bf9137 Merge: c1da394 a9aff9c Author: Brett Chabot Date: Wed Dec 16 13:04:46 2009 -0800 am a9aff9c6: Merge change I1ad6f876 into eclair Merge commit 'a9aff9c61cf0c084f4c9392f1dcc79735d56b9bc' * commit 'a9aff9c61cf0c084f4c9392f1dcc79735d56b9bc': Fix CTS signature tests. commit a9aff9c61cf0c084f4c9392f1dcc79735d56b9bc Merge: 5a477a7 21ca775 Author: Android (Google) Code Review Date: Wed Dec 16 12:58:04 2009 -0800 Merge change I1ad6f876 into eclair * changes: Fix CTS signature tests. commit 21ca775dac808a5d254265038f68a76707ae4989 Author: Brett Chabot Date: Wed Dec 16 11:35:57 2009 -0800 Fix CTS signature tests. Add logic to handle fields with generic types and relax abstract checking for enums. Also add missing sig unit test class AbstractClass, and cleanup whitespace. Bug 2235744 Change-Id: I1ad6f87613d2cc16ac3380a871c95cf1cd4090d2 commit c1da394561cabd9a3d89b5db04847062c7765189 Merge: da5ba0d fef2b49 Author: Wu-cheng Li Date: Wed Dec 16 08:59:56 2009 -0800 am fef2b490: Add camera tests for setPreviewDisplay. Merge commit 'fef2b490c25e26a332eb6e67848a22f912a12b48' * commit 'fef2b490c25e26a332eb6e67848a22f912a12b48': Add camera tests for setPreviewDisplay. commit da5ba0dee9d47f1af57ac3f507e82faad6b3031d Merge: 7486cf8 5a477a7 Author: Wu-cheng Li Date: Tue Dec 15 23:31:18 2009 -0800 am 5a477a71: (-s ours) Merge change Id12addc6 into eclair Merge commit '5a477a71fa96e8a2c43ba3baca07de236bd98a1c' * commit '5a477a71fa96e8a2c43ba3baca07de236bd98a1c': Add camera tests for setPreviewDisplay (do not merge). commit 5a477a71fa96e8a2c43ba3baca07de236bd98a1c Merge: 21e96c1 d12addc Author: Android (Google) Code Review Date: Tue Dec 15 20:47:32 2009 -0800 Merge change Id12addc6 into eclair * changes: Add camera tests for setPreviewDisplay (do not merge). commit d12addc68a80f0501660929039a7a54208b83ac2 Author: Wu-cheng Li Date: Tue Dec 15 16:50:43 2009 +0800 Add camera tests for setPreviewDisplay (do not merge). Our camera app calls startPreview before setPreviewDisplay. We need to make sure camera drivers all support this. Cherry-pick from fef2b490c25e26a332eb6e67848a22f912a12b48. commit fef2b490c25e26a332eb6e67848a22f912a12b48 Author: Wu-cheng Li Date: Tue Dec 15 16:50:43 2009 +0800 Add camera tests for setPreviewDisplay. Our camera app calls startPreview before setPreviewDisplay. We need to make sure camera drivers all support this. commit 7486cf8872720cb78cb0be5e28f0fecbf69040c8 Merge: eb5d943 21e96c1 Author: Dan Bornstein Date: Tue Dec 15 15:05:28 2009 -0800 am 21e96c18: Add the last of the method call tests (at least the last of the ones that I\'m going to write this year). Merge commit '21e96c183316352239ab699eedacdf28f759d153' * commit '21e96c183316352239ab699eedacdf28f759d153': Add the last of the method call tests (at least the last of the ones commit 21e96c183316352239ab699eedacdf28f759d153 Author: Dan Bornstein Date: Mon Dec 14 15:33:10 2009 -0800 Add the last of the method call tests (at least the last of the ones that I'm going to write this year). Change-Id: Ib32a2c603c277215051380f6e38b37ce10a6128f commit eb5d94379bdbae98f038a316b91b22c1130facce Merge: 3b35acf d45fd7f Author: Android (Google) Code Review Date: Mon Dec 14 13:30:55 2009 -0800 Merge change Id45fd7f3 * changes: Fixing CTS to build dalvik tests against Caliper, our new benchmarking framework commit 3b35acffa1a0efeb72b66f5ac5e7c6d70cf84cca Merge: 75fefa7 383081e Author: Brett Chabot Date: Sun Dec 13 12:41:00 2009 -0800 am 383081eb: am a117ea3f: Merge change I02caed7d into eclair Merge commit '383081ebdadfcbf204e1c7e74b779b11dd75a96f' * commit '383081ebdadfcbf204e1c7e74b779b11dd75a96f': Fix android.text.method.cts.CharacterPickerDialogTest:testOnClick. commit 75fefa70eaebbcfee2c4981ed3677759407eb54e Merge: 6f3f522 f2b2763 Author: Brett Chabot Date: Sun Dec 13 12:40:56 2009 -0800 am f2b27632: am 3bc747eb: Merge change If1da349e into eclair Merge commit 'f2b276322ff426f90c04c8b74883380cf2040dee' * commit 'f2b276322ff426f90c04c8b74883380cf2040dee': Increment API level check in CTS. commit 6f3f5226e1779dd4a1e30b7e1e79515c3cbfb64c Merge: 6e34599 661d242 Author: Brett Chabot Date: Sun Dec 13 12:40:52 2009 -0800 am 661d242e: am 52c159e1: Merge change Icf6a0f31 into eclair Merge commit '661d242e1e581d14d8c1f0ca4202de3b8476ae7b' * commit '661d242e1e581d14d8c1f0ca4202de3b8476ae7b': Fix ListViewTest#testAccessItemChecked commit 6e3459978ebdf32088162fb02ab64f52fd96fb13 Merge: f982861 8a31910 Author: Brett Chabot Date: Sun Dec 13 12:40:47 2009 -0800 am 8a319106: am a317c772: Merge change I6e0c3226 into eclair Merge commit '8a31910637bef76ccbc63539a75f6a6fdd6033e9' * commit '8a31910637bef76ccbc63539a75f6a6fdd6033e9': Remove erroneous exception check from LinearLayoutTest#testGetBaseline. commit f98286100f997ac72155387be479d9c497fa485c Merge: fd863f2 0c1d72c Author: Brett Chabot Date: Sun Dec 13 12:40:40 2009 -0800 am 0c1d72ce: am 565913c1: Merge change Iea1798ea into eclair Merge commit '0c1d72cecb710293dab47743405680505cfffb07' * commit '0c1d72cecb710293dab47743405680505cfffb07': Adjust SimpleCursorTreeAdapterTest#testSetViewImage to be resolution independent. commit fd863f25d793235906eaf89a07d42b6a358997a1 Merge: c180f89 38ce725 Author: Brett Chabot Date: Sun Dec 13 12:40:35 2009 -0800 am 38ce725b: am 83767f4c: Merge change I02c6d4b3 into eclair Merge commit '38ce725b853936eea370e73008b6d5f15736bf07' * commit '38ce725b853936eea370e73008b6d5f15736bf07': Remove dubious exception value checks from TextViewTest:testAccessPaintFlags. commit c180f897ab214addc8805a1c201b6ece08f3e739 Merge: 1b93663 a796b57 Author: Dan Bornstein Date: Sun Dec 13 12:40:29 2009 -0800 am a796b576: am 4be924c2: This time for sure. Merge commit 'a796b57693eaf99b4f18021f9fb55789ca4ce200' * commit 'a796b57693eaf99b4f18021f9fb55789ca4ce200': This time for sure. commit 1b93663693663d210fa6ba03f2497816b045064d Merge: 24d8c80 99ab5cf Author: Dan Bornstein Date: Sun Dec 13 12:40:23 2009 -0800 am 99ab5cfc: am 4eca7846: Merge change Ie3d271d1 into eclair Merge commit '99ab5cfcc01eaf62bd1598cae382d49665a37d57' * commit '99ab5cfcc01eaf62bd1598cae382d49665a37d57': Add a set of tests of calling with various argument types, and put the commit 24d8c8037b5fb4c382b37c4c8aac95aedc2c33a7 Merge: 438c084 308fdab Author: Brett Chabot Date: Sun Dec 13 12:40:11 2009 -0800 am 308fdaba: am 0d68020c: Merge change I31306603 into eclair Merge commit '308fdaba3faef6d747ffe0e6bc6e64280d6fc41a' * commit '308fdaba3faef6d747ffe0e6bc6e64280d6fc41a': Fix DialogTest:testContextMenu. commit 438c0841ae33752b708e7449c32b4b993dfb5e68 Merge: 79887ba f73ea76 Author: Dan Bornstein Date: Sun Dec 13 12:40:04 2009 -0800 am f73ea766: am 1b3ae1ad: Add method test sets for most of the remaining return types. Merge commit 'f73ea76656ea373b79e557561fa0fc838320680c' * commit 'f73ea76656ea373b79e557561fa0fc838320680c': Add method test sets for most of the remaining return types. commit 383081ebdadfcbf204e1c7e74b779b11dd75a96f Merge: f2b2763 a117ea3 Author: Brett Chabot Date: Sun Dec 13 12:25:38 2009 -0800 am a117ea3f: Merge change I02caed7d into eclair Merge commit 'a117ea3fdb64fba54e23127fb1bb77382a534ccb' into eclair-mr2 * commit 'a117ea3fdb64fba54e23127fb1bb77382a534ccb': Fix android.text.method.cts.CharacterPickerDialogTest:testOnClick. commit f2b276322ff426f90c04c8b74883380cf2040dee Merge: 661d242 3bc747e Author: Brett Chabot Date: Sun Dec 13 12:25:35 2009 -0800 am 3bc747eb: Merge change If1da349e into eclair Merge commit '3bc747eb6d44c4897158573bd847f0fd1498199c' into eclair-mr2 * commit '3bc747eb6d44c4897158573bd847f0fd1498199c': Increment API level check in CTS. commit 661d242e1e581d14d8c1f0ca4202de3b8476ae7b Merge: 8a31910 52c159e Author: Brett Chabot Date: Sun Dec 13 12:25:30 2009 -0800 am 52c159e1: Merge change Icf6a0f31 into eclair Merge commit '52c159e1ac4a89d598441afd2a1cd660ec0a18d7' into eclair-mr2 * commit '52c159e1ac4a89d598441afd2a1cd660ec0a18d7': Fix ListViewTest#testAccessItemChecked commit 8a31910637bef76ccbc63539a75f6a6fdd6033e9 Merge: 0c1d72c a317c77 Author: Brett Chabot Date: Sun Dec 13 12:25:26 2009 -0800 am a317c772: Merge change I6e0c3226 into eclair Merge commit 'a317c772383941c257329f3e63651642d6432851' into eclair-mr2 * commit 'a317c772383941c257329f3e63651642d6432851': Remove erroneous exception check from LinearLayoutTest#testGetBaseline. commit 0c1d72cecb710293dab47743405680505cfffb07 Merge: 38ce725 565913c Author: Brett Chabot Date: Sun Dec 13 12:25:21 2009 -0800 am 565913c1: Merge change Iea1798ea into eclair Merge commit '565913c132fef10aa9f5ccedce5b0258ca9895df' into eclair-mr2 * commit '565913c132fef10aa9f5ccedce5b0258ca9895df': Adjust SimpleCursorTreeAdapterTest#testSetViewImage to be resolution independent. commit 38ce725b853936eea370e73008b6d5f15736bf07 Merge: a796b57 83767f4 Author: Brett Chabot Date: Sun Dec 13 12:25:16 2009 -0800 am 83767f4c: Merge change I02c6d4b3 into eclair Merge commit '83767f4c4c7c46b68a1bc0787a7a073fd95657d2' into eclair-mr2 * commit '83767f4c4c7c46b68a1bc0787a7a073fd95657d2': Remove dubious exception value checks from TextViewTest:testAccessPaintFlags. commit a796b57693eaf99b4f18021f9fb55789ca4ce200 Merge: 99ab5cf 4be924c Author: Dan Bornstein Date: Sun Dec 13 12:24:49 2009 -0800 am 4be924c2: This time for sure. Merge commit '4be924c22a451c6df6606dfafc2011b700c3c47c' into eclair-mr2 * commit '4be924c22a451c6df6606dfafc2011b700c3c47c': This time for sure. commit 99ab5cfcc01eaf62bd1598cae382d49665a37d57 Merge: 308fdab 4eca784 Author: Dan Bornstein Date: Sun Dec 13 12:24:43 2009 -0800 am 4eca7846: Merge change Ie3d271d1 into eclair Merge commit '4eca784641a4aa6c581bb94476b56ae9470912ce' into eclair-mr2 * commit '4eca784641a4aa6c581bb94476b56ae9470912ce': Add a set of tests of calling with various argument types, and put the commit 308fdaba3faef6d747ffe0e6bc6e64280d6fc41a Merge: f73ea76 0d68020 Author: Brett Chabot Date: Sun Dec 13 12:24:26 2009 -0800 am 0d68020c: Merge change I31306603 into eclair Merge commit '0d68020cf54b854e2994801bbf716d6b5b8d0870' into eclair-mr2 * commit '0d68020cf54b854e2994801bbf716d6b5b8d0870': Fix DialogTest:testContextMenu. commit f73ea76656ea373b79e557561fa0fc838320680c Merge: 5229b5c 1b3ae1a Author: Dan Bornstein Date: Sun Dec 13 12:23:45 2009 -0800 am 1b3ae1ad: Add method test sets for most of the remaining return types. Merge commit '1b3ae1adc28072c26f2b5fc8fb57717dc3be479d' into eclair-mr2 * commit '1b3ae1adc28072c26f2b5fc8fb57717dc3be479d': Add method test sets for most of the remaining return types. commit a117ea3fdb64fba54e23127fb1bb77382a534ccb Merge: 3bc747e e54a9f9 Author: Android (Google) Code Review Date: Sat Dec 12 07:13:51 2009 -0800 Merge change I02caed7d into eclair * changes: Fix android.text.method.cts.CharacterPickerDialogTest:testOnClick. commit 3bc747eb6d44c4897158573bd847f0fd1498199c Merge: 52c159e 7a6ead1 Author: Android (Google) Code Review Date: Sat Dec 12 07:13:25 2009 -0800 Merge change If1da349e into eclair * changes: Increment API level check in CTS. commit 52c159e1ac4a89d598441afd2a1cd660ec0a18d7 Merge: a317c77 451b7f5 Author: Android (Google) Code Review Date: Fri Dec 11 22:18:18 2009 -0800 Merge change Icf6a0f31 into eclair * changes: Fix ListViewTest#testAccessItemChecked commit a317c772383941c257329f3e63651642d6432851 Merge: 565913c 9deb022 Author: Android (Google) Code Review Date: Fri Dec 11 22:17:29 2009 -0800 Merge change I6e0c3226 into eclair * changes: Remove erroneous exception check from LinearLayoutTest#testGetBaseline. commit 565913c132fef10aa9f5ccedce5b0258ca9895df Merge: 83767f4 3a6c17e Author: Android (Google) Code Review Date: Fri Dec 11 22:15:34 2009 -0800 Merge change Iea1798ea into eclair * changes: Adjust SimpleCursorTreeAdapterTest#testSetViewImage to be resolution independent. commit 83767f4c4c7c46b68a1bc0787a7a073fd95657d2 Merge: 4be924c 775ea8b Author: Android (Google) Code Review Date: Fri Dec 11 22:14:01 2009 -0800 Merge change I02c6d4b3 into eclair * changes: Remove dubious exception value checks from TextViewTest:testAccessPaintFlags. commit 775ea8bef8b5e06a49e973dff140771f74f1785f Author: Brett Chabot Date: Fri Dec 11 20:02:53 2009 -0800 Remove dubious exception value checks from TextViewTest:testAccessPaintFlags. Bug 2139294. Change-Id: I02c6d4b394b59ad284dab565a09dfd390c867909 commit 3a6c17e6985f92c154da141f429a56c30050cf80 Author: Brett Chabot Date: Fri Dec 11 19:54:11 2009 -0800 Adjust SimpleCursorTreeAdapterTest#testSetViewImage to be resolution independent. Bug 2106766 Change-Id: Iea1798ea147d834dc9461e482ce5c8a2aa6e6828 commit 9deb02204164743f34362630298026f5ae23e103 Author: Brett Chabot Date: Fri Dec 11 19:46:33 2009 -0800 Remove erroneous exception check from LinearLayoutTest#testGetBaseline. Bug 2139208 Change-Id: I6e0c3226ad27b1306b77a4390977db0ac721cd4a commit 451b7f58d08a265c091f9ff0f47ff3a160dae9eb Author: Brett Chabot Date: Fri Dec 11 19:37:59 2009 -0800 Fix ListViewTest#testAccessItemChecked Bug 2139216 Change-Id: Icf6a0f31dac10a0b0d7802a19f9d178faacdb841 commit aed99454033260a68733b8152b619f15dc00b4db Author: Brett Chabot Date: Fri Dec 11 19:28:12 2009 -0800 Adjust CTS WebSettingsTests for new no-op behaviour. Bug 2258950 Change-Id: Id5692b00208e8e4a0a3105ab7b01278470eb0fd5 commit e54a9f9e3ed0e858de400b9aea65571cfa3baede Author: Brett Chabot Date: Fri Dec 11 18:13:18 2009 -0800 Fix android.text.method.cts.CharacterPickerDialogTest:testOnClick. Bug 2139190 Change-Id: I02caed7d3bf197b511985eabebedd9b5ceceefe4 commit d45fd7f3d8d7d7d30b47ac240a2d4c12107dcd3e Author: Jesse Wilson Date: Fri Dec 11 16:00:29 2009 -0800 Fixing CTS to build dalvik tests against Caliper, our new benchmarking framework commit 79887ba9816a130c3153aa0857547d6bd6134fd4 Merge: cb8c7bf 5229b5c Author: Vasu Nori Date: Fri Dec 11 15:51:55 2009 -0800 am 5229b5c5: Merge change Iebae3e99 into eclair-mr2 Merge commit '5229b5c5ff14f158c5eed18cfd6816e1958124be' * commit '5229b5c5ff14f158c5eed18cfd6816e1958124be': make sure no more than 1 sql statement is executed in execSQL() commit 5229b5c5ff14f158c5eed18cfd6816e1958124be Merge: 02ca988b 8963432 Author: Android (Google) Code Review Date: Fri Dec 11 15:42:53 2009 -0800 Merge change Iebae3e99 into eclair-mr2 * changes: make sure no more than 1 sql statement is executed in execSQL() commit 4be924c22a451c6df6606dfafc2011b700c3c47c Author: Dan Bornstein Date: Fri Dec 11 15:42:01 2009 -0800 This time for sure. Change-Id: I565e6031b51412b4fd4e47760c67ca6aeb111709 commit 89634328e785f323992e065502733ca7e214595a Author: Vasu Nori Date: Fri Dec 11 14:57:59 2009 -0800 make sure no more than 1 sql statement is executed in execSQL() ito address bug # 2256110. commit 4eca784641a4aa6c581bb94476b56ae9470912ce Merge: 0d68020 9656c4f Author: Android (Google) Code Review Date: Fri Dec 11 15:29:43 2009 -0800 Merge change Ie3d271d1 into eclair * changes: Add a set of tests of calling with various argument types, and put the target in for a test of calling with lots of arguments. commit 9656c4f2515800a1b5327a2368470d305cfad689 Author: Dan Bornstein Date: Fri Dec 11 15:23:56 2009 -0800 Add a set of tests of calling with various argument types, and put the target in for a test of calling with lots of arguments. I simplified a couple other tests and fixed some minor errors while I was in the territory, too. Change-Id: Ie3d271d109bb55b7a0639fa5528e76a2a19135c7 commit 0d68020cf54b854e2994801bbf716d6b5b8d0870 Merge: 1b3ae1a 3130660 Author: Android (Google) Code Review Date: Fri Dec 11 15:21:18 2009 -0800 Merge change I31306603 into eclair * changes: Fix DialogTest:testContextMenu. commit cb8c7bf78ea2151e7c641097bac54f8466deac3f Merge: 86f7a76 02ca988b Author: Dan Bornstein Date: Fri Dec 11 01:39:37 2009 -0800 am 02ca988b: am a8e39cce: Merge change Idcff2392 into eclair Merge commit '02ca988b631d8b685c890798f32f530aea003d67' * commit '02ca988b631d8b685c890798f32f530aea003d67': Expand the multifaceted boolean method test to cover the other variants. commit 86f7a76c261ef54218db0073b5306ab8633a6b9a Merge: 4b91c3b bb58ba4 Author: Brett Chabot Date: Thu Dec 10 23:45:36 2009 -0800 am bb58ba42: am 05e97938: Merge change I2c3973be into eclair Merge commit 'bb58ba42512a5c3659586f7fccae83dd37689551' * commit 'bb58ba42512a5c3659586f7fccae83dd37689551': Fix ConnectivityManagerTest testRequestRouteToHost and testGetAllNetworkInfo. commit 4b91c3b99d52445fa133dad831ea757632c9ce45 Merge: 244dccd 392fb5d Author: Dan Bornstein Date: Thu Dec 10 23:45:31 2009 -0800 am 392fb5d1: am 32fa208b: Merge change Iacdc919f into eclair Merge commit '392fb5d1f649911983534f79b93f7ad581f3c347' * commit '392fb5d1f649911983534f79b93f7ad581f3c347': Add a couple helper classes to be used as targets for calling from commit 244dccdb53c1b3eca5d4fe3d17534107efea32bb Merge: 6a23dc8 6ced4f5 Author: Reena Lee Date: Thu Dec 10 23:45:27 2009 -0800 am 6ced4f5b: am 9f8c5856: Merge change I62fac03c into eclair Merge commit '6ced4f5bcdee5d47f6e55eb8b7c65f9998bf0313' * commit '6ced4f5bcdee5d47f6e55eb8b7c65f9998bf0313': Comment needs to be moved from LOCAL_PACKAGE_NAME, otherwise files created have bad filenames "CtsExampleTestCases #Replace Example with your name.xml" and android.example is not created as expected. commit 6a23dc8fd7a5c64ed449a6ba55e868190ef1f982 Merge: 5778013 2964631 Author: Brett Chabot Date: Thu Dec 10 23:45:21 2009 -0800 am 29646317: am ea09b00c: Adjust CTS test PackageManagerTest#testOpPackageToPreferred for new no-op behavior. Merge commit '2964631713a672e34c2b0b86573c44eb49d8f929' * commit '2964631713a672e34c2b0b86573c44eb49d8f929': Adjust CTS test PackageManagerTest#testOpPackageToPreferred for new no-op behavior. commit 02ca988b631d8b685c890798f32f530aea003d67 Merge: bb58ba4 a8e39cc Author: Dan Bornstein Date: Thu Dec 10 19:48:29 2009 -0800 am a8e39cce: Merge change Idcff2392 into eclair Merge commit 'a8e39cce32da53bb5fe484b5c6c1968782458694' into eclair-mr2 * commit 'a8e39cce32da53bb5fe484b5c6c1968782458694': Expand the multifaceted boolean method test to cover the other variants. commit bb58ba42512a5c3659586f7fccae83dd37689551 Merge: 392fb5d 05e9793 Author: Brett Chabot Date: Thu Dec 10 18:00:44 2009 -0800 am 05e97938: Merge change I2c3973be into eclair Merge commit '05e97938f2647f533af39f04028a68d3ed99d828' into eclair-mr2 * commit '05e97938f2647f533af39f04028a68d3ed99d828': Fix ConnectivityManagerTest testRequestRouteToHost and testGetAllNetworkInfo. commit 392fb5d1f649911983534f79b93f7ad581f3c347 Merge: 6ced4f5 32fa208 Author: Dan Bornstein Date: Thu Dec 10 18:00:20 2009 -0800 am 32fa208b: Merge change Iacdc919f into eclair Merge commit '32fa208b29767db24a8ba95fb78934909bf07908' into eclair-mr2 * commit '32fa208b29767db24a8ba95fb78934909bf07908': Add a couple helper classes to be used as targets for calling from commit 6ced4f5bcdee5d47f6e55eb8b7c65f9998bf0313 Merge: 2964631 9f8c585 Author: Reena Lee Date: Thu Dec 10 18:00:15 2009 -0800 am 9f8c5856: Merge change I62fac03c into eclair Merge commit '9f8c585653928162f955fd446ffb4ca603b540d0' into eclair-mr2 * commit '9f8c585653928162f955fd446ffb4ca603b540d0': Comment needs to be moved from LOCAL_PACKAGE_NAME, otherwise files created have bad filenames "CtsExampleTestCases #Replace Example with your name.xml" and android.example is not created as expected. commit 1b3ae1adc28072c26f2b5fc8fb57717dc3be479d Author: Dan Bornstein Date: Thu Dec 10 17:21:47 2009 -0800 Add method test sets for most of the remaining return types. I went with copy-paste. So it goes. Change-Id: Ie32792ec9cf285eb9cfad4e1015b63de7b1c0be7 commit 2964631713a672e34c2b0b86573c44eb49d8f929 Merge: f988de6 ea09b00 Author: Brett Chabot Date: Thu Dec 10 16:44:50 2009 -0800 am ea09b00c: Adjust CTS test PackageManagerTest#testOpPackageToPreferred for new no-op behavior. Merge commit 'ea09b00c6ee80840b18784468857e9c3972abfb0' into eclair-mr2 * commit 'ea09b00c6ee80840b18784468857e9c3972abfb0': Adjust CTS test PackageManagerTest#testOpPackageToPreferred for new no-op behavior. commit a8e39cce32da53bb5fe484b5c6c1968782458694 Merge: 05e9793 2a8faaf Author: Android (Google) Code Review Date: Thu Dec 10 16:38:38 2009 -0800 Merge change Idcff2392 into eclair * changes: Expand the multifaceted boolean method test to cover the other variants. This is a template for how the other return types can be handled. commit 2a8faaf34188eb02979735fed998e7acb3d0089d Author: Dan Bornstein Date: Thu Dec 10 11:21:24 2009 -0800 Expand the multifaceted boolean method test to cover the other variants. This is a template for how the other return types can be handled. I'm not sure if it's really worth it to turn this whole enchilada into yet another layer of macro, or if this is the point where it should just be copy-pasted eight times. Neither choice is particulary savory. Change-Id: Idcff2392a5e3c4baadd8c1ede4edef6b90a535f9 commit 05e97938f2647f533af39f04028a68d3ed99d828 Merge: 32fa208 fe5dc4a Author: Android (Google) Code Review Date: Thu Dec 10 11:05:27 2009 -0800 Merge change I2c3973be into eclair * changes: Fix ConnectivityManagerTest testRequestRouteToHost and testGetAllNetworkInfo. commit 32fa208b29767db24a8ba95fb78934909bf07908 Merge: 9f8c585 bb5f73c Author: Android (Google) Code Review Date: Thu Dec 10 10:06:39 2009 -0800 Merge change Iacdc919f into eclair * changes: Add a couple helper classes to be used as targets for calling from native code, add some utility functions to get stuff set up in native land, and implement one set of the several tests this all now makes easy(ish). commit 9f8c585653928162f955fd446ffb4ca603b540d0 Merge: ea09b00 62fac03 Author: Android (Google) Code Review Date: Thu Dec 10 10:03:15 2009 -0800 Merge change I62fac03c into eclair * changes: Comment needs to be moved from LOCAL_PACKAGE_NAME, otherwise files created have bad filenames "CtsExampleTestCases #Replace Example with your name.xml" and android.example is not created as expected. commit 5778013ff131bc42c3f72892305c0762820218a2 Merge: 29deb56 f988de6 Author: Wu-cheng Li Date: Thu Dec 10 06:58:28 2009 -0800 am f988de6b: am eaf3cb81: Merge change Id960437c into eclair Merge commit 'f988de6be8012130571e15e8b9c62b13db5df586' * commit 'f988de6be8012130571e15e8b9c62b13db5df586': Ensure more parameters to be non-null. commit bb5f73c4da32edfe40d77357291df7f7bfa79a6f Author: Dan Bornstein Date: Wed Dec 9 16:39:39 2009 -0800 Add a couple helper classes to be used as targets for calling from native code, add some utility functions to get stuff set up in native land, and implement one set of the several tests this all now makes easy(ish). Change-Id: Iacdc919f6a1fedec40368334ca05d41f0b070ae4 commit 7a6ead17d2636a5aea1c87863bc5471dc4c949f0 Author: Brett Chabot Date: Tue Dec 8 20:00:25 2009 -0800 Increment API level check in CTS. Change-Id: If1da349e385ffcc488a61aaaf8f9bb1428fe3b62 commit fe5dc4ac09231a58113c8386353b159fb20aa399 Author: Brett Chabot Date: Tue Dec 8 19:52:35 2009 -0800 Fix ConnectivityManagerTest testRequestRouteToHost and testGetAllNetworkInfo. Bugs 2138046 and 2138034. Change-Id: I2c3973be9166892caaf2deb07bc15344b897b552 commit ea09b00c6ee80840b18784468857e9c3972abfb0 Author: Brett Chabot Date: Tue Dec 8 19:27:12 2009 -0800 Adjust CTS test PackageManagerTest#testOpPackageToPreferred for new no-op behavior. Bug 2296457 Change-Id: Iaee26e61e1d679388634b3c1bb58c7a4963d1f4f commit 29deb56a6d0ec7c3bd7965750c42c3f7cd949d75 Merge: 5499eb6 ebdb4b9 Author: Dan Bornstein Date: Tue Dec 8 14:50:51 2009 -0800 am ebdb4b9c: am 52504382: Add a final few method tests. Merge commit 'ebdb4b9c3f9ac5f6bbfdddb86b2767cdaf6633b0' * commit 'ebdb4b9c3f9ac5f6bbfdddb86b2767cdaf6633b0': Add a final few method tests. commit f988de6be8012130571e15e8b9c62b13db5df586 Merge: ebdb4b9 eaf3cb8 Author: Wu-cheng Li Date: Mon Dec 7 19:37:43 2009 -0800 am eaf3cb81: Merge change Id960437c into eclair Merge commit 'eaf3cb81cdf0a403d5bd3b5fae80a6aa5a261716' into eclair-mr2 * commit 'eaf3cb81cdf0a403d5bd3b5fae80a6aa5a261716': Ensure more parameters to be non-null. commit eaf3cb81cdf0a403d5bd3b5fae80a6aa5a261716 Merge: 5250438 86d9e67 Author: Android (Google) Code Review Date: Mon Dec 7 19:28:46 2009 -0800 Merge change Id960437c into eclair * changes: Ensure more parameters to be non-null. commit ebdb4b9c3f9ac5f6bbfdddb86b2767cdaf6633b0 Merge: fac7c65 5250438 Author: Dan Bornstein Date: Mon Dec 7 15:54:37 2009 -0800 am 52504382: Add a final few method tests. Merge commit '52504382044a016e4d232b69e6e06f2b69af0a80' into eclair-mr2 * commit '52504382044a016e4d232b69e6e06f2b69af0a80': Add a final few method tests. commit 52504382044a016e4d232b69e6e06f2b69af0a80 Author: Dan Bornstein Date: Mon Dec 7 15:02:43 2009 -0800 Add a final few method tests. I mean, I could keep adding more, but I think I've hit the point of diminishing returns. Change-Id: I87ae5e5cfaa1a0d5577358e59a698f276e7fe854 commit 5499eb64d37e25afb85b8641ed6b2535ecc740b5 Merge: afd6dbe fac7c65 Author: Dan Bornstein Date: Mon Dec 7 14:57:25 2009 -0800 am fac7c650: am 3b43ca98: Merge change Ib28730b0 into eclair Merge commit 'fac7c650d8174d65b3142d0bea2e8b8c4383d729' * commit 'fac7c650d8174d65b3142d0bea2e8b8c4383d729': Last few tests for the day. commit afd6dbea1802cacdb7a6b339dead392096554512 Merge: d4f35c3 10c1d3f Author: Fabrice Di Meglio Date: Mon Dec 7 14:57:03 2009 -0800 am 10c1d3fa: am fcb5bd1c: Merge change I69efe8b0 into eclair Merge commit '10c1d3fa663232b29adcd890f1555ca4912cd7fc' * commit '10c1d3fa663232b29adcd890f1555ca4912cd7fc': First step to CTS account manager commit d4f35c3d78404748733aca3cb4033851cda15275 Merge: 6f8887d e4aefae Author: Dan Bornstein Date: Mon Dec 7 14:54:37 2009 -0800 am e4aefae2: am af75c267: Add another passel of method calling tests. Merge commit 'e4aefae20891d423d2bb08454fd4d39b6a659f6d' * commit 'e4aefae20891d423d2bb08454fd4d39b6a659f6d': Add another passel of method calling tests. commit 62fac03cf7d4ca739af324bd08b782df5e08a6d4 Author: Reena Lee Date: Mon Dec 7 10:35:04 2009 -0800 Comment needs to be moved from LOCAL_PACKAGE_NAME, otherwise files created have bad filenames "CtsExampleTestCases #Replace Example with your name.xml" and android.example is not created as expected. commit fac7c650d8174d65b3142d0bea2e8b8c4383d729 Merge: 10c1d3f 3b43ca9 Author: Dan Bornstein Date: Fri Dec 4 17:45:46 2009 -0800 am 3b43ca98: Merge change Ib28730b0 into eclair Merge commit '3b43ca98077690cbc5332b23bb3a6347662089f1' into eclair-mr2 * commit '3b43ca98077690cbc5332b23bb3a6347662089f1': Last few tests for the day. commit 3b43ca98077690cbc5332b23bb3a6347662089f1 Merge: fcb5bd1 8579aa1 Author: Android (Google) Code Review Date: Fri Dec 4 17:41:34 2009 -0800 Merge change Ib28730b0 into eclair * changes: Last few tests for the day. commit 10c1d3fa663232b29adcd890f1555ca4912cd7fc Merge: e4aefae fcb5bd1 Author: Fabrice Di Meglio Date: Fri Dec 4 17:08:03 2009 -0800 am fcb5bd1c: Merge change I69efe8b0 into eclair Merge commit 'fcb5bd1c1b0435ddc96f07e26b29e029783567a3' into eclair-mr2 * commit 'fcb5bd1c1b0435ddc96f07e26b29e029783567a3': First step to CTS account manager commit fcb5bd1c1b0435ddc96f07e26b29e029783567a3 Merge: af75c26 0218658 Author: Android (Google) Code Review Date: Fri Dec 4 17:04:21 2009 -0800 Merge change I69efe8b0 into eclair * changes: First step to CTS account manager commit 0218658e93460c7b95c9b244ad4a1f3e5dcdeb61 Author: Fabrice Di Meglio Date: Wed Dec 2 17:18:24 2009 -0800 First step to CTS account manager 1) Took care of Brett review items and added a change for filtering features into hasFeatures() 2) Tool care of second Brett review: - suppresing trailing whitespaces - test is now self-instrumented 3) Took care of 100 chars max + suppressing Google reference into the icons commit 8579aa156275e391f1359bbe552fb8084c5c51e7 Author: Dan Bornstein Date: Fri Dec 4 16:04:52 2009 -0800 Last few tests for the day. Change-Id: Ib28730b0bdf3cc2ae74104100c1db177c1ed223d commit e4aefae20891d423d2bb08454fd4d39b6a659f6d Merge: e4d059b af75c26 Author: Dan Bornstein Date: Fri Dec 4 15:35:47 2009 -0800 am af75c267: Add another passel of method calling tests. Merge commit 'af75c267aa4fdea019f34a48061e968d8e1d1067' into eclair-mr2 * commit 'af75c267aa4fdea019f34a48061e968d8e1d1067': Add another passel of method calling tests. commit af75c267aa4fdea019f34a48061e968d8e1d1067 Author: Dan Bornstein Date: Fri Dec 4 12:10:28 2009 -0800 Add another passel of method calling tests. Change-Id: I2a6eba49d3f7e5692c873aab1d7ee544253ba41d commit 6f8887d95a95c58418fcccbd599cae305bb928fa Merge: b61e749 e4d059b Author: Dan Bornstein Date: Fri Dec 4 11:33:48 2009 -0800 am e4d059b3: am b0e6cd21: Merge change Ib7b1f17a into eclair Merge commit 'e4d059b361fbc508ef85921b04d95f5721ac8735' * commit 'e4d059b361fbc508ef85921b04d95f5721ac8735': Add a few more tests. (How do you eat a whale? One bite at a time.) commit e4d059b361fbc508ef85921b04d95f5721ac8735 Merge: 3f0136d b0e6cd2 Author: Dan Bornstein Date: Fri Dec 4 11:25:03 2009 -0800 am b0e6cd21: Merge change Ib7b1f17a into eclair Merge commit 'b0e6cd219353f89aecea774a9db054644b05fd2e' into eclair-mr2 * commit 'b0e6cd219353f89aecea774a9db054644b05fd2e': Add a few more tests. (How do you eat a whale? One bite at a time.) commit b0e6cd219353f89aecea774a9db054644b05fd2e Merge: 44b4570 8ff8374 Author: Android (Google) Code Review Date: Fri Dec 4 11:19:55 2009 -0800 Merge change Ib7b1f17a into eclair * changes: Add a few more tests. (How do you eat a whale? One bite at a time.) commit 8ff83745eec6f5bc86e03b6c561a3fd2089a0206 Author: Dan Bornstein Date: Thu Dec 3 17:38:18 2009 -0800 Add a few more tests. (How do you eat a whale? One bite at a time.) Change-Id: Ib7b1f17a78a5a285e85e0ffcd598596b17b5a79a commit 86d9e674630d3bd5fdeb8cc0d6d4ed005f044d11 Author: Wu-cheng Li Date: Fri Dec 4 20:14:59 2009 +0800 Ensure more parameters to be non-null. commit b61e7496f0c3adfc801fe0ac8570a3d59ba6df49 Merge: d8aebcc 3f0136d Author: Wu-cheng Li Date: Fri Dec 4 04:32:37 2009 -0800 am 3f0136d3: am 44b45708: Merge change I023d589f into eclair Merge commit '3f0136d34c3e5715e9cf779e21bb45337bcc939c' * commit '3f0136d34c3e5715e9cf779e21bb45337bcc939c': Add more camera parameters tests. commit d8aebcccf2a4f5fb228b0c2666957bfbc40399a1 Merge: 8b422f6 1fba9ad Author: Dan Bornstein Date: Fri Dec 4 04:24:42 2009 -0800 am 1fba9ade: am 64a20502: Flesh out the value return tests a bit. Merge commit '1fba9ade92f62dcb9b11b3c9a735ea5fb648e3e8' * commit '1fba9ade92f62dcb9b11b3c9a735ea5fb648e3e8': Flesh out the value return tests a bit. commit 8b422f6241f74025d04c6ffde5bbbd06d8bf87be Merge: 79ba172 be0a3ec Author: Vasu Nori Date: Fri Dec 4 04:24:37 2009 -0800 am be0a3ec7: Merge change Ie8b054c7 into eclair-mr2 Merge commit 'be0a3ec7d2d8ce5562362a65db56dc74598270a4' * commit 'be0a3ec7d2d8ce5562362a65db56dc74598270a4': add more unittests to SQLiteProgramTest commit 79ba172f5e9f7ff7ce20a528d7d3f4901a010b61 Merge: 5649664 2be402b Author: Dan Bornstein Date: Fri Dec 4 04:24:32 2009 -0800 am 2be402b6: am 789daf21: Sort the TODOs, and add some new ones. Merge commit '2be402b6663bd01e9ad95029f9bb7d7d81c2da78' * commit '2be402b6663bd01e9ad95029f9bb7d7d81c2da78': Sort the TODOs, and add some new ones. commit 3f0136d34c3e5715e9cf779e21bb45337bcc939c Merge: 1fba9ad 44b4570 Author: Wu-cheng Li Date: Thu Dec 3 20:12:43 2009 -0800 am 44b45708: Merge change I023d589f into eclair Merge commit '44b45708ef01252b3ef6c6cb102da0f4d645417f' into eclair-mr2 * commit '44b45708ef01252b3ef6c6cb102da0f4d645417f': Add more camera parameters tests. commit 44b45708ef01252b3ef6c6cb102da0f4d645417f Merge: 64a2050 b928cea Author: Android (Google) Code Review Date: Thu Dec 3 20:06:56 2009 -0800 Merge change I023d589f into eclair * changes: Add more camera parameters tests. commit 1fba9ade92f62dcb9b11b3c9a735ea5fb648e3e8 Merge: be0a3ec 64a2050 Author: Dan Bornstein Date: Thu Dec 3 15:23:44 2009 -0800 am 64a20502: Flesh out the value return tests a bit. Merge commit '64a20502353339fed1a3bf89a5477e9840da0a27' into eclair-mr2 * commit '64a20502353339fed1a3bf89a5477e9840da0a27': Flesh out the value return tests a bit. commit 64a20502353339fed1a3bf89a5477e9840da0a27 Author: Dan Bornstein Date: Thu Dec 3 11:44:49 2009 -0800 Flesh out the value return tests a bit. Change-Id: I9afc677087c43579105a9a8ca7f6c6ddee7d3bee commit be0a3ec7d2d8ce5562362a65db56dc74598270a4 Merge: 2be402b e8b054c Author: Android (Google) Code Review Date: Thu Dec 3 10:33:01 2009 -0800 Merge change Ie8b054c7 into eclair-mr2 * changes: add more unittests to SQLiteProgramTest commit 2be402b6663bd01e9ad95029f9bb7d7d81c2da78 Merge: 03c6fa3 789daf2 Author: Dan Bornstein Date: Thu Dec 3 10:03:28 2009 -0800 am 789daf21: Sort the TODOs, and add some new ones. Merge commit '789daf217e4f9621926668b08d98908170fc74b6' into eclair-mr2 * commit '789daf217e4f9621926668b08d98908170fc74b6': Sort the TODOs, and add some new ones. commit b928ceae3408ed76a1a1dcb7a0872acb0373a291 Author: Wu-cheng Li Date: Wed Dec 2 19:14:06 2009 +0800 Add more camera parameters tests. Update camera tests based on 2.0 compatibility guide. commit 5649664d0c69733220c7bf383c18756c303930fb Merge: 1f33958 03c6fa3 Author: Dan Bornstein Date: Wed Dec 2 20:35:56 2009 -0800 am 03c6fa32: am dd787d9a: This time for sure. Merge commit '03c6fa32dd2a8ef7b571600e9f68008715b73e08' * commit '03c6fa32dd2a8ef7b571600e9f68008715b73e08': This time for sure. commit 1f3395822746c52bfba59145cf9712cbb183c7e5 Merge: 2403977 1ccecc5 Author: Dan Bornstein Date: Wed Dec 2 20:35:52 2009 -0800 am 1ccecc5e: am 6574e976: Combine the main guts of the C and C++ versions. Also fixes the build. Merge commit '1ccecc5e66ba7d408a0d300c5e7894a8cf6b52c8' * commit '1ccecc5e66ba7d408a0d300c5e7894a8cf6b52c8': Combine the main guts of the C and C++ versions. Also fixes the build. commit 2403977bb35a5d480958c1b5c619e6016bfc4073 Merge: 14f9db4 e34a508 Author: Dan Bornstein Date: Wed Dec 2 20:31:19 2009 -0800 am e34a508f: am 8bfc65bb: Added the same two trivial tests to the C++ version. Merge commit 'e34a508f7300ff7ace39befba30144346f01eca9' * commit 'e34a508f7300ff7ace39befba30144346f01eca9': Added the same two trivial tests to the C++ version. commit 789daf217e4f9621926668b08d98908170fc74b6 Author: Dan Bornstein Date: Wed Dec 2 17:34:45 2009 -0800 Sort the TODOs, and add some new ones. Change-Id: I5102b91eaf1fc7b85cbaf2dcad2ec4aea890a7fa commit e8b054c717fd50aedb1386ebd1dc3a17631dd485 Author: Vasu Nori Date: Wed Dec 2 13:26:38 2009 -0800 add more unittests to SQLiteProgramTest commit 03c6fa32dd2a8ef7b571600e9f68008715b73e08 Merge: 1ccecc5 dd787d9 Author: Dan Bornstein Date: Wed Dec 2 12:29:19 2009 -0800 am dd787d9a: This time for sure. Merge commit 'dd787d9a227cf2355ef6c1667d6c332920dcc454' into eclair-mr2 * commit 'dd787d9a227cf2355ef6c1667d6c332920dcc454': This time for sure. commit 1ccecc5e66ba7d408a0d300c5e7894a8cf6b52c8 Merge: e34a508 6574e97 Author: Dan Bornstein Date: Wed Dec 2 12:29:15 2009 -0800 am 6574e976: Combine the main guts of the C and C++ versions. Also fixes the build. Merge commit '6574e9762ea65bc5f9ba6ae934344f342d3625ab' into eclair-mr2 * commit '6574e9762ea65bc5f9ba6ae934344f342d3625ab': Combine the main guts of the C and C++ versions. Also fixes the build. commit dd787d9a227cf2355ef6c1667d6c332920dcc454 Author: Dan Bornstein Date: Wed Dec 2 12:26:28 2009 -0800 This time for sure. Change-Id: Iea30e3cbade631992117a96b1bb870e085fe05f0 commit 6574e9762ea65bc5f9ba6ae934344f342d3625ab Author: Dan Bornstein Date: Wed Dec 2 12:22:17 2009 -0800 Combine the main guts of the C and C++ versions. Also fixes the build. Sorry about that. Change-Id: Ic326645c1b22ed7ea670c4c9c2be3b8c64d2c476 commit e34a508f7300ff7ace39befba30144346f01eca9 Merge: 457d7c2 8bfc65b Author: Dan Bornstein Date: Wed Dec 2 10:55:08 2009 -0800 am 8bfc65bb: Added the same two trivial tests to the C++ version. Merge commit '8bfc65bbbf4685982f1679f93bef1f30a57de364' into eclair-mr2 * commit '8bfc65bbbf4685982f1679f93bef1f30a57de364': Added the same two trivial tests to the C++ version. commit 14f9db4c7c7933c36ac5c9470523af9b418f3c21 Merge: cb767b4 457d7c2 Author: Gloria Wang Date: Tue Dec 1 17:39:10 2009 -0800 am 457d7c20: (-s ours) am 08f52cdf: (-s ours) Use the original image for cts test. Do not scale or dither it. Do not merge. Merge commit '457d7c203682a86804653317ffe3a6b10b94b310' * commit '457d7c203682a86804653317ffe3a6b10b94b310': Use the original image for cts test. Do not scale or dither it. Do not merge. commit 457d7c203682a86804653317ffe3a6b10b94b310 Merge: 92790db 08f52cd Author: Gloria Wang Date: Tue Dec 1 17:15:42 2009 -0800 am 08f52cdf: (-s ours) Use the original image for cts test. Do not scale or dither it. Do not merge. Merge commit '08f52cdf20b94b9c6d6a01bf753ddb883e0286f2' into eclair-mr2 * commit '08f52cdf20b94b9c6d6a01bf753ddb883e0286f2': Use the original image for cts test. Do not scale or dither it. Do not merge. commit 8bfc65bbbf4685982f1679f93bef1f30a57de364 Author: Dan Bornstein Date: Tue Dec 1 14:10:07 2009 -0800 Added the same two trivial tests to the C++ version. Next up, unification of it with the C version via the Power Of Crazy C Macros. Change-Id: I29b55a07462f2e58fd4eabc4aef3b13e99ed076e commit cb767b421b9ce0bf8909741b2e21656117289163 Merge: 37af707 92790db Author: Gloria Wang Date: Tue Dec 1 09:11:37 2009 -0800 am 92790db3: Merge change I0619cf45 into eclair-mr2 Merge commit '92790db30c2422038c610b1c863ca569fc6f6e78' * commit '92790db30c2422038c610b1c863ca569fc6f6e78': Use the original image for cts test. Do not scale or dither it. commit 08f52cdf20b94b9c6d6a01bf753ddb883e0286f2 Author: Gloria Wang Date: Mon Nov 30 16:25:35 2009 -0800 Use the original image for cts test. Do not scale or dither it. Do not merge. commit 92790db30c2422038c610b1c863ca569fc6f6e78 Merge: 8b63395 0619cf4 Author: Android (Google) Code Review Date: Mon Nov 30 15:20:03 2009 -0800 Merge change I0619cf45 into eclair-mr2 * changes: Use the original image for cts test. Do not scale or dither it. commit 0619cf459192c3df8064777b3aa5e8a3def50224 Author: Gloria Wang Date: Mon Nov 30 14:50:58 2009 -0800 Use the original image for cts test. Do not scale or dither it. commit 37af707aec01b796013cfc40cfc702a86deeb413 Merge: f28a590 8b63395 Author: Dan Bornstein Date: Tue Nov 24 15:11:39 2009 -0800 am 8b633957: am 25bdbfab: Add a bit of framework for running and reporting on native tests, and add a couple trivial tests too. Merge commit '8b633957bfd21852077630b3fe49e4aade68b1a2' * commit '8b633957bfd21852077630b3fe49e4aade68b1a2': Add a bit of framework for running and reporting on native tests, and commit 8b633957bfd21852077630b3fe49e4aade68b1a2 Merge: 912cbf8 25bdbfa Author: Dan Bornstein Date: Tue Nov 24 15:01:59 2009 -0800 am 25bdbfab: Add a bit of framework for running and reporting on native tests, and add a couple trivial tests too. Merge commit '25bdbfabafe9d46d65edcea1161ea97db4b46784' into eclair-mr2 * commit '25bdbfabafe9d46d65edcea1161ea97db4b46784': Add a bit of framework for running and reporting on native tests, and commit 25bdbfabafe9d46d65edcea1161ea97db4b46784 Author: Dan Bornstein Date: Mon Nov 23 16:40:03 2009 -0800 Add a bit of framework for running and reporting on native tests, and add a couple trivial tests too. I'll C++ify the framework in a follow-up. Change-Id: Ie5be5fb2fbd8d0add993ae5e43a77ac26f4e870d commit f28a5909b47d84352253164efd4f7f7f22b86500 Merge: 23e1db2 912cbf8 Author: Dan Bornstein Date: Fri Nov 20 14:09:53 2009 -0800 am 912cbf8d: am 8e9fd33a: Add a mostly nominal Bluetooth test. Merge commit '912cbf8dabbccd4a355c986a973f5c08700fcf6e' * commit '912cbf8dabbccd4a355c986a973f5c08700fcf6e': Add a mostly nominal Bluetooth test. commit 912cbf8dabbccd4a355c986a973f5c08700fcf6e Merge: 7bc43ac 8e9fd33 Author: Dan Bornstein Date: Fri Nov 20 14:01:29 2009 -0800 am 8e9fd33a: Add a mostly nominal Bluetooth test. Merge commit '8e9fd33af237e18486c04139d94738ea53357b02' into eclair-mr2 * commit '8e9fd33af237e18486c04139d94738ea53357b02': Add a mostly nominal Bluetooth test. commit 8e9fd33af237e18486c04139d94738ea53357b02 Author: Dan Bornstein Date: Thu Nov 19 15:41:44 2009 -0800 Add a mostly nominal Bluetooth test. Change-Id: Ib3d9c2d09f037b9aaa6b904b07f3b7005698ba1a commit 23e1db2d1e6ead1bfa0a4084272bb96c30c15a7b Merge: 3c37fa1 7bc43ac Author: Brett Chabot Date: Fri Nov 20 11:01:52 2009 -0800 am 7bc43acd: am 3e7bff4d: Merge change Ifb76ae8c into eclair Merge commit '7bc43acdf66a2c6d3c0b0bd14ec48372da6087ac' * commit '7bc43acdf66a2c6d3c0b0bd14ec48372da6087ac': Fix some CTS tests to work on non-160dpi densities. commit 7bc43acdf66a2c6d3c0b0bd14ec48372da6087ac Merge: fc23004 3e7bff4 Author: Brett Chabot Date: Fri Nov 20 10:51:43 2009 -0800 am 3e7bff4d: Merge change Ifb76ae8c into eclair Merge commit '3e7bff4d52a03679b3c77ad8eda00b3921137ebb' into eclair-mr2 * commit '3e7bff4d52a03679b3c77ad8eda00b3921137ebb': Fix some CTS tests to work on non-160dpi densities. commit 3e7bff4d52a03679b3c77ad8eda00b3921137ebb Merge: 4871bdf 124eeca Author: Android (Google) Code Review Date: Fri Nov 20 10:47:42 2009 -0800 Merge change Ifb76ae8c into eclair * changes: Fix some CTS tests to work on non-160dpi densities. commit 124eecaa02000671dd552e0c41af96291b51c185 Author: Brett Chabot Date: Wed Nov 18 14:37:11 2009 -0800 Fix some CTS tests to work on non-160dpi densities. Partial fix for bug 2106766 Change-Id: Ifb76ae8ce633e203ba0e0385f8cab4c669f6e734 commit 3c37fa17626f59e037c0ceb138454ff1f8776a21 Merge: 980309e fc23004 Author: Dan Bornstein Date: Thu Nov 19 17:44:38 2009 -0800 am fc23004c: am 4871bdf2: I missed from my partial testing that the libjnitest makefile wasn\'t getting included, since it was shadowed by a makefile one layer up. Merge commit 'fc23004cca62679b6cff7bc1501c680e72ced314' * commit 'fc23004cca62679b6cff7bc1501c680e72ced314': I missed from my partial testing that the libjnitest makefile wasn't commit 980309ecf9a1fbe41593c687df7b8b8d331e124e Merge: 775a195 5e3beed Author: Dan Bornstein Date: Thu Nov 19 17:44:10 2009 -0800 am 5e3beed6: am 5496a465: Moved libjnitest under tests/tests/jni, since that makes the build ever so slightly happier. Merge commit '5e3beed62affdc4baac555c788e8dd92761b2295' * commit '5e3beed62affdc4baac555c788e8dd92761b2295': Moved libjnitest under tests/tests/jni, since that makes the build commit 775a195dee2dfe254bf7a8cccf516946c45180f6 Merge: 2f48e3b fb8b6a8 Author: Dan Bornstein Date: Thu Nov 19 17:42:05 2009 -0800 am fb8b6a86: am 2fa29023: Add stubs for testing JNI from the C/C++ side, and clean up some stray imports from both the JNI and the example test. Merge commit 'fb8b6a861fce3f221e7965bcbf6378ae7ec356d4' * commit 'fb8b6a861fce3f221e7965bcbf6378ae7ec356d4': Add stubs for testing JNI from the C/C++ side, and clean up some stray commit 2f48e3b9995847046e8c39549a487ca153fce2fb Merge: 539fcbb f6cb104 Author: Dan Bornstein Date: Thu Nov 19 17:39:12 2009 -0800 am f6cb104b: am 388276c1: A very very basic test of JNI linkage. Merge commit 'f6cb104bdbc19dd89fd3b11c1cffbdf931542de5' * commit 'f6cb104bdbc19dd89fd3b11c1cffbdf931542de5': A very very basic test of JNI linkage. commit fc23004cca62679b6cff7bc1501c680e72ced314 Merge: 5e3beed 4871bdf Author: Dan Bornstein Date: Thu Nov 19 16:08:20 2009 -0800 am 4871bdf2: I missed from my partial testing that the libjnitest makefile wasn\'t getting included, since it was shadowed by a makefile one layer up. Merge commit '4871bdf24eab8394a76865ca22905f389e80f63e' into eclair-mr2 * commit '4871bdf24eab8394a76865ca22905f389e80f63e': I missed from my partial testing that the libjnitest makefile wasn't commit 4871bdf24eab8394a76865ca22905f389e80f63e Author: Dan Bornstein Date: Thu Nov 19 15:54:31 2009 -0800 I missed from my partial testing that the libjnitest makefile wasn't getting included, since it was shadowed by a makefile one layer up. Change-Id: Ie7083fd750c23d2a517f9b8428de9bc0bdba84f8 commit 5e3beed62affdc4baac555c788e8dd92761b2295 Merge: fb8b6a8 5496a46 Author: Dan Bornstein Date: Thu Nov 19 15:12:05 2009 -0800 am 5496a465: Moved libjnitest under tests/tests/jni, since that makes the build ever so slightly happier. Merge commit '5496a4659590acb1c7ed95d7483417ed92aa7b6c' into eclair-mr2 * commit '5496a4659590acb1c7ed95d7483417ed92aa7b6c': Moved libjnitest under tests/tests/jni, since that makes the build commit 5496a4659590acb1c7ed95d7483417ed92aa7b6c Author: Dan Bornstein Date: Thu Nov 19 15:02:55 2009 -0800 Moved libjnitest under tests/tests/jni, since that makes the build ever so slightly happier. Change-Id: I8775209a71c70b9e998467190a1767d67e60a5b8 commit fb8b6a861fce3f221e7965bcbf6378ae7ec356d4 Merge: f6cb104 2fa2902 Author: Dan Bornstein Date: Thu Nov 19 14:10:01 2009 -0800 am 2fa29023: Add stubs for testing JNI from the C/C++ side, and clean up some stray imports from both the JNI and the example test. Merge commit '2fa29023791bfc6a75aa6830d50c32da61727432' into eclair-mr2 * commit '2fa29023791bfc6a75aa6830d50c32da61727432': Add stubs for testing JNI from the C/C++ side, and clean up some stray commit 2fa29023791bfc6a75aa6830d50c32da61727432 Author: Dan Bornstein Date: Thu Nov 19 11:13:35 2009 -0800 Add stubs for testing JNI from the C/C++ side, and clean up some stray imports from both the JNI and the example test. Change-Id: I472e9f7163efccf9991a70e88811baef82d7ce0a commit f6cb104bdbc19dd89fd3b11c1cffbdf931542de5 Merge: 1bc2f4a 388276c Author: Dan Bornstein Date: Thu Nov 19 11:42:05 2009 -0800 am 388276c1: A very very basic test of JNI linkage. Merge commit '388276c1e157e51c9a280205734bea815eadf59d' into eclair-mr2 * commit '388276c1e157e51c9a280205734bea815eadf59d': A very very basic test of JNI linkage. commit 539fcbb466128008463454d36cd2a7d01a3e9a51 Merge: aa6d856 1bc2f4a Author: Brett Chabot Date: Wed Nov 18 17:53:04 2009 -0800 am 1bc2f4a4: am ce90978e: Merge change Icf0c2ba6 into eclair Merge commit '1bc2f4a4299836e5fd2e98f5d5b52aad520d4518' * commit '1bc2f4a4299836e5fd2e98f5d5b52aad520d4518': Add receiver to CTS to disable the screen lock. commit 388276c1e157e51c9a280205734bea815eadf59d Author: Dan Bornstein Date: Wed Nov 18 17:16:33 2009 -0800 A very very basic test of JNI linkage. It needs to be expanded to cover many more variants of method calling, as well as covering the use of all the JNI functions from C or C++. Removed the annotations from the example test while I was at it, since apparently they're not recommended practice anymore. Change-Id: Ic90361e66c06afa7edeb6373908b55ebf7d105a1 commit 1bc2f4a4299836e5fd2e98f5d5b52aad520d4518 Merge: 5e6ffe6 ce90978 Author: Brett Chabot Date: Wed Nov 18 14:08:05 2009 -0800 am ce90978e: Merge change Icf0c2ba6 into eclair Merge commit 'ce90978e3f1c6c93a6f08a976b9383018b4e2fd9' into eclair-mr2 * commit 'ce90978e3f1c6c93a6f08a976b9383018b4e2fd9': Add receiver to CTS to disable the screen lock. commit ce90978e3f1c6c93a6f08a976b9383018b4e2fd9 Merge: c0565e9 62a17ce Author: Android (Google) Code Review Date: Wed Nov 18 14:04:01 2009 -0800 Merge change Icf0c2ba6 into eclair * changes: Add receiver to CTS to disable the screen lock. commit 62a17ceaac5e087ed8cdf6abfa3ce91343ccbda1 Author: Brett Chabot Date: Thu Nov 12 13:35:13 2009 -0800 Add receiver to CTS to disable the screen lock. The receiver was added to the existing 'DeviceInfoCollector' apk, and that apk was renamed to TestDeviceSetup to reflect its new purpose. This replaces the old method of injecting a menu key event, which no longer works. Bug 2099347 Change-Id: Icf0c2ba6e65fb0e401dfcc98468c91bb0c7b521d commit aa6d856682b237e40c37cb6a595d710bb4e2b0ff Merge: f260e76 5e6ffe6 Author: Dan Bornstein Date: Tue Nov 17 16:42:42 2009 -0800 am 5e6ffe63: am c0565e9c: Merge change I2b53d9bd into eclair Merge commit '5e6ffe63058532582387ae3e8e3a63afd02a6ae3' * commit '5e6ffe63058532582387ae3e8e3a63afd02a6ae3': Add an explicit "example" test, which may be used both for reference and commit 5e6ffe63058532582387ae3e8e3a63afd02a6ae3 Merge: 8007b18 c0565e9 Author: Dan Bornstein Date: Tue Nov 17 16:34:00 2009 -0800 am c0565e9c: Merge change I2b53d9bd into eclair Merge commit 'c0565e9c1c147d2507665f24d79e38d0cd9567bf' into eclair-mr2 * commit 'c0565e9c1c147d2507665f24d79e38d0cd9567bf': Add an explicit "example" test, which may be used both for reference and commit c0565e9c1c147d2507665f24d79e38d0cd9567bf Merge: 66a3677 a99a3a5 Author: Android (Google) Code Review Date: Tue Nov 17 15:39:23 2009 -0800 Merge change I2b53d9bd into eclair * changes: Add an explicit "example" test, which may be used both for reference and for verification of the CTS framework. commit a99a3a5aa8a69848473981e210de2dab3f80411d Author: Dan Bornstein Date: Tue Nov 17 14:08:48 2009 -0800 Add an explicit "example" test, which may be used both for reference and for verification of the CTS framework. Change-Id: I2b53d9bd7b599fed1ca09a93c67e33deb02bbdd6 commit f260e76641914ef26537d7a0bb3a39fa65a0fff0 Merge: 15f6c5e 8007b18 Author: Phil Dubach Date: Fri Nov 13 15:53:13 2009 -0800 am 8007b18c: am 66a3677e: Integrate unsubmitted cupcake change 149424: CTS: add test cases for android.webkit.WebChromeClient and WebViewClient Merge commit '8007b18c01d82ea42f1e2bd35c1b32183c802503' * commit '8007b18c01d82ea42f1e2bd35c1b32183c802503': Integrate unsubmitted cupcake change 149424: commit 8007b18c01d82ea42f1e2bd35c1b32183c802503 Merge: 0653db6 66a3677 Author: Phil Dubach Date: Fri Nov 13 15:45:19 2009 -0800 am 66a3677e: Integrate unsubmitted cupcake change 149424: CTS: add test cases for android.webkit.WebChromeClient and WebViewClient Merge commit '66a3677e838e6ed1f63f89918ce8cf4e6372ccae' into eclair-mr2 * commit '66a3677e838e6ed1f63f89918ce8cf4e6372ccae': Integrate unsubmitted cupcake change 149424: commit 66a3677e838e6ed1f63f89918ce8cf4e6372ccae Author: Phil Dubach Date: Fri Oct 30 14:27:21 2009 -0700 Integrate unsubmitted cupcake change 149424: CTS: add test cases for android.webkit.WebChromeClient and WebViewClient Change-Id: Ibcb44e264cb25272874f9aff1083e15abc123ff4 commit 15f6c5e2aaa9363f3f1a3c9b039f111b35b85235 Merge: 7278866 0653db6 Author: Brett Chabot Date: Wed Nov 11 17:35:53 2009 -0800 am 0653db61: am b8abc38d: Fix broken WebViewTest tests. Merge commit '0653db6182d96419370aa77d9ca8a6fc530ff65c' * commit '0653db6182d96419370aa77d9ca8a6fc530ff65c': Fix broken WebViewTest tests. commit 0653db6182d96419370aa77d9ca8a6fc530ff65c Merge: 6e1ad14 b8abc38 Author: Brett Chabot Date: Wed Nov 11 17:07:58 2009 -0800 am b8abc38d: Fix broken WebViewTest tests. Merge commit 'b8abc38d471e8e83d81899c70e65d34cb9e92944' into eclair-mr2 * commit 'b8abc38d471e8e83d81899c70e65d34cb9e92944': Fix broken WebViewTest tests. commit b8abc38d471e8e83d81899c70e65d34cb9e92944 Author: Brett Chabot Date: Tue Nov 10 15:38:23 2009 -0800 Fix broken WebViewTest tests. - Adjust testSetInitialScale and testGetContentHeight to account for screen density. - Change testStopLoading and testLoadUrl to use assert 100 as initial progress value. Bug 2251669, 2251716, 2106766 Change-Id: Iaea2dbb609baec8ba50612ac7d7aa8cfb1c249c1 commit 7278866f2ce7aeaf339198d207a0d5de79ea661d Merge: ed1943e 6e1ad14 Author: Brett Chabot Date: Tue Nov 10 14:22:44 2009 -0800 am 6e1ad144: am d41c697b: Merge change I7df6caa8 into eclair Merge commit '6e1ad1449407d0bc6251259f19f2b1babbb35f91' * commit '6e1ad1449407d0bc6251259f19f2b1babbb35f91': CTS CookieTest cleanup. commit 6e1ad1449407d0bc6251259f19f2b1babbb35f91 Merge: af3ac29 d41c697 Author: Brett Chabot Date: Tue Nov 10 14:15:36 2009 -0800 am d41c697b: Merge change I7df6caa8 into eclair Merge commit 'd41c697bd01e1be0728141f290e0257be15c5bcd' into eclair-mr2 * commit 'd41c697bd01e1be0728141f290e0257be15c5bcd': CTS CookieTest cleanup. commit d41c697bd01e1be0728141f290e0257be15c5bcd Merge: 00cb94b 2a8ec95 Author: Android (Google) Code Review Date: Tue Nov 10 14:12:08 2009 -0800 Merge change I7df6caa8 into eclair * changes: CTS CookieTest cleanup. commit 2a8ec95c8b59c3d51f907252403a7c8dc7ef882b Author: Brett Chabot Date: Mon Nov 9 17:07:13 2009 -0800 CTS CookieTest cleanup. Add wait to handle asynchronous removeAllCookies call. Change to use order-independent assertion of cookie contents. Bug 2249746 Change-Id: I7df6caa835eb5b79ae3bf96601bf949aec4e39df commit ed1943e07b1caace8661d5dc354262bb5fe836ff Merge: 93edb2d af3ac29 Author: Brett Chabot Date: Tue Nov 10 10:05:25 2009 -0800 am af3ac294: am 00cb94b2: Merge change I52cd22af into eclair Merge commit 'af3ac294be67fdc22f44ea1f5835c5eb8331a72f' * commit 'af3ac294be67fdc22f44ea1f5835c5eb8331a72f': Fix WebViewTest#testAccessHttpAuthUsernamePassword commit 93edb2da9850428b781d6bf91159b15bb4536ea0 Merge: 12bccea 4d7f7e1 Author: Brett Chabot Date: Tue Nov 10 10:05:21 2009 -0800 am 4d7f7e15: am 4df12b67: Merge change Ia433256a into eclair Merge commit '4d7f7e15908afbdede35b73354a54b8a4db9c0ba' * commit '4d7f7e15908afbdede35b73354a54b8a4db9c0ba': Mark WebIconDatabaseTest#testRemoveAllIcons as a BrokenTest. commit af3ac294be67fdc22f44ea1f5835c5eb8331a72f Merge: 4d7f7e1 00cb94b Author: Brett Chabot Date: Tue Nov 10 09:59:04 2009 -0800 am 00cb94b2: Merge change I52cd22af into eclair Merge commit '00cb94b245c42c7664ae19613fa21dcefb41fa9b' into eclair-mr2 * commit '00cb94b245c42c7664ae19613fa21dcefb41fa9b': Fix WebViewTest#testAccessHttpAuthUsernamePassword commit 4d7f7e15908afbdede35b73354a54b8a4db9c0ba Merge: 798604a 4df12b6 Author: Brett Chabot Date: Tue Nov 10 09:59:00 2009 -0800 am 4df12b67: Merge change Ia433256a into eclair Merge commit '4df12b6748b4b8905cc4aebf1e1e672b7ef29257' into eclair-mr2 * commit '4df12b6748b4b8905cc4aebf1e1e672b7ef29257': Mark WebIconDatabaseTest#testRemoveAllIcons as a BrokenTest. commit 00cb94b245c42c7664ae19613fa21dcefb41fa9b Merge: 4df12b6 a1e03a7 Author: Android (Google) Code Review Date: Tue Nov 10 09:56:27 2009 -0800 Merge change I52cd22af into eclair * changes: Fix WebViewTest#testAccessHttpAuthUsernamePassword commit 4df12b6748b4b8905cc4aebf1e1e672b7ef29257 Merge: e04e638 5eea7e5 Author: Android (Google) Code Review Date: Tue Nov 10 09:56:16 2009 -0800 Merge change Ia433256a into eclair * changes: Mark WebIconDatabaseTest#testRemoveAllIcons as a BrokenTest. commit a1e03a78508d78eb8269f18fa982d957eeabf3af Author: Brett Chabot Date: Mon Nov 9 18:35:04 2009 -0800 Fix WebViewTest#testAccessHttpAuthUsernamePassword Bug 2250114 Change-Id: I52cd22af5ff12f1814e74b13ff53666a6368f93f commit 5eea7e5adc17d92689a2562a26e9f8a501677470 Author: Brett Chabot Date: Mon Nov 9 17:55:58 2009 -0800 Mark WebIconDatabaseTest#testRemoveAllIcons as a BrokenTest. Bug 2250024 Change-Id: Ia433256a604d3c8407a83cece522a27884f69922 commit 12bccea5e41786e79dc02203c66ee68c5e0aa502 Merge: 30c5d9b 798604a Author: Brett Chabot Date: Mon Nov 9 16:33:29 2009 -0800 am 798604ae: am e04e6388: Fix SmsMessageTest#testEmailGateway. Merge commit '798604ae523d2b739fc17d91c85b884445edabe2' * commit '798604ae523d2b739fc17d91c85b884445edabe2': Fix SmsMessageTest#testEmailGateway. commit 798604ae523d2b739fc17d91c85b884445edabe2 Merge: 9e0b02d e04e638 Author: Brett Chabot Date: Mon Nov 9 16:18:09 2009 -0800 am e04e6388: Fix SmsMessageTest#testEmailGateway. Merge commit 'e04e6388950df48f4c8faaa3b09d7052cfae3f71' into eclair-mr2 * commit 'e04e6388950df48f4c8faaa3b09d7052cfae3f71': Fix SmsMessageTest#testEmailGateway. commit 30c5d9b1b3428c80cf0d604296a137b944526f6e Merge: 4465618 9e0b02d Author: Brett Chabot Date: Mon Nov 9 13:50:41 2009 -0800 am 9e0b02dc: am 0e623793: Merge change I15c60fbd into eclair Merge commit '9e0b02dcec7c498a02d876d73478c2a7d64d03ee' * commit '9e0b02dcec7c498a02d876d73478c2a7d64d03ee': Fix WebSettingsTest#testUserAgentString_default. commit 9e0b02dcec7c498a02d876d73478c2a7d64d03ee Merge: dc3488c 0e62379 Author: Brett Chabot Date: Mon Nov 9 12:05:35 2009 -0800 am 0e623793: Merge change I15c60fbd into eclair Merge commit '0e623793e010caa4a9ef6ffae81c2d02f381c43d' into eclair-mr2 * commit '0e623793e010caa4a9ef6ffae81c2d02f381c43d': Fix WebSettingsTest#testUserAgentString_default. commit e04e6388950df48f4c8faaa3b09d7052cfae3f71 Author: Brett Chabot Date: Mon Nov 9 11:07:52 2009 -0800 Fix SmsMessageTest#testEmailGateway. Skip test for CDMA devices for now - need to update to use CDMA pdu. Adjust expected values for subject and message body Bug 2138352 Change-Id: I6d1940e3781ee0fb650be4318f1ee63158bb74fe commit 0e623793e010caa4a9ef6ffae81c2d02f381c43d Merge: 45d7163 15c60fb Author: Android (Google) Code Review Date: Mon Nov 9 08:53:09 2009 -0800 Merge change I15c60fbd into eclair * changes: Fix WebSettingsTest#testUserAgentString_default. commit 44656180d3f271492c80561f630c0cfacdd9e20c Merge: 20acfe9 dc3488c Author: Brett Chabot Date: Sat Nov 7 13:03:50 2009 -0800 am dc3488c1: am 45d7163b: Skip SMS data message tests for CDMA devices. Merge commit 'dc3488c160599356224cd820d247aa5a6beaf741' * commit 'dc3488c160599356224cd820d247aa5a6beaf741': Skip SMS data message tests for CDMA devices. commit dc3488c160599356224cd820d247aa5a6beaf741 Merge: 123c196 45d7163 Author: Brett Chabot Date: Sat Nov 7 12:45:59 2009 -0800 am 45d7163b: Skip SMS data message tests for CDMA devices. Merge commit '45d7163bd3971d93e0c562ef6ce38a0d1c6008b7' into eclair-mr2 * commit '45d7163bd3971d93e0c562ef6ce38a0d1c6008b7': Skip SMS data message tests for CDMA devices. commit 45d7163bd3971d93e0c562ef6ce38a0d1c6008b7 Author: Brett Chabot Date: Fri Nov 6 20:22:55 2009 -0800 Skip SMS data message tests for CDMA devices. Bug 2236642 commit 15c60fbd7b5f842049fc71960e9847336a7650be Author: Brett Chabot Date: Fri Nov 6 20:39:18 2009 -0800 Fix WebSettingsTest#testUserAgentString_default. Update expected values to new Webkit version for Eclair. Bug 2239982 commit 20acfe988d95dfa99b8c4aa1eee127b19df1acb7 Merge: c5d932b 0b80cc1 Author: Android (Google) Code Review Date: Fri Nov 6 18:25:23 2009 -0500 Merge change I51706d9e * changes: Fixing CTS buildfile to point at both Dalvik XML directories. commit 0b80cc1395f0bc2f5d1aadea955baaf8b0dc17f3 Author: Jesse Wilson Date: Fri Nov 6 15:22:48 2009 -0800 Fixing CTS buildfile to point at both Dalvik XML directories. commit c5d932b203007232cbf4fca9cf0ba7a5ec0755a7 Merge: 7ea909b 123c196 Author: Phil Dubach Date: Fri Nov 6 13:42:10 2009 -0800 am 123c1968: (-s ours) am f3c51c92: (-s ours) DO NOT MERGE. Cherrypick CacheManagerTest from mr2. Merge commit '123c19685522b9a331a0b4a92f2499bb423794ef' * commit '123c19685522b9a331a0b4a92f2499bb423794ef': DO NOT MERGE. Cherrypick CacheManagerTest from mr2. commit 123c19685522b9a331a0b4a92f2499bb423794ef Merge: 72be98f f3c51c9 Author: Phil Dubach Date: Fri Nov 6 13:22:29 2009 -0800 am f3c51c92: (-s ours) DO NOT MERGE. Cherrypick CacheManagerTest from mr2. Merge commit 'f3c51c92dfc6af3755379a113272f4c41b190279' into eclair-mr2 * commit 'f3c51c92dfc6af3755379a113272f4c41b190279': DO NOT MERGE. Cherrypick CacheManagerTest from mr2. commit f3c51c92dfc6af3755379a113272f4c41b190279 Author: Phil Dubach Date: Thu Oct 29 11:28:07 2009 -0700 DO NOT MERGE. Cherrypick CacheManagerTest from mr2. Integrate unsubmitted cupcake change 149423: CTS: add test cases for android.webkit.CacheManager commit 7ea909b45e1befc1a3581d96393b4c2fe449885d Merge: 6b4e978 72be98f Author: Brett Chabot Date: Fri Nov 6 11:24:57 2009 -0800 am 72be98ff: am 4a7ce59c: Merge change I5d66022c into eclair Merge commit '72be98ffc54ea027b836db3ac27e3c5443585f24' * commit '72be98ffc54ea027b836db3ac27e3c5443585f24': Fix DrawableContainerTest:testSetDither commit 6b4e9787042c2eafc333aeb9bfeeae10b3c07bb5 Merge: ba83b0c 63d74f2 Author: Phil Dubach Date: Fri Nov 6 11:24:51 2009 -0800 am 63d74f27: (-s ours) am 6c447dc0: (-s ours) Merge change Ie36f7240 into eclair Merge commit '63d74f2765b6f8b96ed9f9f1df64cbfdcf15d530' * commit '63d74f2765b6f8b96ed9f9f1df64cbfdcf15d530': DO NOT MERGE. Cherrypick webkit auth tests from mr2. commit 72be98ffc54ea027b836db3ac27e3c5443585f24 Merge: 63d74f2 4a7ce59 Author: Brett Chabot Date: Fri Nov 6 11:05:39 2009 -0800 am 4a7ce59c: Merge change I5d66022c into eclair Merge commit '4a7ce59c154df8419f607b4fc4bbbc625a3e87ab' into eclair-mr2 * commit '4a7ce59c154df8419f607b4fc4bbbc625a3e87ab': Fix DrawableContainerTest:testSetDither commit 63d74f2765b6f8b96ed9f9f1df64cbfdcf15d530 Merge: bfd4a86 6c447dc Author: Phil Dubach Date: Fri Nov 6 11:05:34 2009 -0800 am 6c447dc0: (-s ours) Merge change Ie36f7240 into eclair Merge commit '6c447dc0df0c823822849197d1e93683c9f73d04' into eclair-mr2 * commit '6c447dc0df0c823822849197d1e93683c9f73d04': DO NOT MERGE. Cherrypick webkit auth tests from mr2. commit 4a7ce59c154df8419f607b4fc4bbbc625a3e87ab Merge: 6c447dc 5d66022 Author: Android (Google) Code Review Date: Fri Nov 6 13:55:32 2009 -0500 Merge change I5d66022c into eclair * changes: Fix DrawableContainerTest:testSetDither commit 6c447dc0df0c823822849197d1e93683c9f73d04 Merge: f6ecbba e36f724 Author: Android (Google) Code Review Date: Fri Nov 6 13:55:25 2009 -0500 Merge change Ie36f7240 into eclair * changes: DO NOT MERGE. Cherrypick webkit auth tests from mr2. commit ba83b0c0bd3a4466aa1ab9dbef01247fea9698f3 Merge: 44e180a bfd4a86 Author: Dmitri Plotnikov Date: Thu Nov 5 20:47:21 2009 -0800 am bfd4a86d: am f6ecbba1: Merge change Ibb351ff7 into eclair Merge commit 'bfd4a86dd778e101dfe9f257a6270b8f4e18a7ee' * commit 'bfd4a86dd778e101dfe9f257a6270b8f4e18a7ee': Fixing breakage in Contacts CTS tests. commit bfd4a86dd778e101dfe9f257a6270b8f4e18a7ee Merge: 1dcd18d f6ecbba Author: Dmitri Plotnikov Date: Thu Nov 5 20:26:12 2009 -0800 am f6ecbba1: Merge change Ibb351ff7 into eclair Merge commit 'f6ecbba18a1cdcb45543b7a06b633505eda2aa3d' into eclair-mr2 * commit 'f6ecbba18a1cdcb45543b7a06b633505eda2aa3d': Fixing breakage in Contacts CTS tests. commit 44e180a09d61f17a3380cefdf549b20fe52d4183 Merge: 8f6d2e2 1dcd18d Author: Phil Dubach Date: Thu Nov 5 19:31:09 2009 -0800 am 1dcd18db: (-s ours) am 8b5b708d: (-s ours) Merge change I32ff6b01 into eclair Merge commit '1dcd18dbbf13634dcee53edfdd64a6faaa3d937b' * commit '1dcd18dbbf13634dcee53edfdd64a6faaa3d937b': DO NOT MERGE. cherry pick WebSettingsTest from mr2. commit 8f6d2e2be66ab55685961349024d4e2a52870189 Merge: 4d96a1a a773637 Author: Phil Dubach Date: Thu Nov 5 19:31:04 2009 -0800 am a7736378: (-s ours) am c305a474: (-s ours) Merge change I74cc8976 into eclair Merge commit 'a77363780f6753fbe73dee6d95daa79fbda2924c' * commit 'a77363780f6753fbe73dee6d95daa79fbda2924c': DO NOT MERGE. cherrypick URLUtil test from mr2. commit 1dcd18dbbf13634dcee53edfdd64a6faaa3d937b Merge: a773637 8b5b708 Author: Phil Dubach Date: Thu Nov 5 19:11:02 2009 -0800 am 8b5b708d: (-s ours) Merge change I32ff6b01 into eclair Merge commit '8b5b708dbf26f1a71d37b1413624cc051aa7963e' into eclair-mr2 * commit '8b5b708dbf26f1a71d37b1413624cc051aa7963e': DO NOT MERGE. cherry pick WebSettingsTest from mr2. commit a77363780f6753fbe73dee6d95daa79fbda2924c Merge: 6301cef c305a47 Author: Phil Dubach Date: Thu Nov 5 19:10:54 2009 -0800 am c305a474: (-s ours) Merge change I74cc8976 into eclair Merge commit 'c305a474eba27bc61202e8c668610db8070fff8c' into eclair-mr2 * commit 'c305a474eba27bc61202e8c668610db8070fff8c': DO NOT MERGE. cherrypick URLUtil test from mr2. commit e36f72405878c4f4f6ef50dc3177d723de1a804c Author: Phil Dubach Date: Wed Oct 21 11:44:55 2009 -0700 DO NOT MERGE. Cherrypick webkit auth tests from mr2. Integrate unsubmitted cupcake change 135106: CTS: add test case for android.webkit.HttpAuthHandler and SslErrorHandler commit f6ecbba18a1cdcb45543b7a06b633505eda2aa3d Merge: 8b5b708 e1b6270 Author: Android (Google) Code Review Date: Thu Nov 5 19:49:07 2009 -0500 Merge change Ibb351ff7 into eclair * changes: Fixing breakage in Contacts CTS tests. commit 8b5b708dbf26f1a71d37b1413624cc051aa7963e Merge: c305a47 32ff6b0 Author: Android (Google) Code Review Date: Thu Nov 5 19:41:30 2009 -0500 Merge change I32ff6b01 into eclair * changes: DO NOT MERGE. cherry pick WebSettingsTest from mr2. commit c305a474eba27bc61202e8c668610db8070fff8c Merge: 6605a8d 74cc897 Author: Android (Google) Code Review Date: Thu Nov 5 19:40:47 2009 -0500 Merge change I74cc8976 into eclair * changes: DO NOT MERGE. cherrypick URLUtil test from mr2. commit 74cc8976d5148a3f70d335f0366551ee21f7b2ed Author: Phil Dubach Date: Tue Oct 6 13:19:01 2009 -0700 DO NOT MERGE. cherrypick URLUtil test from mr2. Integrate unsubmitted cupcake change 133025: CTS: CTS: Added test cases for android.webkit.URLUtil commit 32ff6b01786f6fa07f362a9153b437b6110bc942 Author: Phil Dubach Date: Thu Sep 17 17:21:49 2009 -0700 DO NOT MERGE. cherry pick WebSettingsTest from mr2. Integrate unsubmitted cupcake change 148518: CTS: add test case for android.webkit.WebSettings commit 4d96a1a56fc9dc19ff6a531341c9b92040d8868e Merge: 508419f 6301cef Author: Phil Dubach Date: Thu Nov 5 16:04:09 2009 -0800 am 6301cef9: (-s ours) am 6605a8d7: (-s ours) DO NOT MERGE. cherrypick cts datesorter test from mr2. Merge commit '6301cef91832dcde1984930daa0e2b4eaf133407' * commit '6301cef91832dcde1984930daa0e2b4eaf133407': DO NOT MERGE. cherrypick cts datesorter test from mr2. commit 508419f161ac2eeaba0080089d49e0055a04a0ad Merge: 314158a 15e18b1 Author: Phil Dubach Date: Thu Nov 5 16:04:03 2009 -0800 am 15e18b15: (-s ours) am 75036519: (-s ours) Merge change I62049e69 into eclair Merge commit '15e18b15061d6d1325e48bf976d0896cdde4a730' * commit '15e18b15061d6d1325e48bf976d0896cdde4a730': DO NOT MERGE. Cherrypick cts webkit change from mr2. commit 314158a7873c54d47b2e2a08346ab922c17c5438 Merge: e52ec0b 2bafab7 Author: Phil Dubach Date: Thu Nov 5 16:03:57 2009 -0800 am 2bafab76: (-s ours) am 782f06e5: (-s ours) DO NOT MERGE. cherrypick cts webkit mr2 change. Merge commit '2bafab766b6893fb298997c0ac071975f69c1a2f' * commit '2bafab766b6893fb298997c0ac071975f69c1a2f': DO NOT MERGE. cherrypick cts webkit mr2 change. commit 6301cef91832dcde1984930daa0e2b4eaf133407 Merge: 15e18b1 6605a8d Author: Phil Dubach Date: Thu Nov 5 15:43:45 2009 -0800 am 6605a8d7: (-s ours) DO NOT MERGE. cherrypick cts datesorter test from mr2. Merge commit '6605a8d73448caddf0e74e1f96948ef75bb3508a' into eclair-mr2 * commit '6605a8d73448caddf0e74e1f96948ef75bb3508a': DO NOT MERGE. cherrypick cts datesorter test from mr2. commit 15e18b15061d6d1325e48bf976d0896cdde4a730 Merge: 2bafab7 7503651 Author: Phil Dubach Date: Thu Nov 5 15:43:40 2009 -0800 am 75036519: (-s ours) Merge change I62049e69 into eclair Merge commit '750365199ff2e61f8fa626088443abe454d7f4db' into eclair-mr2 * commit '750365199ff2e61f8fa626088443abe454d7f4db': DO NOT MERGE. Cherrypick cts webkit change from mr2. commit 2bafab766b6893fb298997c0ac071975f69c1a2f Merge: 75225cb 782f06e Author: Phil Dubach Date: Thu Nov 5 15:43:19 2009 -0800 am 782f06e5: (-s ours) DO NOT MERGE. cherrypick cts webkit mr2 change. Merge commit '782f06e5c9298d5f716afe5abd40f54a1d82946c' into eclair-mr2 * commit '782f06e5c9298d5f716afe5abd40f54a1d82946c': DO NOT MERGE. cherrypick cts webkit mr2 change. commit 6605a8d73448caddf0e74e1f96948ef75bb3508a Author: Phil Dubach Date: Wed Oct 7 11:45:07 2009 -0700 DO NOT MERGE. cherrypick cts datesorter test from mr2. Integrate unsubmitted cupcake change 133382: CTS: add test case for android.webkit.DateSorter commit e52ec0bd774c3c3cdc528d9802fd1ac98fc086c7 Merge: ce46892 75225cb Author: Phil Dubach Date: Thu Nov 5 14:30:34 2009 -0800 am 75225cbc: Merge change I47555082 into eclair-mr2 Merge commit '75225cbcb90bc53192bd8d2f9086a851b0b8f8a9' * commit '75225cbcb90bc53192bd8d2f9086a851b0b8f8a9': Integrate unsubmitted cupcake change 149423: commit 750365199ff2e61f8fa626088443abe454d7f4db Merge: 782f06e 62049e6 Author: Android (Google) Code Review Date: Thu Nov 5 17:25:28 2009 -0500 Merge change I62049e69 into eclair * changes: DO NOT MERGE. Cherrypick cts webkit change from mr2. commit 75225cbcb90bc53192bd8d2f9086a851b0b8f8a9 Merge: f54725a e6e441a Author: Android (Google) Code Review Date: Thu Nov 5 17:11:54 2009 -0500 Merge change I47555082 into eclair-mr2 * changes: Integrate unsubmitted cupcake change 149423: CTS: add test cases for android.webkit.CacheManager commit 782f06e5c9298d5f716afe5abd40f54a1d82946c Author: Phil Dubach Date: Fri Oct 16 11:03:35 2009 -0700 DO NOT MERGE. cherrypick cts webkit mr2 change. Integrate unsubmitted cupcake change 132558: CTS: add test case for android.webkit.WebIconDatabase commit e1b62709e734c02a8de710c90a38f2a813a53b01 Author: Dmitri Plotnikov Date: Thu Nov 5 12:52:51 2009 -0800 Fixing breakage in Contacts CTS tests. Bug: http://b/2236480 Change-Id: Ibb351ff755a18beed4d389e2bccc4d1f4b8223a8 commit 62049e69c0ed92deab389950a3bb376911c2d3b6 Author: Phil Dubach Date: Thu Oct 8 12:05:00 2009 -0700 DO NOT MERGE. Cherrypick cts webkit change from mr2. Integrate unsubmitted cupcake change 133011: CTS: add test case of android.webkit.UrlInterceptRegistry commit ce4689273ff96e79918c447c6e097e368ad87dbd Merge: e28bb74 f54725a Author: Brett Chabot Date: Wed Nov 4 14:59:58 2009 -0800 am f54725a3: am 4957e084: Merge change I5226ec66 into eclair Merge commit 'f54725a3e701276574f3d2f4d08fc54320ad98cc' * commit 'f54725a3e701276574f3d2f4d08fc54320ad98cc': Fix TextPaintTest:testConstructor. commit e28bb74e589e915fea83858b3d682f63fe89e206 Merge: cc47222 a1f7350 Author: Brett Chabot Date: Wed Nov 4 14:59:52 2009 -0800 am a1f73509: am 2ce699cb: Merge change Ic74e0d15 into eclair Merge commit 'a1f735098fea0fdfa5abc62be47c5d618097620e' * commit 'a1f735098fea0fdfa5abc62be47c5d618097620e': Fix CTS PhoneNumberUtilsTest:testJudgeMethods. commit cc47222494a8b00ccd642c50dc9562b0b44c53b3 Merge: 6d295b7 36dd646 Author: Brett Chabot Date: Wed Nov 4 14:48:03 2009 -0800 am 36dd646d: am c270243f: Merge change I2107c784 into eclair Merge commit '36dd646da3396edecba1c1417fc261aa640892a3' * commit '36dd646da3396edecba1c1417fc261aa640892a3': Fix AudioManager#testRouting. commit f54725a3e701276574f3d2f4d08fc54320ad98cc Merge: a1f7350 4957e08 Author: Brett Chabot Date: Wed Nov 4 14:37:18 2009 -0800 am 4957e084: Merge change I5226ec66 into eclair Merge commit '4957e084d8602c8d1eb67937389c37d0a85e490b' into eclair-mr2 * commit '4957e084d8602c8d1eb67937389c37d0a85e490b': Fix TextPaintTest:testConstructor. commit a1f735098fea0fdfa5abc62be47c5d618097620e Merge: 36dd646 2ce699c Author: Brett Chabot Date: Wed Nov 4 14:37:10 2009 -0800 am 2ce699cb: Merge change Ic74e0d15 into eclair Merge commit '2ce699cba93747664a64911caa4bd5cc90a13df9' into eclair-mr2 * commit '2ce699cba93747664a64911caa4bd5cc90a13df9': Fix CTS PhoneNumberUtilsTest:testJudgeMethods. commit 4957e084d8602c8d1eb67937389c37d0a85e490b Merge: 2ce699c 5226ec6 Author: Android (Google) Code Review Date: Wed Nov 4 17:26:22 2009 -0500 Merge change I5226ec66 into eclair * changes: Fix TextPaintTest:testConstructor. commit 36dd646da3396edecba1c1417fc261aa640892a3 Merge: 27949b0 c270243 Author: Brett Chabot Date: Wed Nov 4 14:26:20 2009 -0800 am c270243f: Merge change I2107c784 into eclair Merge commit 'c270243f31ff0522b5fcf6a433652c127cc8bb3e' into eclair-mr2 * commit 'c270243f31ff0522b5fcf6a433652c127cc8bb3e': Fix AudioManager#testRouting. commit 2ce699cba93747664a64911caa4bd5cc90a13df9 Merge: c270243 c74e0d1 Author: Android (Google) Code Review Date: Wed Nov 4 17:24:47 2009 -0500 Merge change Ic74e0d15 into eclair * changes: Fix CTS PhoneNumberUtilsTest:testJudgeMethods. commit c270243f31ff0522b5fcf6a433652c127cc8bb3e Merge: 7aed228 7576523 Author: Android (Google) Code Review Date: Wed Nov 4 17:18:44 2009 -0500 Merge change I2107c784 into eclair * changes: Fix AudioManager#testRouting. commit 5226ec665d704084dfb166b778ae68ff844fe50a Author: Brett Chabot Date: Wed Nov 4 13:36:10 2009 -0800 Fix TextPaintTest:testConstructor. Remove unnecessary assertions. Bug 2238876. commit 6d295b7282245cc6916c0e0e5260b5dd4830a3d6 Merge: c950a06 27949b0 Author: Brett Chabot Date: Wed Nov 4 12:16:10 2009 -0800 am 27949b0c: am 7aed228c: Merge change I5123e63a into eclair Merge commit '27949b0c33550ad9f2e57bb105013c57b1a4e8e6' * commit '27949b0c33550ad9f2e57bb105013c57b1a4e8e6': Fix CTS dpi tests. commit c950a063c0873f057bd35eb43a79230cc1ad0c2d Merge: af15d5b 91cf8f7 Author: Brett Chabot Date: Wed Nov 4 12:16:04 2009 -0800 am 91cf8f78: am d6193d68: Merge change Iaab3698c into eclair Merge commit '91cf8f78534406aebbe940e2b32d254f5fa4ac05' * commit '91cf8f78534406aebbe940e2b32d254f5fa4ac05': Fix MediaStore_Images_ThumbnailsTest:testStoreImagesMediaExternal. commit 27949b0c33550ad9f2e57bb105013c57b1a4e8e6 Merge: 91cf8f7 7aed228 Author: Brett Chabot Date: Wed Nov 4 11:55:26 2009 -0800 am 7aed228c: Merge change I5123e63a into eclair Merge commit '7aed228ce8b4d052a1e7a09774f1b8a3a8d64b17' into eclair-mr2 * commit '7aed228ce8b4d052a1e7a09774f1b8a3a8d64b17': Fix CTS dpi tests. commit 91cf8f78534406aebbe940e2b32d254f5fa4ac05 Merge: abe817c d6193d6 Author: Brett Chabot Date: Wed Nov 4 11:55:18 2009 -0800 am d6193d68: Merge change Iaab3698c into eclair Merge commit 'd6193d68676a31205fa9aff7c44a404972b6f8cf' into eclair-mr2 * commit 'd6193d68676a31205fa9aff7c44a404972b6f8cf': Fix MediaStore_Images_ThumbnailsTest:testStoreImagesMediaExternal. commit 7aed228ce8b4d052a1e7a09774f1b8a3a8d64b17 Merge: d6193d6 5123e63 Author: Android (Google) Code Review Date: Wed Nov 4 14:46:37 2009 -0500 Merge change I5123e63a into eclair * changes: Fix CTS dpi tests. commit d6193d68676a31205fa9aff7c44a404972b6f8cf Merge: 99779a4 aab3698 Author: Android (Google) Code Review Date: Wed Nov 4 14:46:24 2009 -0500 Merge change Iaab3698c into eclair * changes: Fix MediaStore_Images_ThumbnailsTest:testStoreImagesMediaExternal. commit 7576523d335b09843f4ec600540127e8ab180999 Author: Brett Chabot Date: Tue Nov 3 14:46:09 2009 -0800 Fix AudioManager#testRouting. Bug 2136268 commit c74e0d157a713bfd1092c8d2400fbafe3a5b7999 Author: Brett Chabot Date: Tue Nov 3 18:02:48 2009 -0800 Fix CTS PhoneNumberUtilsTest:testJudgeMethods. Remove assertion for 112 == emergency number. Bug 2236583 commit af15d5bd03e10aca74e5971f4b24c8795dd9d8bc Merge: f62903a abe817c Author: Brett Chabot Date: Tue Nov 3 17:54:09 2009 -0800 am abe817c2: am 99779a45: Merge change I78c0cbf5 into eclair Merge commit 'abe817c2e390db50b3a8a2d87b1f9b22cfc30c03' * commit 'abe817c2e390db50b3a8a2d87b1f9b22cfc30c03': Fix FileAccessPermissionTest.java. commit aab3698cb64029e00e86c383731b38e7ac3f35ba Author: Brett Chabot Date: Tue Nov 3 17:45:59 2009 -0800 Fix MediaStore_Images_ThumbnailsTest:testStoreImagesMediaExternal. Remove UnsupportedOperationException when updating or deleting a thumbnail. Bug 2236542 commit abe817c2e390db50b3a8a2d87b1f9b22cfc30c03 Merge: df9ba4c 99779a4 Author: Brett Chabot Date: Tue Nov 3 17:32:07 2009 -0800 am 99779a45: Merge change I78c0cbf5 into eclair Merge commit '99779a451e1a8f10d1731b88923834699bab2936' into eclair-mr2 * commit '99779a451e1a8f10d1731b88923834699bab2936': Fix FileAccessPermissionTest.java. commit 99779a451e1a8f10d1731b88923834699bab2936 Merge: ec37d14 78c0cbf Author: Android (Google) Code Review Date: Tue Nov 3 20:19:59 2009 -0500 Merge change I78c0cbf5 into eclair * changes: Fix FileAccessPermissionTest.java. commit f62903a6e43fb533ce56608baad81bcfb52aa3f1 Merge: bf0fc52 df9ba4c Author: Brett Chabot Date: Tue Nov 3 17:00:47 2009 -0800 am df9ba4cb: am ec37d14b: Merge change I90954753 into eclair Merge commit 'df9ba4cb07d57a62559f8c325f616e499ef40679' * commit 'df9ba4cb07d57a62559f8c325f616e499ef40679': Fix MailToTest. commit df9ba4cb07d57a62559f8c325f616e499ef40679 Merge: c028bcb ec37d14 Author: Brett Chabot Date: Tue Nov 3 16:37:31 2009 -0800 am ec37d14b: Merge change I90954753 into eclair Merge commit 'ec37d14bb0e8b9b9d8757c40f70ac9da277fe632' into eclair-mr2 * commit 'ec37d14bb0e8b9b9d8757c40f70ac9da277fe632': Fix MailToTest. commit ec37d14bb0e8b9b9d8757c40f70ac9da277fe632 Merge: 2a9781f 9095475 Author: Android (Google) Code Review Date: Tue Nov 3 19:27:24 2009 -0500 Merge change I90954753 into eclair * changes: Fix MailToTest. commit 78c0cbf5b4f6e62e85f7cd538d4727d9f38baa25 Author: Brett Chabot Date: Tue Nov 3 16:21:34 2009 -0800 Fix FileAccessPermissionTest.java. Adjust checks for listFiles() on protected dirs to only allow null or empty list as valid values. Also rename the class to correct typo. Bug 2134266 commit 90954753dfee68e278cfe10f8e14a5b7a70b0c95 Author: Brett Chabot Date: Tue Nov 3 15:57:26 2009 -0800 Fix MailToTest. Changed the toString assertions to be parameter order independent. commit bf0fc52e5c661a588c00ab5477efae1a2b460a9e Merge: d5dc225 c028bcb Author: Brett Chabot Date: Tue Nov 3 14:39:33 2009 -0800 am c028bcb3: am 2a9781f1: Add new packages to CTS progress tracker. Merge commit 'c028bcb323af99421cf648055589912d645bcc7a' * commit 'c028bcb323af99421cf648055589912d645bcc7a': Add new packages to CTS progress tracker. commit 5d66022c78b1a3503d97a57fb1b1c40416d2750e Author: Brett Chabot Date: Tue Nov 3 14:27:33 2009 -0800 Fix DrawableContainerTest:testSetDither Bug 2219705 commit c028bcb323af99421cf648055589912d645bcc7a Merge: f439175 2a9781f Author: Brett Chabot Date: Tue Nov 3 14:20:50 2009 -0800 am 2a9781f1: Add new packages to CTS progress tracker. Merge commit '2a9781f16877dad1ca00bdf32499e0614dfe211e' into eclair-mr2 * commit '2a9781f16877dad1ca00bdf32499e0614dfe211e': Add new packages to CTS progress tracker. commit 2a9781f16877dad1ca00bdf32499e0614dfe211e Author: Brett Chabot Date: Tue Nov 3 13:24:56 2009 -0800 Add new packages to CTS progress tracker. commit 5123e63ad23b068aded07a2a87c2a93229edac8d Author: Brett Chabot Date: Tue Nov 3 13:21:13 2009 -0800 Fix CTS dpi tests. Change dpi display check to use current api level rather than donut. Refactor source packages to android.dpi namespace for consistency. commit d5dc225e0f2adfae04a2faa562a8365d146201b5 Merge: ff276ed f439175 Author: Dianne Hackborn Date: Mon Nov 2 11:13:07 2009 -0800 am f439175a: am c6dd74ed: Test for issue #2226370: Resource versions match with equality Merge commit 'f439175ab755de3e8ae7a2b2dfc41c98e044e1a3' * commit 'f439175ab755de3e8ae7a2b2dfc41c98e044e1a3': Test for issue #2226370: Resource versions match with equality commit f439175ab755de3e8ae7a2b2dfc41c98e044e1a3 Merge: a1ee0ce c6dd74e Author: Dianne Hackborn Date: Mon Nov 2 10:51:56 2009 -0800 am c6dd74ed: Test for issue #2226370: Resource versions match with equality Merge commit 'c6dd74ed84f79a31b2be4ce52a61fef8e16b54b9' into eclair-mr2 * commit 'c6dd74ed84f79a31b2be4ce52a61fef8e16b54b9': Test for issue #2226370: Resource versions match with equality commit c6dd74ed84f79a31b2be4ce52a61fef8e16b54b9 Author: Dianne Hackborn Date: Sun Nov 1 21:18:44 2009 -0800 Test for issue #2226370: Resource versions match with equality Adds tests to ensure that version number is being handled correctly. Also fixed build to include required density resources. Change-Id: Ia201d9e9ed7603c69ad12d79098f8584479f28fe commit e6e441a9f65dd7f46cfa32b82f516eea1a70cf70 Author: Phil Dubach Date: Thu Oct 29 11:28:07 2009 -0700 Integrate unsubmitted cupcake change 149423: CTS: add test cases for android.webkit.CacheManager Change-Id: I4755508223426975b671cdf5565d909a3a3a2e41 commit ff276ed14e20971b4c6b9aed61f7fd5ef9c55c29 Merge: c53310e a1ee0ce Author: Brett Chabot Date: Thu Oct 29 20:14:14 2009 -0700 am a1ee0ce0: am 531b2fa1: Merge change I92c751e8 into eclair Merge commit 'a1ee0ce034b999b44eb463592a1978b31eaf4ba6' * commit 'a1ee0ce034b999b44eb463592a1978b31eaf4ba6': Fix BitmapDrawableTest:testConstructor. commit c53310e999a71fec6f9a770b3f32e247413b4c7b Merge: b98c1e3 b7a81cf Author: Brett Chabot Date: Thu Oct 29 20:14:08 2009 -0700 am b7a81cf5: am 5275f9b0: Merge change Ie8fa3ff6 into eclair Merge commit 'b7a81cf501db7e4ae0b9d1758fbbda4e5fb80573' * commit 'b7a81cf501db7e4ae0b9d1758fbbda4e5fb80573': Fix flaky test InstrumentationTest#testWaitForIdle. commit b98c1e39e91633aa0443a6c42ce05225891c9792 Merge: 579ad12 76ed580 Author: Brett Chabot Date: Thu Oct 29 20:14:02 2009 -0700 am 76ed580c: am 5fefa285: Merge change I6638b13d into eclair Merge commit '76ed580cdcbc10e6661b9bd27e35915b9ed022b1' * commit '76ed580cdcbc10e6661b9bd27e35915b9ed022b1': Adjust ProgressDialogTest's for new back key handling. commit 579ad123dec26204f3f63862de936d69ef4085a9 Merge: cfdc668 d2979e6 Author: Brett Chabot Date: Thu Oct 29 20:13:56 2009 -0700 am d2979e65: am 5d0b59b8: Merge change I03d072c3 into eclair Merge commit 'd2979e65725cd0ddb330a82e36682203a66a570a' * commit 'd2979e65725cd0ddb330a82e36682203a66a570a': Fix AlertDialogTest#testAlertDialogCancelable. commit cfdc6682c81dbbe9ac004cb8c6d252f0b93c0351 Merge: 049b519 a96d258 Author: Brett Chabot Date: Thu Oct 29 20:13:49 2009 -0700 am a96d2589: am 0909f25f: Merge change I7ec77d83 into eclair Merge commit 'a96d25895de6ee2caa9ee8fae063b03b464d16f0' * commit 'a96d25895de6ee2caa9ee8fae063b03b464d16f0': Fix NinePatchDrawableTest:testSetDither and partially fix testConstructors. commit a1ee0ce034b999b44eb463592a1978b31eaf4ba6 Merge: b7a81cf 531b2fa Author: Brett Chabot Date: Thu Oct 29 19:22:30 2009 -0700 am 531b2fa1: Merge change I92c751e8 into eclair Merge commit '531b2fa1e9b4e2e32bdd1320efaccdc1c0421fa0' into eclair-mr2 * commit '531b2fa1e9b4e2e32bdd1320efaccdc1c0421fa0': Fix BitmapDrawableTest:testConstructor. commit b7a81cf501db7e4ae0b9d1758fbbda4e5fb80573 Merge: 76ed580 5275f9b Author: Brett Chabot Date: Thu Oct 29 19:22:25 2009 -0700 am 5275f9b0: Merge change Ie8fa3ff6 into eclair Merge commit '5275f9b041c2535fb06b785def8c22b4ac46ccbc' into eclair-mr2 * commit '5275f9b041c2535fb06b785def8c22b4ac46ccbc': Fix flaky test InstrumentationTest#testWaitForIdle. commit 76ed580cdcbc10e6661b9bd27e35915b9ed022b1 Merge: d2979e6 5fefa28 Author: Brett Chabot Date: Thu Oct 29 19:22:18 2009 -0700 am 5fefa285: Merge change I6638b13d into eclair Merge commit '5fefa2858c607a2bc1c6566f9c57b7d018f86f99' into eclair-mr2 * commit '5fefa2858c607a2bc1c6566f9c57b7d018f86f99': Adjust ProgressDialogTest's for new back key handling. commit d2979e65725cd0ddb330a82e36682203a66a570a Merge: a96d258 5d0b59b Author: Brett Chabot Date: Thu Oct 29 19:22:12 2009 -0700 am 5d0b59b8: Merge change I03d072c3 into eclair Merge commit '5d0b59b85ed734eb74a4dbcc9281254ce6529227' into eclair-mr2 * commit '5d0b59b85ed734eb74a4dbcc9281254ce6529227': Fix AlertDialogTest#testAlertDialogCancelable. commit a96d25895de6ee2caa9ee8fae063b03b464d16f0 Merge: a4c15df 0909f25 Author: Brett Chabot Date: Thu Oct 29 19:22:05 2009 -0700 am 0909f25f: Merge change I7ec77d83 into eclair Merge commit '0909f25f5f50d8ae861d9889b9e93f2ed7ff84de' into eclair-mr2 * commit '0909f25f5f50d8ae861d9889b9e93f2ed7ff84de': Fix NinePatchDrawableTest:testSetDither and partially fix testConstructors. commit 049b519cc7555a0633de61235bf1987be1fd26d3 Merge: 6f19bf2 a4c15df Author: Phil Dubach Date: Thu Oct 29 14:47:52 2009 -0700 am a4c15df3: Merge change I8916aea2 into eclair-mr2 Merge commit 'a4c15df331d861b8fbaa491c364984c39d26a214' * commit 'a4c15df331d861b8fbaa491c364984c39d26a214': Integrate unsubmitted cupcake change 135106: commit 6f19bf2155a624b5b2b2f41b174e26f3945c5454 Merge: 0cdea1d 439a33d Author: Brett Chabot Date: Thu Oct 29 14:47:46 2009 -0700 am 439a33d5: am a2ea58b5: Merge change I39321bd7 into eclair Merge commit '439a33d582dbe787d731d6292b9b3d7eba1df35f' * commit '439a33d582dbe787d731d6292b9b3d7eba1df35f': Adjust BuildVersionTest to check Eclair-MR1 values. commit 0cdea1d06fc753dabf6a0a0c1606dccb016f42fc Merge: 15d154e 17b6454 Author: Brett Chabot Date: Thu Oct 29 14:47:40 2009 -0700 am 17b64544: am 06945f80: Merge change I4f939d74 into eclair Merge commit '17b645443be1df1287507d802c3f8a6fe3545f62' * commit '17b645443be1df1287507d802c3f8a6fe3545f62': Fix LocationManagerTest:testSendExtraCommand. commit 15d154e99d20f456edb0356b45279e3b3c8d496a Merge: 0ada937 0d52661 Author: Brett Chabot Date: Thu Oct 29 14:47:34 2009 -0700 am 0d526619: am f0d550c5: Merge change Ib899c20f into eclair Merge commit '0d526619bf7b3782a22f01353f4958b2b6dbbba9' * commit '0d526619bf7b3782a22f01353f4958b2b6dbbba9': Fix BitmapFactoryTest#testDecodeResource2. commit 0ada937fdc9e498c88aacf494783600271123b86 Merge: 5145bc1 ef71dfb Author: Brett Chabot Date: Thu Oct 29 14:47:27 2009 -0700 am ef71dfbe: am d14def2d: Merge change Ibd3343f8 into eclair Merge commit 'ef71dfbe074b1775c3f235550cbc59a13707b024' * commit 'ef71dfbe074b1775c3f235550cbc59a13707b024': Quick fix for SQLiteQueryBuilderTest:testSetProjectionMap. commit 5145bc1831caee039ff88a14119c7248d087d24a Merge: d626b86 a35f489 Author: Brett Chabot Date: Thu Oct 29 14:47:20 2009 -0700 am a35f4893: am 52e90b73: Merge change I51e31e4e into eclair Merge commit 'a35f4893b35c1ef09d4e796c2e15175499d8e7d5' * commit 'a35f4893b35c1ef09d4e796c2e15175499d8e7d5': Fix test ContentValuesTest:testToString. commit a4c15df331d861b8fbaa491c364984c39d26a214 Merge: 439a33d 78f8039 Author: Android (Google) Code Review Date: Thu Oct 29 17:00:26 2009 -0400 Merge change I8916aea2 into eclair-mr2 * changes: Integrate unsubmitted cupcake change 135106: CTS: add test case for android.webkit.HttpAuthHandler and SslErrorHandler commit 439a33d582dbe787d731d6292b9b3d7eba1df35f Merge: 17b6454 a2ea58b Author: Brett Chabot Date: Thu Oct 29 13:42:56 2009 -0700 am a2ea58b5: Merge change I39321bd7 into eclair Merge commit 'a2ea58b5db28a05a715b4d52fe32dce34ba2a322' into eclair-mr2 * commit 'a2ea58b5db28a05a715b4d52fe32dce34ba2a322': Adjust BuildVersionTest to check Eclair-MR1 values. commit 17b645443be1df1287507d802c3f8a6fe3545f62 Merge: 0d52661 06945f8 Author: Brett Chabot Date: Thu Oct 29 13:42:48 2009 -0700 am 06945f80: Merge change I4f939d74 into eclair Merge commit '06945f80a93b3c5fe73a2e76fea78ca7a75c5ea6' into eclair-mr2 * commit '06945f80a93b3c5fe73a2e76fea78ca7a75c5ea6': Fix LocationManagerTest:testSendExtraCommand. commit 0d526619bf7b3782a22f01353f4958b2b6dbbba9 Merge: ef71dfb f0d550c Author: Brett Chabot Date: Thu Oct 29 13:42:41 2009 -0700 am f0d550c5: Merge change Ib899c20f into eclair Merge commit 'f0d550c502a75963c2d0cd46bf345a1bf454db27' into eclair-mr2 * commit 'f0d550c502a75963c2d0cd46bf345a1bf454db27': Fix BitmapFactoryTest#testDecodeResource2. commit ef71dfbe074b1775c3f235550cbc59a13707b024 Merge: a35f489 d14def2 Author: Brett Chabot Date: Thu Oct 29 13:42:32 2009 -0700 am d14def2d: Merge change Ibd3343f8 into eclair Merge commit 'd14def2dbd9606591ad1ffa099c8acdadd8dd29e' into eclair-mr2 * commit 'd14def2dbd9606591ad1ffa099c8acdadd8dd29e': Quick fix for SQLiteQueryBuilderTest:testSetProjectionMap. commit a35f4893b35c1ef09d4e796c2e15175499d8e7d5 Merge: 69ba0bd 52e90b7 Author: Brett Chabot Date: Thu Oct 29 13:42:23 2009 -0700 am 52e90b73: Merge change I51e31e4e into eclair Merge commit '52e90b7369fb76f738e061ea9da7945c9dd16ffe' into eclair-mr2 * commit '52e90b7369fb76f738e061ea9da7945c9dd16ffe': Fix test ContentValuesTest:testToString. commit d626b8647f5b5cb78c53efd823ea6d184390307c Merge: fc553aa 69ba0bd Author: Brett Chabot Date: Thu Oct 29 01:59:46 2009 -0700 am 69ba0bda: am e4a74229: Change CTS version to 2.1_pre_r1. Merge commit '69ba0bda2a6982e0f6d2b8b92fb5586a78bdc8ec' * commit '69ba0bda2a6982e0f6d2b8b92fb5586a78bdc8ec': Change CTS version to 2.1_pre_r1. commit 69ba0bda2a6982e0f6d2b8b92fb5586a78bdc8ec Merge: 9a5b06e e4a7422 Author: Brett Chabot Date: Thu Oct 29 01:25:33 2009 -0700 am e4a74229: Change CTS version to 2.1_pre_r1. Merge commit 'e4a742295afb4238f5ff9f4cfc690e6bdffb9143' into eclair-mr2 * commit 'e4a742295afb4238f5ff9f4cfc690e6bdffb9143': Change CTS version to 2.1_pre_r1. commit 531b2fa1e9b4e2e32bdd1320efaccdc1c0421fa0 Merge: 5275f9b 92c751e Author: Android (Google) Code Review Date: Wed Oct 28 22:01:20 2009 -0400 Merge change I92c751e8 into eclair * changes: Fix BitmapDrawableTest:testConstructor. commit 5275f9b041c2535fb06b785def8c22b4ac46ccbc Merge: 5fefa28 e8fa3ff Author: Android (Google) Code Review Date: Wed Oct 28 22:01:10 2009 -0400 Merge change Ie8fa3ff6 into eclair * changes: Fix flaky test InstrumentationTest#testWaitForIdle. commit 5fefa2858c607a2bc1c6566f9c57b7d018f86f99 Merge: 5d0b59b 6638b13 Author: Android (Google) Code Review Date: Wed Oct 28 22:00:59 2009 -0400 Merge change I6638b13d into eclair * changes: Adjust ProgressDialogTest's for new back key handling. commit 5d0b59b85ed734eb74a4dbcc9281254ce6529227 Merge: 0909f25 03d072c Author: Android (Google) Code Review Date: Wed Oct 28 22:00:30 2009 -0400 Merge change I03d072c3 into eclair * changes: Fix AlertDialogTest#testAlertDialogCancelable. commit 0909f25f5f50d8ae861d9889b9e93f2ed7ff84de Merge: a2ea58b 7ec77d8 Author: Android (Google) Code Review Date: Wed Oct 28 21:59:52 2009 -0400 Merge change I7ec77d83 into eclair * changes: Fix NinePatchDrawableTest:testSetDither and partially fix testConstructors. commit a2ea58b5db28a05a715b4d52fe32dce34ba2a322 Merge: 06945f8 39321bd Author: Android (Google) Code Review Date: Wed Oct 28 16:44:57 2009 -0400 Merge change I39321bd7 into eclair * changes: Adjust BuildVersionTest to check Eclair-MR1 values. commit 06945f80a93b3c5fe73a2e76fea78ca7a75c5ea6 Merge: f0d550c 4f939d7 Author: Android (Google) Code Review Date: Wed Oct 28 16:44:48 2009 -0400 Merge change I4f939d74 into eclair * changes: Fix LocationManagerTest:testSendExtraCommand. commit f0d550c502a75963c2d0cd46bf345a1bf454db27 Merge: d14def2 b899c20 Author: Android (Google) Code Review Date: Wed Oct 28 16:44:41 2009 -0400 Merge change Ib899c20f into eclair * changes: Fix BitmapFactoryTest#testDecodeResource2. commit d14def2dbd9606591ad1ffa099c8acdadd8dd29e Merge: 52e90b7 bd3343f Author: Android (Google) Code Review Date: Wed Oct 28 16:44:33 2009 -0400 Merge change Ibd3343f8 into eclair * changes: Quick fix for SQLiteQueryBuilderTest:testSetProjectionMap. commit 52e90b7369fb76f738e061ea9da7945c9dd16ffe Merge: e4a7422 51e31e4 Author: Android (Google) Code Review Date: Wed Oct 28 16:44:23 2009 -0400 Merge change I51e31e4e into eclair * changes: Fix test ContentValuesTest:testToString. commit 78f8039c70b26c22d66b9743f6ce88f32aae9ba3 Author: Phil Dubach Date: Wed Oct 21 11:44:55 2009 -0700 Integrate unsubmitted cupcake change 135106: CTS: add test case for android.webkit.HttpAuthHandler and SslErrorHandler Change-Id: I8916aea234be80ae534f11584d22eee43145e2da commit 39321bd7129ab9f26d46f398df54d555f33451e4 Author: Brett Chabot Date: Tue Oct 27 18:15:50 2009 -0700 Adjust BuildVersionTest to check Eclair-MR1 values. commit 4f939d74fad80401a02061738f882ebd6c95f2af Author: Brett Chabot Date: Tue Oct 27 18:06:35 2009 -0700 Fix LocationManagerTest:testSendExtraCommand. Change test to no longer do a NPE assertion. Bug 2220014 commit 92c751e8a34d807bdf2b1eaffda61f17b1f2311e Author: Brett Chabot Date: Tue Oct 27 18:01:28 2009 -0700 Fix BitmapDrawableTest:testConstructor. Adjust tests for Paint default flags changes. Bug 2136239 commit b899c20f0d84b607b21456620e86cf05839a11e9 Author: Brett Chabot Date: Tue Oct 27 17:54:56 2009 -0700 Fix BitmapFactoryTest#testDecodeResource2. Add tolerances for bitmap height and width checks. Bug 2135254 commit bd3343f81459328561539f691ba491490b0e9e94 Author: Brett Chabot Date: Tue Oct 27 17:49:42 2009 -0700 Quick fix for SQLiteQueryBuilderTest:testSetProjectionMap. Change the expected string to match eclair actual. Bug 2136208 commit 51e31e4ed0422bd31df04904391b1c78faa428a1 Author: Brett Chabot Date: Tue Oct 27 17:44:36 2009 -0700 Fix test ContentValuesTest:testToString. The test was asserting the exact content of the toString content, which is unnecessary and prone to errors if the order changes. Bug 2136193 commit e8fa3ff67f866728121b31766f765f09e7054847 Author: Brett Chabot Date: Tue Oct 27 17:41:08 2009 -0700 Fix flaky test InstrumentationTest#testWaitForIdle. Bug 2219928 commit 31306603fda681ca741a0975c87533f9d05c5ff1 Author: Brett Chabot Date: Tue Oct 27 17:31:49 2009 -0700 Fix DialogTest:testContextMenu. onPanelClosed is no longer called when context menu is closed. Bug 2219899 commit 6638b13da0275aabae76d5763ef49853f6dba76d Author: Brett Chabot Date: Tue Oct 27 17:24:55 2009 -0700 Adjust ProgressDialogTest's for new back key handling. Bug 2136146 commit 03d072c345dca75011372b77b40461f84ed24de3 Author: Brett Chabot Date: Tue Oct 27 17:17:07 2009 -0700 Fix AlertDialogTest#testAlertDialogCancelable. Test needs to wait for dialog to be canceled, since cancelation will occur in main thread. Bug 2134255 commit 7ec77d834e2234fca0d8fd248ea42f3211eff3d3 Author: Brett Chabot Date: Tue Oct 27 16:59:32 2009 -0700 Fix NinePatchDrawableTest:testSetDither and partially fix testConstructors. commit e4a742295afb4238f5ff9f4cfc690e6bdffb9143 Author: Brett Chabot Date: Mon Oct 26 18:07:11 2009 -0700 Change CTS version to 2.1_pre_r1. commit fc553aada5d35c08a10b8391712a614102f49851 Author: Jesse Wilson Date: Mon Oct 26 10:56:43 2009 -0700 Fixing an overly-specific dependency on the support package commit 8d918f1dd02c236554fd0a7610846e874d13d51d Merge: 7956137 9a5b06e Author: Wei Huang Date: Fri Oct 23 11:53:49 2009 -0700 am 9a5b06e1: bug #2180646: update CTS test for PhoneNumberUtils.compare(). Merge commit '9a5b06e15645154193f9b2a7a035bf1821751790' * commit '9a5b06e15645154193f9b2a7a035bf1821751790': bug #2180646: update CTS test for PhoneNumberUtils.compare(). commit 9a5b06e15645154193f9b2a7a035bf1821751790 Author: Wei Huang Date: Thu Oct 22 18:07:58 2009 -0700 bug #2180646: update CTS test for PhoneNumberUtils.compare(). commit 795613754be1098d3ade404c4cd5ad5b7ca3e554 Merge: c7b57d1 01ef970 Author: Brett Chabot Date: Thu Oct 22 07:00:38 2009 -0700 am 01ef9701: (-s ours) am aef11600: (-s ours) Mark NoNetworkStatePermissionTest#testStopUsingNetworkFeature as known failure (DO NOT MERGE) Merge commit '01ef970173456275f647160d192599c9ebb6998d' * commit '01ef970173456275f647160d192599c9ebb6998d': Mark NoNetworkStatePermissionTest#testStopUsingNetworkFeature as known failure (DO NOT MERGE) commit 01ef970173456275f647160d192599c9ebb6998d Merge: c7b57d1 aef1160 Author: Brett Chabot Date: Thu Oct 22 06:38:21 2009 -0700 am aef11600: (-s ours) Mark NoNetworkStatePermissionTest#testStopUsingNetworkFeature as known failure (DO NOT MERGE) Merge commit 'aef116002292133048bb0889cbcac939b5d89edc' into eclair-mr2 * commit 'aef116002292133048bb0889cbcac939b5d89edc': Mark NoNetworkStatePermissionTest#testStopUsingNetworkFeature as known failure (DO NOT MERGE) commit c7b57d1ac4bfca0ac5f78f42042ffd5330613eaa Merge: ebb31b1 88fed75 Author: Android (Google) Code Review Date: Tue Oct 20 18:38:20 2009 -0400 Merge change I0725eb7d into eclair-mr2 * changes: Integrate unsubmitted cupcake change 132558: CTS: add test case for android.webkit.WebIconDatabase commit aef116002292133048bb0889cbcac939b5d89edc Author: Brett Chabot Date: Tue Oct 20 14:25:08 2009 -0700 Mark NoNetworkStatePermissionTest#testStopUsingNetworkFeature as known failure (DO NOT MERGE) BUG 2160462 commit 88fed75ba80389e4bf5bc33133526592beb7d81f Author: Phil Dubach Date: Fri Oct 16 11:03:35 2009 -0700 Integrate unsubmitted cupcake change 132558: CTS: add test case for android.webkit.WebIconDatabase Change-Id: I0725eb7d32d8b1328d002839627251ba3b689b01 commit ebb31b11e09322d25555d69fb9f39d93707ac3c9 Author: Phil Dubach Date: Thu Oct 8 12:05:00 2009 -0700 Integrate unsubmitted cupcake change 133011: CTS: add test case of android.webkit.UrlInterceptRegistry Change-Id: I2b6a9d1c68735202af053b237a34e4ce9b1d7a53 commit 18cd724394c2f0beb1045bee222d2d2129d46a4c Merge: 151da0f 9ada1d2 Author: Android (Google) Code Review Date: Fri Oct 9 19:26:08 2009 -0400 Merge change I9967fd36 into eclair-mr2 * changes: Integrate unsubmitted cupcake change 133382: CTS: add test case for android.webkit.DateSorter commit 151da0fd28eb9f3180c978f37521324cc030522c Merge: 3b5922d 2b4283a Author: Brett Chabot Date: Thu Oct 8 17:35:08 2009 -0700 am 2b4283a6: am 1a17d3b2: Merge change 26033 into donut-gms Merge commit '2b4283a627eb9592f73facc93f158a823e29ffc7' into eclair-mr2 * commit '2b4283a627eb9592f73facc93f158a823e29ffc7': commit 3b5922d77a6d2ebcc45a7c7d22ad684264819252 Merge: d3c7162 77cf4d3 Author: Brett Chabot Date: Thu Oct 8 17:35:04 2009 -0700 am 77cf4d3c: am f96e9b02: Merge change 25685 into donut-gms Merge commit '77cf4d3c20ddbd3e2eae38255f7f4882cf25b2d9' into eclair-mr2 * commit '77cf4d3c20ddbd3e2eae38255f7f4882cf25b2d9': commit d3c7162591e2950b272a920fb3d3bd714d851cec Merge: 309e9ee a261669 Author: Brett Chabot Date: Thu Oct 8 17:35:00 2009 -0700 am a2616693: am ffadf8af: Merge change 25690 into donut-gms Merge commit 'a2616693090ae5284559638d89fb73e2c4f7ec92' into eclair-mr2 * commit 'a2616693090ae5284559638d89fb73e2c4f7ec92': commit 309e9eeb3f3ebe5e7b9775b8ff933e7a3ef8e250 Merge: d574aa8 542c0b8 Author: Phil Dubach Date: Thu Oct 8 17:34:57 2009 -0700 am 542c0b84: am 1516fb4b: Merge change 25688 into donut-gms Merge commit '542c0b844b7f7e4bf6ffe6f78e2b037581ec82bf' into eclair-mr2 * commit '542c0b844b7f7e4bf6ffe6f78e2b037581ec82bf': commit d574aa8f954ea1ab48770eabb097e90f878949b5 Merge: 4bfd38a 24d4fc2 Author: Phil Dubach Date: Thu Oct 8 17:34:52 2009 -0700 am 24d4fc29: am ad52768b: Merge change 25678 into donut-gms Merge commit '24d4fc2963107413b23edf0f97965073366e33a2' into eclair-mr2 * commit '24d4fc2963107413b23edf0f97965073366e33a2': commit 4bfd38a091eb81416ea8e7973f321b69feb963c9 Merge: 3c7e456 4d65de7 Author: Brett Chabot Date: Thu Oct 8 17:34:49 2009 -0700 am 4d65de72: am adc7d0c6: Merge change 25642 into donut-gms Merge commit '4d65de727e2a9de8710ed9b6e057deaa59f91fe8' into eclair-mr2 * commit '4d65de727e2a9de8710ed9b6e057deaa59f91fe8': commit 3c7e45603c002527c7cc4eb86ffff29d9339b972 Merge: 7c0f1ca 8c34b3d Author: Phil Dubach Date: Thu Oct 8 17:34:45 2009 -0700 am 8c34b3db: am 5d6af1eb: Merge change 25662 into donut-gms Merge commit '8c34b3db46860a22646f05d7f81d8810446333d7' into eclair-mr2 * commit '8c34b3db46860a22646f05d7f81d8810446333d7': commit 7c0f1ca88678b348def4e042e141d6813e5ae758 Merge: f61508e 2a89d8f Author: Brett Chabot Date: Thu Oct 8 17:34:41 2009 -0700 am 2a89d8f2: am 930df1ae: Merge change 25664 into donut-gms Merge commit '2a89d8f233b95d62ece849c88a7243221a170242' into eclair-mr2 * commit '2a89d8f233b95d62ece849c88a7243221a170242': commit f61508e6be7d9cc81abc0778779f5343c53f7331 Merge: d4276a4 a3ee4ef Author: Brett Chabot Date: Thu Oct 8 17:34:36 2009 -0700 am a3ee4ef6: am cce1e198: Change CTS version to 1.6_r1. Merge commit 'a3ee4ef6302cbcc543b3ac921c655ed03dfcc62e' into eclair-mr2 * commit 'a3ee4ef6302cbcc543b3ac921c655ed03dfcc62e': commit d4276a40eb19f51d73542ec36e8357880cf9ec0e Merge: ea07afb 95377ac Author: Brett Chabot Date: Thu Oct 8 17:34:32 2009 -0700 am 95377acc: am b9049084: Merge change 25191 into donut-gms Merge commit '95377accf159c9a745fb146ecdcf505f957ce407' into eclair-mr2 * commit '95377accf159c9a745fb146ecdcf505f957ce407': commit ea07afbbad0639169890a37c0be8d4269fd6737b Merge: 746e1f4 b0a03cb Author: Brett Chabot Date: Thu Oct 8 17:34:28 2009 -0700 am b0a03cb5: am ec65c6a1: CTS: Fix SmsManager#testSendMessages. Merge commit 'b0a03cb5af956364e7465ab22b06268548e42fad' into eclair-mr2 * commit 'b0a03cb5af956364e7465ab22b06268548e42fad': commit 746e1f477e50b58d2f10b21f41e25169301bfe27 Merge: cac62f0 4ca70e9 Author: Phil Dubach Date: Thu Oct 8 17:34:24 2009 -0700 am 4ca70e9d: am 93dbdba7: Merge change 24922 into donut-gms Merge commit '4ca70e9d1c1d11e08dcb7b024e87259c5c48848f' into eclair-mr2 * commit '4ca70e9d1c1d11e08dcb7b024e87259c5c48848f': commit cac62f075edc8d125e5c95dd879b29d1c77b4e97 Merge: 864faff c26c6d0 Author: Brett Chabot Date: Thu Oct 8 17:34:20 2009 -0700 am c26c6d02: am 112b909c: Add initial CTS test for TextToSpeech. Merge commit 'c26c6d02a767bddba4ab6142ff8d36b230e9cffc' into eclair-mr2 * commit 'c26c6d02a767bddba4ab6142ff8d36b230e9cffc': commit 864faff65a13c3b3752f5cf1a5436f70f25d168f Merge: 138fd62 37287ef Author: Brett Chabot Date: Thu Oct 8 17:34:16 2009 -0700 am 37287ef4: am ee5109a2: Merge change 24478 into donut-gms Merge commit '37287ef47c0aaaec9519626fc89ab586eef2e64a' into eclair-mr2 * commit '37287ef47c0aaaec9519626fc89ab586eef2e64a': commit 138fd62a05b8f79851d9584de70aa48ca489e01d Merge: 931f237 03aeb74 Author: Brett Chabot Date: Thu Oct 8 17:34:11 2009 -0700 am 03aeb74f: am da8bac8b: Merge change 24756 into donut-gms Merge commit '03aeb74f2cf651b6f166513ed9d00d11a8b1a65d' into eclair-mr2 * commit '03aeb74f2cf651b6f166513ed9d00d11a8b1a65d': commit 931f237df4d8485ba0680db2c54ab52e636282ed Merge: ee1883a b7061ad Author: android-build SharedAccount Date: Thu Oct 8 17:34:07 2009 -0700 am b7061ad3: am 1d497e29: Merge commit \'m/donut-release\' into donut-gms Merge commit 'b7061ad323fc1ee305108b9883525bcb988b6aef' into eclair-mr2 * commit 'b7061ad323fc1ee305108b9883525bcb988b6aef': commit ee1883aac7c1a46a63de421c00e435d90693e9f5 Merge: 0842010 e06da25 Author: Brett Chabot Date: Thu Oct 8 17:34:03 2009 -0700 am e06da25e: am 91cf778c: Add CTS test for default user agent string. Merge commit 'e06da25e9f99eaefd142986ea35318259749c1ab' into eclair-mr2 * commit 'e06da25e9f99eaefd142986ea35318259749c1ab': commit 0842010115b36d4383717309604b051f8ff1898b Merge: f7bda27 a480f36 Author: Phil Dubach Date: Thu Oct 8 17:33:59 2009 -0700 am a480f361: am a7456733: Merge change 24449 into donut-gms Merge commit 'a480f3615673de0cb772bc0ebe93a167a5ddb5a5' into eclair-mr2 * commit 'a480f3615673de0cb772bc0ebe93a167a5ddb5a5': commit f7bda2735c7da4a387c9fd331a4fccd0c55a1da1 Merge: 3a18d03 6cb322c Author: Brett Chabot Date: Thu Oct 8 17:33:55 2009 -0700 am 6cb322c5: am 5c8ba482: Merge change 24423 into donut-gms Merge commit '6cb322c59f97735307ec355f6dfcaf4e7a15e229' into eclair-mr2 * commit '6cb322c59f97735307ec355f6dfcaf4e7a15e229': commit 3a18d03b1a25d6ec20f8218041b0b13a88a8fa7a Merge: 5a22062 f7db1c5 Author: Phil Dubach Date: Thu Oct 8 17:33:51 2009 -0700 am f7db1c5d: am d008b86b: Merge change 23932 into donut-gms Merge commit 'f7db1c5da2a494e1b48bf0375a2dbe2d2183aed6' into eclair-mr2 * commit 'f7db1c5da2a494e1b48bf0375a2dbe2d2183aed6': commit 5a22062b35ab5e8346481697e4a988dc8c818df0 Merge: af7a3602a 5522dd4 Author: Phil Dubach Date: Thu Oct 8 17:33:47 2009 -0700 am 5522dd4a: am 55bf3a18: Integrate unsubmitted cupcake change 135105: CTS: add test case for android.webkit.WebBackForwardList Merge commit '5522dd4a55711a085979420a378723671a3aa105' into eclair-mr2 * commit '5522dd4a55711a085979420a378723671a3aa105': commit af7a3602a3669e53f4e3a27a326e7dc28e2e2a9a Merge: 3893a62 8855b9d Author: Phil Dubach Date: Thu Oct 8 17:33:43 2009 -0700 am 8855b9d1: am 556a8dea: Merge change 23703 into donut-gms Merge commit '8855b9d1c80c3ace211f21e183515daa60df25c0' into eclair-mr2 * commit '8855b9d1c80c3ace211f21e183515daa60df25c0': commit 3893a62837c87be5072f14c41fbfcc91167e8ad3 Merge: 5fd48ff 7639cbb Author: Brett Chabot Date: Thu Oct 8 17:33:39 2009 -0700 am 7639cbbe: am 8b94845c: Remove Intent.ACTION_AIRPLANE_MODE_CHANGED from protected broadcasts test. Merge commit '7639cbbe77a5b57a160ebd908557123709d7a9e0' into eclair-mr2 * commit '7639cbbe77a5b57a160ebd908557123709d7a9e0': commit 2b4283a627eb9592f73facc93f158a823e29ffc7 Merge: 77cf4d3 1a17d3b Author: Brett Chabot Date: Thu Oct 8 15:02:14 2009 -0700 am 1a17d3b2: Merge change 26033 into donut-gms Merge commit '1a17d3b276aedcde36dd2a60efe4ddcfc3b06574' into eclair * commit '1a17d3b276aedcde36dd2a60efe4ddcfc3b06574': CTS: remove tags check from testBuildFingerprint. commit 77cf4d3c20ddbd3e2eae38255f7f4882cf25b2d9 Merge: a261669 f96e9b0 Author: Brett Chabot Date: Thu Oct 8 15:02:10 2009 -0700 am f96e9b02: Merge change 25685 into donut-gms Merge commit 'f96e9b020b54d3508a607bee95b6beeb29e0c786' into eclair * commit 'f96e9b020b54d3508a607bee95b6beeb29e0c786': CTS: Adjust SensorTest to treat temperature sensor as optional. commit a2616693090ae5284559638d89fb73e2c4f7ec92 Merge: 542c0b8 ffadf8a Author: Brett Chabot Date: Thu Oct 8 15:02:00 2009 -0700 am ffadf8af: Merge change 25690 into donut-gms Merge commit 'ffadf8af630531cd5c019730b668657dda2698e2' into eclair * commit 'ffadf8af630531cd5c019730b668657dda2698e2': CTS: Guard against NPE in HostTimer. commit 542c0b844b7f7e4bf6ffe6f78e2b037581ec82bf Merge: 24d4fc2 1516fb4 Author: Phil Dubach Date: Thu Oct 8 15:01:56 2009 -0700 am 1516fb4b: Merge change 25688 into donut-gms Merge commit '1516fb4ba86223e58a13126956e20c8bba3a5650' into eclair * commit '1516fb4ba86223e58a13126956e20c8bba3a5650': CTS: Mark android.webkit.cts.CookieTest.testDomain as broken commit 24d4fc2963107413b23edf0f97965073366e33a2 Merge: 4d65de7 ad52768 Author: Phil Dubach Date: Thu Oct 8 15:01:52 2009 -0700 am ad52768b: Merge change 25678 into donut-gms Merge commit 'ad52768b3169ce91d854cec06c0f3b0dddf7d486' into eclair * commit 'ad52768b3169ce91d854cec06c0f3b0dddf7d486': CTS: Mark android.webkit.cts.WebHistoryItemTest.testRedirect as broken commit 4d65de727e2a9de8710ed9b6e057deaa59f91fe8 Merge: 8c34b3d adc7d0c Author: Brett Chabot Date: Thu Oct 8 15:01:48 2009 -0700 am adc7d0c6: Merge change 25642 into donut-gms Merge commit 'adc7d0c6908953534ab83ab0fc0f43bdb929dd7e' into eclair * commit 'adc7d0c6908953534ab83ab0fc0f43bdb929dd7e': CTS: Fix AudioTrackTest#testAudioTrackProperties. commit 8c34b3db46860a22646f05d7f81d8810446333d7 Merge: 2a89d8f 5d6af1e Author: Phil Dubach Date: Thu Oct 8 15:01:44 2009 -0700 am 5d6af1eb: Merge change 25662 into donut-gms Merge commit '5d6af1eb7b79d06d40d1cd9c6a48ef8c1c34f083' into eclair * commit '5d6af1eb7b79d06d40d1cd9c6a48ef8c1c34f083': CTS: Force internal web server to shut down befor starting new instance commit 2a89d8f233b95d62ece849c88a7243221a170242 Merge: a3ee4ef 930df1a Author: Brett Chabot Date: Thu Oct 8 15:01:39 2009 -0700 am 930df1ae: Merge change 25664 into donut-gms Merge commit '930df1aed446f123c02932d07cdbd85a4edda987' into eclair * commit '930df1aed446f123c02932d07cdbd85a4edda987': CTS: Remove internal references from MediaControllerTest. commit a3ee4ef6302cbcc543b3ac921c655ed03dfcc62e Merge: 95377ac cce1e19 Author: Brett Chabot Date: Thu Oct 8 15:01:35 2009 -0700 am cce1e198: Change CTS version to 1.6_r1. Merge commit 'cce1e19806905eed4de3ad594747b5d3fb45a97a' into eclair * commit 'cce1e19806905eed4de3ad594747b5d3fb45a97a': Change CTS version to 1.6_r1. commit 95377accf159c9a745fb146ecdcf505f957ce407 Merge: b0a03cb b904908 Author: Brett Chabot Date: Thu Oct 8 15:01:31 2009 -0700 am b9049084: Merge change 25191 into donut-gms Merge commit 'b9049084630d2652d18efd2f6082153cf0ea516c' into eclair * commit 'b9049084630d2652d18efd2f6082153cf0ea516c': CTS: fix some tests with internal references. commit b0a03cb5af956364e7465ab22b06268548e42fad Merge: 4ca70e9 ec65c6a Author: Brett Chabot Date: Thu Oct 8 15:01:26 2009 -0700 am ec65c6a1: CTS: Fix SmsManager#testSendMessages. Merge commit 'ec65c6a1d77d2a3111c4cd624612caf680e6064b' into eclair * commit 'ec65c6a1d77d2a3111c4cd624612caf680e6064b': CTS: Fix SmsManager#testSendMessages. commit 4ca70e9d1c1d11e08dcb7b024e87259c5c48848f Merge: c26c6d0 93dbdba Author: Phil Dubach Date: Thu Oct 8 15:01:22 2009 -0700 am 93dbdba7: Merge change 24922 into donut-gms Merge commit '93dbdba7785edccaac70679a2e67b510912db056' into eclair * commit '93dbdba7785edccaac70679a2e67b510912db056': CTS: Fix tests with dependencies on display density commit c26c6d02a767bddba4ab6142ff8d36b230e9cffc Merge: 37287ef 112b909 Author: Brett Chabot Date: Thu Oct 8 15:01:18 2009 -0700 am 112b909c: Add initial CTS test for TextToSpeech. Merge commit '112b909c565241dc44931aee5452ec525d90b797' into eclair * commit '112b909c565241dc44931aee5452ec525d90b797': Add initial CTS test for TextToSpeech. commit 37287ef47c0aaaec9519626fc89ab586eef2e64a Merge: 03aeb74 ee5109a Author: Brett Chabot Date: Thu Oct 8 15:01:13 2009 -0700 am ee5109a2: Merge change 24478 into donut-gms Merge commit 'ee5109a2501480e147abfab3c5de26f4575c1203' into eclair * commit 'ee5109a2501480e147abfab3c5de26f4575c1203': Add CTS test for GestureLibrary. commit 03aeb74f2cf651b6f166513ed9d00d11a8b1a65d Merge: b7061ad da8bac8 Author: Brett Chabot Date: Thu Oct 8 15:01:09 2009 -0700 am da8bac8b: Merge change 24756 into donut-gms Merge commit 'da8bac8b162c4924117367b77e5778294d1be05b' into eclair * commit 'da8bac8b162c4924117367b77e5778294d1be05b': CTS: Add replace real location providers with mocks test. commit b7061ad323fc1ee305108b9883525bcb988b6aef Merge: e06da25 1d497e2 Author: android-build SharedAccount Date: Thu Oct 8 15:01:05 2009 -0700 am 1d497e29: Merge commit \'m/donut-release\' into donut-gms Merge commit '1d497e291bc5fc9251e4951e32183a481f3c8d41' into eclair * commit '1d497e291bc5fc9251e4951e32183a481f3c8d41': commit e06da25e9f99eaefd142986ea35318259749c1ab Merge: a480f36 91cf778 Author: Brett Chabot Date: Thu Oct 8 15:01:00 2009 -0700 am 91cf778c: Add CTS test for default user agent string. Merge commit '91cf778cd7223fd138464c22a9413830e89d21f9' into eclair * commit '91cf778cd7223fd138464c22a9413830e89d21f9': Add CTS test for default user agent string. commit a480f3615673de0cb772bc0ebe93a167a5ddb5a5 Merge: 6cb322c a745673 Author: Phil Dubach Date: Thu Oct 8 15:00:56 2009 -0700 am a7456733: Merge change 24449 into donut-gms Merge commit 'a745673342d2f73a79e689bea4ff5281fbfdb399' into eclair * commit 'a745673342d2f73a79e689bea4ff5281fbfdb399': Integrate unsubmitted cupcake change 133408: commit 6cb322c59f97735307ec355f6dfcaf4e7a15e229 Merge: f7db1c5 5c8ba48 Author: Brett Chabot Date: Thu Oct 8 15:00:52 2009 -0700 am 5c8ba482: Merge change 24423 into donut-gms Merge commit '5c8ba482e06ac6144fa11a580cf1a1e595c21605' into eclair * commit '5c8ba482e06ac6144fa11a580cf1a1e595c21605': Add CTS test for build fingerprint. commit f7db1c5da2a494e1b48bf0375a2dbe2d2183aed6 Merge: 5522dd4 d008b86 Author: Phil Dubach Date: Thu Oct 8 15:00:47 2009 -0700 am d008b86b: Merge change 23932 into donut-gms Merge commit 'd008b86b79e392f165b8c99f4c495a774174d4b7' into eclair * commit 'd008b86b79e392f165b8c99f4c495a774174d4b7': Integrate unsubmitted cupcake change 133409: commit 5522dd4a55711a085979420a378723671a3aa105 Merge: 8855b9d 55bf3a1 Author: Phil Dubach Date: Thu Oct 8 15:00:42 2009 -0700 am 55bf3a18: Integrate unsubmitted cupcake change 135105: CTS: add test case for android.webkit.WebBackForwardList Merge commit '55bf3a18a3ff50bb7f535a6983318a9936c204f1' into eclair * commit '55bf3a18a3ff50bb7f535a6983318a9936c204f1': Integrate unsubmitted cupcake change 135105: commit 8855b9d1c80c3ace211f21e183515daa60df25c0 Merge: 7639cbb 556a8de Author: Phil Dubach Date: Thu Oct 8 15:00:37 2009 -0700 am 556a8dea: Merge change 23703 into donut-gms Merge commit '556a8dea03f4a5511cae1d69efd946f13955a5c7' into eclair * commit '556a8dea03f4a5511cae1d69efd946f13955a5c7': Integrate unsubmitted cupcake change 149425: commit 7639cbbe77a5b57a160ebd908557123709d7a9e0 Merge: c6b4078 8b94845 Author: Brett Chabot Date: Thu Oct 8 15:00:32 2009 -0700 am 8b94845c: Remove Intent.ACTION_AIRPLANE_MODE_CHANGED from protected broadcasts test. Merge commit '8b94845c4da42fb865a3acad396d73f55780d418' into eclair * commit '8b94845c4da42fb865a3acad396d73f55780d418': Remove Intent.ACTION_AIRPLANE_MODE_CHANGED from protected broadcasts test. commit 9ada1d2d63f2d35850d04aed0613f0e9ea837228 Author: Phil Dubach Date: Wed Oct 7 11:45:07 2009 -0700 Integrate unsubmitted cupcake change 133382: CTS: add test case for android.webkit.DateSorter Change-Id: I9967fd36f7089e9e2ca3d39f12e7b89a42c0cb34 commit 5fd48ff4b5d8857f8b7ad7ac21487e99310c08e1 Author: Phil Dubach Date: Tue Oct 6 13:19:01 2009 -0700 Integrate unsubmitted cupcake change 133025: CTS: CTS: Added test cases for android.webkit.URLUtil Change-Id: I744aa35132ce2a584cbc64bdd8ab5436b2d7404d commit bcedea01fa27c0f587218a439920eeb4f3bd9873 Merge: 3b4485e c6b4078 Author: Fred Quintana Date: Tue Oct 6 12:04:35 2009 -0700 am c6b40787: remove the insert and update Entities calls Merge commit 'c6b4078766aa8c028c3bd0030b80b306dff33fdc' into eclair-mr2 * commit 'c6b4078766aa8c028c3bd0030b80b306dff33fdc': remove the insert and update Entities calls commit c6b4078766aa8c028c3bd0030b80b306dff33fdc Author: Fred Quintana Date: Mon Oct 5 14:55:46 2009 -0700 remove the insert and update Entities calls commit 3b4485ebbf1a6659b89025d79235a6e919d1d473 Author: Phil Dubach Date: Thu Sep 17 17:21:49 2009 -0700 Integrate unsubmitted cupcake change 148518: CTS: add test case for android.webkit.WebSettings commit e6450699445ad67ee95fe60e8da6ce8d3c08b400 Merge: 89d3a8f 1a17d3b Author: Brett Chabot Date: Thu Oct 1 14:51:14 2009 -0700 Merge remote branch 'goog/donut-gms' into eclair-mr2 commit 89d3a8fc681cb6eb5084629e67c5c57d22eed468 Author: Gloria Wang Date: Wed Sep 30 10:16:50 2009 -0700 Add new longer mp3 file testmp3_2.mp3 for testPlayAudio. commit 3a71b76cba19729a02ee5ddd41a27ac6d02fdd08 Author: johnwang Date: Fri Sep 11 19:16:00 2009 -0700 Update NeighboringCellInfo test due to API changes. commit b523b66167dbb8a4ba5599fc6d264685c33f22dc Author: Wei Huang Date: Sun Sep 20 23:30:28 2009 -0700 change phoneNumberUtilsTest for MIN_MATCH change. Change-Id: Ia06377fbc47591401cbc6720413451e49345064f commit 1a17d3b276aedcde36dd2a60efe4ddcfc3b06574 Merge: f96e9b0 aa980be Author: Android (Google) Code Review Date: Sun Sep 20 19:14:41 2009 -0400 Merge change 26033 into donut-gms * changes: CTS: remove tags check from testBuildFingerprint. commit aa980bed7e1e9beb56f40b4ba70ef7657eea91f8 Author: Brett Chabot Date: Sun Sep 20 15:04:14 2009 -0700 CTS: remove tags check from testBuildFingerprint. BUG 2133085 commit 4d1a0924f3e3d0e6b65a47878a325d58d1f58ac5 Author: Daisuke Miyakawa Date: Sat Sep 19 15:14:46 2009 -0700 Add and modify tests related to PhoneNumberUtils#compare() Internal issue number: 1892808 commit 9ef014ac8654972ee00d0292f736e59d8dd84cf4 Author: Daisuke Miyakawa Date: Sat Sep 19 15:14:46 2009 -0700 Add and modify tests related to PhoneNumberUtils#compare() Internal issue number: 1892808 commit f96e9b020b54d3508a607bee95b6beeb29e0c786 Merge: ffadf8a bc192a6 Author: Android (Google) Code Review Date: Fri Sep 18 01:15:21 2009 -0400 Merge change 25685 into donut-gms * changes: CTS: Adjust SensorTest to treat temperature sensor as optional. commit ffadf8af630531cd5c019730b668657dda2698e2 Merge: 1516fb4 3accf36 Author: Android (Google) Code Review Date: Thu Sep 17 22:43:31 2009 -0400 Merge change 25690 into donut-gms * changes: CTS: Guard against NPE in HostTimer. commit 3accf368b96c6720fb97a8edd171777ef04da315 Author: Brett Chabot Date: Thu Sep 17 19:37:15 2009 -0700 CTS: Guard against NPE in HostTimer. BUG 2056369 commit 1516fb4ba86223e58a13126956e20c8bba3a5650 Merge: ad52768 5312a16 Author: Android (Google) Code Review Date: Thu Sep 17 22:35:18 2009 -0400 Merge change 25688 into donut-gms * changes: CTS: Mark android.webkit.cts.CookieTest.testDomain as broken commit 5312a1657ada060a796f08fec4949087fe5b1020 Author: Phil Dubach Date: Thu Sep 17 19:28:21 2009 -0700 CTS: Mark android.webkit.cts.CookieTest.testDomain as broken Bug 2129378 Change-Id: I174b7a5e7856258c8c813c5cd5794ead008d2c21 commit bc192a6fa83a5d4ccd7ddf3adab54865659ac47c Author: Brett Chabot Date: Thu Sep 17 19:25:33 2009 -0700 CTS: Adjust SensorTest to treat temperature sensor as optional. BUG 2087471 commit ad52768b3169ce91d854cec06c0f3b0dddf7d486 Merge: adc7d0c f7897e6 Author: Android (Google) Code Review Date: Thu Sep 17 22:22:21 2009 -0400 Merge change 25678 into donut-gms * changes: CTS: Mark android.webkit.cts.WebHistoryItemTest.testRedirect as broken commit adc7d0c6908953534ab83ab0fc0f43bdb929dd7e Merge: 5d6af1e d099bbd Author: Android (Google) Code Review Date: Thu Sep 17 22:15:53 2009 -0400 Merge change 25642 into donut-gms * changes: CTS: Fix AudioTrackTest#testAudioTrackProperties. commit f7897e64c52a3e4682eeb1593a5d071397e00c09 Author: Phil Dubach Date: Thu Sep 17 18:42:25 2009 -0700 CTS: Mark android.webkit.cts.WebHistoryItemTest.testRedirect as broken Bug 2121787 Change-Id: I5716a33f01847ea007015dbaadba524e108dd905 commit 5d6af1eb7b79d06d40d1cd9c6a48ef8c1c34f083 Merge: 930df1a 76d3e35 Author: Android (Google) Code Review Date: Thu Sep 17 21:53:10 2009 -0400 Merge change 25662 into donut-gms * changes: CTS: Force internal web server to shut down befor starting new instance commit 930df1aed446f123c02932d07cdbd85a4edda987 Merge: cce1e19 3bb6fb7 Author: Android (Google) Code Review Date: Thu Sep 17 21:15:39 2009 -0400 Merge change 25664 into donut-gms * changes: CTS: Remove internal references from MediaControllerTest. commit 3bb6fb7527ce95807cee2ec2324bc98962514bc4 Author: Brett Chabot Date: Thu Sep 17 18:04:55 2009 -0700 CTS: Remove internal references from MediaControllerTest. BUG 2088069 commit 76d3e35ce78f94ca0f3cecc62e71d4be6ef91cd6 Author: Phil Dubach Date: Thu Sep 17 18:02:31 2009 -0700 CTS: Force internal web server to shut down befor starting new instance Bug 2121787 Change-Id: Iae1bcf16066683c6ec8d2edfbc72abf0ab4e20d5 commit d099bbd2d2be3a84379d72dda33875cf4fc4ea40 Author: Brett Chabot Date: Thu Sep 17 17:12:03 2009 -0700 CTS: Fix AudioTrackTest#testAudioTrackProperties. Change to test for min nativeFrameCount threshold rather than absolute. BUG 2087828 commit cce1e19806905eed4de3ad594747b5d3fb45a97a Author: Brett Chabot Date: Wed Sep 16 20:09:22 2009 -0700 Change CTS version to 1.6_r1. commit b9049084630d2652d18efd2f6082153cf0ea516c Merge: ec65c6a e091316 Author: Android (Google) Code Review Date: Wed Sep 16 19:27:43 2009 -0400 Merge change 25191 into donut-gms * changes: CTS: fix some tests with internal references. commit e091316b9f7e7c1dfffa80623188b8496769d398 Author: Brett Chabot Date: Tue Sep 15 18:36:59 2009 -0700 CTS: fix some tests with internal references. BUGS 2087453 1925351 commit ec65c6a1d77d2a3111c4cd624612caf680e6064b Author: Brett Chabot Date: Tue Sep 15 20:01:24 2009 -0700 CTS: Fix SmsManager#testSendMessages. BUG 2108667 commit 93dbdba7785edccaac70679a2e67b510912db056 Merge: 112b909 45fa4a5 Author: Android (Google) Code Review Date: Tue Sep 15 12:42:55 2009 -0400 Merge change 24922 into donut-gms * changes: CTS: Fix tests with dependencies on display density commit 19d6ff3877366e09145ef1ee1809998fa1ab2a9a Author: Dianne Hackborn Date: Sun Sep 13 16:17:37 2009 -0700 Follow key event API change. Change-Id: Ifd442bc5ed9564ce4eb51a4887757c97c1c94068 commit 45fa4a5720610d9a81f2a58bb6eda726fedd661e Author: Phil Dubach Date: Thu Sep 10 17:06:56 2009 -0700 CTS: Fix tests with dependencies on display density Bug 2106766 Change-Id: Ifdea38b25960f7a369ba0249b745109956003324 commit 112b909c565241dc44931aee5452ec525d90b797 Author: Brett Chabot Date: Fri Sep 11 16:39:15 2009 -0700 Add initial CTS test for TextToSpeech. commit ee5109a2501480e147abfab3c5de26f4575c1203 Merge: da8bac8 c7ff2e6 Author: Android (Google) Code Review Date: Fri Sep 11 18:52:28 2009 -0400 Merge change 24478 into donut-gms * changes: Add CTS test for GestureLibrary. commit 8ab9921ba3e42f8ad17078e123aada5a2d845389 Author: Brett Chabot Date: Fri Sep 11 15:26:23 2009 -0700 Change CTS tests to not build against SDK. Most CTS test packages reference test related annotations in dalvik.annotation which are not part of SDK. This was previously allowed due to bug in build build system. For now, temporarily change CTS makefiles so they are not built against SDK. BUG 2114936 commit da8bac8b162c4924117367b77e5778294d1be05b Merge: 1d497e2 d61f394 Author: Android (Google) Code Review Date: Fri Sep 11 17:39:42 2009 -0400 Merge change 24756 into donut-gms * changes: CTS: Add replace real location providers with mocks test. commit 1d497e291bc5fc9251e4951e32183a481f3c8d41 Merge: 91cf778 e3aef78 Author: android-build SharedAccount Date: Fri Sep 11 14:19:35 2009 -0700 Merge commit 'm/donut-release' into donut-gms commit d61f3945c5d75c7dff5eb57840b8d3fe1f5d0b7a Author: Brett Chabot Date: Fri Sep 11 13:55:48 2009 -0700 CTS: Add replace real location providers with mocks test. Also do some cleanup in the location test package to remove unnecessary dependency on InstrumentationCtsTestRunner and CtsTestStubs. BUG 2068874 commit 91cf778cd7223fd138464c22a9413830e89d21f9 Author: Brett Chabot Date: Thu Sep 10 17:46:39 2009 -0700 Add CTS test for default user agent string. BUG 2033383 commit a745673342d2f73a79e689bea4ff5281fbfdb399 Merge: 5c8ba48 b19f1d5 Author: Android (Google) Code Review Date: Thu Sep 10 13:41:20 2009 -0400 Merge change 24449 into donut-gms * changes: Integrate unsubmitted cupcake change 133408: CTS: add test case for android.webkit.CookieManager commit c7ff2e61798abc3a9a99bdb4e26b54dae296de11 Author: Brett Chabot Date: Wed Sep 9 18:08:26 2009 -0700 Add CTS test for GestureLibrary. Since GestureLibrary and GestureStore have similiar APIs, refactor GestureStoreTest to extract common test methods in a shared class reusable by GestureLibraryTest. commit 5c8ba482e06ac6144fa11a580cf1a1e595c21605 Merge: d008b86 365914d Author: Android (Google) Code Review Date: Wed Sep 9 21:41:26 2009 -0400 Merge change 24423 into donut-gms * changes: Add CTS test for build fingerprint. commit b19f1d5969caea46743b1f6add40095673e3b8f3 Author: Phil Dubach Date: Fri Sep 4 12:16:51 2009 -0700 Integrate unsubmitted cupcake change 133408: CTS: add test case for android.webkit.CookieManager Change-Id: I1ad39472277d52b07d6e288d09b2f2634b375a7a commit 365914d8b9fdedc54aee68836f4226296d1dff82 Author: Brett Chabot Date: Wed Sep 9 13:55:13 2009 -0700 Add CTS test for build fingerprint. BUG 2108493 commit d008b86b79e392f165b8c99f4c495a774174d4b7 Merge: 55bf3a1 9928dc2 Author: Android (Google) Code Review Date: Fri Sep 4 14:34:19 2009 -0700 Merge change 23932 into donut-gms * changes: Integrate unsubmitted cupcake change 133409: CTS: add test case of android.webkit.MimeTypeMap commit 9928dc2ef6ca748ab6ac53700d17919672f36e1b Author: Phil Dubach Date: Thu Sep 3 16:46:06 2009 -0700 Integrate unsubmitted cupcake change 133409: CTS: add test case of android.webkit.MimeTypeMap Change-Id: I22c25917a13ae6c10f2c8c7e52937786f2b168ed commit 55bf3a18a3ff50bb7f535a6983318a9936c204f1 Author: Phil Dubach Date: Thu Sep 3 10:27:07 2009 -0700 Integrate unsubmitted cupcake change 135105: CTS: add test case for android.webkit.WebBackForwardList Change-Id: I41642c42d7258d87a6111697d1e841ce38c83cb1 commit 556a8dea03f4a5511cae1d69efd946f13955a5c7 Merge: 8b94845 e58f212 Author: Android (Google) Code Review Date: Thu Sep 3 15:20:41 2009 -0700 Merge change 23703 into donut-gms * changes: Integrate unsubmitted cupcake change 149425: CTS: add test cases for android.webkit.WebView commit e58f2128efd17d0fef8876b49087483823acc88a Author: Phil Dubach Date: Thu Jul 30 14:33:23 2009 -0700 Integrate unsubmitted cupcake change 149425: CTS: add test cases for android.webkit.WebView Also regroup webkit-related assets in subfolders. Change-Id: I42d15ebe92aed191617b13aac37cc48383c1e9c0 commit 8b94845c4da42fb865a3acad396d73f55780d418 Author: Brett Chabot Date: Wed Sep 2 18:40:21 2009 -0700 Remove Intent.ACTION_AIRPLANE_MODE_CHANGED from protected broadcasts test. BUG 2097002 commit 38739cce443210e21bf61bbc7a1fd34aee41903c Author: Eric Fischer Date: Tue Sep 1 15:45:26 2009 -0700 Add backslash before apostrophe so it doesn't get lost. This is required by another change I am about to submit that makes it an error not to include the backslash, since it is inevitably a mistake when someone fails to include it. commit 764aea3b371103561d869f74514882e079965445 Merge: fa792c4 e3aef78 Author: Brett Chabot Date: Mon Aug 31 11:45:21 2009 -0700 am e3aef786: Increment CTS version to 1.6_pre_r2. Merge commit 'e3aef7860c1ca2ae83a78cf296546947d2511148' into eclair * commit 'e3aef7860c1ca2ae83a78cf296546947d2511148': Increment CTS version to 1.6_pre_r2. commit e3aef7860c1ca2ae83a78cf296546947d2511148 Author: Brett Chabot Date: Mon Aug 31 11:41:04 2009 -0700 Increment CTS version to 1.6_pre_r2. Change-Id: I53fc15eb50580c65e28974d5518ca73a54cf73ab commit fa792c46f8a94ab0ed3815cccbd982446071fa90 Merge: 146cbe3 48a66cc Author: Bill Napier Date: Sun Aug 30 19:06:01 2009 -0700 am 48a66ccf: CTS tests for checking that the proper default values are set for the new Manifest Attributes. Merge commit '48a66ccf9d950b654fc2c401b3f912dc45e05564' into eclair * commit '48a66ccf9d950b654fc2c401b3f912dc45e05564': CTS tests for checking that the proper default values are set for the new Manifest Attributes. commit 48a66ccf9d950b654fc2c401b3f912dc45e05564 Author: Bill Napier Date: Sun Aug 30 18:50:30 2009 -0700 CTS tests for checking that the proper default values are set for the new Manifest Attributes. commit 146cbe3bc66078c19d27d74300bb3dc2caa5fb64 Merge: 940437d 7578e57 Author: Brett Chabot Date: Fri Aug 28 14:24:10 2009 -0700 am 7578e575: Merge change 23155 into donut Merge commit '7578e57567d63139b563e2a3c6face707beeb931' into eclair * commit '7578e57567d63139b563e2a3c6face707beeb931': Change CTS makefiles so apps are built in data not system partition. commit 7578e57567d63139b563e2a3c6face707beeb931 Merge: 496aef4 5a54633 Author: Android (Google) Code Review Date: Fri Aug 28 14:21:21 2009 -0700 Merge change 23155 into donut * changes: Change CTS makefiles so apps are built in data not system partition. commit 5a54633fc208901d99b9b1283f2858dc6e330a0e Author: Brett Chabot Date: Fri Aug 28 12:22:23 2009 -0700 Change CTS makefiles so apps are built in data not system partition. BUG 2053298 Change-Id: I2c541c03f7c33c69cde7b0567b080710658c8d28 commit 940437ddad4282dfeac26b63020e0541f0cd9269 Merge: dc5f5ab 496aef4 Author: Brett Chabot Date: Wed Aug 26 17:47:33 2009 -0700 am 496aef40: CTS: Add initial simple unit test for GestureStore. Merge commit '496aef40c77af81c19dc2dc8f902ccbfa346e19b' into eclair * commit '496aef40c77af81c19dc2dc8f902ccbfa346e19b': CTS: Add initial simple unit test for GestureStore. commit dc5f5ab6237d395ae83f38ef9d0f465d441ce709 Merge: e923cd8 925578c Author: Brett Chabot Date: Wed Aug 26 09:29:30 2009 -0700 am 925578cf: Merge change 22541 into donut Merge commit '925578cfcabfec40f10d833aace940bfb3325f31' into eclair * commit '925578cfcabfec40f10d833aace940bfb3325f31': CTS: Remove references to internal API from ZoomControlsTest. commit e923cd88e9a10a1a5c5331e6340e15ee3c5073ea Merge: 1e74e9d 91fc21c Author: Brett Chabot Date: Wed Aug 26 09:29:25 2009 -0700 am 91fc21c2: Merge change 22526 into donut Merge commit '91fc21c22617b3beac69f90c7f8d7bf690425c9b' into eclair * commit '91fc21c22617b3beac69f90c7f8d7bf690425c9b': CTS: Fix ContextWrapperTest to not reference hardcoded package names. commit 496aef40c77af81c19dc2dc8f902ccbfa346e19b Author: Brett Chabot Date: Tue Aug 25 20:02:30 2009 -0700 CTS: Add initial simple unit test for GestureStore. BUG 2048364 Change-Id: Iee096d5ee8feec3e32e18efd1587281304374654 commit 925578cfcabfec40f10d833aace940bfb3325f31 Merge: 91fc21c cc4ef14 Author: Android (Google) Code Review Date: Tue Aug 25 16:36:38 2009 -0700 Merge change 22541 into donut * changes: CTS: Remove references to internal API from ZoomControlsTest. commit cc4ef140ee09a8d61e4a4a09b82e4cfb049a4674 Author: Brett Chabot Date: Mon Aug 24 18:36:37 2009 -0700 CTS: Remove references to internal API from ZoomControlsTest. BUG 1915035 Change-Id: Ia947f7c675e3672d9b20b565d5675f4fa6828506 commit 91fc21c22617b3beac69f90c7f8d7bf690425c9b Merge: 98b2334 621b1bf Author: Android (Google) Code Review Date: Tue Aug 25 16:29:36 2009 -0700 Merge change 22526 into donut * changes: CTS: Fix ContextWrapperTest to not reference hardcoded package names. commit 1e74e9d191620bf161176492a2b849b44f8fd606 Merge: 5190cdd 98b2334 Author: Phil Dubach Date: Tue Aug 25 10:07:24 2009 -0700 am 98b23349: CTS: Increase robustness of description generator Merge commit '98b233492529272fbcc33d08797b06e7a256a1a1' into eclair * commit '98b233492529272fbcc33d08797b06e7a256a1a1': CTS: Increase robustness of description generator commit 98b233492529272fbcc33d08797b06e7a256a1a1 Author: Phil Dubach Date: Mon Aug 24 17:58:05 2009 -0700 CTS: Increase robustness of description generator When searching for test packages under cts/tests/tests, ignore any directory that does not contain a makefile and manifest. BUG 2075465 Change-Id: I6de677a8282bce7001a95ac08ce192f1f0b344b9 commit 621b1bf443d6bc1b681dfd86a21c61fd09693660 Author: Brett Chabot Date: Mon Aug 24 17:45:54 2009 -0700 CTS: Fix ContextWrapperTest to not reference hardcoded package names. BUG 1934249 Change-Id: I376dfdb03a8af0e32e3dfefec4d9a4133412dfaf commit 5190cdd2c981582345020cac771a3e4b81d89a4f Merge: a89d351 0768d61 Author: Brett Chabot Date: Mon Aug 24 13:42:52 2009 -0700 am 0768d61e: CTS: cleanup whitespace in DeviceManager. Merge commit '0768d61e271fad5371c1dc1e4fb4c1a041a37896' into eclair * commit '0768d61e271fad5371c1dc1e4fb4c1a041a37896': CTS: cleanup whitespace in DeviceManager. commit 0768d61e271fad5371c1dc1e4fb4c1a041a37896 Author: Brett Chabot Date: Mon Aug 24 12:46:40 2009 -0700 CTS: cleanup whitespace in DeviceManager. commit a89d3519db442c03748cc95a221396a6cff4a552 Merge: 9f88885 86cbe1d Author: Phil Dubach Date: Mon Aug 24 12:01:03 2009 -0700 am 86cbe1d7: Merge change 22456 into donut Merge commit '86cbe1d7341f7190a921f1240f82f42d5af2fff5' into eclair * commit '86cbe1d7341f7190a921f1240f82f42d5af2fff5': CTS: Remove description generator shell script and related cleanup commit 9f888853080159fb80a6b76f2d7170b13f3321b7 Merge: e87d416 6068048 Author: Phil Dubach Date: Mon Aug 24 12:01:01 2009 -0700 am 60680481: CTS: Add test description and test plan for app security tests Merge commit '60680481d97015e7fceedc3ed93c6d0481a32397' into eclair * commit '60680481d97015e7fceedc3ed93c6d0481a32397': CTS: Add test description and test plan for app security tests commit 86cbe1d7341f7190a921f1240f82f42d5af2fff5 Merge: 6068048 818089e Author: Android (Google) Code Review Date: Mon Aug 24 12:00:05 2009 -0700 Merge change 22456 into donut * changes: CTS: Remove description generator shell script and related cleanup commit 818089ef55cd4b1685df99435c9bdef092802708 Author: Phil Dubach Date: Mon Aug 24 10:45:55 2009 -0700 CTS: Remove description generator shell script and related cleanup The description generator shell script has been replaced by a Python script that has fewer dependencies on the operating system. This change removes the old shell script. The doclet used to insert an XML_INFO attribute into the generated description. The shell script used sed to replace this with any additional attributes it wanted to inject. With the new Python script, this extra attribute is no longer required. Change-Id: I2aadf2dea55b5f263406807e76221476259b48ae commit e87d416819cd3a35a171ec67bfa6071d48a31832 Merge: 7f2c1d4 ec19a57 Author: Phil Dubach Date: Sat Aug 22 07:44:06 2009 -0700 am ec19a57e: CTS: Use plain /usr/bin/python for the build instead of /usr/bin/python2.4 Merge commit 'ec19a57e07e932804dd8f77a8432cb9aa34288da' into eclair * commit 'ec19a57e07e932804dd8f77a8432cb9aa34288da': CTS: Use plain /usr/bin/python for the build instead of /usr/bin/python2.4 commit 60680481d97015e7fceedc3ed93c6d0481a32397 Author: Phil Dubach Date: Wed Aug 19 10:13:23 2009 -0700 CTS: Add test description and test plan for app security tests commit ec19a57e07e932804dd8f77a8432cb9aa34288da Author: Phil Dubach Date: Fri Aug 21 15:20:13 2009 -0700 CTS: Use plain /usr/bin/python for the build instead of /usr/bin/python2.4 Even though the python style guide explicitly requests that python2.4 should be used in the shebang line, there is no such executable or link on the Mac build machine. Changing the shebang to /usr/bin/python should do the trick. The popular '/usr/bin/env python' is not allowed according to the style guide due to issues with killall. commit 7f2c1d4c40793d9d2858058b3dcd66275b6590a4 Merge: 73e54f2 f029963 Author: Phil Dubach Date: Fri Aug 21 13:59:52 2009 -0700 am f0299637: Merge change 22153 into donut Merge commit 'f0299637223b8881d49a2a20111bc807771afd2f' into eclair * commit 'f0299637223b8881d49a2a20111bc807771afd2f': CTS: Sort test packages alphabetically by the name of their description file commit f0299637223b8881d49a2a20111bc807771afd2f Merge: e084519 8dcedfe Author: Android (Google) Code Review Date: Fri Aug 21 13:57:24 2009 -0700 Merge change 22153 into donut * changes: CTS: Sort test packages alphabetically by the name of their description file commit 73e54f2e5edc7814b4fbfd5024669971ca5ae6bc Author: Dianne Hackborn Date: Thu Aug 20 19:32:35 2009 -0700 Update to follow new APIs. commit ba8d12ad3b68e36c825851b22812acdd65341d9e Merge: ef40620 e084519 Author: Brett Chabot Date: Thu Aug 20 17:56:07 2009 -0700 am e0845197: Merge change 21935 into donut Merge commit 'e0845197250ccdf336636a2aaa5ba905888e4b03' into eclair * commit 'e0845197250ccdf336636a2aaa5ba905888e4b03': CTS: Initial checkin of some basic Gesture unit tests. commit e0845197250ccdf336636a2aaa5ba905888e4b03 Merge: 1f5a5ed 34258b6 Author: Android (Google) Code Review Date: Thu Aug 20 17:53:58 2009 -0700 Merge change 21935 into donut * changes: CTS: Initial checkin of some basic Gesture unit tests. commit 34258b619ecf28630ab1650002a29e8532e06861 Author: Brett Chabot Date: Wed Aug 19 12:59:46 2009 -0700 CTS: Initial checkin of some basic Gesture unit tests. commit 8dcedfe4cd70c45d5fa815c7449211a785b04905 Author: Phil Dubach Date: Thu Aug 20 16:10:39 2009 -0700 CTS: Sort test packages alphabetically by the name of their description file The previous plan description generator sorted packages alphabetically by preserving the order returned by 'ls *.xml' in the test repository. The new python generator uses glob() to search for all xml files, so the order is undefined. Simply sorting the list returned by glob() is sufficient, since the plan generator preserves the order of that list for all plans. commit ef40620062e2afb79db551672deaae3ca04d9f8e Merge: 22eecd0 1f5a5ed Author: Brett Chabot Date: Wed Aug 19 14:30:29 2009 -0700 am 1f5a5ed8: CTS: change harness to use \'adb reboot\' command. Merge commit '1f5a5ed8dd1e4b1c27986353cf29846f8edc1caa' into eclair * commit '1f5a5ed8dd1e4b1c27986353cf29846f8edc1caa': CTS: change harness to use 'adb reboot' command. commit 22eecd00127ee046acee1453f45ac07fe309639c Author: Marco Nelissen Date: Wed Aug 19 13:09:20 2009 -0700 Update CTS test for the extended MediaPlayerControl interface. commit 1f5a5ed8dd1e4b1c27986353cf29846f8edc1caa Author: Brett Chabot Date: Wed Aug 19 10:54:25 2009 -0700 CTS: change harness to use 'adb reboot' command. Previously the harness would use adb shell reboot. Changing to adb reboot allows running CTS against user builds. commit 6c0b99ee24d250049e0a120682717a4c27065358 Merge: 573a834 171d445 Author: Phil Dubach Date: Tue Aug 18 17:08:30 2009 -0700 am 171d4458: Merge change 21366 into donut Merge commit '171d44583ac1748448957f6015b4554b648b4ac7' into eclair * commit '171d44583ac1748448957f6015b4554b648b4ac7': CTS: Python script to replace the description and plan generator commit 171d44583ac1748448957f6015b4554b648b4ac7 Merge: 352879f 0d6ef06 Author: Android (Google) Code Review Date: Tue Aug 18 17:05:30 2009 -0700 Merge change 21366 into donut * changes: CTS: Python script to replace the description and plan generator commit 573a834c05e9f0f72a59df63b45cbf887fa67e00 Merge: fdc0b2a 352879f Author: Phil Dubach Date: Tue Aug 18 16:33:07 2009 -0700 am 352879f1: Merge change 21813 into donut Merge commit '352879f1c0168e06be3629fde141e2c74b48e566' into eclair * commit '352879f1c0168e06be3629fde141e2c74b48e566': CTS: Fix console search for test packages commit 352879f1c0168e06be3629fde141e2c74b48e566 Merge: 391acd2 9e59a2c Author: Android (Google) Code Review Date: Tue Aug 18 16:30:59 2009 -0700 Merge change 21813 into donut * changes: CTS: Fix console search for test packages commit 9e59a2c65f2f1a7e23974a768c7cad522c58195b Author: Phil Dubach Date: Tue Aug 18 16:05:51 2009 -0700 CTS: Fix console search for test packages Bug 2059475. Manual integration of cupcake change 147398 Original comment: CTS: Fix console search for test packages When the CTS host searched for a test package to run, it did so using String.startswith() to allow partial package names to be entered on the console. This caused problems with multiple packages that share the same prefix. commit 0d6ef0674c25f652d5891c996042382211084edc Author: Phil Dubach Date: Wed Aug 12 18:13:16 2009 -0700 CTS: Python script to replace the description and plan generator This will eventually replace the very complex and hard to maintain genDefaultTestPlan.sh. In this initial step, the functionality is kept identical to original script. A separate change in build/core/tasks/cts.mk is needed to make the switch to the new script. commit fdc0b2a1337435839c06c9e413f40a5061efc0da Merge: d72d08b 391acd2 Author: Brett Chabot Date: Tue Aug 18 13:11:03 2009 -0700 am 391acd2f: Merge change 21339 into donut Merge commit '391acd2fa8c3daced47fbe36f59362c1c334165f' into eclair * commit '391acd2fa8c3daced47fbe36f59362c1c334165f': Refactor/copy existing telephony tests to add CTS tests for the new donut telephony API. commit d72d08b2b0536296a7da6074b5c2c1477cb66ec5 Merge: 6f3a5c9 035b453 Author: Bill Napier Date: Tue Aug 18 11:01:42 2009 -0700 am 035b4536: fix build. Merge commit '035b45369db9863114b369f50911204a13b7c4be' into eclair * commit '035b45369db9863114b369f50911204a13b7c4be': fix build. commit 6f3a5c9f6ff1d2c77f67025aaa53bc7e76f1b445 Merge: b8b1580 ba5ee4a Author: Bill Napier Date: Tue Aug 18 11:01:39 2009 -0700 am ba5ee4af: Add first CTS DPI test that verifies that device is running a supported resolution. Merge commit 'ba5ee4af0bbf73368270c27567cbd1787f1a321c' into eclair * commit 'ba5ee4af0bbf73368270c27567cbd1787f1a321c': Add first CTS DPI test that verifies that device is running a supported resolution. commit b8b15809a41a7ed6de09af3ed15047913df0dce9 Merge: d081437 f8ee8d5 Author: Brett Chabot Date: Tue Aug 18 11:01:25 2009 -0700 am f8ee8d58: Merge change 21233 into donut Merge commit 'f8ee8d58f99f47611577eff98638b3f598655719' into eclair * commit 'f8ee8d58f99f47611577eff98638b3f598655719': Remove a bunch of unused CTS tests from continuous test build to save space. commit d081437e0665d3e0d912047e66f31428d8364572 Merge: 350c089 669797f Author: Brett Chabot Date: Tue Aug 18 11:00:18 2009 -0700 am 669797f2: Change CTS version number from 1.0 to 1.6_pre_r1. Merge commit '669797f2ce272f96a01654ca6e333dbc5e825263' into eclair * commit '669797f2ce272f96a01654ca6e333dbc5e825263': Change CTS version number from 1.0 to 1.6_pre_r1. commit 350c0891e82482d568d1c569d6bf911cb4d46bf6 Merge: f962b49 88d931b Author: Brett Chabot Date: Tue Aug 18 10:59:49 2009 -0700 am 88d931b0: Change CTS BuildVersionTest to check for 1.6 instead of Donut. Merge commit '88d931b0278617c6cb41233c14cb30a220cc2bd2' into eclair * commit '88d931b0278617c6cb41233c14cb30a220cc2bd2': Change CTS BuildVersionTest to check for 1.6 instead of Donut. commit f962b49931263cea8cb7eda843bc2d644d9f0534 Merge: f3d145c 03177f1 Author: Brett Chabot Date: Tue Aug 18 10:39:20 2009 -0700 am 03177f13: More CTS cleanup Merge commit '03177f13b328038c9c11b7f32420f42be0bc4f3b' into eclair * commit '03177f13b328038c9c11b7f32420f42be0bc4f3b': More CTS cleanup commit 391acd2fa8c3daced47fbe36f59362c1c334165f Merge: 035b453 7000873 Author: Android (Google) Code Review Date: Mon Aug 17 18:02:51 2009 -0700 Merge change 21339 into donut * changes: Refactor/copy existing telephony tests to add CTS tests for the new donut telephony API. commit 035b45369db9863114b369f50911204a13b7c4be Author: Bill Napier Date: Mon Aug 17 16:43:04 2009 -0700 fix build. commit 7000873a066ca6f6e5c174b8f5fd944dd8c222b1 Author: Brett Chabot Date: Wed Aug 12 16:34:31 2009 -0700 Refactor/copy existing telephony tests to add CTS tests for the new donut telephony API. BUG 2048364 commit ba5ee4af0bbf73368270c27567cbd1787f1a321c Author: Bill Napier Date: Thu Aug 13 14:46:56 2009 -0700 Add first CTS DPI test that verifies that device is running a supported resolution. commit f8ee8d58f99f47611577eff98638b3f598655719 Merge: 669797f f9e03e1 Author: Android (Google) Code Review Date: Mon Aug 17 14:39:37 2009 -0700 Merge change 21233 into donut * changes: Remove a bunch of unused CTS tests from continuous test build to save space. commit 669797f2ce272f96a01654ca6e333dbc5e825263 Author: Brett Chabot Date: Mon Aug 17 12:55:42 2009 -0700 Change CTS version number from 1.0 to 1.6_pre_r1. BUG 2058836 commit 88d931b0278617c6cb41233c14cb30a220cc2bd2 Author: Brett Chabot Date: Fri Aug 14 20:08:42 2009 -0700 Change CTS BuildVersionTest to check for 1.6 instead of Donut. commit f9e03e13a89a7c1ef27571bf779c06b6f0808727 Author: Brett Chabot Date: Thu Aug 13 20:55:28 2009 -0700 Remove a bunch of unused CTS tests from continuous test build to save space. BUG 2053298 commit 03177f13b328038c9c11b7f32420f42be0bc4f3b Author: Brett Chabot Date: Thu Aug 13 21:23:28 2009 -0700 More CTS cleanup - Mark currently failing CTS tests as BrokenTests. - Fix race condition in LocationManagerTest - tweak host config to run tests in batch mode - fix genDefaultTestPlan and rename java package so permission2 tests get included properly, BUG 2053939 commit f3d145ced572299224108f910e34c26c857f8113 Merge: 6969020 488336c Author: Brett Chabot Date: Wed Aug 12 12:05:05 2009 -0700 am 488336cb: Disable/fix more CTS tests. Merge commit '488336cb81ebc7b179544252c186ccdc02b9e073' * commit '488336cb81ebc7b179544252c186ccdc02b9e073': Disable/fix more CTS tests. commit 69690203bfe37abdafd876598fba8f810ef2d42c Merge: c49f97c fe0b5df Author: Phil Dubach Date: Tue Aug 11 18:12:20 2009 -0700 am fe0b5dfe: CTS: Add junit.jar to classpath to fix VM tests Merge commit 'fe0b5dfe89510d78030f6e4231faf11df40841c9' * commit 'fe0b5dfe89510d78030f6e4231faf11df40841c9': CTS: Add junit.jar to classpath to fix VM tests commit 488336cb81ebc7b179544252c186ccdc02b9e073 Author: Brett Chabot Date: Mon Aug 10 18:15:01 2009 -0700 Disable/fix more CTS tests. Marked as BrokenTest: - LauncherActivityTest#testLaunchActivity. BUG 2028339 - SearchManagerTest testStartSearch and testStopSearch. BUG 2041610 - AudioManagerTest#testMuteSolo. BUG 2041773 - LayoutTest#testGetLineMax and testGetLineWidth. BUG 1937126 - GalleryTest#testSetCallbackDuringFling. BUG 1937126 - MediaStore_Audio_Playlists_MembersTest#testGetContentUri: BUG 2017132 Marked as ToBeFixed: - ProgressBarTest#testAccessInterpolator. BUG 2031844 Fixes: - RemoteViewsTest#testSetImageViewUri and testSetUri: Tests were using a non- existent temporary file location. BUG 2042235 commit fe0b5dfe89510d78030f6e4231faf11df40841c9 Author: Phil Dubach Date: Tue Aug 11 10:50:16 2009 -0700 CTS: Add junit.jar to classpath to fix VM tests See bug 2046033. The junit classes are no longer part of cts.jar. For CTS distribution ZIPs, this is already taken care of in startcts. commit c49f97c6c77653585d2c71bd35a4b962e23cd9ab Merge: 0c49aed 06c2425 Author: Phil Dubach Date: Fri Aug 7 14:44:41 2009 -0700 am 06c24251: Merge change 20445 into donut Merge commit '06c24251e7bb43a31562b2f956a5b4139c1bac65' * commit '06c24251e7bb43a31562b2f956a5b4139c1bac65': Integrate unsubmitted cupcake change 131127: commit 06c24251e7bb43a31562b2f956a5b4139c1bac65 Merge: 4cc921d eaf9e0a Author: Android (Google) Code Review Date: Fri Aug 7 13:59:29 2009 -0700 Merge change 20445 into donut * changes: Integrate unsubmitted cupcake change 131127: CTS: add test cases for graphics.ComposeShader, CornerPathEffect, DashPathEffect, DiscretePathEffect, EmbossMaskFilter and LightingColorFilter commit eaf9e0a2bf1cb0b3099dd2e1663ec1c4cfe85a57 Author: Phil Dubach Date: Wed Aug 5 15:22:36 2009 -0700 Integrate unsubmitted cupcake change 131127: CTS: add test cases for graphics.ComposeShader, CornerPathEffect, DashPathEffect, DiscretePathEffect, EmbossMaskFilter and LightingColorFilter commit 0c49aedbfeb578f24ae99df59a171afde78eeb8b Merge: 6e8e3c7 4cc921d Author: Phil Dubach Date: Fri Aug 7 10:35:23 2009 -0700 am 4cc921d4: Merge change 20162 into donut Merge commit '4cc921d4a21b00261ccfa97474b0695817dde111' * commit '4cc921d4a21b00261ccfa97474b0695817dde111': Integrate unsubmitted cupcake change 131124: commit 6e8e3c7f9dc07e9d5781624efaa5a582a75f66b1 Merge: 6d742d8 f026808 Author: Phil Dubach Date: Fri Aug 7 10:35:20 2009 -0700 am f0268081: Merge change 20019 into donut Merge commit 'f0268081f04a8d7c931e3481b433576f2b54685e' * commit 'f0268081f04a8d7c931e3481b433576f2b54685e': Integrate unsubmitted cupcake change 131132: commit 4cc921d4a21b00261ccfa97474b0695817dde111 Merge: f026808 7bde99f Author: Android (Google) Code Review Date: Fri Aug 7 10:33:35 2009 -0700 Merge change 20162 into donut * changes: Integrate unsubmitted cupcake change 131124: CTS: add test cases for graphics.AvoidXfermode, BitmapShader, BlurMaskFilter, ColorMatrixColorFilter and ComposePathEffect commit f0268081f04a8d7c931e3481b433576f2b54685e Merge: 3b82d02 9b1ed1f Author: Android (Google) Code Review Date: Fri Aug 7 10:33:24 2009 -0700 Merge change 20019 into donut * changes: Integrate unsubmitted cupcake change 131132: CTS: add test case for graphics.PorterDuffXfermode, RadialGradient, Shader_TileMode, SumPathEffect and SweepGradient commit 6d742d847afce85af3643d6512ee08559b74f879 Merge: 9a63b2b 3b82d02 Author: Android (Google) Code Review Date: Thu Aug 6 16:10:04 2009 -0700 am 3b82d02e: Merge change 20325 into donut Merge commit '3b82d02e51fe3429b82e2778d2a4ec81e0b13254' * commit '3b82d02e51fe3429b82e2778d2a4ec81e0b13254': Add CTS test for ConnectivityManager permissions. commit 3b82d02e51fe3429b82e2778d2a4ec81e0b13254 Merge: 0fc95fb 08cbaa0 Author: Android (Google) Code Review Date: Thu Aug 6 16:08:11 2009 -0700 Merge change 20325 into donut * changes: Add CTS test for ConnectivityManager permissions. commit 9a63b2b851e5703159414864b5d188d58bc9fe2a Merge: 90bb477 0fc95fb Author: Brett Chabot Date: Thu Aug 6 15:01:13 2009 -0700 am 0fc95fb4: Add CTS test for App Widget permissions. Merge commit '0fc95fb4eadf88e9f178589a5d46e6498489dc91' * commit '0fc95fb4eadf88e9f178589a5d46e6498489dc91': Add CTS test for App Widget permissions. commit 08cbaa0c129db133b857c62d3c96f15936679fb9 Author: Brett Chabot Date: Thu Aug 6 14:03:27 2009 -0700 Add CTS test for ConnectivityManager permissions. BUG 1552860. commit 0fc95fb4eadf88e9f178589a5d46e6498489dc91 Author: Brett Chabot Date: Thu Aug 6 14:00:43 2009 -0700 Add CTS test for App Widget permissions. BUG 1552860 commit 90bb477bf286b35fc273c17c949174ca3668fe68 Merge: fd9a572 f55e9fe Author: Brett Chabot Date: Wed Aug 5 18:00:35 2009 -0700 am f55e9fee: Remove NoProcessOutgoingCallPermissionTest#testProcessOutgoingCall from large suite. Merge commit 'f55e9fee1b4d8f43cb0ee29445a98ff343a4c6b5' * commit 'f55e9fee1b4d8f43cb0ee29445a98ff343a4c6b5': Remove NoProcessOutgoingCallPermissionTest#testProcessOutgoingCall from large suite. commit f55e9fee1b4d8f43cb0ee29445a98ff343a4c6b5 Author: Brett Chabot Date: Wed Aug 5 17:19:30 2009 -0700 Remove NoProcessOutgoingCallPermissionTest#testProcessOutgoingCall from large suite. This test was initiating a call that was never terminated, which interferred with other tests. BUG 2021796 commit 7bde99fbdcb23dbf5b7b7bd1839df7e83eea33e8 Author: Phil Dubach Date: Tue Aug 4 16:19:53 2009 -0700 Integrate unsubmitted cupcake change 131124: CTS: add test cases for graphics.AvoidXfermode, BitmapShader, BlurMaskFilter, ColorMatrixColorFilter and ComposePathEffect commit 9b1ed1fec14549d9673a4a02228282fa44aa2985 Author: Phil Dubach Date: Mon Aug 3 12:33:56 2009 -0700 Integrate unsubmitted cupcake change 131132: CTS: add test case for graphics.PorterDuffXfermode, RadialGradient, Shader_TileMode, SumPathEffect and SweepGradient commit fd9a57256eda3bce7db5491c66b975f8ac44d27c Merge: c9b4b28 b1394da Author: Android (Google) Code Review Date: Tue Aug 4 14:21:37 2009 -0700 am b1394dad: Merge change 9628 into donut Merge commit 'b1394dadbc11cde5b2defc5dc6f5d93389e34f56' * commit 'b1394dadbc11cde5b2defc5dc6f5d93389e34f56': Fix android.widget.cts.TabWidgetTest:testAddView. commit c9b4b283f042078c06d8b0a749891b2426b51197 Merge: 0fbc60d 9dd474b Author: Android (Google) Code Review Date: Tue Aug 4 14:21:34 2009 -0700 am 9dd474bc: Merge change 9520 into donut Merge commit '9dd474bc7e269aebe14ddbc462ad30f26d3821ad' * commit '9dd474bc7e269aebe14ddbc462ad30f26d3821ad': Integrate unsubmitted cupcake change 131131: commit b1394dadbc11cde5b2defc5dc6f5d93389e34f56 Merge: 9dd474b 3e44489 Author: Android (Google) Code Review Date: Tue Aug 4 14:19:16 2009 -0700 Merge change 9628 into donut * changes: Fix android.widget.cts.TabWidgetTest:testAddView. commit 9dd474bc7e269aebe14ddbc462ad30f26d3821ad Merge: c1f4716 59eafab Author: Android (Google) Code Review Date: Tue Aug 4 14:17:07 2009 -0700 Merge change 9520 into donut * changes: Integrate unsubmitted cupcake change 131131: CTS: add test cases for graphics.LinearGradient, PaintFlagsDrawFilter, PathDashPathEffect, PixelXorXfermode and PorterDuffColorFilter commit 3e444892af4748d0a7c3b0fbc95211dffccdfd4e Author: Brett Chabot Date: Mon Aug 3 20:12:07 2009 -0700 Fix android.widget.cts.TabWidgetTest:testAddView. Modify assertions for generateDefaultLayoutParams to comply with javadoc. commit 0fbc60d7929ba0e02b07da9fd077f67ca5c66dd0 Merge: e94391a c1f4716 Author: Brett Chabot Date: Tue Aug 4 13:25:32 2009 -0700 am c1f47162: Fix CTS SimpleAdapterTest#testGetView and testGetDropDownView. Merge commit 'c1f47162d780264109f85fca55a8bd87b043efb0' * commit 'c1f47162d780264109f85fca55a8bd87b043efb0': Fix CTS SimpleAdapterTest#testGetView and testGetDropDownView. commit c1f47162d780264109f85fca55a8bd87b043efb0 Author: Brett Chabot Date: Tue Aug 4 11:31:51 2009 -0700 Fix CTS SimpleAdapterTest#testGetView and testGetDropDownView. Use a view previously handled by the adapter as the view to convert, instead of an unsupported random view. (bug 2031921) commit e94391a55ed4d22a79b23861ec68ce9a23ff3d7a Merge: ada895b 9e3536f Author: Android (Google) Code Review Date: Mon Aug 3 17:29:12 2009 -0700 am 9e3536f9: Merge change 9423 into donut Merge commit '9e3536f9a537fb6cb861e8087bbf2521855435db' * commit '9e3536f9a537fb6cb861e8087bbf2521855435db': More cts test fixes. commit 9e3536f9a537fb6cb861e8087bbf2521855435db Merge: 9a526e3 329fbf8 Author: Android (Google) Code Review Date: Mon Aug 3 17:27:44 2009 -0700 Merge change 9423 into donut * changes: More cts test fixes. commit 329fbf8de072d5474ce8e387c77c7a12743e2833 Author: Brett Chabot Date: Fri Jul 31 16:45:07 2009 -0700 More cts test fixes. - Remove checks that relied on internal resource ids from AlertDialogTest (1934801) - Change expected values for ResourcesTest#testGetText tests (2028535) - Fix logic in ListViewTest#testAccessItemChecked, and mark as to be fixed (2028542) - Fix ListView#testAccessFooterView - add TextView's without any layout to avoid ClassCastException during list view reset. (2026064) commit ada895b8e59cbd0beec13abc961c03093fbc463a Merge: 367ca6b 9a526e3 Author: Android (Google) Code Review Date: Mon Aug 3 14:58:05 2009 -0700 am 9a526e38: Merge change 9523 into donut Merge commit '9a526e3843ed6fefc92b4f76bacd69095ec6c600' * commit '9a526e3843ed6fefc92b4f76bacd69095ec6c600': Address intermittent CTS AutoCompleteTextViewTest failures. commit 9a526e3843ed6fefc92b4f76bacd69095ec6c600 Merge: 5ebabbd 3407ac6 Author: Android (Google) Code Review Date: Mon Aug 3 14:54:53 2009 -0700 Merge change 9523 into donut * changes: Address intermittent CTS AutoCompleteTextViewTest failures. commit 367ca6b1ec99dbd2b65b85ba1ee16e4cfd1f8a96 Merge: ae643ba 5ebabbd Author: Brett Chabot Date: Mon Aug 3 14:51:42 2009 -0700 am 5ebabbdf: Fix android.graphics.drawable.cts.NinePatchDrawableTest:testConstructors. Merge commit '5ebabbdf172d69f7b8e369a27a9318f415c32a06' * commit '5ebabbdf172d69f7b8e369a27a9318f415c32a06': Fix android.graphics.drawable.cts.NinePatchDrawableTest:testConstructors. commit 5ebabbdf172d69f7b8e369a27a9318f415c32a06 Author: Brett Chabot Date: Fri Jul 31 17:07:11 2009 -0700 Fix android.graphics.drawable.cts.NinePatchDrawableTest:testConstructors. Remove false checks for NPE being thrown (bug 2028593) commit 3407ac63453d3896ea72f5054db1c7927010e1c6 Author: Brett Chabot Date: Mon Aug 3 12:42:17 2009 -0700 Address intermittent CTS AutoCompleteTextViewTest failures. Add pauses before checking UI state, and change pop up dismiss drop down call to run on UI thread. bugs 2028634 and 2028662. commit 59eafab4bca193fbb4f38ce2c32f8bf9ec53c088 Author: Phil Dubach Date: Fri Jul 31 10:40:27 2009 -0700 Integrate unsubmitted cupcake change 131131: CTS: add test cases for graphics.LinearGradient, PaintFlagsDrawFilter, PathDashPathEffect, PixelXorXfermode and PorterDuffColorFilter commit ae643ba49189300f983955beee8f39f44f267faf Merge: e103f92 1d13499 Author: Android (Google) Code Review Date: Thu Jul 30 17:59:58 2009 -0700 am 1d134990: Merge change 9171 into donut Merge commit '1d13499026bba29d2bc144511eb73ec99d02d9aa' * commit '1d13499026bba29d2bc144511eb73ec99d02d9aa': Integrate unsubmitted cupcake change 148896: commit 1d13499026bba29d2bc144511eb73ec99d02d9aa Merge: b0b0cc0 62481a9 Author: Android (Google) Code Review Date: Thu Jul 30 17:56:54 2009 -0700 Merge change 9171 into donut * changes: Integrate unsubmitted cupcake change 148896: CTS: add testcases for android.media.JetPlayer commit e103f928fc00f9de7400cae0620b2bb6d8f0861e Merge: c9351d8 b0b0cc0 Author: Android (Google) Code Review Date: Thu Jul 30 16:07:18 2009 -0700 am b0b0cc01: Merge change 9217 into donut Merge commit 'b0b0cc01c53f6244e3ba2f676ed96c8d81f28dec' * commit 'b0b0cc01c53f6244e3ba2f676ed96c8d81f28dec': CTS: Clean up image resources commit c9351d8d290d086a57d0543092e0364b4fafb3d9 Merge: f97b241 6a61463 Author: Android (Google) Code Review Date: Thu Jul 30 16:06:48 2009 -0700 am 6a614632: Merge change 9043 into donut Merge commit '6a614632829ed77d0b0c1530f213c8c0d1fbafab' * commit '6a614632829ed77d0b0c1530f213c8c0d1fbafab': Integrate unsubmitted cupcake change 143598: commit f97b24173260fe83ca984050933c55da1f5b46e3 Merge: aa248f2 0a2a263 Author: Brett Chabot Date: Thu Jul 30 16:05:12 2009 -0700 am 0a2a2633: Fix android.view.cts.ViewTest#testKeyPreIme. Merge commit '0a2a26334cac0b21b3e93ff9333eefd21e3e7ef8' * commit '0a2a26334cac0b21b3e93ff9333eefd21e3e7ef8': Fix android.view.cts.ViewTest#testKeyPreIme. commit b0b0cc01c53f6244e3ba2f676ed96c8d81f28dec Merge: 6a61463 4aaf3a8 Author: Android (Google) Code Review Date: Thu Jul 30 13:53:23 2009 -0700 Merge change 9217 into donut * changes: CTS: Clean up image resources commit 4aaf3a8d3c9e68a11020b23d95eeb905197deda0 Author: Phil Dubach Date: Thu Jul 30 12:22:51 2009 -0700 CTS: Clean up image resources Replace images of unknown origin and rename baby_face.jpg. commit 6a614632829ed77d0b0c1530f213c8c0d1fbafab Merge: 0a2a263 de36974 Author: Android (Google) Code Review Date: Thu Jul 30 11:40:46 2009 -0700 Merge change 9043 into donut * changes: Integrate unsubmitted cupcake change 143598: CTS: add testcase for AudioRecord, MediaPlayer and MediaRecorder commit de369742c66ba236a4e00c0d1b66fc468e431c20 Author: Phil Dubach Date: Mon Jul 27 13:34:52 2009 -0700 Integrate unsubmitted cupcake change 143598: CTS: add testcase for AudioRecord, MediaPlayer and MediaRecorder commit 62481a9f78fa97e23d11fd54e49974a9243889f9 Author: Phil Dubach Date: Wed Jul 29 18:18:27 2009 -0700 Integrate unsubmitted cupcake change 148896: CTS: add testcases for android.media.JetPlayer commit aa248f203318a8c83a1976c3783b721da63a0f01 Merge: cc22bb5 99c3748 Author: Android (Google) Code Review Date: Thu Jul 30 09:57:08 2009 -0700 am 99c37484: Merge change 9036 into donut Merge commit '99c374840e45349ce136a1c1da9602c6dbdad88b' * commit '99c374840e45349ce136a1c1da9602c6dbdad88b': CTS test cleanup to address comments from previous code review. commit cc22bb508445b3581e54a78c9be94152488f1d63 Merge: 6f8cdc5 eb04ddf Author: Android (Google) Code Review Date: Thu Jul 30 06:56:11 2009 -0700 am eb04ddf1: Merge change 8933 into donut Merge commit 'eb04ddf1a094280798f26fadeb65ddda5a0d7b3b' * commit 'eb04ddf1a094280798f26fadeb65ddda5a0d7b3b': A bunch of fixes for cts tests in donut. commit 0a2a26334cac0b21b3e93ff9333eefd21e3e7ef8 Author: Brett Chabot Date: Wed Jul 29 18:18:33 2009 -0700 Fix android.view.cts.ViewTest#testKeyPreIme. Issue a key down command instead of a key up and down event to avoid SecurityException. (bug 2019096) commit 99c374840e45349ce136a1c1da9602c6dbdad88b Merge: eb04ddf b7d7dbd Author: Android (Google) Code Review Date: Wed Jul 29 17:19:39 2009 -0700 Merge change 9036 into donut * changes: CTS test cleanup to address comments from previous code review. commit b7d7dbd41d70769e4059009370e4fbd1ad90e3f9 Author: Brett Chabot Date: Wed Jul 29 15:28:32 2009 -0700 CTS test cleanup to address comments from previous code review. commit eb04ddf1a094280798f26fadeb65ddda5a0d7b3b Merge: 984b3c8 e947cdc Author: Android (Google) Code Review Date: Wed Jul 29 10:53:33 2009 -0700 Merge change 8933 into donut * changes: A bunch of fixes for cts tests in donut. commit e947cdc06f481293bbd4466c5e73860ea34fcb87 Author: Brett Chabot Date: Tue Jul 28 19:32:53 2009 -0700 A bunch of fixes for cts tests in donut. The specifics are as follows: - Fix android.content.res.cts.ConfigTest (bug 2016026) - Add definition of custom test locale in make file - remove configuration resources for the default test configuration settings - add missing configurations - Port missing logic from ConfigTest from framework unit tests - Comment out untestable logic in ActivityManagerTest#testProcessInErrorState (bug 2004043) - Mark tests.api.java.io.FileTest#test_delete as a known failure (bug 1990816) - Fix InstrumentationTest#sendPointerSync: Adjust coordinates of MotionEvent in so its directed to activity under test instead of Status bar (bug 2004230) - also apply same fix to GestureDetector tests (bug 2019096) - Disable failing PaintTest methods that rely on hardcoded values (bug 1934963) - Remove asserts for constantPadding value when variablePadding is false from AnimationDrawableTest#testInflate and DrawableContainerStateTest# testAccessConstantPadding and StateListDrawableTest#testInflate (bug 2016862) - Remove false assertions from GeocoderTest (bug 2017021) - Add checks for presence of GPS provider to LocationManagerTest (bug 2017647) - Remove null provider check from MediaStore_Audio_Playlists_MembersTest#testGetContentUri (bug 2017132) - Removing assertion that LoginFilter.getFilter is returning an instance of SpannableString (bug 1937348) - Turn off kerning when measuring text in TextUtilsTest (bug 2017456) - Update DateUtilsTest#testGetAMPMString to test for lower case values (bug 2017467) - Fix DateUtilsTest#testFormatMethod so it accepts both a leadign zero and no leading zero for single digit month dates (bug 2017471) - Remove NPE check in ViewTest#testGetLocationOnScreen (bug 2018903) commit 6f8cdc58dc0ed37318b940cc386a1a0370e671b2 Merge: a367fac 984b3c8 Author: Android (Google) Code Review Date: Tue Jul 28 15:27:37 2009 -0700 am 984b3c8f: Merge change 8542 into donut Merge commit '984b3c8f85ea8dec2bb9d5203a1d9c41f0bf7cc8' * commit '984b3c8f85ea8dec2bb9d5203a1d9c41f0bf7cc8': Integrate unsubmitted cupcake change 148895: commit 984b3c8f85ea8dec2bb9d5203a1d9c41f0bf7cc8 Merge: a04dc39 adffe61 Author: Android (Google) Code Review Date: Tue Jul 28 15:05:51 2009 -0700 Merge change 8542 into donut * changes: Integrate unsubmitted cupcake change 148895: CTS: add new testcases for android.media.AudioTrack commit adffe61684541707a5800a0e5b35db584f45287b Author: Phil Dubach Date: Fri Jul 24 09:43:01 2009 -0700 Integrate unsubmitted cupcake change 148895: CTS: add new testcases for android.media.AudioTrack commit a367fac4b4ff5862afdc57aaece04b944436b40c Merge: 88a68d1 a04dc39 Author: Leon Scroggins Date: Mon Jul 27 10:52:24 2009 -0700 am a04dc396: Use the old string for bookmarks permissions. Merge commit 'a04dc3969646f091515ed08138d4b651ab3ec869' * commit 'a04dc3969646f091515ed08138d4b651ab3ec869': Use the old string for bookmarks permissions. commit a04dc3969646f091515ed08138d4b651ab3ec869 Author: Leon Scroggins Date: Mon Jul 27 11:09:24 2009 -0400 Use the old string for bookmarks permissions. When we made the bookmark permissions public, we also changed their names, which might break existing apps. Change them back. Depends on a change in frameworks/base. commit 88a68d10dc2f1128cb3061d3aa8b8ad2f73f85d3 Merge: 6b34bba 529794c Author: Phil Dubach Date: Fri Jul 24 16:08:41 2009 -0700 am 529794c3: Integrate unsubmitted cupcake change 132238: CTS: add test cases for android.webkit.WebHistoryItem Merge commit '529794c369a78e2da986ebb2054de462183955b6' * commit '529794c369a78e2da986ebb2054de462183955b6': Integrate unsubmitted cupcake change 132238: commit 529794c369a78e2da986ebb2054de462183955b6 Author: Phil Dubach Date: Tue Jul 21 14:58:37 2009 -0700 Integrate unsubmitted cupcake change 132238: CTS: add test cases for android.webkit.WebHistoryItem commit 6b34bba1d324e31cc82d05506f883ced38b428bc Merge: 27232ac b872991 Author: Phil Dubach Date: Thu Jul 23 23:59:11 2009 -0700 am b8729910: Integrate unsubmitted cupcake change 122861: CTS: add test cases for android.content.AsyncQueryHandler and ContentQueryMap Merge commit 'b87299103d8b2e2714beb901f2ae2efd45333a49' * commit 'b87299103d8b2e2714beb901f2ae2efd45333a49': Integrate unsubmitted cupcake change 122861: commit 27232ac40666639c0ee0f0f37727af005b5b9dc9 Merge: b541865 2d00cf7 Author: Android (Google) Code Review Date: Thu Jul 23 23:59:06 2009 -0700 am 2d00cf78: Merge change 5430 into donut Merge commit '2d00cf789059ce751d07d9252173af1d68e64948' * commit '2d00cf789059ce751d07d9252173af1d68e64948': Integrate unsubmitted cupcake change 131160: commit b541865f61b142c61196670d6e1824c629efa452 Merge: 0498b8a 008a413 Author: Phil Dubach Date: Thu Jul 23 19:38:08 2009 -0700 resolved conflicts for merge of 008a4136 to master commit 0498b8a212529e64378fd93b41e38fe1b3a45c00 Merge: 8fa4fe8 d96ace4 Author: Android (Google) Code Review Date: Thu Jul 23 16:25:40 2009 -0700 am d96ace47: Merge change 8296 into donut Merge commit 'd96ace47b468432bb77fd615052cd1477a64dfc3' * commit 'd96ace47b468432bb77fd615052cd1477a64dfc3': Remove NoReceiveSmsPermissionTest from large continuous suite. commit 8fa4fe8a5485e7ae62631858b62cf57ef7eba2d0 Merge: 4f819f8 0e70562 Author: Phil Dubach Date: Thu Jul 23 16:25:37 2009 -0700 am 0e70562f: Integrate unsubmitted cupcake change 131600: CTS: add test cases for media.Ringtone and RingtoneManager Merge commit '0e70562f5d00a7a2329670d552c6f6d109002b83' * commit '0e70562f5d00a7a2329670d552c6f6d109002b83': Integrate unsubmitted cupcake change 131600: commit b87299103d8b2e2714beb901f2ae2efd45333a49 Author: Phil Dubach Date: Fri Jun 26 11:15:55 2009 -0700 Integrate unsubmitted cupcake change 122861: CTS: add test cases for android.content.AsyncQueryHandler and ContentQueryMap commit 2d00cf789059ce751d07d9252173af1d68e64948 Merge: 008a413 7d029be Author: Android (Google) Code Review Date: Thu Jul 23 15:42:12 2009 -0700 Merge change 5430 into donut * changes: Integrate unsubmitted cupcake change 131160: CTS: add test cases for database.sqlite.SQLiteQueryBuilder, SQLiteOpenHelper and SQLiteCursor commit 008a41362f1503f29f90ae84136285f28e2ff535 Merge: d96ace4 b59283e Author: Android (Google) Code Review Date: Thu Jul 23 11:25:08 2009 -0700 Merge change 8283 into donut * changes: Integrate unsubmitted cupcake change 149408: CTS: added missed test case for android.content.ContentProvider#openAssetFile, refactored BrokenTests for ContextWrapperTest commit b59283ea9362bf0945a2c43191f523e0ab5566fc Author: Phil Dubach Date: Tue Jul 21 14:45:09 2009 -0700 Integrate unsubmitted cupcake change 149408: CTS: added missed test case for android.content.ContentProvider#openAssetFile, refactored BrokenTests for ContextWrapperTest commit d96ace47b468432bb77fd615052cd1477a64dfc3 Merge: 0e70562 8fbfa0d Author: Android (Google) Code Review Date: Thu Jul 23 10:32:28 2009 -0700 Merge change 8296 into donut * changes: Remove NoReceiveSmsPermissionTest from large continuous suite. commit 4f819f88b91c50f8201c5c0b9faf8221f5a04e02 Merge: 1949b23 e1a07a3 Author: Android (Google) Code Review Date: Thu Jul 23 09:49:40 2009 -0700 Merge change 7729 * changes: Fix issue 1795088 Improve audio routing code commit 8fbfa0dae508ea8399ef14059140265f36f3ced4 Author: Brett Chabot Date: Wed Jul 22 19:24:19 2009 -0700 Remove NoReceiveSmsPermissionTest from large continuous suite. It requires a valid SIM to run properly, thus not suitable for continuous lab. commit 0e70562f5d00a7a2329670d552c6f6d109002b83 Author: Phil Dubach Date: Wed Jul 22 17:45:27 2009 -0700 Integrate unsubmitted cupcake change 131600: CTS: add test cases for media.Ringtone and RingtoneManager commit 1949b23766b685f4868d560c8f13234255dd57df Merge: 19a0a65 9bf8bb9 Author: Brett Chabot Date: Tue Jul 21 19:40:46 2009 -0700 am 9bf8bb9b: Mark cts DevicePowerPermissionTest.testUserActivity as a known failure, and remove from continuous tests. Merge commit '9bf8bb9b41d9b8320850c7ead91cf57836e65a1f' * commit '9bf8bb9b41d9b8320850c7ead91cf57836e65a1f': Mark cts DevicePowerPermissionTest.testUserActivity as a known failure, and remove from continuous tests. commit 9bf8bb9b41d9b8320850c7ead91cf57836e65a1f Author: Brett Chabot Date: Tue Jul 21 18:40:13 2009 -0700 Mark cts DevicePowerPermissionTest.testUserActivity as a known failure, and remove from continuous tests. commit 19a0a65bfa89b2212d403c9aaf0615c8ddb9c1be Merge: f46bb81 5c6bec0 Author: Android (Google) Code Review Date: Tue Jul 21 16:16:11 2009 -0700 am 5c6bec01: Merge change 7969 into donut Merge commit '5c6bec01401d08ae86fe05fd6324eaed85d13375' * commit '5c6bec01401d08ae86fe05fd6324eaed85d13375': Cts content tests cleanup. commit 5c6bec01401d08ae86fe05fd6324eaed85d13375 Merge: f600985 e15a994 Author: Android (Google) Code Review Date: Tue Jul 21 16:13:04 2009 -0700 Merge change 7969 into donut * changes: Cts content tests cleanup. commit e15a994531cd2f8db19ce0bdd8baed98ba2bfef3 Author: Brett Chabot Date: Mon Jul 20 17:32:32 2009 -0700 Cts content tests cleanup. Remove tests for hidden APIs SyncResult, SyncContext and SyncStats. Fix IntentTest.testFillIn, and rename the IntentTest constants. commit f46bb8176b1576d24f2c85dc6a656646759ca5cf Merge: 28c4499 f600985 Author: Android (Google) Code Review Date: Tue Jul 21 14:56:45 2009 -0700 am f6009859: Merge change 8045 into donut Merge commit 'f60098595e716cc90dbe4a52d0391a305c940c28' * commit 'f60098595e716cc90dbe4a52d0391a305c940c28': Integrate unsubmitted cupcake change 131143: commit f60098595e716cc90dbe4a52d0391a305c940c28 Merge: 0952d6c bc64efa Author: Android (Google) Code Review Date: Tue Jul 21 14:54:46 2009 -0700 Merge change 8045 into donut * changes: Integrate unsubmitted cupcake change 131143: CTS: add test cases for telephony.gsm.SmsMessage, SmsMessage and GsmCellLocation commit 28c44996c12e155e2f70917f2d179d67788f31ef Merge: 8c3535c 0952d6c Author: Android (Google) Code Review Date: Tue Jul 21 14:39:03 2009 -0700 am 0952d6cf: Merge change 7953 into donut Merge commit '0952d6cf249123ca5e0cda843a042b5a9bdf7889' * commit '0952d6cf249123ca5e0cda843a042b5a9bdf7889': Integrate unsubmitted cupcake change 131145: commit 8c3535c89bbc2499640cbf164ee9a0c156d1408d Merge: c2bb761 e4a2386 Author: Android (Google) Code Review Date: Tue Jul 21 14:38:48 2009 -0700 am e4a23866: Merge change 7404 into donut Merge commit 'e4a238667934ec9451c164152e32f2a3d271b744' * commit 'e4a238667934ec9451c164152e32f2a3d271b744': Integrate unsubmitted cupcake change 143447: commit 0952d6cf249123ca5e0cda843a042b5a9bdf7889 Merge: e4a2386 781d2da Author: Android (Google) Code Review Date: Tue Jul 21 14:18:30 2009 -0700 Merge change 7953 into donut * changes: Integrate unsubmitted cupcake change 131145: CTS: add test cases for telephony.CellLocation, PhoneNumberUtils, PhoneNumberFormattingTextWatcher, NeighboringCellInfo, ServiceState and TelephonyManager commit bc64efa2e1fd3ae03fb608d6540af3b9c9ad7b2c Author: Phil Dubach Date: Mon Jul 20 16:41:56 2009 -0700 Integrate unsubmitted cupcake change 131143: CTS: add test cases for telephony.gsm.SmsMessage, SmsMessage and GsmCellLocation commit e4a238667934ec9451c164152e32f2a3d271b744 Merge: 74593fa f38dd2c Author: Android (Google) Code Review Date: Tue Jul 21 13:36:41 2009 -0700 Merge change 7404 into donut * changes: Integrate unsubmitted cupcake change 143447: CTS: add testcase android.telephony.cts.PhoneStateListenerTest commit c2bb761a8b7f6bf4e9ed6a8354b8eb96e2d45d42 Merge: 2ca5f74 74593fa Author: Android (Google) Code Review Date: Mon Jul 20 15:45:33 2009 -0700 am 74593fa6: Merge change 7787 into donut Merge commit '74593fa68df684a2af8bb4885c188b221607da68' * commit '74593fa68df684a2af8bb4885c188b221607da68': Integrate unsubmitted cupcake change 131603: commit 74593fa68df684a2af8bb4885c188b221607da68 Merge: 432006a 03ed42d Author: Android (Google) Code Review Date: Mon Jul 20 15:43:22 2009 -0700 Merge change 7787 into donut * changes: Integrate unsubmitted cupcake change 131603: CTS: add test cases for media.FaceDetector, MediaScannerConnection and SoundPool commit 781d2da0ef4df574dcab49f0bcb742380e74209c Author: Phil Dubach Date: Wed Jul 15 14:45:26 2009 -0700 Integrate unsubmitted cupcake change 131145: CTS: add test cases for telephony.CellLocation, PhoneNumberUtils, PhoneNumberFormattingTextWatcher, NeighboringCellInfo, ServiceState and TelephonyManager commit 03ed42d0263f4e935b5cf313dfa9c72cc97373f6 Author: Phil Dubach Date: Thu Jul 16 11:51:33 2009 -0700 Integrate unsubmitted cupcake change 131603: CTS: add test cases for media.FaceDetector, MediaScannerConnection and SoundPool commit 2ca5f740ecbd4adba0ccc037dec579473d037a6a Merge: 5b802ed 432006a Author: Android (Google) Code Review Date: Mon Jul 20 13:29:47 2009 -0700 am 432006aa: Merge change 7812 into donut Merge commit '432006aa4ddb4943fdb3f7be554bc512ec4197fe' * commit '432006aa4ddb4943fdb3f7be554bc512ec4197fe': Integrate unsubmitted cupcake change 147095: commit 432006aa4ddb4943fdb3f7be554bc512ec4197fe Merge: ae9efdf 4e1f9d9 Author: Android (Google) Code Review Date: Mon Jul 20 13:27:27 2009 -0700 Merge change 7812 into donut * changes: Integrate unsubmitted cupcake change 147095: CTS: cleanup code under package android.text commit 5b802ed07569a50def0bdff13fe32b52c8b4ae90 Merge: caa7a3f ae9efdf Author: Phil Dubach Date: Mon Jul 20 09:23:23 2009 -0700 am ae9efdf0: Integrate unsubmitted cupcake change 123637: CTS: add test cases for android.content.SearchRecentSuggestionsProvider Merge commit 'ae9efdf0063cf26d5d148dc9bee645d23d95edc0' * commit 'ae9efdf0063cf26d5d148dc9bee645d23d95edc0': Integrate unsubmitted cupcake change 123637: commit 4e1f9d9624ebe505af923b8f9d311d0729ea9c8c Author: Phil Dubach Date: Fri Jul 17 18:21:14 2009 -0700 Integrate unsubmitted cupcake change 147095: CTS: cleanup code under package android.text commit caa7a3fb8832d969c74bf27e2065cc95b8c5b6cf Merge: 253ba62 10aacdd Author: Phil Dubach Date: Fri Jul 17 17:13:12 2009 -0700 am 10aacddb: Integrate unsubmitted cupcake change 131148: CTS: add test cases for media.AsyncPlayer, AudioManager and ToneGenerator Merge commit '10aacddbf7cf11cb20b154f7b8c046d7c856d273' * commit '10aacddbf7cf11cb20b154f7b8c046d7c856d273': Integrate unsubmitted cupcake change 131148: commit ae9efdf0063cf26d5d148dc9bee645d23d95edc0 Author: Phil Dubach Date: Fri Jul 17 16:36:14 2009 -0700 Integrate unsubmitted cupcake change 123637: CTS: add test cases for android.content.SearchRecentSuggestionsProvider commit 10aacddbf7cf11cb20b154f7b8c046d7c856d273 Author: Phil Dubach Date: Thu Jul 9 18:18:42 2009 -0700 Integrate unsubmitted cupcake change 131148: CTS: add test cases for media.AsyncPlayer, AudioManager and ToneGenerator commit e1a07a3a6fdd90d85ce7347a5fad4e4996942c3d Author: Eric Laurent Date: Fri Jul 17 11:24:12 2009 -0700 Fix issue 1795088 Improve audio routing code Initial commit for review. commit 253ba6235e47a4b5b62e548be22b360fde0d593f Merge: 30eb002 33dc1fa Author: Dianne Hackborn Date: Fri Jul 17 02:09:10 2009 -0700 am 33dc1fad: Fix issue #1936929: android.os.cts.BundleTest:testDescribeContents is failing on donut Merge commit '33dc1fadfe2685caf562e149e1240796d951967b' * commit '33dc1fadfe2685caf562e149e1240796d951967b': Fix issue #1936929: android.os.cts.BundleTest:testDescribeContents is failing on donut commit 33dc1fadfe2685caf562e149e1240796d951967b Author: Dianne Hackborn Date: Thu Jul 16 18:05:30 2009 -0700 Fix issue #1936929: android.os.cts.BundleTest:testDescribeContents is failing on donut Also some other misc cleanup I found while there. commit 30eb0026a4bdecf91c942fb9caad6c18dc439eb4 Merge: a199a0d 94caf5b Author: Android (Google) Code Review Date: Wed Jul 15 13:41:58 2009 -0700 am 94caf5b1: Merge change 7169 into donut Merge commit '94caf5b13a1bc1a0bb32fd0a045c7e7fd0b5698f' * commit '94caf5b13a1bc1a0bb32fd0a045c7e7fd0b5698f': Add new donut packages to CTS test progress tracker. commit f38dd2ca5f7eb02f136f637f29e1613616f979d3 Author: Phil Dubach Date: Tue Jul 14 19:06:48 2009 -0700 Integrate unsubmitted cupcake change 143447: CTS: add testcase android.telephony.cts.PhoneStateListenerTest commit 94caf5b13a1bc1a0bb32fd0a045c7e7fd0b5698f Merge: dbc29d6 c29e88f Author: Android (Google) Code Review Date: Wed Jul 15 09:46:14 2009 -0700 Merge change 7169 into donut * changes: Add new donut packages to CTS test progress tracker. commit c29e88f1f6e7729273b907248760df4b8556381c Author: Brett Chabot Date: Tue Jul 14 16:21:44 2009 -0700 Add new donut packages to CTS test progress tracker. commit a199a0d2fee7e2703a631cc76a5d8ca871cd3d6d Merge: fd66701 dbc29d6 Author: Android (Google) Code Review Date: Tue Jul 14 15:48:45 2009 -0700 am dbc29d6b: Merge change 6961 into donut Merge commit 'dbc29d6b6b1505241be672cc21308056599d4f13' * commit 'dbc29d6b6b1505241be672cc21308056599d4f13': Integrate unsubmitted cupcake change 146708: commit fd66701e74ae5b24375b2d972ed7cceaa2368375 Merge: 807cd81 71cb298 Author: Phil Dubach Date: Tue Jul 14 15:48:43 2009 -0700 am 71cb298d: Integrate unsubmitted cupcake change 120317: CTS: add test cases for android.graphics.Picture Merge commit '71cb298d7dcfb35e69e19c8a7e92a2cf7eb4497f' * commit '71cb298d7dcfb35e69e19c8a7e92a2cf7eb4497f': Integrate unsubmitted cupcake change 120317: commit dbc29d6b6b1505241be672cc21308056599d4f13 Merge: 71cb298 59ab33f Author: Android (Google) Code Review Date: Tue Jul 14 15:46:52 2009 -0700 Merge change 6961 into donut * changes: Integrate unsubmitted cupcake change 146708: CTS: add testcase for android.graphics.NinePatch commit 807cd8106452f56d7d6a3093a18ca5b15ade27aa Merge: 6ef73e5 46a8676 Author: Phil Dubach Date: Tue Jul 14 10:50:42 2009 -0700 am 46a86763: Integrate unsubmitted cupcake change 124106: CTS: add test cases for graphics.drawable.AnimationDrawable Merge commit '46a8676329428a8ee8261122860919744700173e' * commit '46a8676329428a8ee8261122860919744700173e': Integrate unsubmitted cupcake change 124106: commit 71cb298d7dcfb35e69e19c8a7e92a2cf7eb4497f Author: Phil Dubach Date: Tue Jul 14 09:49:36 2009 -0700 Integrate unsubmitted cupcake change 120317: CTS: add test cases for android.graphics.Picture commit 46a8676329428a8ee8261122860919744700173e Author: Phil Dubach Date: Mon Jul 13 15:40:23 2009 -0700 Integrate unsubmitted cupcake change 124106: CTS: add test cases for graphics.drawable.AnimationDrawable commit 59ab33f87bb958a7d5c18c7f3be9b1ef7cfdfdb1 Author: Phil Dubach Date: Mon Jul 13 10:49:37 2009 -0700 Integrate unsubmitted cupcake change 146708: CTS: add testcase for android.graphics.NinePatch commit 6ef73e579705ec2d96f481266b189ef6fbaefba0 Merge: 6cf5e22 5a458b5 Author: Dianne Hackborn Date: Sun Jul 12 21:55:58 2009 -0700 am 5a458b56: CLOSE_SYSTEM_DIALOGS can\'t be protected. Merge commit '5a458b5686d0e959e85caef7a94118720e399cf5' * commit '5a458b5686d0e959e85caef7a94118720e399cf5': CLOSE_SYSTEM_DIALOGS can't be protected. commit 6cf5e223fd5215a252fa6de5c3c855a00f7c1726 Merge: 1bccfbb f84c8b8 Author: Android (Google) Code Review Date: Sun Jul 12 06:06:47 2009 -0700 am f84c8b8f: Merge change 6803 into donut Merge commit 'f84c8b8fb428477c6546dcbecae9c82d13cc89d4' * commit 'f84c8b8fb428477c6546dcbecae9c82d13cc89d4': Add CTS tests for protected broadcasts. commit 5a458b5686d0e959e85caef7a94118720e399cf5 Author: Dianne Hackborn Date: Fri Jul 10 17:31:15 2009 -0700 CLOSE_SYSTEM_DIALOGS can't be protected. commit f84c8b8fb428477c6546dcbecae9c82d13cc89d4 Merge: 170e1d4 0e0b742 Author: Android (Google) Code Review Date: Fri Jul 10 16:12:32 2009 -0700 Merge change 6803 into donut * changes: Add CTS tests for protected broadcasts. commit 0e0b74288106aea00f3b8bed55c5ef8deb0f0040 Author: Dianne Hackborn Date: Fri Jul 10 13:40:09 2009 -0700 Add CTS tests for protected broadcasts. commit 1bccfbb64e95652af743750200ea2a7be704b328 Merge: 0204266 170e1d4 Author: Android (Google) Code Review Date: Fri Jul 10 12:11:05 2009 -0700 am 170e1d4f: Merge change 6765 into donut Merge commit '170e1d4fd77f084f3b113d8bacbd70b0f333d8de' * commit '170e1d4fd77f084f3b113d8bacbd70b0f333d8de': Rename the cts install-tests to appsecurity-tests, and add more tests. commit 170e1d4fd77f084f3b113d8bacbd70b0f333d8de Merge: e41f3da dd0aa01 Author: Android (Google) Code Review Date: Fri Jul 10 12:09:13 2009 -0700 Merge change 6765 into donut * changes: Rename the cts install-tests to appsecurity-tests, and add more tests. commit 0204266ed8faca9a4aad4aa78bd85589ccfdc06e Merge: 41530f6 e41f3da Author: Phil Dubach Date: Fri Jul 10 10:02:21 2009 -0700 am e41f3da1: Integrate unsubmitted cupcake change 131138: CTS: add test cases for graphics.drawable.shapes Merge commit 'e41f3da1c316c52514c0f023f4f46a68458e874a' * commit 'e41f3da1c316c52514c0f023f4f46a68458e874a': Integrate unsubmitted cupcake change 131138: commit dd0aa01d673665dfc2c62006883a903a1a261f48 Author: Brett Chabot Date: Fri Jul 10 12:10:53 2009 -0400 Rename the cts install-tests to appsecurity-tests, and add more tests. This CL adds tests to verify:: - App cannot be installed over existing app with different signature - Application cannot access another app's private data - Instrumentating an app requires same certificate - permissions that require a matching signature won't be granted to .apks with a different one. The change that modifies the runtest test def so these tests can be run will be coming shortly. See http://b/editIssue?id=1971693 for more details. commit e41f3da1c316c52514c0f023f4f46a68458e874a Author: Phil Dubach Date: Thu Jul 9 12:10:12 2009 -0700 Integrate unsubmitted cupcake change 131138: CTS: add test cases for graphics.drawable.shapes commit 41530f685515048015af3ac769e2aacf60137c03 Merge: d7c7350 b82d287 Author: Android (Google) Code Review Date: Thu Jul 9 12:50:20 2009 -0700 am b82d2874: Merge change 5293 into donut Merge commit 'b82d28749da40af9293e492a473102198eb4048e' * commit 'b82d28749da40af9293e492a473102198eb4048e': Integrate unsubmitted cupcake change 149102: commit d7c7350fd45bbb327000c83e81083b8b4b1f85ce Merge: fb4532a b900b5e Author: Android (Google) Code Review Date: Thu Jul 9 12:50:17 2009 -0700 am b900b5e2: Merge change 5270 into donut Merge commit 'b900b5e267aa25cd7dbd80e99c002f053a3e292d' * commit 'b900b5e267aa25cd7dbd80e99c002f053a3e292d': Integrate unsubmitted cupcake change 131662: commit fb4532ab96cb118076524b0fa2e4eb2c1cb66373 Merge: 825a380 91a5249 Author: Android (Google) Code Review Date: Thu Jul 9 12:50:15 2009 -0700 am 91a5249b: Merge change 5231 into donut Merge commit '91a5249b7092b7ccb87a9e6afe965bcea8db14f6' * commit '91a5249b7092b7ccb87a9e6afe965bcea8db14f6': Integrate unsubmitted cupcake change 131601: commit 825a380461bb8e1c4090d914ba0873379001cc2d Merge: e6f0afe 8598f82 Author: Android (Google) Code Review Date: Thu Jul 9 12:50:13 2009 -0700 am 8598f827: Merge change 5223 into donut Merge commit '8598f827ba6e82044811f3014b747c2f89b921c4' * commit '8598f827ba6e82044811f3014b747c2f89b921c4': Integrate unsubmitted cupcake change 132555: commit e6f0afe89d95c17203b2541c6f99ae7bd0aaa35f Merge: ed58f4f 2757308 Author: Android (Google) Code Review Date: Thu Jul 9 12:49:47 2009 -0700 am 27573089: Merge change 6527 into donut Merge commit '2757308996cc2c0cb1ea62973b9d03564ec28f12' * commit '2757308996cc2c0cb1ea62973b9d03564ec28f12': Integrate unsubmitted cupcake change 124110: commit b82d28749da40af9293e492a473102198eb4048e Merge: b900b5e 276c5a4 Author: Android (Google) Code Review Date: Thu Jul 9 10:39:46 2009 -0700 Merge change 5293 into donut * changes: Integrate unsubmitted cupcake change 149102: CTS: add test cases for android.database.DatabaseUtils.InsertHelper commit b900b5e267aa25cd7dbd80e99c002f053a3e292d Merge: 91a5249 4cd04c4 Author: Android (Google) Code Review Date: Thu Jul 9 10:31:58 2009 -0700 Merge change 5270 into donut * changes: Integrate unsubmitted cupcake change 131662: CTS: Added test cases for android.database.sqlite.SQLiteProgram commit 91a5249b7092b7ccb87a9e6afe965bcea8db14f6 Merge: 8598f82 e396fad Author: Android (Google) Code Review Date: Thu Jul 9 10:10:41 2009 -0700 Merge change 5231 into donut * changes: Integrate unsubmitted cupcake change 131601: CTS: add test cases for database.sqlite.SQLiteQuery and SQLiteDatabase commit 8598f827ba6e82044811f3014b747c2f89b921c4 Merge: 2757308 105a4cd Author: Android (Google) Code Review Date: Thu Jul 9 09:34:57 2009 -0700 Merge change 5223 into donut * changes: Integrate unsubmitted cupcake change 132555: CTS: add test case for android.database.sqlite.SQLiteStatement commit 2757308996cc2c0cb1ea62973b9d03564ec28f12 Merge: 6e72fc5 6d3bfca Author: Android (Google) Code Review Date: Thu Jul 9 08:56:46 2009 -0700 Merge change 6527 into donut * changes: Integrate unsubmitted cupcake change 124110: CTS: add test case for graphics.drawable.DrawableContainer and DrawableContainerState commit 6d3bfcaeffd9501f7d7fb1421f2411f5f0a64939 Author: Phil Dubach Date: Wed Jul 8 11:34:25 2009 -0700 Integrate unsubmitted cupcake change 124110: CTS: add test case for graphics.drawable.DrawableContainer and DrawableContainerState commit ed58f4f0f40c624078d50d5ec5d5b5c2ca3e6a83 Merge: 3bc9115 6e72fc5 Author: Android (Google) Code Review Date: Wed Jul 8 14:01:16 2009 -0700 am 6e72fc50: Merge change 6483 into donut Merge commit '6e72fc504675fedba41c762404beff49de6393c7' * commit '6e72fc504675fedba41c762404beff49de6393c7': Integrate unsubmitted cupcake change 149417: commit 6e72fc504675fedba41c762404beff49de6393c7 Merge: 9e46cca 80b2b04 Author: Android (Google) Code Review Date: Wed Jul 8 13:59:16 2009 -0700 Merge change 6483 into donut * changes: Integrate unsubmitted cupcake change 149417: CTS: added missed test cases for package android.graphics.drawable commit 80b2b0414cfb461c562d4133e242daa341ed3bcb Author: Phil Dubach Date: Mon Jun 29 12:15:49 2009 -0700 Integrate unsubmitted cupcake change 149417: CTS: added missed test cases for package android.graphics.drawable commit 3bc9115e87c8f24ea6c71bebbcc225640e7e5ae2 Merge: 3893d41 9e46cca Author: Phil Dubach Date: Mon Jul 6 12:43:23 2009 -0700 am 9e46cca8: CTS: Relax DialerKeyListenerTest.testLookup() Integration of cupcake change 150299-p9 Merge commit '9e46cca85dd7468d128cc8c610f58402f10bc41a' * commit '9e46cca85dd7468d128cc8c610f58402f10bc41a': CTS: Relax DialerKeyListenerTest.testLookup() commit 3893d419439ddf165d5155a935d83c84731d2450 Merge: 9c7d1d0 fde1cf9 Author: Phil Dubach Date: Fri Jul 3 08:17:58 2009 -0700 am fde1cf9e: CTS: Fix CameraTest.testAccessParameters() Merge commit 'fde1cf9e04c0d123394ded4c8d48f791dc7632ed' * commit 'fde1cf9e04c0d123394ded4c8d48f791dc7632ed': CTS: Fix CameraTest.testAccessParameters() commit 9e46cca85dd7468d128cc8c610f58402f10bc41a Author: Phil Dubach Date: Thu Jul 2 14:33:47 2009 -0700 CTS: Relax DialerKeyListenerTest.testLookup() Integration of cupcake change 150299-p9 commit 9c7d1d0ea2878333064261a31bb0d7c30671f0e2 Merge: 44c5036 ba9c2b2 Author: Phil Dubach Date: Wed Jul 1 22:43:54 2009 -0700 am ba9c2b2f: CTS: Do not assume order of ContextWrapper.fileList() Merge commit 'ba9c2b2fda3f700d88054ea9a93e2b1476a5ba8f' * commit 'ba9c2b2fda3f700d88054ea9a93e2b1476a5ba8f': CTS: Do not assume order of ContextWrapper.fileList() commit 44c5036e592daff812873e47f576e24e1b8da31c Merge: 9ad2737 6a5ea44 Author: Chris Palmer Date: Wed Jul 1 00:07:03 2009 -0700 am 6a5ea440: Tests for READ_PHONE_STATE and TelephonyManager. Merge commit '6a5ea440ae363640f3d9ebcc9221e71ddbf58320' * commit '6a5ea440ae363640f3d9ebcc9221e71ddbf58320': Tests for READ_PHONE_STATE and TelephonyManager. commit fde1cf9e04c0d123394ded4c8d48f791dc7632ed Author: Phil Dubach Date: Tue Jun 30 16:17:36 2009 -0700 CTS: Fix CameraTest.testAccessParameters() Integration from Cupcake change 150240-p9 commit 9ad2737e7fcf452ddce3660e1db7060d93f57fc9 Merge: 109326f 4dd61d2 Author: Android (Google) Code Review Date: Tue Jun 30 14:49:09 2009 -0700 am 4dd61d24: Merge change 5599 into donut Merge commit '4dd61d245f7903f483a74c3ce0261b7355c9a3c9' * commit '4dd61d245f7903f483a74c3ce0261b7355c9a3c9': Integrate unsubmitted cupcake change 131116: commit ba9c2b2fda3f700d88054ea9a93e2b1476a5ba8f Author: Phil Dubach Date: Tue Jun 30 13:52:20 2009 -0700 CTS: Do not assume order of ContextWrapper.fileList() Integration of change 150220-p9 from Cupcake. commit 109326ff746f732307a00ddff02464d2f5ecf2ad Merge: 3ef6f2c a53ea58 Author: Android (Google) Code Review Date: Mon Jun 29 20:20:30 2009 -0700 am a53ea58d: Merge change 5590 into donut Merge commit 'a53ea58d14a24abe1f5f68ff55aa4e7e87205633' * commit 'a53ea58d14a24abe1f5f68ff55aa4e7e87205633': Add shared uid app install test to cts. commit 6a5ea440ae363640f3d9ebcc9221e71ddbf58320 Author: Chris Palmer Date: Mon Jun 29 13:39:33 2009 -0700 Tests for READ_PHONE_STATE and TelephonyManager. commit 4dd61d245f7903f483a74c3ce0261b7355c9a3c9 Merge: a53ea58 a11fdd9 Author: Android (Google) Code Review Date: Mon Jun 29 10:59:27 2009 -0700 Merge change 5599 into donut * changes: Integrate unsubmitted cupcake change 131116: CTS: add test cases for graphics.drawable.BitmapDrawable, LayerDrawable, PaintDrawable, PictureDrawable, RotateDrawable and ScaleDrawable commit a53ea58d14a24abe1f5f68ff55aa4e7e87205633 Merge: 906d2d8 5252553 Author: Android (Google) Code Review Date: Sat Jun 27 12:09:48 2009 -0700 Merge change 5590 into donut * changes: Add shared uid app install test to cts. commit a11fdd9fbbff1f4031133bd36942f758db335636 Author: Phil Dubach Date: Fri Jun 26 14:34:40 2009 -0700 Integrate unsubmitted cupcake change 131116: CTS: add test cases for graphics.drawable.BitmapDrawable, LayerDrawable, PaintDrawable, PictureDrawable, RotateDrawable and ScaleDrawable commit 525255328c581e217b3682d575ee06b292222df2 Author: Brett Chabot Date: Fri Jun 26 16:51:44 2009 -0700 Add shared uid app install test to cts. This host test uses hosttestlib to verify that an apk which declares a shared user id fails to install if its signed with a different certificate than an existing app that declares the same shared userid. Included in this CL are: - InstallTests.java, which is the test itself - two empty test apps that declare the same user id - two test certificates The change to actually include this test in the CTS distribution will be forthcoming in a separate CL, once b/1781345 is implemented. For now, the test can be run via the 'runtest cts-appinstall' command. commit 7d029be2b297e5a5b045a708f006afd194f8a1c8 Author: Phil Dubach Date: Thu Jun 25 14:44:54 2009 -0700 Integrate unsubmitted cupcake change 131160: CTS: add test cases for database.sqlite.SQLiteQueryBuilder, SQLiteOpenHelper and SQLiteCursor commit 3ef6f2c4ea12d9747779d4c441c2e4471755f09b Merge: 66cb0a8 906d2d8 Author: Android (Google) Code Review Date: Thu Jun 25 14:33:55 2009 -0700 am 906d2d88: Merge change 4979 into donut Merge commit '906d2d88793c4cde5865511fb6b424fba604511c' * commit '906d2d88793c4cde5865511fb6b424fba604511c': Test for PROCESS_OUTGOING_CALLS Permission. commit 906d2d88793c4cde5865511fb6b424fba604511c Merge: 4fffeba b31dc95 Author: Android (Google) Code Review Date: Thu Jun 25 13:32:12 2009 -0700 Merge change 4979 into donut * changes: Test for PROCESS_OUTGOING_CALLS Permission. commit b31dc95cfaf643fbc25a5f23907b1005786fa2e9 Author: Chris Palmer Date: Mon Jun 22 15:32:12 2009 -0700 Test for PROCESS_OUTGOING_CALLS Permission. commit 66cb0a81f8550a162574deb5a10701f2063b795a Merge: 07cb5d3 4fffeba Author: Phil Dubach Date: Thu Jun 25 10:07:14 2009 -0700 am 4fffeba0: Integrate unsubmitted cupcake change 123652: CTS: add test cases for database.CharArrayBuffer, ContentObserver and ContentObservable Merge commit '4fffeba088cecb31fd8947a9a70c3802339902f7' * commit '4fffeba088cecb31fd8947a9a70c3802339902f7': Integrate unsubmitted cupcake change 123652: commit 276c5a4420b643a4267adda259bf55ab3221e5ed Author: Phil Dubach Date: Wed Jun 24 16:22:39 2009 -0700 Integrate unsubmitted cupcake change 149102: CTS: add test cases for android.database.DatabaseUtils.InsertHelper commit 4cd04c45a17a7091b9c7e4cad935aa52829f70ef Author: Phil Dubach Date: Wed Jun 24 14:51:39 2009 -0700 Integrate unsubmitted cupcake change 131662: CTS: Added test cases for android.database.sqlite.SQLiteProgram commit e396fad39a98f3cb6e836707816a9b9d727e41ac Author: Phil Dubach Date: Wed Jun 24 11:28:48 2009 -0700 Integrate unsubmitted cupcake change 131601: CTS: add test cases for database.sqlite.SQLiteQuery and SQLiteDatabase commit 105a4cdef6d690f424a0bd65fb2e3dd11ee4a653 Author: Phil Dubach Date: Wed Jun 24 10:34:08 2009 -0700 Integrate unsubmitted cupcake change 132555: CTS: add test case for android.database.sqlite.SQLiteStatement commit 4fffeba088cecb31fd8947a9a70c3802339902f7 Author: Phil Dubach Date: Tue Jun 23 17:13:57 2009 -0700 Integrate unsubmitted cupcake change 123652: CTS: add test cases for database.CharArrayBuffer, ContentObserver and ContentObservable commit 07cb5d37d591397f5d125ddef3fa7be32ef5c227 Author: Fred Quintana Date: Mon Jun 22 18:05:57 2009 -0700 support for changes to the sync settings and control API commit 617df1b895e546fb656988c9b508fc4eaa0276c4 Merge: f689d09 7460333 Author: Phil Dubach Date: Tue Jun 23 13:08:25 2009 -0700 am 74603331: Integrate unsubmitted cupcake change 149409: CTS: added test case for android.location.LocationManager#removeTestProvider Merge commit '746033319bd79b766bd82fca4a13ed66ff4aadec' * commit '746033319bd79b766bd82fca4a13ed66ff4aadec': Integrate unsubmitted cupcake change 149409: commit f689d0996643c07e3bab476589c8b92b5c2ca850 Merge: 9151e7d 703563d Author: Android (Google) Code Review Date: Tue Jun 23 13:08:12 2009 -0700 am 703563d0: Merge change 4955 into donut Merge commit '703563d0016f3cf307920d24f5151b0cdbf862dd' * commit '703563d0016f3cf307920d24f5151b0cdbf862dd': Remove embedded junit src from CTS host. commit 746033319bd79b766bd82fca4a13ed66ff4aadec Author: Phil Dubach Date: Mon Jun 8 11:18:51 2009 -0700 Integrate unsubmitted cupcake change 149409: CTS: added test case for android.location.LocationManager#removeTestProvider Remove or fix fragile tests (issue 1840782). commit 703563d0016f3cf307920d24f5151b0cdbf862dd Merge: 8434c68 eb07685 Author: Android (Google) Code Review Date: Tue Jun 23 09:52:09 2009 -0700 Merge change 4955 into donut * changes: Remove embedded junit src from CTS host. commit eb076857bf022cf332457ee45095f4f6bb9a75ca Author: Brett Chabot Date: Mon Jun 22 13:23:46 2009 -0700 Remove embedded junit src from CTS host. Instead, CTS will now include junit.jar build from external/junit. commit 9151e7daed8b3a388aa267d6c7b2960c1c7b01bc Merge: 0dc46b4 8434c68 Author: Android (Google) Code Review Date: Mon Jun 22 10:14:49 2009 -0700 am 8434c682: Merge change 4856 into donut Merge commit '8434c682b03e5d068e4a2943c1f2d6fb2ffbced7' * commit '8434c682b03e5d068e4a2943c1f2d6fb2ffbced7': Integrate unsubmitted cupcake change 147350: commit 8434c682b03e5d068e4a2943c1f2d6fb2ffbced7 Merge: 57dc280 3ba0b61 Author: Android (Google) Code Review Date: Mon Jun 22 10:13:30 2009 -0700 Merge change 4856 into donut * changes: Integrate unsubmitted cupcake change 147350: CTS: clean up code in android.graphics package commit 0dc46b4c2ae67dbf8309a4620cf1a93c854b105c Merge: d5f1e0e 57dc280 Author: Leon Scroggins Date: Mon Jun 22 09:56:34 2009 -0700 am 57dc280f: Use the new bookmark permissions. Merge commit '57dc280f812007f1280dbfec1834925b13615893' * commit '57dc280f812007f1280dbfec1834925b13615893': Use the new bookmark permissions. commit 57dc280f812007f1280dbfec1834925b13615893 Author: Leon Scroggins Date: Fri Jun 19 14:19:28 2009 -0400 Use the new bookmark permissions. Depends on https://android-git.corp.google.com/g/4775, which makes the bookmark permissions public. commit d5f1e0e0d7c2ec3adb4e6ee83afcb276a902e40f Merge: 782644e 31a96d4 Author: Android (Google) Code Review Date: Fri Jun 19 17:15:25 2009 -0700 am 31a96d4d: Merge change 4795 into donut Merge commit '31a96d4d18359d62390a3cd887f0a2e637449f4c' * commit '31a96d4d18359d62390a3cd887f0a2e637449f4c': Add cts permission test for receiving an SMS, and move secure settings permisson test. commit 31a96d4d18359d62390a3cd887f0a2e637449f4c Merge: ed195eb d507fc0 Author: Android (Google) Code Review Date: Fri Jun 19 17:13:11 2009 -0700 Merge change 4795 into donut * changes: Add cts permission test for receiving an SMS, and move secure settings permisson test. commit 3ba0b6150db73d97daedc177f99ed480778ecf41 Author: Phil Dubach Date: Wed Jun 17 13:38:57 2009 -0700 Integrate unsubmitted cupcake change 147350: CTS: clean up code in android.graphics package Completely overhauled Interpolator test, which did not actually test anything in the previous version. commit 782644e2e506a0010fc947e71e046d26b22b39f2 Merge: 33b07df ed195eb Author: Phil Dubach Date: Fri Jun 19 16:48:36 2009 -0700 am ed195ebb: Integrate unsubmitted cupcake change 118319: CTS: add test cases for TabHost, TabHost.TabSpec and TabWidget Merge commit 'ed195ebbe2014b247043dd149dd2b78a2e07af88' * commit 'ed195ebbe2014b247043dd149dd2b78a2e07af88': Integrate unsubmitted cupcake change 118319: commit ed195ebbe2014b247043dd149dd2b78a2e07af88 Author: Phil Dubach Date: Mon Jun 8 15:43:26 2009 -0700 Integrate unsubmitted cupcake change 118319: CTS: add test cases for TabHost, TabHost.TabSpec and TabWidget commit d507fc0c1d88c7e020f383d2bd73fb897b8aebc4 Author: Brett Chabot Date: Fri Jun 19 12:29:34 2009 -0700 Add cts permission test for receiving an SMS, and move secure settings permisson test. The receive sms and secure settings test are specialized cases, which require the test to have some permissions to perform. Thus this CL creates a new test apk to host these tests in. commit 33b07dfba82ffaeaa3da48799d1704f95f2b19cb Merge: 6cc7357 52fc42a Author: Phil Dubach Date: Fri Jun 19 10:38:41 2009 -0700 am 52fc42ae: Integrate unsubmitted cupcake change 118314: CTS: add test cases for android.widget.RemoteViews and android.widget.RemoteViews.ActionException Merge commit '52fc42ae6ea919d1a9135da56632e0a952e21eeb' * commit '52fc42ae6ea919d1a9135da56632e0a952e21eeb': Integrate unsubmitted cupcake change 118314: commit 52fc42ae6ea919d1a9135da56632e0a952e21eeb Author: Phil Dubach Date: Mon Jun 8 13:35:54 2009 -0700 Integrate unsubmitted cupcake change 118314: CTS: add test cases for android.widget.RemoteViews and android.widget.RemoteViews.ActionException commit 6cc73576cdddfb9a39c331cdbfb964e2ccfd9ed3 Merge: 4584ca0 ce53534 Author: Brett Chabot Date: Thu Jun 18 15:26:09 2009 -0700 am ce535346: Cleanup CTS provider permission tests. Merge commit 'ce5353465568cca84f2a0998cdc3eb27750aeaa0' * commit 'ce5353465568cca84f2a0998cdc3eb27750aeaa0': Cleanup CTS provider permission tests. commit ce5353465568cca84f2a0998cdc3eb27750aeaa0 Author: Brett Chabot Date: Thu Jun 18 14:58:23 2009 -0700 Cleanup CTS provider permission tests. Remove tests for providers that are not part of the public API (Calendar, Sync, etc), and add tests for the public providers not covered. Change implementation of the tests to use the new AndroidTestCase helper methods. Split noReadWritePermissionTest into ProviderPermissionTest and NoSdCardWritePermissionTest. commit 4584ca03a8640204f07eebe2ffbb3a2d1af170a1 Merge: 7c753a6 d9e4c12 Author: Chris Palmer Date: Wed Jun 17 18:46:11 2009 -0700 am d9e4c123: Fixed the test to accept FileNotFoundException as success. Merge commit 'd9e4c123f8d24a1ae4395a0e649bf57c9d02a837' * commit 'd9e4c123f8d24a1ae4395a0e649bf57c9d02a837': Fixed the test to accept FileNotFoundException as success. commit 7c753a66028cc8b317f514d75ba266d8437f9c54 Merge: 947248a 7facad7 Author: Android (Google) Code Review Date: Wed Jun 17 18:45:41 2009 -0700 am 7facad78: Merge change 4443 into donut Merge commit '7facad782078e7787e96b3992222ad1ff75a4573' * commit '7facad782078e7787e96b3992222ad1ff75a4573': Integrate unsubmitted cupcake change 148892: commit 947248a3782d299a51236e09f83645753f21087e Merge: 2a1f1f9 05684f1 Author: Android (Google) Code Review Date: Wed Jun 17 15:57:05 2009 -0700 am 05684f12: Merge change 4403 into donut Merge commit '05684f12157af6c9e3477792b8f1681d05446ee2' * commit '05684f12157af6c9e3477792b8f1681d05446ee2': Test that CALL_PRIVILEGED Permission is enforced. commit d9e4c123f8d24a1ae4395a0e649bf57c9d02a837 Author: Chris Palmer Date: Wed Jun 17 15:01:16 2009 -0700 Fixed the test to accept FileNotFoundException as success. commit 7facad782078e7787e96b3992222ad1ff75a4573 Merge: 05684f1 698feca Author: Android (Google) Code Review Date: Wed Jun 17 11:35:09 2009 -0700 Merge change 4443 into donut * changes: Integrate unsubmitted cupcake change 148892: CTS: add missed testcase in GestureDetector_SimpleOnGestureListenerTest, KeyCharacterMapTest, ViewConfigurationTest, ViewDebugTest, ViewGroupTest and WindowManager_LayoutParamsTest commit 05684f12157af6c9e3477792b8f1681d05446ee2 Merge: c0b959f 712ae93 Author: Android (Google) Code Review Date: Wed Jun 17 11:25:53 2009 -0700 Merge change 4403 into donut * changes: Test that CALL_PRIVILEGED Permission is enforced. commit 2a1f1f94b756105fa876bff6ca2fc81c9663ae3d Merge: 3cff9d6 c0b959f Author: Android (Google) Code Review Date: Tue Jun 16 21:59:34 2009 -0700 am c0b959f4: Merge change 4410 into donut Merge commit 'c0b959f4e0ea3f8cd275fb82c03728c94022e21f' * commit 'c0b959f4e0ea3f8cd275fb82c03728c94022e21f': Integrate unsubmitted cupcake change 148434: Integrate unsubmitted cupcake change 148433: commit 698feca5cdbca2b4f30d5d62cf48d2a6a29bcdc8 Author: Phil Dubach Date: Tue Jun 16 18:06:46 2009 -0700 Integrate unsubmitted cupcake change 148892: CTS: add missed testcase in GestureDetector_SimpleOnGestureListenerTest, KeyCharacterMapTest, ViewConfigurationTest, ViewDebugTest, ViewGroupTest and WindowManager_LayoutParamsTest commit c0b959f4e0ea3f8cd275fb82c03728c94022e21f Merge: 1662cf8 5de0f0e Author: Android (Google) Code Review Date: Tue Jun 16 17:00:16 2009 -0700 Merge change 4410 into donut * changes: Integrate unsubmitted cupcake change 148434: CTS: add testcase for android.os.AsyncTask commit 1662cf8f57b3cd5cc3272058bc40d6d7a214f470 Merge: 4ee78f8 1ec1e68 Author: Android (Google) Code Review Date: Tue Jun 16 17:00:06 2009 -0700 Merge change 4361 into donut * changes: Integrate unsubmitted cupcake change 148433: CTS: add testcase for android.app.IntentService commit 5de0f0ebc439671186f7cd73e9c9ad40631c0d0d Author: Phil Dubach Date: Tue Jun 16 13:54:05 2009 -0700 Integrate unsubmitted cupcake change 148434: CTS: add testcase for android.os.AsyncTask commit 712ae93e3b593a79c575d579dc5dad18cf248b70 Author: Chris Palmer Date: Tue Jun 16 16:00:29 2009 -0700 Test that CALL_PRIVILEGED Permission is enforced. commit 1ec1e68639bfe5b4995eaf3ece43599fe93cff04 Author: Phil Dubach Date: Mon Jun 15 16:55:14 2009 -0700 Integrate unsubmitted cupcake change 148433: CTS: add testcase for android.app.IntentService commit 3cff9d6eabb67024986fe559d42675cfb4b6b1b4 Merge: 7adb2c6 4ee78f8 Author: Android (Google) Code Review Date: Tue Jun 16 10:34:29 2009 -0700 am 4ee78f8d: Merge change 4183 into donut Merge commit '4ee78f8d3cdaf0b3eef89e7e136276b9e1c5dda9' * commit '4ee78f8d3cdaf0b3eef89e7e136276b9e1c5dda9': Integrate unsubmitted cupcake change 148419: Integrate unsubmitted cupcake change 147431: commit 4ee78f8d3cdaf0b3eef89e7e136276b9e1c5dda9 Merge: 7bd7aa9 807e62b Author: Android (Google) Code Review Date: Tue Jun 16 10:32:17 2009 -0700 Merge change 4183 into donut * changes: Integrate unsubmitted cupcake change 147431: CTS: clean up code in android.content.res package commit 7bd7aa9a4cafbb987d61f947026770d422b92a2d Merge: 52622d2 8c1f66e Author: Android (Google) Code Review Date: Tue Jun 16 10:32:03 2009 -0700 Merge change 4259 into donut * changes: Integrate unsubmitted cupcake change 148419: CTS: cleanup code and add missing testcase in content package commit 7adb2c688ffefe88b564a5ae23f4fc648b3980a2 Merge: fb89c66 52622d2 Author: Chris Palmer Date: Tue Jun 16 08:36:06 2009 -0700 am 52622d2b: Corrected class Javadoc. Added test for WRITE_EXTERNAL_STORAGE. Propagate non-Security exceptions. Merge commit '52622d2b896cc085937808d5f7d63a265533d393' * commit '52622d2b896cc085937808d5f7d63a265533d393': Corrected class Javadoc. Added test for WRITE_EXTERNAL_STORAGE. Propagate non-Security exceptions. commit 8c1f66ea6570a821241e84e8210082e2c793536c Author: Phil Dubach Date: Mon Jun 15 15:27:16 2009 -0700 Integrate unsubmitted cupcake change 148419: CTS: cleanup code and add missing testcase in content package commit 52622d2b896cc085937808d5f7d63a265533d393 Author: Chris Palmer Date: Mon Jun 8 12:03:19 2009 -0700 Corrected class Javadoc. Added test for WRITE_EXTERNAL_STORAGE. Propagate non-Security exceptions. commit fb89c66efdb132e2f9c4b1f84aa115717b8c647e Merge: 5a21e8e 84fc40d Author: Android (Google) Code Review Date: Mon Jun 15 14:18:22 2009 -0700 am 84fc40d8: Merge change 3093 into donut Merge commit '84fc40d8d6e3a69ff82fbb8607ca09db38177e7c' * commit '84fc40d8d6e3a69ff82fbb8607ca09db38177e7c': Test for the CAMERA Permission. commit 84fc40d8d6e3a69ff82fbb8607ca09db38177e7c Merge: 577a54e 69f6344 Author: Android (Google) Code Review Date: Mon Jun 15 14:16:15 2009 -0700 Merge change 3093 into donut * changes: Test for the CAMERA Permission. commit 5a21e8ee3da8ab9c3dccb2b3dfe96ce9ea45bdf5 Merge: 3c7749e 577a54e Author: Chris Palmer Date: Mon Jun 15 13:31:53 2009 -0700 am 577a54e4: Had forgotten to actually call fail. Fixed. Merge commit '577a54e46f3a344be87c17c51fdcaae566b75499' * commit '577a54e46f3a344be87c17c51fdcaae566b75499': Had forgotten to actually call fail. Fixed. commit 577a54e46f3a344be87c17c51fdcaae566b75499 Author: Chris Palmer Date: Mon Jun 15 13:23:08 2009 -0700 Had forgotten to actually call fail. Fixed. commit 3c7749ebee41f1d2df72d9fb6abb530d397bb55c Merge: 5242c90 d7d7329 Author: Android (Google) Code Review Date: Mon Jun 15 12:38:47 2009 -0700 am d7d7329d: Merge change 4194 into donut Merge commit 'd7d7329d16f8459c92bc97b8662852f5ae1ad842' * commit 'd7d7329d16f8459c92bc97b8662852f5ae1ad842': Test that rebooting by broadcast Intent requires Permission. commit d7d7329d16f8459c92bc97b8662852f5ae1ad842 Merge: 7f7c51a 792b3eb Author: Android (Google) Code Review Date: Mon Jun 15 12:36:42 2009 -0700 Merge change 4194 into donut * changes: Test that rebooting by broadcast Intent requires Permission. commit 792b3eb27a07110fc44408b8a21ba1daa760be5b Author: Chris Palmer Date: Mon Jun 15 11:32:00 2009 -0700 Test that rebooting by broadcast Intent requires Permission. commit 5242c90eff448b75552415d1532cd54199233681 Merge: eb7ea7d 7f7c51a Author: Chris Palmer Date: Mon Jun 15 12:26:13 2009 -0700 am 7f7c51ad: Tests to verify that DEVICE_POWER is enforced. Merge commit '7f7c51ad6512b1018519abbc02a909bc1072646c' * commit '7f7c51ad6512b1018519abbc02a909bc1072646c': Tests to verify that DEVICE_POWER is enforced. commit 7f7c51ad6512b1018519abbc02a909bc1072646c Author: Chris Palmer Date: Mon Jun 15 11:45:15 2009 -0700 Tests to verify that DEVICE_POWER is enforced. commit 807e62bed2ab9cd024d714883552fdddc0b370ab Author: Phil Dubach Date: Fri Jun 12 17:47:44 2009 -0700 Integrate unsubmitted cupcake change 147431: CTS: clean up code in android.content.res package commit eb7ea7da7b343455eb787a49977077a6eff94a74 Merge: 736eca7 4bca0f0 Author: Phil Dubach Date: Mon Jun 15 10:20:23 2009 -0700 am 4bca0f00: Integrate unsubmitted cupcake change 147354: CTS: clean up code in android.hardware package Merge commit '4bca0f00f61e2017b7f722b5d47ef320a5c738a1' * commit '4bca0f00f61e2017b7f722b5d47ef320a5c738a1': Integrate unsubmitted cupcake change 147354: commit 736eca76101f870c1ff01c9b13990773698dc59b Merge: 239312c 5366b18 Author: Android (Google) Code Review Date: Sun Jun 14 21:12:53 2009 -0700 am 5366b18e: Merge change 4074 into donut Merge commit '5366b18e88bfc39b96b6ddd8a14f674f015ad010' * commit '5366b18e88bfc39b96b6ddd8a14f674f015ad010': Integrate unsubmitted cupcake change 147343: commit 239312cdf7886ea87079d4c15b23e0fc93228494 Merge: 5060e14 982d3cd Author: Android (Google) Code Review Date: Sun Jun 14 21:12:23 2009 -0700 am 982d3cdd: Merge change 3974 into donut Merge commit '982d3cdd4df777b104ae683f40e8b3b67c494157' * commit '982d3cdd4df777b104ae683f40e8b3b67c494157': Integrate unsubmitted cupcake change 147342: commit 4bca0f00f61e2017b7f722b5d47ef320a5c738a1 Author: Phil Dubach Date: Fri Jun 12 17:11:02 2009 -0700 Integrate unsubmitted cupcake change 147354: CTS: clean up code in android.hardware package commit 5366b18e88bfc39b96b6ddd8a14f674f015ad010 Merge: 982d3cd 8151e7c Author: Android (Google) Code Review Date: Fri Jun 12 15:19:24 2009 -0700 Merge change 4074 into donut * changes: Integrate unsubmitted cupcake change 147343: CTS: clean up code in android.app package commit 8151e7cd7f60ed986a2132dd0aec271e5fd77b40 Author: Phil Dubach Date: Thu Jun 11 16:11:16 2009 -0700 Integrate unsubmitted cupcake change 147343: CTS: clean up code in android.app package Fixes bug 1912974 ActivityManagerTest.testGetRunningServices. commit 982d3cdd4df777b104ae683f40e8b3b67c494157 Merge: a69b43b 158aa4a Author: Android (Google) Code Review Date: Fri Jun 12 11:17:47 2009 -0700 Merge change 3974 into donut * changes: Integrate unsubmitted cupcake change 147342: CTS: clean up code in android.net package commit 5060e14a373bb927f7150924bd7863e54e63546d Merge: bfa2302 a69b43b Author: Android (Google) Code Review Date: Fri Jun 12 08:25:14 2009 -0700 am a69b43bc: Merge change 3668 into donut Merge commit 'a69b43bc7edc4b124aedc3fc8e36d78ce00856d3' * commit 'a69b43bc7edc4b124aedc3fc8e36d78ce00856d3': Integrate unsubmitted cupcake change 130893: commit bfa230211169769cacb9a2300acce3d71a12ab11 Merge: ddda352 fc60f74 Author: Android (Google) Code Review Date: Fri Jun 12 08:25:13 2009 -0700 am fc60f746: Merge change 3674 into donut Merge commit 'fc60f74683f8943f6309666881b1c26fd57486ba' * commit 'fc60f74683f8943f6309666881b1c26fd57486ba': Integrate unsubmitted cupcake change 145678: commit ddda352c43d4faa0d74ec901ddbfa8639a2784b8 Merge: e946b83 7c2f14a Author: Phil Dubach Date: Fri Jun 12 08:25:11 2009 -0700 am 7c2f14aa: Integrate unsubmitted cupcake change 147319: CTS: add new cases and clean up code in android.os package Merge commit '7c2f14aa1c4049c94c25f16d1e1f252d9e4ebeb3' * commit '7c2f14aa1c4049c94c25f16d1e1f252d9e4ebeb3': Integrate unsubmitted cupcake change 147319: commit 158aa4a98a19d572eb2b75283e181f54ee544787 Author: Phil Dubach Date: Thu Jun 11 14:02:10 2009 -0700 Integrate unsubmitted cupcake change 147342: CTS: clean up code in android.net package commit a69b43bc7edc4b124aedc3fc8e36d78ce00856d3 Merge: fc60f74 35b6d1e Author: Android (Google) Code Review Date: Thu Jun 11 15:45:09 2009 -0700 Merge change 3668 into donut * changes: Integrate unsubmitted cupcake change 130893: CTS: add test cases for widget.DialerFilter commit fc60f74683f8943f6309666881b1c26fd57486ba Merge: 7c2f14a b60901d Author: Android (Google) Code Review Date: Thu Jun 11 15:44:55 2009 -0700 Merge change 3674 into donut * changes: Integrate unsubmitted cupcake change 145678: CTS: fixed failed problem in ViewGroup_LayoutParamsTest commit 69f63445815b8ce244fb46bfcfb6f011a3588940 Author: Chris Palmer Date: Mon Jun 8 13:52:51 2009 -0700 Test for the CAMERA Permission. commit 7c2f14aa1c4049c94c25f16d1e1f252d9e4ebeb3 Author: Phil Dubach Date: Thu Jun 11 11:39:50 2009 -0700 Integrate unsubmitted cupcake change 147319: CTS: add new cases and clean up code in android.os package commit e946b83d8c65162eb3a82ff6b2fa13eb4f40d1b7 Merge: d410ca5 d815c8f Author: Android (Google) Code Review Date: Thu Jun 11 11:42:00 2009 -0700 am d815c8f9: Merge change 3840 into donut Merge commit 'd815c8f91daebb5c3140a33c20c10afcd56f79e4' * commit 'd815c8f91daebb5c3140a33c20c10afcd56f79e4': Integrate unsubmitted cupcake change 147087: commit d410ca5a8b42fc577d75e063ca6fb32f1e4a4da5 Merge: 1355dc5 0773511 Author: Android (Google) Code Review Date: Thu Jun 11 11:41:58 2009 -0700 am 07735110: Merge change 3829 into donut Merge commit '077351107c34b5f640da8b8329db27cf9431c7f6' * commit '077351107c34b5f640da8b8329db27cf9431c7f6': Integrate unsubmitted cupcake change 146914: commit 1355dc586c30e7a036941763c0364500685cfed7 Merge: b6fb2c5 3a06828 Author: Android (Google) Code Review Date: Thu Jun 11 11:41:56 2009 -0700 am 3a068288: Merge change 3654 into donut Merge commit '3a06828837fe26cf294946ee9e73b820398b4e8b' * commit '3a06828837fe26cf294946ee9e73b820398b4e8b': Integrate unsubmitted cupcake change 118504: commit d815c8f91daebb5c3140a33c20c10afcd56f79e4 Merge: 0773511 59bc535 Author: Android (Google) Code Review Date: Thu Jun 11 10:51:52 2009 -0700 Merge change 3840 into donut * changes: Integrate unsubmitted cupcake change 147087: CTS: cleanup code in SpannableStringBuilderTest, DebugUtilsTest, EventLogTagsTest, LogPrinterTest and SparseBooleanArrayTest commit 077351107c34b5f640da8b8329db27cf9431c7f6 Merge: 3a06828 4762052 Author: Android (Google) Code Review Date: Thu Jun 11 10:51:41 2009 -0700 Merge change 3829 into donut * changes: Integrate unsubmitted cupcake change 146914: CTS: add missing testcase for PrintStreamPrinter, SparseIntArray and TypedValue commit 3a06828837fe26cf294946ee9e73b820398b4e8b Merge: 64d07fe 699c509 Author: Android (Google) Code Review Date: Thu Jun 11 10:51:23 2009 -0700 Merge change 3654 into donut * changes: Integrate unsubmitted cupcake change 118504: CTS: add test case for RelativeLayout and RelativeLayout.LayoutParams commit 59bc5358168c5420f4c0ac92a6e81e7e6224fd16 Author: Phil Dubach Date: Wed Jun 10 17:41:35 2009 -0700 Integrate unsubmitted cupcake change 147087: CTS: cleanup code in SpannableStringBuilderTest, DebugUtilsTest, EventLogTagsTest, LogPrinterTest and SparseBooleanArrayTest commit 47620528271aebb8069f564e79a92dcf59d5baea Author: Phil Dubach Date: Tue Jun 9 19:39:31 2009 -0700 Integrate unsubmitted cupcake change 146914: CTS: add missing testcase for PrintStreamPrinter, SparseIntArray and TypedValue commit b6fb2c5c12310c3c20d23024f79c08e41ca05e9c Merge: 5792f22 64d07fe Author: Phil Dubach Date: Wed Jun 10 17:19:59 2009 -0700 am 64d07fe7: Exclude system alert dialog permission tests Merge commit '64d07fe70a2605b40555ac8ed704495be7e4fff7' * commit '64d07fe70a2605b40555ac8ed704495be7e4fff7': Exclude system alert dialog permission tests commit 64d07fe70a2605b40555ac8ed704495be7e4fff7 Author: Phil Dubach Date: Wed Jun 10 16:21:31 2009 -0700 Exclude system alert dialog permission tests See bugs 1909470, 1910487. Although the test in question passes, it causes the UI thread to die when the test activity gets destroyed. This can only be re-enabled once 1910487 has been fixed. commit 5792f22f0d273f2fa79a846d3790aa8ea7f99b94 Merge: 8890364 7c20b1b Author: Brett Chabot Date: Wed Jun 10 11:15:31 2009 -0700 am 7c20b1b3: Add test size annotations to cts permission tests. Merge commit '7c20b1b324c6d260d5476bc0f990b6727d8410fb' * commit '7c20b1b324c6d260d5476bc0f990b6727d8410fb': Add test size annotations to cts permission tests. commit 7c20b1b324c6d260d5476bc0f990b6727d8410fb Author: Brett Chabot Date: Tue Jun 9 20:05:36 2009 -0700 Add test size annotations to cts permission tests. This is necessary to run the tests in the continous system. Also fixed type in testKeyguardReenabled method. commit b60901d15b7291d2c739f6eac121aa69c4ea84ea Author: Phil Dubach Date: Tue Jun 9 18:04:37 2009 -0700 Integrate unsubmitted cupcake change 145678: CTS: fixed failed problem in ViewGroup_LayoutParamsTest commit 35b6d1e29d3569233a94987d0b9216fcca92df23 Author: Phil Dubach Date: Tue Jun 9 17:02:23 2009 -0700 Integrate unsubmitted cupcake change 130893: CTS: add test cases for widget.DialerFilter commit 889036458b9de036f7d6253afef0b2a31e7e3b02 Merge: 1fa5cba b81b030 Author: Phil Dubach Date: Tue Jun 9 16:34:34 2009 -0700 am b81b030d: Fix style in android.text.format.cts.TimeTest Merge commit 'b81b030d93725efd86709f6039d6da05402e0450' * commit 'b81b030d93725efd86709f6039d6da05402e0450': Fix style in android.text.format.cts.TimeTest commit 1fa5cbadf981fbabadc7e94cce38bb4504215461 Merge: b8d6a5b 8d16e6d Author: Phil Dubach Date: Tue Jun 9 16:34:27 2009 -0700 am 8d16e6d5: Integrate unsubmitted cupcake change 149039: CTS: add testcase for DateFormat, DateUtils, Time and Formatter in android.text.format package Merge commit '8d16e6d51a5214eafa797c191105738d8b694915' * commit '8d16e6d51a5214eafa797c191105738d8b694915': Integrate unsubmitted cupcake change 149039: commit 699c509004659a1e9f0112389fde9871d2ff2f84 Author: Phil Dubach Date: Tue Jun 9 16:32:25 2009 -0700 Integrate unsubmitted cupcake change 118504: CTS: add test case for RelativeLayout and RelativeLayout.LayoutParams commit b81b030d93725efd86709f6039d6da05402e0450 Author: Phil Dubach Date: Tue Jun 9 16:08:35 2009 -0700 Fix style in android.text.format.cts.TimeTest commit b8d6a5b5823332da0312c6d97361ebe4a07a3020 Merge: 7d70e93 7e49083 Author: Android (Google) Code Review Date: Tue Jun 9 15:38:40 2009 -0700 am 7e490839: Merge change 3352 into donut Merge commit '7e490839a5eb14635249bbe68ab69b3526e9dcf4' * commit '7e490839a5eb14635249bbe68ab69b3526e9dcf4': Integrate unsubmitted cupcake change 149419: commit 8d16e6d51a5214eafa797c191105738d8b694915 Author: Phil Dubach Date: Tue Jun 9 12:14:42 2009 -0700 Integrate unsubmitted cupcake change 149039: CTS: add testcase for DateFormat, DateUtils, Time and Formatter in android.text.format package commit 7e490839a5eb14635249bbe68ab69b3526e9dcf4 Merge: 72b705b 1f4a940 Author: Android (Google) Code Review Date: Tue Jun 9 12:04:43 2009 -0700 Merge change 3352 into donut * changes: Integrate unsubmitted cupcake change 149419: CTS: add test cases for android.widget.AlphabetIndexer commit 7d70e9318a0e8550b82b7933c6080eab9c02cb8d Merge: 61f9009 72b705b Author: Phil Dubach Date: Mon Jun 8 11:12:04 2009 -0700 am 72b705b4: Integrate unsubmitted cupcake change 149421: CTS: add missed test cases for package android.widget Merge commit '72b705b4df314c5cb81a9db2347fb6a6f9384b9a' * commit '72b705b4df314c5cb81a9db2347fb6a6f9384b9a': Integrate unsubmitted cupcake change 149421: commit 72b705b4df314c5cb81a9db2347fb6a6f9384b9a Author: Phil Dubach Date: Fri Jun 5 15:15:37 2009 -0700 Integrate unsubmitted cupcake change 149421: CTS: add missed test cases for package android.widget commit 61f900923600850eb2c69286b9d2688fc759e26c Merge: acb442a 5d79c6f Author: Phil Dubach Date: Mon Jun 8 10:54:29 2009 -0700 am 5d79c6fa: Integrate unsubmitted cupcake change 149110: CTS: add test case for anroid.widget.SlidingDrawer Merge commit '5d79c6fabf27d80d9373fd10e1d5dbbb58370c22' * commit '5d79c6fabf27d80d9373fd10e1d5dbbb58370c22': Integrate unsubmitted cupcake change 149110: commit acb442ac4175396571168d35bd125b75c835a097 Merge: 3f71c62 0b27aa6 Author: Android (Google) Code Review Date: Fri Jun 5 21:17:26 2009 -0700 am 0b27aa63: Merge change 3179 into donut Merge commit '0b27aa63809aabf7725b54a26d8f7313ad970f28' * commit '0b27aa63809aabf7725b54a26d8f7313ad970f28': Integrate unsubmitted cupcake change 149411: commit 5d79c6fabf27d80d9373fd10e1d5dbbb58370c22 Author: Phil Dubach Date: Fri Jun 5 18:34:01 2009 -0700 Integrate unsubmitted cupcake change 149110: CTS: add test case for anroid.widget.SlidingDrawer commit 0b27aa63809aabf7725b54a26d8f7313ad970f28 Merge: 832c35e 8ce9f29 Author: Android (Google) Code Review Date: Fri Jun 5 15:00:09 2009 -0700 Merge change 3179 into donut * changes: Integrate unsubmitted cupcake change 149411: CTS: added missed test cases for package android.text.method commit 1f4a940e8a490a87abe55a4dcb029063ce83bc2f Author: Phil Dubach Date: Fri Jun 5 11:42:57 2009 -0700 Integrate unsubmitted cupcake change 149419: CTS: add test cases for android.widget.AlphabetIndexer commit 3f71c62a53abc400471106aeb06364586a5df699 Merge: a5eb4bc 832c35e Author: Brett Chabot Date: Fri Jun 5 11:41:18 2009 -0700 am 832c35e5: Add permission tests for browser and subscribed feeds. Merge commit '832c35e5439a3ca57957ca6c40a424aac1bd78e9' * commit '832c35e5439a3ca57957ca6c40a424aac1bd78e9': Add permission tests for browser and subscribed feeds. commit a5eb4bc825bee2a103adc391abe550f50ec320ee Merge: 6a67fb1 601a8ba Author: Android (Google) Code Review Date: Fri Jun 5 00:29:52 2009 -0700 am 601a8baa: Merge change 3250 into donut Merge commit '601a8baae876c758a8c32288fc812721c6efe3a2' * commit '601a8baae876c758a8c32288fc812721c6efe3a2': Integrate unsubmitted cupcake change 147444: commit 6a67fb142e415eca67b7106774ed35e711fd98bf Merge: d8872db 4391bcb Author: Android (Google) Code Review Date: Thu Jun 4 23:48:38 2009 -0700 am 4391bcb9: Merge change 3199 into donut Merge commit '4391bcb98851621195dddedddecaf8c4bfc3280d' * commit '4391bcb98851621195dddedddecaf8c4bfc3280d': Integrate unsubmitted cupcake change 149109: commit d8872db665adf14f1a07601a3dde7e22a94b20f5 Merge: f74d8bc d3f8828 Author: Android (Google) Code Review Date: Thu Jun 4 22:43:09 2009 -0700 am d3f8828c: Merge change 3084 into donut Merge commit 'd3f8828cf542604a9cfc3d634bf234c7b5716414' * commit 'd3f8828cf542604a9cfc3d634bf234c7b5716414': New test for audio-related Permissions. Updated for style (public test* commit f74d8bc8587767c3108287ad16928246ad834b7f Merge: bf5039c 729a720 Author: Android (Google) Code Review Date: Thu Jun 4 22:43:02 2009 -0700 am 729a7206: Merge change 3114 into donut Merge commit '729a72064594a428c7b4288e4ffcb46a35e6d04c' * commit '729a72064594a428c7b4288e4ffcb46a35e6d04c': Integrate unsubmitted cupcake change 130903: commit bf5039c6ceeebdc18ae6c2078fbd0cb6f2b0590b Merge: e894aa1 e587366 Author: Android (Google) Code Review Date: Thu Jun 4 22:42:59 2009 -0700 am e5873667: Merge change 3119 into donut Merge commit 'e5873667695011628cb6c8558e7db4fe766c0b91' * commit 'e5873667695011628cb6c8558e7db4fe766c0b91': Integrate unsubmitted cupcake change 117229: commit e894aa1329ca85f9633f574e66a57418a47332f1 Merge: 6ad80f6 d40295c Author: Phil Dubach Date: Thu Jun 4 22:42:56 2009 -0700 am d40295cc: Integrate unsubmitted cupcake change 149410: CTS: add test case for androi.text.TextUtils#dumpSpans Merge commit 'd40295ccf180e7b512662272072ce7e96ad6bce6' * commit 'd40295ccf180e7b512662272072ce7e96ad6bce6': Integrate unsubmitted cupcake change 149410: commit 832c35e5439a3ca57957ca6c40a424aac1bd78e9 Author: Brett Chabot Date: Thu Jun 4 20:19:48 2009 -0700 Add permission tests for browser and subscribed feeds. See bug 1899531 for details. commit 601a8baae876c758a8c32288fc812721c6efe3a2 Merge: 4391bcb 6ecbbe2 Author: Android (Google) Code Review Date: Thu Jun 4 17:17:31 2009 -0700 Merge change 3250 into donut * changes: Integrate unsubmitted cupcake change 147444: CTS: add permission test cases: NoActivityRelatedPermissionTest, NoAudioPermissionTest, NoReadWritePermissionTest, NoReadLogsPermissionTest, NoWakeLockPermissionTest and NoSystemFunctionPermissionTest commit 6ecbbe26d6256c9ad252159c2ecf202545e5f94d Author: Phil Dubach Date: Thu Jun 4 13:45:47 2009 -0700 Integrate unsubmitted cupcake change 147444: CTS: add permission test cases: NoActivityRelatedPermissionTest, NoAudioPermissionTest, NoReadWritePermissionTest, NoReadLogsPermissionTest, NoWakeLockPermissionTest and NoSystemFunctionPermissionTest commit 4391bcb98851621195dddedddecaf8c4bfc3280d Merge: d3f8828 9964df5 Author: Android (Google) Code Review Date: Thu Jun 4 15:49:31 2009 -0700 Merge change 3199 into donut * changes: Integrate unsubmitted cupcake change 149109: CTS: add test case for android.widget.HorizontalScrollView commit 9964df5e7a2d0603b28adef643102089f87d4d34 Author: Phil Dubach Date: Thu Jun 4 12:19:32 2009 -0700 Integrate unsubmitted cupcake change 149109: CTS: add test case for android.widget.HorizontalScrollView commit d3f8828cf542604a9cfc3d634bf234c7b5716414 Merge: 729a720 5f9c855 Author: Android (Google) Code Review Date: Thu Jun 4 11:36:37 2009 -0700 Merge change 3084 into donut * changes: New test for audio-related Permissions. Updated for style (public test* methods) and commented-out a test for an issue we don't intend to fix. commit 8ce9f296cac94572c4cf16b5693a54c41258018f Author: Phil Dubach Date: Thu Jun 4 11:25:41 2009 -0700 Integrate unsubmitted cupcake change 149411: CTS: added missed test cases for package android.text.method commit 729a72064594a428c7b4288e4ffcb46a35e6d04c Merge: e587366 d77f09b Author: Android (Google) Code Review Date: Thu Jun 4 11:16:37 2009 -0700 Merge change 3114 into donut * changes: Integrate unsubmitted cupcake change 130903: CTS: add test cases for view.Surface commit e5873667695011628cb6c8558e7db4fe766c0b91 Merge: d40295c ebf00dd Author: Android (Google) Code Review Date: Thu Jun 4 11:16:20 2009 -0700 Merge change 3119 into donut * changes: Integrate unsubmitted cupcake change 117229: CTS: add test cases for ZoomButton commit ebf00ddb951958d7cc9290ffbbca6aa492228c78 Author: Phil Dubach Date: Wed Jun 3 18:28:43 2009 -0700 Integrate unsubmitted cupcake change 117229: CTS: add test cases for ZoomButton commit d77f09b3b5096e176edc35974cb9141237f9ecae Author: Phil Dubach Date: Wed Jun 3 17:39:30 2009 -0700 Integrate unsubmitted cupcake change 130903: CTS: add test cases for view.Surface commit d40295ccf180e7b512662272072ce7e96ad6bce6 Author: Phil Dubach Date: Tue Jun 2 18:14:37 2009 -0700 Integrate unsubmitted cupcake change 149410: CTS: add test case for androi.text.TextUtils#dumpSpans commit 6ad80f64a188963655858615baa4b426b0940ddd Merge: 96078ee 8e8fbe1 Author: Android (Google) Code Review Date: Wed Jun 3 16:54:13 2009 -0700 am 8e8fbe12: Merge change 3096 into donut Merge commit '8e8fbe1254c9611e7a80311fc1fc9f63a93a098a' * commit '8e8fbe1254c9611e7a80311fc1fc9f63a93a098a': Integrate unsubmitted cupcake change 149414: commit 96078eebd0df334e9856f444f36d41190915c1d2 Merge: b083c97 c92891a Author: Android (Google) Code Review Date: Wed Jun 3 16:54:11 2009 -0700 am c92891af: Merge change 3087 into donut Merge commit 'c92891af0bc65471a4ce4cb97d94e7f0443bdb12' * commit 'c92891af0bc65471a4ce4cb97d94e7f0443bdb12': Integrate unsubmitted cupcake change 149412: commit 8e8fbe1254c9611e7a80311fc1fc9f63a93a098a Merge: c92891a e251871 Author: Android (Google) Code Review Date: Wed Jun 3 16:52:11 2009 -0700 Merge change 3096 into donut * changes: Integrate unsubmitted cupcake change 149414: CTS: added missed test cases for package android.view commit c92891af0bc65471a4ce4cb97d94e7f0443bdb12 Merge: 6d59137 4f5067b Author: Android (Google) Code Review Date: Wed Jun 3 16:51:55 2009 -0700 Merge change 3087 into donut * changes: Integrate unsubmitted cupcake change 149412: CTS: CTS: added missed test cases for package android.text.style commit 5f9c85593f901f7b8152c5b259d3e7050c74ae78 Author: Chris Palmer Date: Wed Jun 3 15:21:01 2009 -0700 New test for audio-related Permissions. Updated for style (public test* methods) and commented-out a test for an issue we don't intend to fix. commit e251871173bba68ee326e208f8697f48146d5d06 Author: Phil Dubach Date: Wed Jun 3 15:53:43 2009 -0700 Integrate unsubmitted cupcake change 149414: CTS: added missed test cases for package android.view commit b083c979ac828075992367131ce6d8d10d34606e Merge: 7859bf3 6d59137 Author: Phil Dubach Date: Wed Jun 3 15:47:05 2009 -0700 am 6d591371: Integrate unsubmitted cupcake change 149413: CTS: add missed test case for android.view.animation.Animation#clone Merge commit '6d59137174a5325acb60650b6b18b4a546d45b84' * commit '6d59137174a5325acb60650b6b18b4a546d45b84': Integrate unsubmitted cupcake change 149413: commit 6d59137174a5325acb60650b6b18b4a546d45b84 Author: Phil Dubach Date: Wed Jun 3 15:35:48 2009 -0700 Integrate unsubmitted cupcake change 149413: CTS: add missed test case for android.view.animation.Animation#clone commit 4f5067b94980b162e7cb8678f4a37fa401f6a8d5 Author: Phil Dubach Date: Wed Jun 3 15:21:00 2009 -0700 Integrate unsubmitted cupcake change 149412: CTS: CTS: added missed test cases for package android.text.style commit 7859bf358bef6f5b99d7f8ad5a667a0cad41f902 Merge: da44fc7 d6f4758 Author: Android (Google) Code Review Date: Wed Jun 3 13:00:26 2009 -0700 am d6f4758a: Merge change 2506 into donut Merge commit 'd6f4758aa3c27a0860e273fe711d5d14902664fc' * commit 'd6f4758aa3c27a0860e273fe711d5d14902664fc': Integrate unsubmitted cupcake change 131139: commit da44fc705f5c28fc37f8b94c37fc992fdf90e85b Merge: f0c4aed 6fa5540 Author: Android (Google) Code Review Date: Wed Jun 3 13:00:24 2009 -0700 am 6fa5540c: Merge change 2960 into donut Merge commit '6fa5540c36758119039d8991b02dc84eac0f2582' * commit '6fa5540c36758119039d8991b02dc84eac0f2582': CTS: Clean up and fix MemoryFileTest commit d6f4758aa3c27a0860e273fe711d5d14902664fc Merge: 6fa5540 ab17a39 Author: Android (Google) Code Review Date: Wed Jun 3 11:41:46 2009 -0700 Merge change 2506 into donut * changes: Integrate unsubmitted cupcake change 131139: CTS: add test cases for net.wifi.ScanResult, SupplicantState, WifiConfiguration, WifiInfo and WifiManager. Added new tests as per mondrian comments. Cleaned code to get rid of eclipse warnings. commit 6fa5540c36758119039d8991b02dc84eac0f2582 Merge: 6248302 5a4b864 Author: Android (Google) Code Review Date: Wed Jun 3 11:41:20 2009 -0700 Merge change 2960 into donut * changes: CTS: Clean up and fix MemoryFileTest commit f0c4aed91b1905c5ec5323164d3f013318e7d77c Merge: f989f75 6248302 Author: Phil Dubach Date: Tue Jun 2 22:48:33 2009 -0700 am 62483027: Integrate unsubmitted cupcake change 149104: CTS: add test case for android.provider.UserDictionary.Words Merge commit '62483027c666c90d5c077196715d16ef76843f83' * commit '62483027c666c90d5c077196715d16ef76843f83': Integrate unsubmitted cupcake change 149104: commit 62483027c666c90d5c077196715d16ef76843f83 Author: Phil Dubach Date: Tue Jun 2 15:42:59 2009 -0700 Integrate unsubmitted cupcake change 149104: CTS: add test case for android.provider.UserDictionary.Words commit f989f75a22b34b696a00e5da0145ddbe1a6a0be2 Merge: a179c9c 34416f7 Author: Android (Google) Code Review Date: Tue Jun 2 15:37:20 2009 -0700 am 34416f75: Merge change 2963 into donut Merge commit '34416f750fe2c47153bdfb8630762acecd21e524' * commit '34416f750fe2c47153bdfb8630762acecd21e524': Integrate unsubmitted cupcake change 123653: commit 34416f750fe2c47153bdfb8630762acecd21e524 Merge: d9e9d87 91ec588 Author: Android (Google) Code Review Date: Tue Jun 2 15:34:47 2009 -0700 Merge change 2963 into donut * changes: Integrate unsubmitted cupcake change 123653: CTS: add test cases for net.SSLCertificateSocketFactory commit a179c9cafe8a36ceb3137a82fe6ccbf2cb1d271d Merge: 9d97ff6 d9e9d87 Author: Phil Dubach Date: Tue Jun 2 15:29:01 2009 -0700 am d9e9d870: Integrate unsubmitted cupcake change 149106: CTS: add test case for android.view.OrientationEventListener. Merge commit 'd9e9d870e36235433b29f7cfb7d348a690be8042' * commit 'd9e9d870e36235433b29f7cfb7d348a690be8042': Integrate unsubmitted cupcake change 149106: commit 5a4b864d033322bf6e1a17726a2c1131e609df02 Author: Phil Dubach Date: Tue Jun 2 15:01:02 2009 -0700 CTS: Clean up and fix MemoryFileTest Tests should not catch exceptions unless they are expected. The Junit framework automatically handles exceptions thrown by the tests. Catching and failing causes the original stacktrace to be lost. Also fix testClose(), since the framework now correctly throws an exception when an attempt is made to read from a closed MemoryFile. commit 91ec588f54bf0b2ecb1fb8956fe4775942f2bd3b Author: Phil Dubach Date: Tue Jun 2 14:46:51 2009 -0700 Integrate unsubmitted cupcake change 123653: CTS: add test cases for net.SSLCertificateSocketFactory commit d9e9d870e36235433b29f7cfb7d348a690be8042 Author: Phil Dubach Date: Tue Jun 2 13:01:08 2009 -0700 Integrate unsubmitted cupcake change 149106: CTS: add test case for android.view.OrientationEventListener. commit 9d97ff6b94c7477877983b7cd17fb02dad2a6add Author: Fred Quintana Date: Wed May 20 18:38:15 2009 -0700 change applyBatch to take an ArrayList rather than [] commit b1dd901a64410fd717bded67b4b05cd7d0995642 Merge: bcda79a 50d3d27 Author: Bjorn Bringert Date: Fri May 29 01:10:54 2009 -0700 am 50d3d271: CTS changes for MemoryFile constructor throwing IOException. Merge commit '50d3d2715308eb8670701c6a17843e7621197d5d' * commit '50d3d2715308eb8670701c6a17843e7621197d5d': CTS changes for MemoryFile constructor throwing IOException. commit 50d3d2715308eb8670701c6a17843e7621197d5d Author: Bjorn Bringert Date: Thu May 28 14:55:02 2009 +0100 CTS changes for MemoryFile constructor throwing IOException. This change updates the CTS tests for MemoryFile to catch IOExceptions thrown by the MemoryFile constructor. Before, the MemoryFile constructor could throw IOException, but did not declare this fact, see http://b/issue?id=1881829 This has now been fixed in https://android-git.corp.google.com/g/2618 Unfortunately that change must be submitted together with this one in order not to break the build. commit ab17a392f342ad1cbb991fde82bc5da05b37fd5e Author: Phil Dubach Date: Tue May 19 11:43:39 2009 -0700 Integrate unsubmitted cupcake change 131139: CTS: add test cases for net.wifi.ScanResult, SupplicantState, WifiConfiguration, WifiInfo and WifiManager. Added new tests as per mondrian comments. Cleaned code to get rid of eclipse warnings. commit bcda79a5cd94cd70692922c8f6edd9af0ae028d9 Merge: cac48a5 a5b9bbc Author: Phil Dubach Date: Tue May 26 17:58:16 2009 -0700 am a5b9bbc3: Integrate unsubmitted cupcake change 120329: CTS: add test cases for android.view.View Merge commit 'a5b9bbc3a4d553627dccbae3b23fd3a97505953b' * commit 'a5b9bbc3a4d553627dccbae3b23fd3a97505953b': Integrate unsubmitted cupcake change 120329: commit a5b9bbc3a4d553627dccbae3b23fd3a97505953b Author: Phil Dubach Date: Tue May 26 15:17:37 2009 -0700 Integrate unsubmitted cupcake change 120329: CTS: add test cases for android.view.View commit cac48a550f66558630e7e7175b9987708fa0d220 Merge: 4fba13b b9d142f Author: Phil Dubach Date: Tue May 26 14:35:00 2009 -0700 am b9d142f6: Integrate unsubmitted cupcake change 125078: CTS: add test cases for content.BroadcastReceiver Merge commit 'b9d142f687a1dff4c43e42f62804a174dbdcdc52' * commit 'b9d142f687a1dff4c43e42f62804a174dbdcdc52': Integrate unsubmitted cupcake change 125078: commit b9d142f687a1dff4c43e42f62804a174dbdcdc52 Author: Phil Dubach Date: Wed May 20 14:42:25 2009 -0700 Integrate unsubmitted cupcake change 125078: CTS: add test cases for content.BroadcastReceiver commit 4fba13ba2a741fd9a0dea7d4b13c70a15c426a6f Merge: 7e1918e 5fb8178 Author: Android (Google) Code Review Date: Tue May 26 12:55:38 2009 -0700 am 5fb81789: Merge change 2101 into donut Merge commit '5fb8178951ad29efce9751d8cd90ab5e365247d1' * commit '5fb8178951ad29efce9751d8cd90ab5e365247d1': Integrate unsubmitted cupcake change 120332: commit 5fb8178951ad29efce9751d8cd90ab5e365247d1 Merge: 52efeb8 58e58b1 Author: Android (Google) Code Review Date: Tue May 26 11:41:16 2009 -0700 Merge change 2101 into donut * changes: Integrate unsubmitted cupcake change 120332: CTS: add test cases for android.text.DynamicLayout commit 7e1918ed6b1cec1bc908a61a7d9e7e6b269ab3d6 Merge: d192dbc 52efeb8 Author: Phil Dubach Date: Fri May 22 14:55:08 2009 -0700 am 52efeb8b: Integrate unsubmitted cupcake change 118310: CTS: add test case for android.widget.Gallery. Merge commit '52efeb8b46e0322ac57f8a5c2d2a9acb34830b4b' * commit '52efeb8b46e0322ac57f8a5c2d2a9acb34830b4b': Integrate unsubmitted cupcake change 118310: commit 52efeb8b46e0322ac57f8a5c2d2a9acb34830b4b Author: Phil Dubach Date: Fri May 22 14:13:59 2009 -0700 Integrate unsubmitted cupcake change 118310: CTS: add test case for android.widget.Gallery. commit d192dbce94ef13f05394e81e2c913c75226123c6 Author: Fred Quintana Date: Wed May 20 18:38:15 2009 -0700 add IPC support for ContentProvider batch operations commit 58e58b14d37d593aec550d8ce737619b8aa4960c Author: Phil Dubach Date: Wed May 20 12:13:01 2009 -0700 Integrate unsubmitted cupcake change 120332: CTS: add test cases for android.text.DynamicLayout commit 7ece1ba30e0a1fd7fd2b34b1169b2d1fe8b12b4f Merge: 2a2bd5d dcbdf8d Author: Android (Google) Code Review Date: Wed May 20 11:49:48 2009 -0700 am dcbdf8df: Merge change 2088 into donut Merge commit 'dcbdf8dfe7e558e878255d4b81ec55ce246efffd' * commit 'dcbdf8dfe7e558e878255d4b81ec55ce246efffd': Integrate unsubmitted cupcake change 147367: commit dcbdf8dfe7e558e878255d4b81ec55ce246efffd Merge: d97c14e 4d09c50 Author: Android (Google) Code Review Date: Wed May 20 10:01:28 2009 -0700 Merge change 2088 into donut * changes: Integrate unsubmitted cupcake change 147367: CTS: add test cases for android.view.animation.RotateAnimation, ScaleAnimation and TranslateAnimation. commit 4d09c50318adb8e2131c0acc27a76a9f504daa60 Author: Phil Dubach Date: Wed May 20 09:34:57 2009 -0700 Integrate unsubmitted cupcake change 147367: CTS: add test cases for android.view.animation.RotateAnimation, ScaleAnimation and TranslateAnimation. commit 2a2bd5d36ec28416afcf6aa0bbb5c06c4cc4e210 Merge: 3f9f981 d97c14e Author: Brett Chabot Date: Wed May 20 08:54:20 2009 -0700 am d97c14e3: Revert "Change cts tests to use InstrumentationTestRunner." Merge commit 'd97c14e3fc34f3c588e842b54dc7a1bd893a3009' * commit 'd97c14e3fc34f3c588e842b54dc7a1bd893a3009': Revert "Change cts tests to use InstrumentationTestRunner." commit d97c14e3fc34f3c588e842b54dc7a1bd893a3009 Author: Brett Chabot Date: Tue May 19 18:08:05 2009 -0700 Revert "Change cts tests to use InstrumentationTestRunner." This reverts commit 4e149f1be91afaab8dd5064cdd187f73eb6053c3. commit 3f9f981e375b36d6d52f53f735b16db1cc15e35a Merge: 5d9e2e2 15f91be Author: Phil Dubach Date: Tue May 19 17:36:49 2009 -0700 am 15f91bef: Integrate unsubmitted cupcake change 123924: CTS: add test cases for hardware.Sensor and SensorManager Merge commit '15f91befac7d432d4211731744f5b7bd8403b902' * commit '15f91befac7d432d4211731744f5b7bd8403b902': Integrate unsubmitted cupcake change 123924: commit 15f91befac7d432d4211731744f5b7bd8403b902 Author: Phil Dubach Date: Tue May 19 16:41:52 2009 -0700 Integrate unsubmitted cupcake change 123924: CTS: add test cases for hardware.Sensor and SensorManager commit 5d9e2e253768e5ee2456fac1b968d2e19b1bce7d Merge: e3e6f29 a97f97f Author: Phil Dubach Date: Tue May 19 16:40:48 2009 -0700 am a97f97f1: Integrate unsubmitted cupcake change 147366: CTS: add test cases for android.view.animation.LayoutAnimationController and GridLayoutAnimationController. Merge commit 'a97f97f1707bac6c00770c6ae4d28ef217b48659' * commit 'a97f97f1707bac6c00770c6ae4d28ef217b48659': Integrate unsubmitted cupcake change 147366: commit a97f97f1707bac6c00770c6ae4d28ef217b48659 Author: Phil Dubach Date: Tue May 19 15:05:52 2009 -0700 Integrate unsubmitted cupcake change 147366: CTS: add test cases for android.view.animation.LayoutAnimationController and GridLayoutAnimationController. commit e3e6f2915d9f6ec977699624014966e4e0dfdeaf Merge: 35ae55f d1f5378 Author: Phil Dubach Date: Tue May 19 15:07:04 2009 -0700 am d1f5378d: Integrate unsubmitted cupcake change 147364: CTS: add test cases for android.view.animation.AnimationSet, AnimationUtils and Transformation. Merge commit 'd1f5378dcc511e97224d187068ec132800ff7018' * commit 'd1f5378dcc511e97224d187068ec132800ff7018': Integrate unsubmitted cupcake change 147364: commit d1f5378dcc511e97224d187068ec132800ff7018 Author: Phil Dubach Date: Tue May 19 13:46:27 2009 -0700 Integrate unsubmitted cupcake change 147364: CTS: add test cases for android.view.animation.AnimationSet, AnimationUtils and Transformation. commit 35ae55f4ab7b575f2597797247d31176bfb5ce7f Merge: d44c0cf 597759f Author: Phil Dubach Date: Mon May 18 23:55:46 2009 -0700 am 597759f5: Integrate unsubmitted cupcake change 122803: CTS: add test cases for FocusFinder and GestureDetector Merge commit '597759f5189ecbed3803046dee4a86c575a57b0c' * commit '597759f5189ecbed3803046dee4a86c575a57b0c': Integrate unsubmitted cupcake change 122803: commit d44c0cf40ab9723a0e0734d34c766f926829c773 Merge: 33d1161 ed57ee5 Author: Android (Google) Code Review Date: Mon May 18 23:55:45 2009 -0700 am ed57ee53: Merge change 1904 into donut Merge commit 'ed57ee530bfcd95e99606c1ab45f978f7eee1458' * commit 'ed57ee530bfcd95e99606c1ab45f978f7eee1458': Integrate unsubmitted cupcake change 123656: commit 597759f5189ecbed3803046dee4a86c575a57b0c Author: Phil Dubach Date: Mon May 18 17:14:48 2009 -0700 Integrate unsubmitted cupcake change 122803: CTS: add test cases for FocusFinder and GestureDetector commit ed57ee530bfcd95e99606c1ab45f978f7eee1458 Merge: db7c692 5892431 Author: Android (Google) Code Review Date: Mon May 18 14:51:41 2009 -0700 Merge change 1904 into donut * changes: Integrate unsubmitted cupcake change 123656: CTS: add test cases for location.Criteria, Geocoder, GpsStatus, GpsSatellite and Location commit 5892431da96f9b4bf9970ac6761e9d7f941e8636 Author: Phil Dubach Date: Mon May 18 14:16:36 2009 -0700 Integrate unsubmitted cupcake change 123656: CTS: add test cases for location.Criteria, Geocoder, GpsStatus, GpsSatellite and Location commit 33d11616816edf0e65d8ebe980b3e9b9a94df5da Merge: 2c5bd88 db7c692 Author: Phil Dubach Date: Mon May 18 14:01:58 2009 -0700 am db7c6926: Integrate unsubmitted cupcake change 122791: CTS: add test cases for android.content.res.AssetManager Merge commit 'db7c6926da245523e5ec2299ebeb9ace5629f564' * commit 'db7c6926da245523e5ec2299ebeb9ace5629f564': Integrate unsubmitted cupcake change 122791: commit db7c6926da245523e5ec2299ebeb9ace5629f564 Author: Phil Dubach Date: Mon May 18 12:02:07 2009 -0700 Integrate unsubmitted cupcake change 122791: CTS: add test cases for android.content.res.AssetManager commit 2c5bd88cd210d710048c286b10a28406ec0f0b7a Merge: 1ed5a12 782ce10 Author: Android (Google) Code Review Date: Mon May 18 13:44:24 2009 -0700 am 782ce103: Merge change 1838 into donut Merge commit '782ce1030967a28c52eec40b61b6eba5056d24f9' * commit '782ce1030967a28c52eec40b61b6eba5056d24f9': Integrate unsubmitted cupcake change 122821: commit 1ed5a124b8df59d0856b4d500ece10ec633b8b80 Merge: 54fa818 e512979 Author: Phil Dubach Date: Mon May 18 13:44:23 2009 -0700 am e5129795: Integrate unsubmitted cupcake change 122311: CTS: add test cases for android.os.CountDownTimer Merge commit 'e5129795dbd3d5c8934c761c6ea3833932aaa74c' * commit 'e5129795dbd3d5c8934c761c6ea3833932aaa74c': Integrate unsubmitted cupcake change 122311: commit 782ce1030967a28c52eec40b61b6eba5056d24f9 Merge: e512979 ea99ab0 Author: Android (Google) Code Review Date: Mon May 18 11:56:15 2009 -0700 Merge change 1838 into donut * changes: Integrate unsubmitted cupcake change 122821: CTS: add test cases for android.content.res.Resources commit e5129795dbd3d5c8934c761c6ea3833932aaa74c Author: Phil Dubach Date: Fri May 15 16:30:01 2009 -0700 Integrate unsubmitted cupcake change 122311: CTS: add test cases for android.os.CountDownTimer commit ea99ab0ba2830711b1f074f34f647e075da1c38d Author: Phil Dubach Date: Fri May 15 17:59:01 2009 -0700 Integrate unsubmitted cupcake change 122821: CTS: add test cases for android.content.res.Resources commit 54fa8189e9ef683723dbdbbb28586b00fa3ddbb8 Merge: 83c9c6f 9830bc8 Author: Android (Google) Code Review Date: Fri May 15 17:59:26 2009 -0700 am 9830bc84: Merge change 1828 into donut Merge commit '9830bc84d529987d0ff7c589e6a62b5416301794' * commit '9830bc84d529987d0ff7c589e6a62b5416301794': Integrate unsubmitted cupcake change 130899: commit 9830bc84d529987d0ff7c589e6a62b5416301794 Merge: 942d4c7 3eee0e5 Author: Android (Google) Code Review Date: Fri May 15 17:50:25 2009 -0700 Merge change 1828 into donut * changes: Integrate unsubmitted cupcake change 130899: CTS: add test cases for android.os.RemoteException commit 3eee0e58bba7838efe419c1491e257c8b189c277 Author: Phil Dubach Date: Fri May 15 16:08:52 2009 -0700 Integrate unsubmitted cupcake change 130899: CTS: add test cases for android.os.RemoteException commit 83c9c6f368fae9fa953baf15ba8207e3bbe287c6 Merge: 4140371 942d4c7 Author: Android (Google) Code Review Date: Fri May 15 16:25:24 2009 -0700 am 942d4c7b: Merge change 1807 into donut Merge commit '942d4c7bb5714c9b717d2843f0aa66d1cca7ddfc' * commit '942d4c7bb5714c9b717d2843f0aa66d1cca7ddfc': Update CTS host tool to work with the new ddmlib API. commit 4140371943b7563a17aa8dc4a957316cf4b643af Merge: 4d27ada 8d5c4e4 Author: Phil Dubach Date: Fri May 15 16:25:23 2009 -0700 am 8d5c4e43: Integrate unsubmitted cupcake change 146308: CTS: add test cases for AccelerateDecelerateInterpolator, AccelerateInterpolator, CycleInterpolator and LinearInterpolator. Merge commit '8d5c4e4319a6dc4621b5a3fca598873ed7cd69f4' * commit '8d5c4e4319a6dc4621b5a3fca598873ed7cd69f4': Integrate unsubmitted cupcake change 146308: commit 942d4c7bb5714c9b717d2843f0aa66d1cca7ddfc Merge: 8d5c4e4 8207b3d Author: Android (Google) Code Review Date: Fri May 15 15:21:17 2009 -0700 Merge change 1807 into donut * changes: Update CTS host tool to work with the new ddmlib API. commit 8d5c4e4319a6dc4621b5a3fca598873ed7cd69f4 Author: Phil Dubach Date: Thu May 14 13:31:59 2009 -0700 Integrate unsubmitted cupcake change 146308: CTS: add test cases for AccelerateDecelerateInterpolator, AccelerateInterpolator, CycleInterpolator and LinearInterpolator. commit 4d27adaa19f8b37f7667b75b69b7c46d9c7d17b3 Merge: 1150b17 a9f4a22 Author: Phil Dubach Date: Fri May 15 14:29:41 2009 -0700 am a9f4a221: Fix build after change 2524. Merge commit 'a9f4a221d47159d1327da64fa9f6c19263222606' * commit 'a9f4a221d47159d1327da64fa9f6c19263222606': Fix build after change 2524. commit a9f4a221d47159d1327da64fa9f6c19263222606 Author: Phil Dubach Date: Fri May 15 13:51:14 2009 -0700 Fix build after change 2524. commit 8207b3dddc7df1865cac78f23ebf952c5f907d09 Author: Xavier Ducrohet Date: Fri May 15 13:35:28 2009 -0700 Update CTS host tool to work with the new ddmlib API. commit 1150b1750d688881a0a0916bfa98191d638a4af1 Merge: f75b2d1 fb2c547 Author: Phil Dubach Date: Fri May 15 13:31:42 2009 -0700 am fb2c547a: Integrate unsubmitted cupcake change 122792: CTS: add test cases for android.view.Window Merge commit 'fb2c547ad0be80d68addaca46d1a6a6ec050eebd' * commit 'fb2c547ad0be80d68addaca46d1a6a6ec050eebd': Integrate unsubmitted cupcake change 122792: commit fb2c547ad0be80d68addaca46d1a6a6ec050eebd Author: Phil Dubach Date: Thu May 14 17:17:01 2009 -0700 Integrate unsubmitted cupcake change 122792: CTS: add test cases for android.view.Window commit f75b2d13f5449b11a46ea214badf87c4d8c23f66 Merge: 8808dcf 05ff95a Author: Android (Google) Code Review Date: Thu May 14 18:28:20 2009 -0700 am 05ff95a6: Merge change 1711 into donut Merge commit '05ff95a6a6c0f210a2100b1a1215de01bb4b56e1' * commit '05ff95a6a6c0f210a2100b1a1215de01bb4b56e1': Integration of unsubmitted cupcake change 122278: commit 05ff95a6a6c0f210a2100b1a1215de01bb4b56e1 Merge: 2152b85 06648b6 Author: Android (Google) Code Review Date: Thu May 14 18:25:23 2009 -0700 Merge change 1711 into donut * changes: Integration of unsubmitted cupcake change 122278: CTS: add test cases for android.widget.AbsoluteLayout commit 8808dcf6512650634b3f2c9bdbadcba2b35f5135 Merge: 85bc97f 2152b85 Author: Bill Napier Date: Thu May 14 18:11:45 2009 -0700 am 2152b857: am 31f8d506: AI 148879: Update SignatureTest with many fixes. - Update SignatureTest to build against SDK - Provides better error messages on failures - Fixes issue with final methods in final classes (http://b/1839589) - Fixes issue with strict checking on native modifier (http://b/1839558) - Fixes issue with removal of abstract modifier on a class (http://b/1839622) BUG=1839558,1839622,1839589 Merge commit '2152b857a828f55050e38aba5051e4d2c9aa874e' * commit '2152b857a828f55050e38aba5051e4d2c9aa874e': AI 148879: Update SignatureTest with many fixes. commit 2152b857a828f55050e38aba5051e4d2c9aa874e Merge: 22662ef 31f8d50 Author: Bill Napier Date: Thu May 14 18:09:59 2009 -0700 am 31f8d506: AI 148879: Update SignatureTest with many fixes. - Update SignatureTest to build against SDK - Provides better error messages on failures - Fixes issue with final methods in final classes (http://b/1839589) - Fixes issue with strict checking on native modifier (http://b/1839558) - Fixes issue with removal of abstract modifier on a class (http://b/1839622) BUG=1839558,1839622,1839589 Merge commit '31f8d5069ecf4ecd3318eeb0875a42d2942548c2' into donut * commit '31f8d5069ecf4ecd3318eeb0875a42d2942548c2': AI 148879: Update SignatureTest with many fixes. commit 31f8d5069ecf4ecd3318eeb0875a42d2942548c2 Author: Bill Napier Date: Thu May 14 18:07:17 2009 -0700 AI 148879: Update SignatureTest with many fixes. - Update SignatureTest to build against SDK - Provides better error messages on failures - Fixes issue with final methods in final classes (http://b/1839589) - Fixes issue with strict checking on native modifier (http://b/1839558) - Fixes issue with removal of abstract modifier on a class (http://b/1839622) BUG=1839558,1839622,1839589 Automated import of CL 148879 commit 85bc97f7c92c3b6e04dffef3a7548f8b5513bf24 Merge: b23d567 22662ef Author: Android (Google) Code Review Date: Thu May 14 17:24:22 2009 -0700 am 22662ef2: Merge change 1706 into donut Merge commit '22662ef236cc99f0c19f450d9209da961c4868da' * commit '22662ef236cc99f0c19f450d9209da961c4868da': Change cts tests to use InstrumentationTestRunner. commit b23d5674c4b662986fbc0fa6bc30d29216da3b34 Merge: 323b52b 62c8964 Author: Android (Google) Code Review Date: Thu May 14 17:24:22 2009 -0700 am 62c89640: Merge change 1701 into donut Merge commit '62c8964038882b6881a528485e0c380a5a54ce11' * commit '62c8964038882b6881a528485e0c380a5a54ce11': Integration of unsubmitted cupcake change 123642 commit 22662ef236cc99f0c19f450d9209da961c4868da Merge: 62c8964 4e149f1 Author: Android (Google) Code Review Date: Thu May 14 17:23:09 2009 -0700 Merge change 1706 into donut * changes: Change cts tests to use InstrumentationTestRunner. commit 62c8964038882b6881a528485e0c380a5a54ce11 Merge: 0567ea1 d7b4324 Author: Android (Google) Code Review Date: Thu May 14 17:22:05 2009 -0700 Merge change 1701 into donut * changes: Integration of unsubmitted cupcake change 123642 CTS: add test cases for android.widget.AbsListView commit 323b52bd270d55a5b0b3d9d603ae92a78f2ae3e8 Merge: e68988d 0567ea1 Author: Android (Google) Code Review Date: Thu May 14 16:02:59 2009 -0700 am 0567ea13: Merge change 1700 into donut Merge commit '0567ea13e1d4068c0cc9c265c18e8ae8b99377ad' * commit '0567ea13e1d4068c0cc9c265c18e8ae8b99377ad': Update CTS to use the new IDevice#getSyncService(). commit 0567ea13e1d4068c0cc9c265c18e8ae8b99377ad Merge: 231a0d3 7652b18 Author: Android (Google) Code Review Date: Thu May 14 16:00:36 2009 -0700 Merge change 1700 into donut * changes: Update CTS to use the new IDevice#getSyncService(). commit 4e149f1be91afaab8dd5064cdd187f73eb6053c3 Author: Brett Chabot Date: Thu May 14 15:55:21 2009 -0700 Change cts tests to use InstrumentationTestRunner. commit 06648b6b682040d6138bb290a42280e6c949179d Author: Phil Dubach Date: Thu May 14 15:46:26 2009 -0700 Integration of unsubmitted cupcake change 122278: CTS: add test cases for android.widget.AbsoluteLayout commit d7b4324babbc8cbdc600830c98f7d6d13ef72019 Author: Phil Dubach Date: Thu May 14 15:29:14 2009 -0700 Integration of unsubmitted cupcake change 123642 CTS: add test cases for android.widget.AbsListView commit 7652b18f9fe45d237fb53a31e550f9561da50e2b Author: Xavier Ducrohet Date: Thu May 14 15:20:50 2009 -0700 Update CTS to use the new IDevice#getSyncService(). The method now throws an IOException if the connection to adb failed. commit e68988d2d265bed3d58b50aa77b5150cee4c2940 Merge: 8f189e0 231a0d3 Author: Bill Napier Date: Thu May 14 14:56:47 2009 -0700 am 231a0d37: Other small issues found during findbugs fixit. Merge commit '231a0d37f301ce98c085fe0f65de9864efe75a83' * commit '231a0d37f301ce98c085fe0f65de9864efe75a83': Other small issues found during findbugs fixit. commit 8f189e01a7cbc6b0b1637b75f19ca005d97f4e6e Merge: 2abe1f3 79a83a6 Author: Bill Napier Date: Thu May 14 14:53:21 2009 -0700 am 79a83a6a: Fix possible race condition in android.view.cts.waitForResult. Merge commit '79a83a6a6879dedc0c1c4f4393c4ab27d24ae311' * commit '79a83a6a6879dedc0c1c4f4393c4ab27d24ae311': Fix possible race condition in android.view.cts.waitForResult. commit 231a0d37f301ce98c085fe0f65de9864efe75a83 Author: Bill Napier Date: Thu May 14 14:47:04 2009 -0700 Other small issues found during findbugs fixit. commit 79a83a6a6879dedc0c1c4f4393c4ab27d24ae311 Author: Bill Napier Date: Thu May 14 13:20:27 2009 -0700 Fix possible race condition in android.view.cts.waitForResult. commit 2abe1f368256324729ed7c27d0ff816874af199a Merge: bba97ce 53cff00 Author: Bill Napier Date: Thu May 14 11:44:10 2009 -0700 am 53cff00: Make isFinished field name nicer to read. Merge commit '53cff00f2371863a6387b73bd038c63d16d6dc02' * commit '53cff00f2371863a6387b73bd038c63d16d6dc02': Make isFinished field name nicer to read. commit bba97ce1487b0c9dc9091a1e966688d221998b04 Merge: 903c3bb 6c12b46 Author: Bill Napier Date: Thu May 14 11:32:47 2009 -0700 am 6c12b46: Fix race-condition in waiting for activity to finish code. Merge commit '6c12b4686763e2a255066e1d5ad63db799e0da2a' * commit '6c12b4686763e2a255066e1d5ad63db799e0da2a': Fix race-condition in waiting for activity to finish code. commit 53cff00f2371863a6387b73bd038c63d16d6dc02 Author: Bill Napier Date: Thu May 14 11:30:57 2009 -0700 Make isFinished field name nicer to read. commit 6c12b4686763e2a255066e1d5ad63db799e0da2a Author: Bill Napier Date: Thu May 14 11:07:39 2009 -0700 Fix race-condition in waiting for activity to finish code. findbugs fixit. commit 903c3bbedacba9b29fbf8c67a8733d3226a4daa4 Merge: dad5422 a7d9560 Author: Bill Napier Date: Thu May 14 09:40:02 2009 -0700 am a7d9560: Fix test case to actually obey the passed in maximum start t Merge commit 'a7d956051a1cd802bef342c8deb86479108e1cee' * commit 'a7d956051a1cd802bef342c8deb86479108e1cee': Fix test case to actually obey the passed in maximum start time. commit a7d956051a1cd802bef342c8deb86479108e1cee Author: Bill Napier Date: Thu May 14 09:31:29 2009 -0700 Fix test case to actually obey the passed in maximum start time. findbugs fixit commit dad5422ec772758ccfd4fd67a794979e8ed6fffb Merge: 5df7e29 09777a9 Author: Android (Google) Code Review Date: Wed May 13 12:50:04 2009 -0700 Merge change 1374 * changes: content provider entities commit 5df7e296ca812767b6747f766ffea12dd808c6b3 Merge: 5747d6a ca047b5 Author: Phil Dubach Date: Tue May 12 19:03:34 2009 -0700 am ca047b5: am 1263200: AI 148774: CTS Fix problem with VM tests when CT Merge commit 'ca047b58476da4b508c016fa537c4ed9b7c364e4' * commit 'ca047b58476da4b508c016fa537c4ed9b7c364e4': AI 148774: CTS Fix problem with VM tests when CTS_PATH is not absolute commit 5747d6ab72367813cd85ae9de89538fc02474ec7 Merge: 534acb1 b99c55b Author: Dianne Hackborn Date: Tue May 12 19:03:33 2009 -0700 am b99c55b: Remove tests for now hidden install API. Merge commit 'b99c55b1a4098b369496068399f5f9eb7664f8e1' * commit 'b99c55b1a4098b369496068399f5f9eb7664f8e1': Remove tests for now hidden install API. commit ca047b58476da4b508c016fa537c4ed9b7c364e4 Merge: b99c55b 1263200 Author: Phil Dubach Date: Tue May 12 18:49:29 2009 -0700 am 1263200: AI 148774: CTS Fix problem with VM tests when CTS_PATH is no Merge commit '1263200b247f112602a9a85001a7c15c41060790' into donut * commit '1263200b247f112602a9a85001a7c15c41060790': AI 148774: CTS Fix problem with VM tests when CTS_PATH is not absolute commit 1263200b247f112602a9a85001a7c15c41060790 Author: Phil Dubach Date: Tue May 12 17:06:59 2009 -0700 AI 148774: CTS Fix problem with VM tests when CTS_PATH is not absolute If the repository path given to CTS (constructed from the path to the host_config.xml and the configured directories in that file) contains relative parts (. or ..), then the class loader for the host side tests used for the VM tests fails to load the jar. This was exposed by CL148645, which added a '..' to the path by default. Fix the problem by canonicalizing the JAR path before constructing the class loader. BUG=1847426 Automated import of CL 148774 commit b99c55b1a4098b369496068399f5f9eb7664f8e1 Author: Dianne Hackborn Date: Mon May 11 18:57:19 2009 -0700 Remove tests for now hidden install API. commit 534acb146d4452ff516b21642a993c0e0f2be2cb Merge: 304ba21 9c8b7eb Author: Phil Dubach Date: Tue May 12 11:47:52 2009 -0700 am 9c8b7eb: am 1c57118: AI 148741: CTS Add XML schema to describe format Merge commit '9c8b7ebce1208a6b5b788199b8d5cab7f78221d9' * commit '9c8b7ebce1208a6b5b788199b8d5cab7f78221d9': AI 148741: CTS Add XML schema to describe format of test results commit 9c8b7ebce1208a6b5b788199b8d5cab7f78221d9 Merge: d1eb2aa 1c57118 Author: Phil Dubach Date: Tue May 12 11:43:59 2009 -0700 am 1c57118: AI 148741: CTS Add XML schema to describe format of test res Merge commit '1c571181107ef6ab1d073e0259a0dfa73327cf69' into donut * commit '1c571181107ef6ab1d073e0259a0dfa73327cf69': AI 148741: CTS Add XML schema to describe format of test results commit 1c571181107ef6ab1d073e0259a0dfa73327cf69 Author: Phil Dubach Date: Tue May 12 11:41:38 2009 -0700 AI 148741: CTS Add XML schema to describe format of test results This is currently informational only. The XML result file does not link to the schema yet. Automated import of CL 148741 commit 304ba212ead0f1447723a0660a06575a2d42c07c Merge: 58d2a7c d1eb2aa Author: Phil Dubach Date: Mon May 11 13:42:08 2009 -0700 am d1eb2aa: am 707e13f: AI 148689: CTS Exclude flaky test from android.g Merge commit 'd1eb2aa98eaff379148174aa060e5c2e56fc320e' * commit 'd1eb2aa98eaff379148174aa060e5c2e56fc320e': AI 148689: CTS Exclude flaky test from android.graphics.cts commit 58d2a7cdca5f3d99cd067af96ff03b04a82c53a8 Merge: 37f0ee2 59a7a12 Author: Phil Dubach Date: Mon May 11 13:42:07 2009 -0700 am 59a7a12: am debd3ce: AI 148687: CTS: Update CTS result transformation Merge commit '59a7a12b5a00f401001563ece4d000b0cace208b' * commit '59a7a12b5a00f401001563ece4d000b0cace208b': AI 148687: CTS: Update CTS result transformation commit d1eb2aa98eaff379148174aa060e5c2e56fc320e Merge: 59a7a12 707e13f Author: Phil Dubach Date: Mon May 11 13:36:26 2009 -0700 am 707e13f: AI 148689: CTS Exclude flaky test from android.graphics.cts Merge commit '707e13f29c58725e8cd8b2feae36c989bf78dabb' into donut * commit '707e13f29c58725e8cd8b2feae36c989bf78dabb': AI 148689: CTS Exclude flaky test from android.graphics.cts commit 59a7a12b5a00f401001563ece4d000b0cace208b Merge: e7e4c43 debd3ce Author: Phil Dubach Date: Mon May 11 13:36:25 2009 -0700 am debd3ce: AI 148687: CTS: Update CTS result transformation Merge commit 'debd3ce7a51a51bafa414bca3dd63f98fb9d978c' into donut * commit 'debd3ce7a51a51bafa414bca3dd63f98fb9d978c': AI 148687: CTS: Update CTS result transformation commit 707e13f29c58725e8cd8b2feae36c989bf78dabb Author: Phil Dubach Date: Mon May 11 13:30:54 2009 -0700 AI 148689: CTS Exclude flaky test from android.graphics.cts Automated import of CL 148689 commit debd3ce7a51a51bafa414bca3dd63f98fb9d978c Author: Phil Dubach Date: Mon May 11 13:28:23 2009 -0700 AI 148687: CTS: Update CTS result transformation Added the hostname and test timeout to the resulting html. Fixed the CTS version output to display the version of CTS instead of the test result version. Added new fields to the device info section to more clearly identify the device and build. Automated import of CL 148687 commit 09777a96623bbebff6b21bc78678763a1f723ecb Author: Fred Quintana Date: Thu May 7 17:24:29 2009 -0700 content provider entities commit 37f0ee283f65a3792e5b1284097f807c31cb7465 Merge: ecf5931 e7e4c43 Author: Phil Dubach Date: Fri May 8 22:49:13 2009 -0700 am e7e4c43: am 38bd8b9: AI 148645: CTS: Change startcts script to use ad Merge commit 'e7e4c43540eabc2608796e3aeb071aef5c306cb4' * commit 'e7e4c43540eabc2608796e3aeb071aef5c306cb4': AI 148645: CTS: Change startcts script to use adb and ddmlib from the SDK commit ecf59310f275e22b6639a792609ccb3e6c67b8a0 Merge: ec915b5 77e7797 Author: Phil Dubach Date: Fri May 8 22:49:12 2009 -0700 am 77e7797: am 63d0c74: AI 148635: CTS: Disable batch mode due to stabil Merge commit '77e779758eafc241927bc318d90567bec151c264' * commit '77e779758eafc241927bc318d90567bec151c264': AI 148635: CTS: Disable batch mode due to stability problems commit ec915b51b523272b8184dfc83fdbb4f6efac9773 Merge: b834c98 eafc7ec Author: Phil Dubach Date: Fri May 8 22:49:12 2009 -0700 am eafc7ec: am ad690bb: AI 148634: CTS: Exclude AlarmManager test broken Merge commit 'eafc7eca2c1d96734fafb9e02fc46390916ff3ae' * commit 'eafc7eca2c1d96734fafb9e02fc46390916ff3ae': AI 148634: CTS: Exclude AlarmManager test broken by CL148448 commit e7e4c43540eabc2608796e3aeb071aef5c306cb4 Merge: 77e7797 38bd8b9 Author: Phil Dubach Date: Fri May 8 18:05:30 2009 -0700 am 38bd8b9: AI 148645: CTS: Change startcts script to use adb and ddmlib Merge commit '38bd8b98c1da238685b79a789812f0c4d1e18edf' into donut * commit '38bd8b98c1da238685b79a789812f0c4d1e18edf': AI 148645: CTS: Change startcts script to use adb and ddmlib from the SDK commit 38bd8b98c1da238685b79a789812f0c4d1e18edf Author: Phil Dubach Date: Fri May 8 18:02:28 2009 -0700 AI 148645: CTS: Change startcts script to use adb and ddmlib from the SDK Prior to this change, a fully built android source tree was required to run CTS. Now we use an SDK 1.5 installation instead. This change also separates the 'startcts' script from the 'cts' script. The latter is used for running CTS from a full source tree and contains undesired magic that tries to find adb and ddmlib in common places. BUG=1838912,1839041 Automated import of CL 148645 commit 77e779758eafc241927bc318d90567bec151c264 Merge: eafc7ec 63d0c74 Author: Phil Dubach Date: Fri May 8 16:25:01 2009 -0700 am 63d0c74: AI 148635: CTS: Disable batch mode due to stability problems Merge commit '63d0c74d7c1a23389b3303b3504db3da6c212eac' into donut * commit '63d0c74d7c1a23389b3303b3504db3da6c212eac': AI 148635: CTS: Disable batch mode due to stability problems commit 63d0c74d7c1a23389b3303b3504db3da6c212eac Author: Phil Dubach Date: Fri May 8 16:21:58 2009 -0700 AI 148635: CTS: Disable batch mode due to stability problems Batch mode can be enabled manually by changing the host_config.xml file in the CTS repository. Automated import of CL 148635 commit eafc7eca2c1d96734fafb9e02fc46390916ff3ae Merge: c682991 ad690bb Author: Phil Dubach Date: Fri May 8 16:21:03 2009 -0700 am ad690bb: AI 148634: CTS: Exclude AlarmManager test broken by CL148448 Merge commit 'ad690bb85a62d0ceccfa2001563704c70d20617f' into donut * commit 'ad690bb85a62d0ceccfa2001563704c70d20617f': AI 148634: CTS: Exclude AlarmManager test broken by CL148448 commit ad690bb85a62d0ceccfa2001563704c70d20617f Author: Phil Dubach Date: Fri May 8 16:20:14 2009 -0700 AI 148634: CTS: Exclude AlarmManager test broken by CL148448 CL148448 changed the time zone for the test process to GMT. This broke a test which makes the (reasonable) assumption that the test application should have the same default timezone as any service it starts. Automated import of CL 148634 commit b834c980c3ddba57388cf391e7aaa1be28415cb5 Merge: ab1599e c682991 Author: Phil Dubach Date: Fri May 8 00:56:58 2009 -0700 am c682991: am 698c04c: AI 148525: CTS: Rerun currently running test whe Merge commit 'c68299129dbdbbb992df14c31d97aafb50e08a7d' * commit 'c68299129dbdbbb992df14c31d97aafb50e08a7d': AI 148525: CTS: Rerun currently running test when batch mode terminates abruptly commit c68299129dbdbbb992df14c31d97aafb50e08a7d Merge: 5f4aabc 698c04c Author: Phil Dubach Date: Fri May 8 00:51:39 2009 -0700 am 698c04c: AI 148525: CTS: Rerun currently running test when batch mode Merge commit '698c04cca376dc073be4ba7ee752b24bb6966c47' into donut * commit '698c04cca376dc073be4ba7ee752b24bb6966c47': AI 148525: CTS: Rerun currently running test when batch mode terminates abruptly commit 698c04cca376dc073be4ba7ee752b24bb6966c47 Author: Phil Dubach Date: Fri May 8 00:48:19 2009 -0700 AI 148525: CTS: Rerun currently running test when batch mode terminates abruptly BUG=1839491 Automated import of CL 148525 commit ab1599e067af80314ad5dc37291ef9b03ad73062 Merge: d6cadd3 5f4aabc Author: Phil Dubach Date: Thu May 7 10:37:59 2009 -0700 am 5f4aabc: am 5671dd6: AI 148455: CTS: Change tests in Android plan to Merge commit '5f4aabc61a6d967ebe3ae6b71abfdf3f4cc59cc9' * commit '5f4aabc61a6d967ebe3ae6b71abfdf3f4cc59cc9': AI 148455: CTS: Change tests in Android plan to use new InstrumentationCtsTestRunner commit 5f4aabc61a6d967ebe3ae6b71abfdf3f4cc59cc9 Merge: d43fd34 5671dd6 Author: Phil Dubach Date: Thu May 7 10:34:59 2009 -0700 am 5671dd6: AI 148455: CTS: Change tests in Android plan to use new Inst Merge commit '5671dd66999a0b43ca078458e3db59b3263d4fa1' into donut * commit '5671dd66999a0b43ca078458e3db59b3263d4fa1': AI 148455: CTS: Change tests in Android plan to use new InstrumentationCtsTestRunner commit 5671dd66999a0b43ca078458e3db59b3263d4fa1 Author: Phil Dubach Date: Thu May 7 10:34:41 2009 -0700 AI 148455: CTS: Change tests in Android plan to use new InstrumentationCtsTestRunner BUG=1537738 Automated import of CL 148455 commit d6cadd3bd76ce783315dd2b4be79dc9fc37d38ff Merge: 89ec949 d43fd34 Author: Jorg Pleumann Date: Thu May 7 09:33:37 2009 -0700 am d43fd34: am 43ad2f6: AI 148448: A tiny, tiny fix for the new CTS test Merge commit 'd43fd34c857030ee7d20730601b7a6b705aa10ba' * commit 'd43fd34c857030ee7d20730601b7a6b705aa10ba': AI 148448: A tiny, tiny fix for the new CTS test runner commit d43fd34c857030ee7d20730601b7a6b705aa10ba Merge: dc52411 43ad2f6 Author: Jorg Pleumann Date: Thu May 7 09:29:39 2009 -0700 am 43ad2f6: AI 148448: A tiny, tiny fix for the new CTS test runner Merge commit '43ad2f6fa7e931296e787926f948070044fd54a0' into donut * commit '43ad2f6fa7e931296e787926f948070044fd54a0': AI 148448: A tiny, tiny fix for the new CTS test runner commit 43ad2f6fa7e931296e787926f948070044fd54a0 Author: Jorg Pleumann Date: Thu May 7 09:27:16 2009 -0700 AI 148448: A tiny, tiny fix for the new CTS test runner that ensures all tests see GMT as the default timezone. This fixes six tests in Sql and one in the Text module. BUG=1285921 Automated import of CL 148448 commit 89ec949552214014a8866c269a27b3d9ef17b48c Merge: 79f0955 dc52411 Author: Jorg Pleumann Date: Thu May 7 01:41:20 2009 -0700 am dc52411: am 8a6c9f9: AI 148430: Adding a new CTS test runner that is Merge commit 'dc52411b16a69583d222f05d2cf5adb8a1f34c14' * commit 'dc52411b16a69583d222f05d2cf5adb8a1f34c14': AI 148430: Adding a new CTS test runner that is basically commit dc52411b16a69583d222f05d2cf5adb8a1f34c14 Merge: 4f4547c 8a6c9f9 Author: Jorg Pleumann Date: Thu May 7 01:36:25 2009 -0700 am 8a6c9f9: AI 148430: Adding a new CTS test runner that is basically Merge commit '8a6c9f9562a83dff4dd8ee71b5c20f714f9fcfe6' into donut * commit '8a6c9f9562a83dff4dd8ee71b5c20f714f9fcfe6': AI 148430: Adding a new CTS test runner that is basically commit 8a6c9f9562a83dff4dd8ee71b5c20f714f9fcfe6 Author: Jorg Pleumann Date: Thu May 7 01:33:15 2009 -0700 AI 148430: Adding a new CTS test runner that is basically a copy of the old one, but resides in android/cts and is built and installed as part of the CTS. This makes sure we always have the correct test runner on a device, so we should see the various improvements also on off-the-shelf Cupcake phones. BUG=1537738 Automated import of CL 148430 commit 79f09551dc43feb2a738c2c0e36bcd1b43f701c6 Merge: 9ab7146 4f4547c Author: Phil Dubach Date: Wed May 6 14:29:35 2009 -0700 am 4f4547c: am 14cb792: AI 148392: CTS: Include host configuration value Merge commit '4f4547cdcc6eaa848d86f077ccc1b43ee947a26f' * commit '4f4547cdcc6eaa848d86f077ccc1b43ee947a26f': AI 148392: CTS: Include host configuration values in result file commit 4f4547cdcc6eaa848d86f077ccc1b43ee947a26f Merge: 25d76a5 14cb792 Author: Phil Dubach Date: Wed May 6 14:27:13 2009 -0700 am 14cb792: AI 148392: CTS: Include host configuration values in result Merge commit '14cb792d7cedbb29b648cc05e8369c816627a369' into donut * commit '14cb792d7cedbb29b648cc05e8369c816627a369': AI 148392: CTS: Include host configuration values in result file commit 14cb792d7cedbb29b648cc05e8369c816627a369 Author: Phil Dubach Date: Wed May 6 14:24:09 2009 -0700 AI 148392: CTS: Include host configuration values in result file Automated import of CL 148392 commit 9ab714693697da132825fddffb613c73fe4e1bb7 Merge: 8e1e9c6 25d76a5 Author: Phil Dubach Date: Wed May 6 11:28:01 2009 -0700 am 25d76a5: am d2b5fd8: AI 148374: CTS: Do not ask whether to resume a s Merge commit '25d76a5edbfbeb07e66bfb09f39039a0e7718100' * commit '25d76a5edbfbeb07e66bfb09f39039a0e7718100': AI 148374: CTS: Do not ask whether to resume a session when started from command line commit 25d76a5edbfbeb07e66bfb09f39039a0e7718100 Merge: 4b08ffd d2b5fd8 Author: Phil Dubach Date: Wed May 6 11:22:36 2009 -0700 am d2b5fd8: AI 148374: CTS: Do not ask whether to resume a session when Merge commit 'd2b5fd8abb19aa1a3aa1390a07d443fad25b2244' into donut * commit 'd2b5fd8abb19aa1a3aa1390a07d443fad25b2244': AI 148374: CTS: Do not ask whether to resume a session when started from command line commit d2b5fd8abb19aa1a3aa1390a07d443fad25b2244 Author: Phil Dubach Date: Wed May 6 11:21:36 2009 -0700 AI 148374: CTS: Do not ask whether to resume a session when started from command line BUG=1835344 Automated import of CL 148374 commit 8e1e9c619722f3d05458ee5e35c4198dbc7a8e07 Merge: 1c9a071 4b08ffd Author: Phil Dubach Date: Tue May 5 19:52:42 2009 -0700 am 4b08ffd: am fa5ce86: AI 148357: CTS: Read sesion start and end times Merge commit '4b08ffdb11a0dbfb0a6c338fcdd34d5d2d7a3ed3' * commit '4b08ffdb11a0dbfb0a6c338fcdd34d5d2d7a3ed3': AI 148357: CTS: Read sesion start and end times when loading existing results commit 4b08ffdb11a0dbfb0a6c338fcdd34d5d2d7a3ed3 Merge: 0ccd964 fa5ce86 Author: Phil Dubach Date: Tue May 5 19:48:42 2009 -0700 am fa5ce86: AI 148357: CTS: Read sesion start and end times when loading Merge commit 'fa5ce86bcb012cb5fa836361a43664a367cecfca' into donut * commit 'fa5ce86bcb012cb5fa836361a43664a367cecfca': AI 148357: CTS: Read sesion start and end times when loading existing results commit fa5ce86bcb012cb5fa836361a43664a367cecfca Author: Phil Dubach Date: Tue May 5 19:45:27 2009 -0700 AI 148357: CTS: Read sesion start and end times when loading existing results This fixes the problem where 'ls -r' would not show the correct start and end times for sessions that were loaded from existing results. The start and end times displayed were both set to the time when the result was loaded, which made it impossible to choose the right session among a number of runs with the same plan. Automated import of CL 148357 commit 1c9a07108fa1e437b31e61834c6de617efd8aebd Merge: 34d62eb 0ccd964 Author: Phil Dubach Date: Tue May 5 17:47:45 2009 -0700 am 0ccd964: am 7c19589: AI 148329: CTS: Exclude performance tests from t Merge commit '0ccd9649f09a53e6dd086c5a7b86c04c98a97ded' * commit '0ccd9649f09a53e6dd086c5a7b86c04c98a97ded': AI 148329: CTS: Exclude performance tests from the CTS and Android test plans commit 34d62eb1db8dd9a7a773674962c65e866826cd31 Merge: 07a14f2 07c442b Author: Phil Dubach Date: Tue May 5 17:47:44 2009 -0700 am 07c442b: am 57fd770: AI 148328: CTS: Fix premature end of session whe Merge commit '07c442b4c3c001c1c159ffbb41ab3e32e5816f75' * commit '07c442b4c3c001c1c159ffbb41ab3e32e5816f75': AI 148328: CTS: Fix premature end of session when disabling device restarts commit 07a14f29649826e86e50a498f48bb2d5a4dfb9e5 Merge: ccbdd88 11aa01d Author: Phil Dubach Date: Tue May 5 17:47:44 2009 -0700 am 11aa01d: am f5668c7: AI 148327: CTS: Mark flaky test MediaControllerT Merge commit '11aa01deaa0f16d3814707e7bfa2a26e43265f34' * commit '11aa01deaa0f16d3814707e7bfa2a26e43265f34': AI 148327: CTS: Mark flaky test MediaControllerTest.testDispatchKeyEvent as broken commit ccbdd88486e2319de8b21c4a5aae37d1d9e6852c Merge: fd08d89 91648cf Author: Phil Dubach Date: Tue May 5 17:47:44 2009 -0700 am 91648cf: am dc4e179: AI 148315: CTS: Import existing sessions from re Merge commit '91648cf8d7a0f1f3dbb5b74658bd9faffb7c426a' * commit '91648cf8d7a0f1f3dbb5b74658bd9faffb7c426a': AI 148315: CTS: Import existing sessions from result directory when restarting console commit 0ccd9649f09a53e6dd086c5a7b86c04c98a97ded Merge: 07c442b 7c19589 Author: Phil Dubach Date: Tue May 5 17:42:46 2009 -0700 am 7c19589: AI 148329: CTS: Exclude performance tests from the CTS and A Merge commit '7c19589fd91f1027c09171b32f180c3d32473192' into donut * commit '7c19589fd91f1027c09171b32f180c3d32473192': AI 148329: CTS: Exclude performance tests from the CTS and Android test plans commit 07c442b4c3c001c1c159ffbb41ab3e32e5816f75 Merge: 11aa01d 57fd770 Author: Phil Dubach Date: Tue May 5 17:42:45 2009 -0700 am 57fd770: AI 148328: CTS: Fix premature end of session when disabling Merge commit '57fd7702a412ad10fbae061368c4cc3ea9e72f2a' into donut * commit '57fd7702a412ad10fbae061368c4cc3ea9e72f2a': AI 148328: CTS: Fix premature end of session when disabling device restarts commit 11aa01deaa0f16d3814707e7bfa2a26e43265f34 Merge: 91648cf f5668c7 Author: Phil Dubach Date: Tue May 5 17:42:45 2009 -0700 am f5668c7: AI 148327: CTS: Mark flaky test MediaControllerTest.testDisp Merge commit 'f5668c7bee6a3c68ffdcc51bbc9313af547ab770' into donut * commit 'f5668c7bee6a3c68ffdcc51bbc9313af547ab770': AI 148327: CTS: Mark flaky test MediaControllerTest.testDispatchKeyEvent as broken commit 91648cf8d7a0f1f3dbb5b74658bd9faffb7c426a Merge: 045f13b dc4e179 Author: Phil Dubach Date: Tue May 5 17:42:44 2009 -0700 am dc4e179: AI 148315: CTS: Import existing sessions from result directo Merge commit 'dc4e179f1821bbeac2e66a383beb51c2edbb7d55' into donut * commit 'dc4e179f1821bbeac2e66a383beb51c2edbb7d55': AI 148315: CTS: Import existing sessions from result directory when restarting console commit 7c19589fd91f1027c09171b32f180c3d32473192 Author: Phil Dubach Date: Tue May 5 16:21:58 2009 -0700 AI 148329: CTS: Exclude performance tests from the CTS and Android test plans Automated import of CL 148329 commit 57fd7702a412ad10fbae061368c4cc3ea9e72f2a Author: Phil Dubach Date: Tue May 5 16:19:37 2009 -0700 AI 148328: CTS: Fix premature end of session when disabling device restarts CTS can be run without restarting the device by setting the maxTestCount configuration option to 0. This did not work as expected, since the session was aborted after the first package completed. Automated import of CL 148328 commit f5668c7bee6a3c68ffdcc51bbc9313af547ab770 Author: Phil Dubach Date: Tue May 5 16:17:13 2009 -0700 AI 148327: CTS: Mark flaky test MediaControllerTest.testDispatchKeyEvent as broken Automated import of CL 148327 commit dc4e179f1821bbeac2e66a383beb51c2edbb7d55 Author: Phil Dubach Date: Tue May 5 14:01:34 2009 -0700 AI 148315: CTS: Import existing sessions from result directory when restarting console BUG=1812493 Automated import of CL 148315 commit fd08d898fa926b21169480b8ac5bb1e59ba1691b Merge: 4349c85 045f13b Author: Phil Dubach Date: Tue May 5 10:37:49 2009 -0700 am 045f13b: am 5b58efe: AI 148303: CTS host: Add host machine informatio Merge commit '045f13b8a0905acb8fa03523991400c3f75bd526' * commit '045f13b8a0905acb8fa03523991400c3f75bd526': AI 148303: CTS host: Add host machine information to the CTS result commit 045f13b8a0905acb8fa03523991400c3f75bd526 Merge: d24e4c7 5b58efe Author: Phil Dubach Date: Tue May 5 10:32:54 2009 -0700 am 5b58efe: AI 148303: CTS host: Add host machine information to the CTS Merge commit '5b58efe5a7b53a57dc217cdbc6c95185400dea2f' into donut * commit '5b58efe5a7b53a57dc217cdbc6c95185400dea2f': AI 148303: CTS host: Add host machine information to the CTS result commit 5b58efe5a7b53a57dc217cdbc6c95185400dea2f Author: Phil Dubach Date: Tue May 5 10:31:01 2009 -0700 AI 148303: CTS host: Add host machine information to the CTS result Add hostname, OS and Java information and a CTS version string to the result XML. BUG=1819121 Automated import of CL 148303 commit 4349c85263e1e6a17744f5425e86534ff08884fb Merge: 99aee25 d24e4c7 Author: Phil Dubach Date: Mon May 4 17:02:41 2009 -0700 am d24e4c7: am f9fb333: AI 148276: CTS: Remove internal API dependency f Merge commit 'd24e4c7a1321f578f5ded7eed438189b75b88a88' * commit 'd24e4c7a1321f578f5ded7eed438189b75b88a88': AI 148276: CTS: Remove internal API dependency from MediaStore tests commit d24e4c7a1321f578f5ded7eed438189b75b88a88 Merge: 8bef4f3 f9fb333 Author: Phil Dubach Date: Mon May 4 16:57:17 2009 -0700 am f9fb333: AI 148276: CTS: Remove internal API dependency from MediaSto Merge commit 'f9fb33343ea97aaa019443f2f8eb2d7c5da10e10' into donut * commit 'f9fb33343ea97aaa019443f2f8eb2d7c5da10e10': AI 148276: CTS: Remove internal API dependency from MediaStore tests commit f9fb33343ea97aaa019443f2f8eb2d7c5da10e10 Author: Phil Dubach Date: Mon May 4 16:56:50 2009 -0700 AI 148276: CTS: Remove internal API dependency from MediaStore tests MediaStore tests were using the internal API FileUtils.getFatVolumeId() to determine whether an SD card is mounted. For some reason, this does not work after formatting the card from the device. This change removes references to the hidden API. Automated import of CL 148276 commit 99aee25b9a5d1818d9560374ae08535ba7a0319e Merge: aa4e8dc 8bef4f3 Author: Phil Dubach Date: Mon May 4 12:05:44 2009 -0700 am 8bef4f3: am 780f705: AI 148267: CTS: Mark remaining failures in Andro Merge commit '8bef4f38aaf9a8688d10920ae09f14a70759eaa4' * commit '8bef4f38aaf9a8688d10920ae09f14a70759eaa4': AI 148267: CTS: Mark remaining failures in Android test plan as broken. commit 8bef4f38aaf9a8688d10920ae09f14a70759eaa4 Merge: 15c7d6b 780f705 Author: Phil Dubach Date: Mon May 4 12:02:18 2009 -0700 am 780f705: AI 148267: CTS: Mark remaining failures in Android test plan Merge commit '780f7056d1ad2ddba0744c68fad382a74e7d15db' into donut * commit '780f7056d1ad2ddba0744c68fad382a74e7d15db': AI 148267: CTS: Mark remaining failures in Android test plan as broken. commit 780f7056d1ad2ddba0744c68fad382a74e7d15db Author: Phil Dubach Date: Mon May 4 12:01:07 2009 -0700 AI 148267: CTS: Mark remaining failures in Android test plan as broken. Automated import of CL 148267 commit aa4e8dc42c71a31ed4619b277ff6f4d467e0a5ac Merge: b409589 15c7d6b Author: Phil Dubach Date: Sun May 3 17:03:29 2009 -0700 am 15c7d6b: am 1dcf27c: AI 148239: CTS: Fix failing test cases in androi Merge commit '15c7d6b59c1534bbd6b6f0197f507c86ee188056' * commit '15c7d6b59c1534bbd6b6f0197f507c86ee188056': AI 148239: CTS: Fix failing test cases in android.widget commit b409589c4e8377b6638e40e2cbb3160149ad9f06 Merge: 3c71f0e 84aee85 Author: Phil Dubach Date: Sun May 3 17:03:28 2009 -0700 am 84aee85: am 44e9f24: AI 148227: CTS: Add configurable delay after ins Merge commit '84aee852d8c739ee624a1a7df43d3a8e03cd7ca3' * commit '84aee852d8c739ee624a1a7df43d3a8e03cd7ca3': AI 148227: CTS: Add configurable delay after installing or removing an APK commit 3c71f0e6a00996f821b15b3fdc573c1d22684971 Merge: 9001265 82e8de9 Author: Phil Dubach Date: Sun May 3 17:03:27 2009 -0700 am 82e8de9: am 617f18e: AI 148198: CTS: Fix or exclude failing tests in Merge commit '82e8de934b1f1bb6e28d89e12753a7ec58d87f0e' * commit '82e8de934b1f1bb6e28d89e12753a7ec58d87f0e': AI 148198: CTS: Fix or exclude failing tests in Android test plan commit 9001265d46a27bb7d3c1be6bd48b7a3711cc5184 Author: Phil Dubach Date: Sat May 2 23:30:28 2009 -0700 merged 617f18e with conflicts to master commit 15c7d6b59c1534bbd6b6f0197f507c86ee188056 Merge: 84aee85 1dcf27c Author: Phil Dubach Date: Fri May 1 23:27:57 2009 -0700 am 1dcf27c: AI 148239: CTS: Fix failing test cases in android.widget Merge commit '1dcf27c9855683dd76d3e3d9c48003f628caed9b' into donut * commit '1dcf27c9855683dd76d3e3d9c48003f628caed9b': AI 148239: CTS: Fix failing test cases in android.widget commit 84aee852d8c739ee624a1a7df43d3a8e03cd7ca3 Merge: 82e8de9 44e9f24 Author: Phil Dubach Date: Fri May 1 23:27:57 2009 -0700 am 44e9f24: AI 148227: CTS: Add configurable delay after installing or r Merge commit '44e9f24a4ef3741c0a78dc092ecb69e7453e05d1' into donut * commit '44e9f24a4ef3741c0a78dc092ecb69e7453e05d1': AI 148227: CTS: Add configurable delay after installing or removing an APK commit 1dcf27c9855683dd76d3e3d9c48003f628caed9b Author: Phil Dubach Date: Fri May 1 18:41:01 2009 -0700 AI 148239: CTS: Fix failing test cases in android.widget Automated import of CL 148239 commit 44e9f24a4ef3741c0a78dc092ecb69e7453e05d1 Author: Phil Dubach Date: Fri May 1 16:26:09 2009 -0700 AI 148227: CTS: Add configurable delay after installing or removing an APK This is an attempt to avoid getting ANRs in android.process.acore. Those ANRs typically happen shortly after installing a new test APK. BUG=1827098 Automated import of CL 148227 commit 82e8de934b1f1bb6e28d89e12753a7ec58d87f0e Merge: bd28efa 617f18e Author: Phil Dubach Date: Fri May 1 13:46:20 2009 -0700 am 617f18e: AI 148198: CTS: Fix or exclude failing tests in Android test Merge commit '617f18ef6aeb9fc3e520019a85c0748917d2bd0f' into donut * commit '617f18ef6aeb9fc3e520019a85c0748917d2bd0f': AI 148198: CTS: Fix or exclude failing tests in Android test plan commit 617f18ef6aeb9fc3e520019a85c0748917d2bd0f Author: Phil Dubach Date: Fri May 1 13:42:48 2009 -0700 AI 148198: CTS: Fix or exclude failing tests in Android test plan Automated import of CL 148198 commit 85e6b2b3fb15477e9af645fd381c44713c7501a7 Merge: 5759b19 bd28efa Author: Phil Dubach Date: Thu Apr 30 23:53:40 2009 -0700 am bd28efa: am 7a06798: AI 148171: CTS: Fix failing test cases in Androi Merge commit 'bd28efaa077826bc7346f7be028a8b5c851c5a08' * commit 'bd28efaa077826bc7346f7be028a8b5c851c5a08': AI 148171: CTS: Fix failing test cases in Android test plan commit 5759b19f0e15fd8749145a54602bb30fa36aa1c8 Merge: 043c0fb 57c5fa1 Author: Scott Su Date: Thu Apr 30 23:53:40 2009 -0700 am 57c5fa1: am f005cd6: AI 148161: CTS: Support from creating derived pl Merge commit '57c5fa15345fe987c30dae55407b2677f22ec43d' * commit '57c5fa15345fe987c30dae55407b2677f22ec43d': AI 148161: CTS: Support from creating derived plans from previous sessions. commit 043c0fb05043c17aea87a12327567fc1e749c59d Merge: e71e1a3 abb8334 Author: Scott Su Date: Thu Apr 30 23:53:39 2009 -0700 am abb8334: am a568534: AI 148158: CTS: Fix CTS start script for OS X Ti Merge commit 'abb8334f9c0d8a774068a6ff0c610433ffbcc8eb' * commit 'abb8334f9c0d8a774068a6ff0c610433ffbcc8eb': AI 148158: CTS: Fix CTS start script for OS X Tiger commit bd28efaa077826bc7346f7be028a8b5c851c5a08 Merge: 57c5fa1 7a06798 Author: Phil Dubach Date: Thu Apr 30 23:48:26 2009 -0700 am 7a06798: AI 148171: CTS: Fix failing test cases in Android test plan Merge commit '7a06798806a656c5fbffd496a3606ecb1658b86f' into donut * commit '7a06798806a656c5fbffd496a3606ecb1658b86f': AI 148171: CTS: Fix failing test cases in Android test plan commit 57c5fa15345fe987c30dae55407b2677f22ec43d Merge: abb8334 f005cd6 Author: Scott Su Date: Thu Apr 30 23:48:26 2009 -0700 am f005cd6: AI 148161: CTS: Support from creating derived plans from pre Merge commit 'f005cd606f3e89a455afe99e82752d33b47f20ca' into donut * commit 'f005cd606f3e89a455afe99e82752d33b47f20ca': AI 148161: CTS: Support from creating derived plans from previous sessions. commit abb8334f9c0d8a774068a6ff0c610433ffbcc8eb Merge: 8e208f9 a568534 Author: Scott Su Date: Thu Apr 30 23:48:25 2009 -0700 am a568534: AI 148158: CTS: Fix CTS start script for OS X Tiger Merge commit 'a568534648d985c12b35d0a403223becac48ec7c' into donut * commit 'a568534648d985c12b35d0a403223becac48ec7c': AI 148158: CTS: Fix CTS start script for OS X Tiger commit 7a06798806a656c5fbffd496a3606ecb1658b86f Author: Phil Dubach Date: Thu Apr 30 23:07:46 2009 -0700 AI 148171: CTS: Fix failing test cases in Android test plan Automated import of CL 148171 commit f005cd606f3e89a455afe99e82752d33b47f20ca Author: Scott Su Date: Thu Apr 30 18:55:54 2009 -0700 AI 148161: CTS: Support from creating derived plans from previous sessions. BUG=1812493 Automated import of CL 148161 commit a568534648d985c12b35d0a403223becac48ec7c Author: Scott Su Date: Thu Apr 30 18:36:23 2009 -0700 AI 148158: CTS: Fix CTS start script for OS X Tiger The bash on OS X Tiger does not understand extended tests. Use grep for argument pattern matching instead. BUG=1760122 Automated import of CL 148158 commit e71e1a33d9a71bd3af685ff910de6d0782ec3be4 Merge: 77cf55c 8e208f9 Author: Phil Dubach Date: Thu Apr 30 18:11:13 2009 -0700 am 8e208f9: am e0e5790: AI 148153: CTS: Strip control characters from fa Merge commit '8e208f98b4604d0131e03084a3170865ffe526e1' * commit '8e208f98b4604d0131e03084a3170865ffe526e1': AI 148153: CTS: Strip control characters from failure strings before converting to XML commit 77cf55ce8f4289fcffb37198e2c3e3d4285882ee Merge: a0157bf 8623e2d Author: Phil Dubach Date: Thu Apr 30 18:11:12 2009 -0700 am 8623e2d: am 9c8fbb1: AI 148148: CTS: Encode SHA-1 hash of test packag Merge commit '8623e2d177caa4c6e91c826b2b4155331fc33dbe' * commit '8623e2d177caa4c6e91c826b2b4155331fc33dbe': AI 148148: CTS: Encode SHA-1 hash of test packages in hex instead of Base64 commit a0157bf047590357e3fe7e1876ba3e12d211364e Merge: a97af55 f1f1998 Author: Scott Su Date: Thu Apr 30 18:11:12 2009 -0700 am f1f1998: am fa3dca7: AI 148142: CTS: added @BrokenTest tag for failed Merge commit 'f1f19985c6f037e1a9f7a964d785303b2dd07b0e' * commit 'f1f19985c6f037e1a9f7a964d785303b2dd07b0e': AI 148142: CTS: added @BrokenTest tag for failed cases in ContextWrapperTest. commit 8e208f98b4604d0131e03084a3170865ffe526e1 Merge: 8623e2d e0e5790 Author: Phil Dubach Date: Thu Apr 30 17:56:05 2009 -0700 am e0e5790: AI 148153: CTS: Strip control characters from failure string Merge commit 'e0e579051414248e1b74fbfe5029d07b7edcd456' into donut * commit 'e0e579051414248e1b74fbfe5029d07b7edcd456': AI 148153: CTS: Strip control characters from failure strings before converting to XML commit e0e579051414248e1b74fbfe5029d07b7edcd456 Author: Phil Dubach Date: Thu Apr 30 17:54:52 2009 -0700 AI 148153: CTS: Strip control characters from failure strings before converting to XML BUG=1815048 Automated import of CL 148153 commit 8623e2d177caa4c6e91c826b2b4155331fc33dbe Merge: f1f1998 9c8fbb1 Author: Phil Dubach Date: Thu Apr 30 17:36:29 2009 -0700 am 9c8fbb1: AI 148148: CTS: Encode SHA-1 hash of test packages in hex in Merge commit '9c8fbb1ce18f51c64309173610e42f7fea675853' into donut * commit '9c8fbb1ce18f51c64309173610e42f7fea675853': AI 148148: CTS: Encode SHA-1 hash of test packages in hex instead of Base64 commit f1f19985c6f037e1a9f7a964d785303b2dd07b0e Merge: a290f2d fa3dca7 Author: Scott Su Date: Thu Apr 30 17:36:29 2009 -0700 am fa3dca7: AI 148142: CTS: added @BrokenTest tag for failed cases in Co Merge commit 'fa3dca790231da46f5327aa6a07c64f9e205dccd' into donut * commit 'fa3dca790231da46f5327aa6a07c64f9e205dccd': AI 148142: CTS: added @BrokenTest tag for failed cases in ContextWrapperTest. commit 9c8fbb1ce18f51c64309173610e42f7fea675853 Author: Phil Dubach Date: Thu Apr 30 17:33:45 2009 -0700 AI 148148: CTS: Encode SHA-1 hash of test packages in hex instead of Base64 BUG=1824287 Automated import of CL 148148 commit a97af552e79f55552fa748ee1b147f515c486cfd Merge: 8943e5c a290f2d Author: Scott Su Date: Thu Apr 30 17:30:09 2009 -0700 am a290f2d: am 7592e4f: AI 148140: CTS: fixed failed cases in LocationMa Merge commit 'a290f2d5bc298b3a97f6267ea01bdb95eeb8f037' * commit 'a290f2d5bc298b3a97f6267ea01bdb95eeb8f037': AI 148140: CTS: fixed failed cases in LocationManagerTest. commit 8943e5c6782eadbe1d60cd3094a98fe892d05d41 Merge: 9b80f8b 7154a8b Author: Phil Dubach Date: Thu Apr 30 17:30:08 2009 -0700 am 7154a8b: am ae22e37: AI 148127: CTS: fix \'unable to find instrumenta Merge commit '7154a8b714ce1636940259fd2cd55d97da0e7ce7' * commit '7154a8b714ce1636940259fd2cd55d97da0e7ce7': AI 148127: CTS: fix 'unable to find instrumentation info' bug in hardware package commit 9b80f8bcc0ca06eabf214a0afbd4ddebc555fd07 Merge: 5301098 edb0054 Author: Phil Dubach Date: Thu Apr 30 17:30:08 2009 -0700 am edb0054: am 9d84774: AI 148124: CTS: Increase max Java heap for runni Merge commit 'edb00544a2a5c63d03ca0b44c3c9ede178a7f880' * commit 'edb00544a2a5c63d03ca0b44c3c9ede178a7f880': AI 148124: CTS: Increase max Java heap for running CTS to 512M commit 53010984b58f8a30ab6df5a8272b05f68e588446 Merge: a6d811e 1d58ca7 Author: Phil Dubach Date: Thu Apr 30 17:30:07 2009 -0700 am 1d58ca7: am 7eaf3cf: AI 148122: CTS: fix failed cases in AbsSeekBarTe Merge commit '1d58ca7a1aa3606a533fa9832aa1650a378ca5ef' * commit '1d58ca7a1aa3606a533fa9832aa1650a378ca5ef': AI 148122: CTS: fix failed cases in AbsSeekBarTest, GridViewTest, ListViewTest and PopupWindowTest. commit a6d811ebf1aec6e25f89f1d24b65e91a6830b700 Merge: 8ffa46b 82f6ba3 Author: Phil Dubach Date: Thu Apr 30 17:30:07 2009 -0700 am 82f6ba3: am 37b5663: AI 148102: CTS: Fix test failures in android.wid Merge commit '82f6ba348f507cce282a4451ed87b3c209a66bc9' * commit '82f6ba348f507cce282a4451ed87b3c209a66bc9': AI 148102: CTS: Fix test failures in android.widget due to missing TextViewStubActivity commit fa3dca790231da46f5327aa6a07c64f9e205dccd Author: Scott Su Date: Thu Apr 30 17:30:00 2009 -0700 AI 148142: CTS: added @BrokenTest tag for failed cases in ContextWrapperTest. Automated import of CL 148142 commit a290f2d5bc298b3a97f6267ea01bdb95eeb8f037 Merge: 7154a8b 7592e4f Author: Scott Su Date: Thu Apr 30 17:27:11 2009 -0700 am 7592e4f: AI 148140: CTS: fixed failed cases in LocationManagerTest. Merge commit '7592e4f9f8b89dfafc1f57e28fb293c52c1bccdc' into donut * commit '7592e4f9f8b89dfafc1f57e28fb293c52c1bccdc': AI 148140: CTS: fixed failed cases in LocationManagerTest. commit 7154a8b714ce1636940259fd2cd55d97da0e7ce7 Merge: edb0054 ae22e37 Author: Phil Dubach Date: Thu Apr 30 17:27:11 2009 -0700 am ae22e37: AI 148127: CTS: fix \'unable to find instrumentation info\' bu Merge commit 'ae22e3755448dcd84e4afae13ef6a1d525220946' into donut * commit 'ae22e3755448dcd84e4afae13ef6a1d525220946': AI 148127: CTS: fix 'unable to find instrumentation info' bug in hardware package commit edb00544a2a5c63d03ca0b44c3c9ede178a7f880 Merge: 1d58ca7 9d84774 Author: Phil Dubach Date: Thu Apr 30 17:27:11 2009 -0700 am 9d84774: AI 148124: CTS: Increase max Java heap for running CTS to 51 Merge commit '9d847745583b62038b36ff79d6cac28f8a46e64f' into donut * commit '9d847745583b62038b36ff79d6cac28f8a46e64f': AI 148124: CTS: Increase max Java heap for running CTS to 512M commit 1d58ca7a1aa3606a533fa9832aa1650a378ca5ef Merge: 82f6ba3 7eaf3cf Author: Phil Dubach Date: Thu Apr 30 17:27:10 2009 -0700 am 7eaf3cf: AI 148122: CTS: fix failed cases in AbsSeekBarTest, GridView Merge commit '7eaf3cffb3dd49ff19932b75e1db3dc0618c749b' into donut * commit '7eaf3cffb3dd49ff19932b75e1db3dc0618c749b': AI 148122: CTS: fix failed cases in AbsSeekBarTest, GridViewTest, ListViewTest and PopupWindowTest. commit 82f6ba348f507cce282a4451ed87b3c209a66bc9 Merge: d841620 37b5663 Author: Phil Dubach Date: Thu Apr 30 17:27:10 2009 -0700 am 37b5663: AI 148102: CTS: Fix test failures in android.widget due to m Merge commit '37b5663202f6a51ec8616ab851742fae28d503fe' into donut * commit '37b5663202f6a51ec8616ab851742fae28d503fe': AI 148102: CTS: Fix test failures in android.widget due to missing TextViewStubActivity commit 7592e4f9f8b89dfafc1f57e28fb293c52c1bccdc Author: Scott Su Date: Thu Apr 30 17:26:49 2009 -0700 AI 148140: CTS: fixed failed cases in LocationManagerTest. Automated import of CL 148140 commit 8ffa46b9496873ad5b07f3217900abfd6e44f5bd Merge: c06c1d0 d841620 Author: Scott Su Date: Thu Apr 30 17:23:09 2009 -0700 am d841620: am 259ced7: AI 148076: CTS: Add support for @BrokenTest in D Merge commit 'd841620864059fa547c94b3b54fbc6a2f2fb83c4' * commit 'd841620864059fa547c94b3b54fbc6a2f2fb83c4': AI 148076: CTS: Add support for @BrokenTest in DescriptionGenerator. commit c06c1d029f4a27ccbd181c26d30a9c557c54b71a Merge: 3d15930 80d993d Author: Phil Dubach Date: Thu Apr 30 17:23:09 2009 -0700 am 80d993d: am 48f63bd: AI 148071: CTS: Modify test description generato Merge commit '80d993d9cf6032beda9b51da82ca12cb75c1bc37' * commit '80d993d9cf6032beda9b51da82ca12cb75c1bc37': AI 148071: CTS: Modify test description generator to include tests in subpackages commit 3d15930aac93f91963045762e627f3b9c81b39c0 Merge: 7e478c2 10fa154 Author: Scott Su Date: Thu Apr 30 17:23:08 2009 -0700 am 10fa154: am 5e96f28: AI 148070: CTS: fixed failed problem in android. Merge commit '10fa154a1249dac283ca5588fcaca38ade6fe369' * commit '10fa154a1249dac283ca5588fcaca38ade6fe369': AI 148070: CTS: fixed failed problem in android.graphics.cts.MovieTest commit 7e478c277180d7831c0f4073746df2da5a8a0e07 Merge: 2298096 9078425 Author: Phil Dubach Date: Thu Apr 30 17:23:08 2009 -0700 am 9078425: am 0ca73c0: AI 148069: CTS: Run test bundles with more than Merge commit '907842536b54270590b343ed9777f85d42b51d59' * commit '907842536b54270590b343ed9777f85d42b51d59': AI 148069: CTS: Run test bundles with more than 200 tests in individual mode commit 229809643b5b86780ca6b456ceef9b6a5debfc98 Merge: ba5a8a6 25f0746 Author: Bill Napier Date: Thu Apr 30 17:23:08 2009 -0700 am 25f0746: am 6d152af: AI 148066: Change perf2 app test from Calculator Merge commit '25f0746f7b6b9d4ee9a870c5bb6e89124529ad8d' * commit '25f0746f7b6b9d4ee9a870c5bb6e89124529ad8d': AI 148066: Change perf2 app test from Calculator to MusicBrowser. commit ba5a8a683e2eb9b2af1a4489f9809f98106f2909 Merge: 336e26e f6469da Author: Scott Su Date: Thu Apr 30 17:23:07 2009 -0700 am f6469da: am c0a8231: AI 148056: CTS: refactor failed cases in package Merge commit 'f6469daee7345fe59bf0ea7b30c556642a14f01d' * commit 'f6469daee7345fe59bf0ea7b30c556642a14f01d': AI 148056: CTS: refactor failed cases in package android.content.pm. commit 336e26ec796574f97a04da7cb85aed6b32780353 Merge: 2e17fa5 8230c9d Author: Scott Su Date: Thu Apr 30 17:23:07 2009 -0700 am 8230c9d: am 986c1ab: AI 148055: CTS: refactor failed case in Animatio Merge commit '8230c9d8691dccc0cb583b48db63d0c7c03add2f' * commit '8230c9d8691dccc0cb583b48db63d0c7c03add2f': AI 148055: CTS: refactor failed case in AnimationTest. commit 2e17fa5b4ed032bcbc76c02c6b62672cc3b4facd Merge: 1b1ce88 168b3da Author: Scott Su Date: Thu Apr 30 17:23:06 2009 -0700 am 168b3da: am 363c4bb: AI 148054: CTS: refactor failed cases in package Merge commit '168b3dab90d36035cf5cf899927bb309fe0154c9' * commit '168b3dab90d36035cf5cf899927bb309fe0154c9': AI 148054: CTS: refactor failed cases in package anroid.text. commit 1b1ce88486f94c626d6eeb239cca79fd102e6499 Merge: b28e921 1f08bea Author: Scott Su Date: Thu Apr 30 17:23:06 2009 -0700 am 1f08bea: am b45eaae: AI 148053: CTS: fixed failed testcases Merge commit '1f08beaf7562270ef4e019af800a8d0c4af0a016' * commit '1f08beaf7562270ef4e019af800a8d0c4af0a016': AI 148053: CTS: fixed failed testcases commit b28e92180b97e112351e3bb896cf3b547e5901d0 Merge: 92f11c3 a52af6b Author: Gaurav Mathur Date: Thu Apr 30 17:23:06 2009 -0700 am a52af6b: am 382ad68: AI 148041: Update CTS report template with follo Merge commit 'a52af6b7104d737cc702837533c286075d656201' * commit 'a52af6b7104d737cc702837533c286075d656201': AI 148041: Update CTS report template with following: commit ae22e3755448dcd84e4afae13ef6a1d525220946 Author: Phil Dubach Date: Thu Apr 30 17:20:47 2009 -0700 AI 148127: CTS: fix 'unable to find instrumentation info' bug in hardware package Cloned from CL 148075 by 'g4 patch'. Original change by sus@sus_osx on 2009/04/30 00:37:03. Automated import of CL 148127 commit 92f11c3cb7da6358ae60749885ac1eb93661f4a2 Merge: 331f842 35074ac Author: Android (Google) Code Review Date: Thu Apr 30 17:20:01 2009 -0700 Merge change 803 * changes: decouple SyncAdapter from ContentProvider commit 9d847745583b62038b36ff79d6cac28f8a46e64f Author: Phil Dubach Date: Thu Apr 30 17:19:22 2009 -0700 AI 148124: CTS: Increase max Java heap for running CTS to 512M Automated import of CL 148124 commit 7eaf3cffb3dd49ff19932b75e1db3dc0618c749b Author: Phil Dubach Date: Thu Apr 30 17:17:56 2009 -0700 AI 148122: CTS: fix failed cases in AbsSeekBarTest, GridViewTest, ListViewTest and PopupWindowTest. Cloned from CL 148079 by 'g4 patch'. Original change by sus@sus_osx on 2009/04/30 02:34:15. Automated import of CL 148122 commit 37b5663202f6a51ec8616ab851742fae28d503fe Author: Phil Dubach Date: Thu Apr 30 17:10:22 2009 -0700 AI 148102: CTS: Fix test failures in android.widget due to missing TextViewStubActivity Automated import of CL 148102 commit d841620864059fa547c94b3b54fbc6a2f2fb83c4 Merge: 80d993d 259ced7 Author: Scott Su Date: Thu Apr 30 17:09:26 2009 -0700 am 259ced7: AI 148076: CTS: Add support for @BrokenTest in DescriptionGe Merge commit '259ced7af6a4b1b782d8d81ca88bfa9f48cfd69d' into donut * commit '259ced7af6a4b1b782d8d81ca88bfa9f48cfd69d': AI 148076: CTS: Add support for @BrokenTest in DescriptionGenerator. commit 80d993d9cf6032beda9b51da82ca12cb75c1bc37 Merge: 10fa154 48f63bd Author: Phil Dubach Date: Thu Apr 30 17:09:26 2009 -0700 am 48f63bd: AI 148071: CTS: Modify test description generator to include Merge commit '48f63bd7cf8e4a7ce7146873172df82aa912f3a0' into donut * commit '48f63bd7cf8e4a7ce7146873172df82aa912f3a0': AI 148071: CTS: Modify test description generator to include tests in subpackages commit 10fa154a1249dac283ca5588fcaca38ade6fe369 Merge: 9078425 5e96f28 Author: Scott Su Date: Thu Apr 30 17:09:25 2009 -0700 am 5e96f28: AI 148070: CTS: fixed failed problem in android.graphics.cts Merge commit '5e96f28424bb30bebb0c30c0aa50870cf0a834f0' into donut * commit '5e96f28424bb30bebb0c30c0aa50870cf0a834f0': AI 148070: CTS: fixed failed problem in android.graphics.cts.MovieTest commit 907842536b54270590b343ed9777f85d42b51d59 Merge: 25f0746 0ca73c0 Author: Phil Dubach Date: Thu Apr 30 17:09:25 2009 -0700 am 0ca73c0: AI 148069: CTS: Run test bundles with more than 200 tests in Merge commit '0ca73c0c8667055d7db72ccdeecaa6323ba95028' into donut * commit '0ca73c0c8667055d7db72ccdeecaa6323ba95028': AI 148069: CTS: Run test bundles with more than 200 tests in individual mode commit 25f0746f7b6b9d4ee9a870c5bb6e89124529ad8d Merge: f6469da 6d152af Author: Bill Napier Date: Thu Apr 30 17:09:25 2009 -0700 am 6d152af: AI 148066: Change perf2 app test from Calculator to MusicBro Merge commit '6d152af15daf3c35f65d5fe66b5bc6dfc0066b24' into donut * commit '6d152af15daf3c35f65d5fe66b5bc6dfc0066b24': AI 148066: Change perf2 app test from Calculator to MusicBrowser. commit f6469daee7345fe59bf0ea7b30c556642a14f01d Merge: 8230c9d c0a8231 Author: Scott Su Date: Thu Apr 30 17:09:24 2009 -0700 am c0a8231: AI 148056: CTS: refactor failed cases in package android.con Merge commit 'c0a82311ffcc841cad1b11d727c7c58979c21c07' into donut * commit 'c0a82311ffcc841cad1b11d727c7c58979c21c07': AI 148056: CTS: refactor failed cases in package android.content.pm. commit 8230c9d8691dccc0cb583b48db63d0c7c03add2f Merge: 168b3da 986c1ab Author: Scott Su Date: Thu Apr 30 17:09:24 2009 -0700 am 986c1ab: AI 148055: CTS: refactor failed case in AnimationTest. Merge commit '986c1abd236b093f8a33a6a6a9a49a14f02ebd62' into donut * commit '986c1abd236b093f8a33a6a6a9a49a14f02ebd62': AI 148055: CTS: refactor failed case in AnimationTest. commit 168b3dab90d36035cf5cf899927bb309fe0154c9 Merge: 1f08bea 363c4bb Author: Scott Su Date: Thu Apr 30 17:09:24 2009 -0700 am 363c4bb: AI 148054: CTS: refactor failed cases in package anroid.text Merge commit '363c4bb74b4f78dd4633207e7742a04d5c4cb5b5' into donut * commit '363c4bb74b4f78dd4633207e7742a04d5c4cb5b5': AI 148054: CTS: refactor failed cases in package anroid.text. commit 1f08beaf7562270ef4e019af800a8d0c4af0a016 Merge: a52af6b b45eaae Author: Scott Su Date: Thu Apr 30 17:09:23 2009 -0700 am b45eaae: AI 148053: CTS: fixed failed testcases Merge commit 'b45eaaecb73b3b5fada849b3f8732642a7041658' into donut * commit 'b45eaaecb73b3b5fada849b3f8732642a7041658': AI 148053: CTS: fixed failed testcases commit a52af6b7104d737cc702837533c286075d656201 Merge: 8d06005 382ad68 Author: Gaurav Mathur Date: Thu Apr 30 17:09:23 2009 -0700 am 382ad68: AI 148041: Update CTS report template with following: Merge commit '382ad68de8dc1fedbf9ce3ab4d1d65f4d80acaef' into donut * commit '382ad68de8dc1fedbf9ce3ab4d1d65f4d80acaef': AI 148041: Update CTS report template with following: commit 259ced7af6a4b1b782d8d81ca88bfa9f48cfd69d Author: Scott Su Date: Thu Apr 30 17:05:49 2009 -0700 AI 148076: CTS: Add support for @BrokenTest in DescriptionGenerator. Tests that are annotated @BrokenTest are excluded from the test description. Automated import of CL 148076 commit 48f63bd7cf8e4a7ce7146873172df82aa912f3a0 Author: Phil Dubach Date: Thu Apr 30 17:04:12 2009 -0700 AI 148071: CTS: Modify test description generator to include tests in subpackages Automated import of CL 148071 commit 5e96f28424bb30bebb0c30c0aa50870cf0a834f0 Author: Scott Su Date: Thu Apr 30 17:02:35 2009 -0700 AI 148070: CTS: fixed failed problem in android.graphics.cts.MovieTest Automated import of CL 148070 commit 0ca73c0c8667055d7db72ccdeecaa6323ba95028 Author: Phil Dubach Date: Thu Apr 30 17:01:09 2009 -0700 AI 148069: CTS: Run test bundles with more than 200 tests in individual mode This increases stability, since we still see hangs in batchmode for large test bundles. Automated import of CL 148069 commit 6d152af15daf3c35f65d5fe66b5bc6dfc0066b24 Author: Bill Napier Date: Thu Apr 30 16:59:42 2009 -0700 AI 148066: Change perf2 app test from Calculator to MusicBrowser. Automated import of CL 148066 commit c0a82311ffcc841cad1b11d727c7c58979c21c07 Author: Scott Su Date: Thu Apr 30 16:57:50 2009 -0700 AI 148056: CTS: refactor failed cases in package android.content.pm. Automated import of CL 148056 commit 986c1abd236b093f8a33a6a6a9a49a14f02ebd62 Author: Scott Su Date: Thu Apr 30 16:56:23 2009 -0700 AI 148055: CTS: refactor failed case in AnimationTest. Automated import of CL 148055 commit 363c4bb74b4f78dd4633207e7742a04d5c4cb5b5 Author: Scott Su Date: Thu Apr 30 16:54:52 2009 -0700 AI 148054: CTS: refactor failed cases in package anroid.text. Automated import of CL 148054 commit b45eaaecb73b3b5fada849b3f8732642a7041658 Author: Scott Su Date: Thu Apr 30 16:53:23 2009 -0700 AI 148053: CTS: fixed failed testcases Automated import of CL 148053 commit 382ad68de8dc1fedbf9ce3ab4d1d65f4d80acaef Author: Gaurav Mathur Date: Thu Apr 30 16:51:53 2009 -0700 AI 148041: Update CTS report template with following: - Package name links to section in report - Package level pass/timeout/fail broken out in summary - Failures are colored in red - known failure text changed to known problem Automated import of CL 148041 commit 35074ac61cf15ed16fa1cb3cbcaa60d29db7f4c8 Author: Fred Quintana Date: Wed Apr 29 17:53:18 2009 -0700 decouple SyncAdapter from ContentProvider commit 331f842f190a70c286bc467ec826005155678e90 Merge: cef6536 8d06005 Author: Scott Su <> Date: Thu Apr 30 00:01:22 2009 -0700 am 8d06005: am f40e213: AI 147986: Change CTS tests to use Instrumentati Merge commit '8d060057dcb0c8c5594d022b995fe97b05ff67d9' * commit '8d060057dcb0c8c5594d022b995fe97b05ff67d9': AI 147986: Change CTS tests to use InstrumentationCoreTestRunner, which has handled the @BrokenTest commit 8d060057dcb0c8c5594d022b995fe97b05ff67d9 Merge: 2f1ba0b f40e213 Author: Scott Su <> Date: Wed Apr 29 23:30:41 2009 -0700 am f40e213: AI 147986: Change CTS tests to use InstrumentationCoreTestRu Merge commit 'f40e21305b0a6f5358e3926e8ac70079d1e3bb85' into donut * commit 'f40e21305b0a6f5358e3926e8ac70079d1e3bb85': AI 147986: Change CTS tests to use InstrumentationCoreTestRunner, which has handled the @BrokenTest commit cef6536582d73ca418fef9229fb663dda8476d37 Merge: 66bc8a0 2f1ba0b Author: Phil Dubach <> Date: Wed Apr 29 11:03:03 2009 -0700 am 2f1ba0b: am 3a52ca1: AI 147980: CTS: Fix device status problem after Merge commit '2f1ba0b12d880c7bc2049dc1f785bde1110d4706' * commit '2f1ba0b12d880c7bc2049dc1f785bde1110d4706': AI 147980: CTS: Fix device status problem after a reset commit 66bc8a0783f95141cf3df7df93ff510b6648cf80 Merge: ed183c0 2fe778e Author: Phil Dubach <> Date: Wed Apr 29 11:03:03 2009 -0700 am 2fe778e: am 59c0ba1: AI 147972: CTS: Fix a problem in Selector which Merge commit '2fe778e773cef37a2f0ffabcdcbcf31930e27d85' * commit '2fe778e773cef37a2f0ffabcdcbcf31930e27d85': AI 147972: CTS: Fix a problem in Selector which would ignore the packages mistakenly when selecting test suites. commit ed183c0359ec2c46c1879e021871cac557f6bba4 Merge: 2780d55 01ad61f Author: Phil Dubach <> Date: Wed Apr 29 11:03:03 2009 -0700 am 01ad61f: am a0ec0db: AI 147957: CTS: Add configuration variable to se Merge commit '01ad61f18219130c07ff4773819f6f58d3f08384' * commit '01ad61f18219130c07ff4773819f6f58d3f08384': AI 147957: CTS: Add configuration variable to set max size for a package to be run in batch mode commit 2780d55776123bfd223183c22a5e946bcaf6c81e Merge: 9562bee 8e5d79a Author: Phil Dubach <> Date: Wed Apr 29 11:03:02 2009 -0700 am 8e5d79a: am ba0c1bb: AI 147910: CTS: Fix test failures in GravityTest Merge commit '8e5d79a12f69f9cee57e578392871c3f290807a0' * commit '8e5d79a12f69f9cee57e578392871c3f290807a0': AI 147910: CTS: Fix test failures in GravityTest and ViewGroup_LayoutParamsTest commit 9562bee986e9918ac69729311e373376e8fd8475 Merge: 1a2ca7d 8507cd3 Author: Phil Dubach <> Date: Wed Apr 29 11:03:02 2009 -0700 am 8507cd3: am 4a40445: AI 147877: CTS: Sort package, suite, case and te Merge commit '8507cd352f9734b398baa8658fa772b265afb061' * commit '8507cd352f9734b398baa8658fa772b265afb061': AI 147877: CTS: Sort package, suite, case and test lists for interactive plan generation commit 1a2ca7d09a74189926d0f64805500f8177946606 Merge: 9304f84 45b0c8a Author: Phil Dubach <> Date: Wed Apr 29 11:03:02 2009 -0700 am 45b0c8a: am c6e9382: AI 147876: CTS: Fix signature test timeout handl Merge commit '45b0c8a5e1c3b69818c8489df02fcdc46fd199fe' * commit '45b0c8a5e1c3b69818c8489df02fcdc46fd199fe': AI 147876: CTS: Fix signature test timeout handling and add timeout value to config commit 9304f8459320b40493c9d66cbb271bf8b51166b8 Merge: 5c7538a 6171372 Author: Phil Dubach <> Date: Wed Apr 29 11:03:01 2009 -0700 am 6171372: am 6231185: AI 147797: CTS: Throw exception on attempts to i Merge commit '6171372549ac843e88a28f5ab66d0499b5e2dc34' * commit '6171372549ac843e88a28f5ab66d0499b5e2dc34': AI 147797: CTS: Throw exception on attempts to install a nonexistent APK commit 5c7538aaa2ba38bb59be26fb8a55c182f1e8ebf0 Merge: d2ad5ed 3890d3b Author: Gaurav Mathur <> Date: Wed Apr 29 11:03:01 2009 -0700 am 3890d3b: am af9a409: AI 147786: Automated g4 rollback of changelist 1 Merge commit '3890d3bb2ad2f93c357debbef76ed5aeacd61d3f' * commit '3890d3bb2ad2f93c357debbef76ed5aeacd61d3f': AI 147786: Automated g4 rollback of changelist 147771. commit d2ad5ed22ec31f2d781dea716c819858c75eca6c Merge: c819f08 ae49d40 Author: Phil Dubach <> Date: Wed Apr 29 11:03:01 2009 -0700 am ae49d40: am 4f35e5e: AI 147771: CTS: Throw exception on attempts to i Merge commit 'ae49d406d25b7df4f6c3a35b7054407a16558d46' * commit 'ae49d406d25b7df4f6c3a35b7054407a16558d46': AI 147771: CTS: Throw exception on attempts to install a nonexistent APK commit c819f080ed7643e49215b2ad519f9c0320f6c681 Merge: f789ccd ff7ca9b Author: Phil Dubach <> Date: Wed Apr 29 11:03:00 2009 -0700 am ff7ca9b: am d5fe3a6: AI 147757: CTS: Increase test timeout and fix re Merge commit 'ff7ca9ba145ad2de361350fe464541abc19cd2bd' * commit 'ff7ca9ba145ad2de361350fe464541abc19cd2bd': AI 147757: CTS: Increase test timeout and fix result mixups after batch timeout commit f789ccdbaa20d779f623a84f5589f0011223027a Merge: 53e3c71 ec5e654 Author: Gaurav Mathur <> Date: Wed Apr 29 11:03:00 2009 -0700 am ec5e654: am d9901b8: AI 147750: Add soft API test for SDK version Merge commit 'ec5e65461ca51a614325a3e1e53c5edaf9cba3ad' * commit 'ec5e65461ca51a614325a3e1e53c5edaf9cba3ad': AI 147750: Add soft API test for SDK version commit 53e3c7189177ac1020918e6156db154ef0a90e0b Merge: 36fd927 b2e80bf Author: Jorg Pleumann <> Date: Wed Apr 29 11:02:59 2009 -0700 am b2e80bf: am 4613a90: AI 147731: Forgot to submit the build changes fo Merge commit 'b2e80bf61520f6269bf7cfb9cfcfa489eb9c732a' * commit 'b2e80bf61520f6269bf7cfb9cfcfa489eb9c732a': AI 147731: Forgot to submit the build changes for the commit 36fd9272785f1cb8be8fb6bf7d3f0fb2283f1ba5 Merge: 2a5bcc0 0c86cde Author: Scott Su <> Date: Wed Apr 29 11:02:59 2009 -0700 am 0c86cde: am 0aad978: AI 147679: CTS: add test cases for MessageQueue Merge commit '0c86cde97d855df0a1deed71a1b6a4e836320e20' * commit '0c86cde97d855df0a1deed71a1b6a4e836320e20': AI 147679: CTS: add test cases for MessageQueue and Messenger commit 2a5bcc0a224b23ce521027c786392dee0eba1b58 Merge: 095cdff c88b8d6 Author: Scott Su <> Date: Wed Apr 29 11:02:59 2009 -0700 am c88b8d6: am d5033e8: AI 147675: CTS: add test cases for android.os.Pa Merge commit 'c88b8d60ab97d4747f7da0da363093ecb231d056' * commit 'c88b8d60ab97d4747f7da0da363093ecb231d056': AI 147675: CTS: add test cases for android.os.Parcel commit 095cdff3726c1e47312134f10d9ab77d3413f799 Merge: da3575d a600af2 Author: Scott Su <> Date: Wed Apr 29 11:02:58 2009 -0700 am a600af2: am 381af19: AI 147672: CTS: add test cases fro android.os.Pa Merge commit 'a600af2d4596b91327abcc174c33e88cbfb79594' * commit 'a600af2d4596b91327abcc174c33e88cbfb79594': AI 147672: CTS: add test cases fro android.os.ParcelFileDescriptor commit da3575d36205af9d759d2658d57a586073c82e40 Merge: d3ab2df 563b34d Author: Scott Su <> Date: Wed Apr 29 11:02:58 2009 -0700 am 563b34d: am ce08ad3: AI 147669: CTS: Add test case for android.app.No Merge commit '563b34d8c122c76cef03745f51eab80e43b03fcf' * commit '563b34d8c122c76cef03745f51eab80e43b03fcf': AI 147669: CTS: Add test case for android.app.Notification commit d3ab2df7eeed61abb5fe9c890ae291f7da703065 Merge: 036acf9 dee1788 Author: Scott Su <> Date: Wed Apr 29 11:02:58 2009 -0700 am dee1788: am 56f2a42: AI 147666: CTS: add test cases for android.os.Me Merge commit 'dee1788971dea06b7211e494052689412fe54edf' * commit 'dee1788971dea06b7211e494052689412fe54edf': AI 147666: CTS: add test cases for android.os.Message, Handler and Looper commit 036acf97f303ee173ca094a1340fabff2f46bbfa Merge: 9605932 f0e44e2 Author: Scott Su <> Date: Wed Apr 29 11:02:57 2009 -0700 am f0e44e2: am b430c8a: AI 147663: CTS: add test cases for android.os.P Merge commit 'f0e44e25ce9c155024880711c393811247c444f9' * commit 'f0e44e25ce9c155024880711c393811247c444f9': AI 147663: CTS: add test cases for android.os.PowerManager.WakeLock commit 96059322dca191a517f7f836e18f2bd900f27424 Merge: a65150a 0c4cc61 Author: Scott Su <> Date: Wed Apr 29 11:02:57 2009 -0700 am 0c4cc61: am 810648a: AI 147658: CTS: add test cases for android.view. Merge commit '0c4cc61c882a31bb5e2641d074f0c5f19b0d5f0f' * commit '0c4cc61c882a31bb5e2641d074f0c5f19b0d5f0f': AI 147658: CTS: add test cases for android.view.KeyCharacterMap commit a65150a95890c82db11893755c57d4b5b82e5542 Merge: 9daa8d2 ec087cb Author: Scott Su <> Date: Wed Apr 29 11:02:57 2009 -0700 am ec087cb: am a9e8720: AI 147655: CTS: add test cases for android.app.K Merge commit 'ec087cb8f1dff6e3b6e8462dc590bbc65750f193' * commit 'ec087cb8f1dff6e3b6e8462dc590bbc65750f193': AI 147655: CTS: add test cases for android.app.KeyguardManager commit 9daa8d2cef527a5b3646df7664ffc906e6ccaff4 Merge: 0f553ea 8e209e4 Author: Scott Su <> Date: Wed Apr 29 11:02:56 2009 -0700 am 8e209e4: am 60db5a8: AI 147652: CTS: fixed failed problem in android. Merge commit '8e209e4f3a12380a9bbdc9f949d5a28a13ba0832' * commit '8e209e4f3a12380a9bbdc9f949d5a28a13ba0832': AI 147652: CTS: fixed failed problem in android.app.cts.DatePickerDialogTest commit 0f553ea80b1603b4fad770843dd2171ac6ace27c Merge: 81714fa c7ecaf5 Author: Scott Su <> Date: Wed Apr 29 11:02:56 2009 -0700 am c7ecaf5: am cdeeb5b: AI 147648: CTS: add test cases for android.app.D Merge commit 'c7ecaf520f2399f92ef7da2d66de8a11e3267fc1' * commit 'c7ecaf520f2399f92ef7da2d66de8a11e3267fc1': AI 147648: CTS: add test cases for android.app.Dialog commit 81714fa20a3d1fe7bf73527a484f2cf57acca00d Merge: c6006a8 f8ed701 Author: Scott Su <> Date: Wed Apr 29 11:02:56 2009 -0700 am f8ed701: am e68a4a1: AI 147644: CTS: add test cases for app.ListActiv Merge commit 'f8ed701dac34af2bed63416cc0bf0b9b3c4dca62' * commit 'f8ed701dac34af2bed63416cc0bf0b9b3c4dca62': AI 147644: CTS: add test cases for app.ListActivity commit c6006a8d0e912f665de0e8e3af99463cc265dd24 Merge: 52f970c b35a6dd Author: Scott Su <> Date: Wed Apr 29 11:02:55 2009 -0700 am b35a6dd: am 60cb930: AI 147640: CTS: add test cases for android.app.A Merge commit 'b35a6dd2fa38c0f5e9a98770a35dea5d4dca42d8' * commit 'b35a6dd2fa38c0f5e9a98770a35dea5d4dca42d8': AI 147640: CTS: add test cases for android.app.AlarmManager commit 52f970cbfe2188493cb471d86901979146de062e Merge: 6a0aec7 224d6dc Author: Scott Su <> Date: Wed Apr 29 11:02:55 2009 -0700 am 224d6dc: am f479bb5: AI 147637: CTS: Add test case for android.app.Ac Merge commit '224d6dcea88578d89fa75020e62b088267463dfe' * commit '224d6dcea88578d89fa75020e62b088267463dfe': AI 147637: CTS: Add test case for android.app.ActivityManager commit 6a0aec7a8463c7327bd67897370a7429e2284d75 Merge: 15bb815 f2725d4 Author: Scott Su <> Date: Wed Apr 29 11:02:54 2009 -0700 am f2725d4: am fd27abc: AI 147634: CTS: add test cases for app.AlertDial Merge commit 'f2725d41ce1e32f040e4a76e7850d0cad6c5fd34' * commit 'f2725d41ce1e32f040e4a76e7850d0cad6c5fd34': AI 147634: CTS: add test cases for app.AlertDialog. commit 15bb815cdd1a0b148fb0c74170eddb1539072c6b Merge: 6a31b1d 051b404 Author: Scott Su <> Date: Wed Apr 29 11:02:54 2009 -0700 am 051b404: am 5a76025: AI 147631: CTS: add test cases for LauncherActiv Merge commit '051b4046b81507d3dc5dcea59b629a12929f6ac6' * commit '051b4046b81507d3dc5dcea59b629a12929f6ac6': AI 147631: CTS: add test cases for LauncherActivity and TabActivity commit 6a31b1d494c041fa21d051536f90592a78fbf1e6 Merge: 01adea7 3bc03a1 Author: Scott Su <> Date: Wed Apr 29 11:02:54 2009 -0700 am 3bc03a1: am 42f8f66: AI 147625: CTS: add test cases for content.pm.Pa Merge commit '3bc03a132ec0af42db739c110762ebfad518fe97' * commit '3bc03a132ec0af42db739c110762ebfad518fe97': AI 147625: CTS: add test cases for content.pm.PackageManager and its related class. commit 01adea7eaf77521dba889f2230a08b39388b483f Merge: f51e21b 8b9d235 Author: Scott Su <> Date: Wed Apr 29 11:02:53 2009 -0700 am 8b9d235: am 29aac8d: AI 147618: CTS: add test cases for android.app.E Merge commit '8b9d23595113e49189f896b4736af98300962cfa' * commit '8b9d23595113e49189f896b4736af98300962cfa': AI 147618: CTS: add test cases for android.app.ExpandableListActivity commit f51e21b1c8affc5a12456899a4894ccd5c08c955 Merge: 02f095e c6ead99 Author: Scott Su <> Date: Wed Apr 29 11:02:53 2009 -0700 am c6ead99: am d776ea2: AI 147612: CTS: add test cases for Intent, Inten Merge commit 'c6ead99e1fa4b6e60899a0e4b9d4958cf6567833' * commit 'c6ead99e1fa4b6e60899a0e4b9d4958cf6567833': AI 147612: CTS: add test cases for Intent, IntentFiler and MutableContextWrapper commit 02f095e01e86013e125d4870059b5a872fc968b5 Merge: 6da4611 424ae4f Author: Scott Su <> Date: Wed Apr 29 11:02:52 2009 -0700 am 424ae4f: am 7c0bdb3: AI 147609: CTS: add test cases for android.app.A Merge commit '424ae4f8f8ef4b2a39e527b98d3007b22bf327bd' * commit '424ae4f8f8ef4b2a39e527b98d3007b22bf327bd': AI 147609: CTS: add test cases for android.app.Activity. commit 6da4611d5277183b6f38f892ef7ea469d3bbda8f Merge: aec2c1c 2073201 Author: Scott Su <> Date: Wed Apr 29 11:02:52 2009 -0700 am 2073201: am 86ed74f: AI 147606: CTS: fix failed problem in android.gr Merge commit '2073201548d75c79fb7ba00e273fa6a448b5f108' * commit '2073201548d75c79fb7ba00e273fa6a448b5f108': AI 147606: CTS: fix failed problem in android.graphics.Paint commit aec2c1cf9f04ab39ff48e1dffd191faa1644d006 Merge: 9882fbd 2760bcf Author: Scott Su <> Date: Wed Apr 29 11:02:52 2009 -0700 am 2760bcf: am 2cc27de: AI 147603: CTS: add test case for LocalActivityM Merge commit '2760bcfef758b87bebac111a86e3d4dee0d1d457' * commit '2760bcfef758b87bebac111a86e3d4dee0d1d457': AI 147603: CTS: add test case for LocalActivityManager. commit 9882fbd00acc0968827839f981a9e349ca3f9aae Merge: f6e8149 ce9c046 Author: Scott Su <> Date: Wed Apr 29 11:02:51 2009 -0700 am ce9c046: am 17a8617: AI 147597: CTS: add test cases for android.conte Merge commit 'ce9c04692d79e6532957f4ec0ab116ac5808dd5d' * commit 'ce9c04692d79e6532957f4ec0ab116ac5808dd5d': AI 147597: CTS: add test cases for android.content.res.TypedArray commit f6e8149e54893109cfccb6e2ec707ff8ccee5302 Merge: 1196979 df4ed27 Author: Scott Su <> Date: Wed Apr 29 11:02:51 2009 -0700 am df4ed27: am 89a0970: AI 147594: CTS: add test cases for android.os.To Merge commit 'df4ed272639e67ca5d8ae0d1be2d154440d634ea' * commit 'df4ed272639e67ca5d8ae0d1be2d154440d634ea': AI 147594: CTS: add test cases for android.os.TokenWatcher commit 119697901c899945524e62ad18dfe19f84254d29 Merge: 35ddad8 0d73614 Author: Scott Su <> Date: Wed Apr 29 11:02:51 2009 -0700 am 0d73614: am 501c063: AI 147591: CTS: add test cases for app.Notificat Merge commit '0d73614a909b0866078aaf048a398dde631b7707' * commit '0d73614a909b0866078aaf048a398dde631b7707': AI 147591: CTS: add test cases for app.NotificationManager commit 35ddad8bc9be912a144ce3a951a208cc99869f68 Merge: c9a6d63 d759837 Author: Scott Su <> Date: Wed Apr 29 11:02:50 2009 -0700 am d759837: am 383a208: AI 147588: CTS: add test cases for android.widge Merge commit 'd759837bafdf6099581cc49aca95c1bb28eea89e' * commit 'd759837bafdf6099581cc49aca95c1bb28eea89e': AI 147588: CTS: add test cases for android.widget.VideoView commit c9a6d632fd30037540303a5da4eb643b78c116e5 Merge: 7d187dc 3b681cd Author: Scott Su <> Date: Wed Apr 29 11:02:50 2009 -0700 am 3b681cd: am 0af8f5c: AI 147584: CTS: add test cases for provider.Medi Merge commit '3b681cd5cb0e03b8411c288ce187f537dae5411b' * commit '3b681cd5cb0e03b8411c288ce187f537dae5411b': AI 147584: CTS: add test cases for provider.MediaStore commit 7d187dc54dd5dcd0fc91e275065f1abafff3129f Merge: 9b5d24c 04566ac Author: Scott Su <> Date: Wed Apr 29 11:02:50 2009 -0700 am 04566ac: am edf555c: AI 147581: CTS:add test case for android.widget. Merge commit '04566acda2da80653f37a11e275514d98d0340cc' * commit '04566acda2da80653f37a11e275514d98d0340cc': AI 147581: CTS:add test case for android.widget.MediaController commit 9b5d24ca48c18dec5af3c69dba797d9580140fdb Merge: ccf76e9 fa391a9 Author: Scott Su <> Date: Wed Apr 29 11:02:49 2009 -0700 am fa391a9: am 85f5d8c: AI 147573: CTS: add test cases for view.KeyEvent Merge commit 'fa391a94e54098be179961b6d10cddb68f61a0c8' * commit 'fa391a94e54098be179961b6d10cddb68f61a0c8': AI 147573: CTS: add test cases for view.KeyEvent commit ccf76e9c026651d4bbba7c6add0e67862c75b679 Merge: af0cc0d 2abd7cb Author: Scott Su <> Date: Wed Apr 29 11:02:49 2009 -0700 am 2abd7cb: am 51f48d5: AI 147570: CTS: add test cases for android.widge Merge commit '2abd7cb7fe001250d54976277014166944214c48' * commit '2abd7cb7fe001250d54976277014166944214c48': AI 147570: CTS: add test cases for android.widget.HeaderViewListAdapter commit af0cc0d406f19aa128f044692137a58933bd6074 Merge: e33deed 3db45a0 Author: Scott Su <> Date: Wed Apr 29 11:02:49 2009 -0700 am 3db45a0: am c05d403: AI 147566: CTS: add test cases for android.widge Merge commit '3db45a0dd3e21550f054474bc9d7a5ae2a6aa90e' * commit '3db45a0dd3e21550f054474bc9d7a5ae2a6aa90e': AI 147566: CTS: add test cases for android.widget.SeekBar. commit e33deedfe56bf13b72aa78b6b7c4b2a5ade59d46 Merge: 0cd8484 969c4f0 Author: Scott Su <> Date: Wed Apr 29 11:02:48 2009 -0700 am 969c4f0: am c032163: AI 147561: CTS: add test cases for android.widge Merge commit '969c4f0a02ed52d513e29da417085fc81e506c0f' * commit '969c4f0a02ed52d513e29da417085fc81e506c0f': AI 147561: CTS: add test cases for android.widget.FrameLayout commit 0cd84843c69522944efdd5a79d4aa91a3825c1e9 Merge: cd0d488 e3d4641 Author: Phil Dubach <> Date: Wed Apr 29 11:02:48 2009 -0700 am e3d4641: am e610a1e: AI 147559: CTS: Use longer timeouts to allow for Merge commit 'e3d4641db871a03055a58c7eabbbd175280ed21b' * commit 'e3d4641db871a03055a58c7eabbbd175280ed21b': AI 147559: CTS: Use longer timeouts to allow for class initialization delays commit cd0d4886fdb1cf01b412711ae5b241e1df404e81 Merge: a0de593 e5940eb Author: Scott Su <> Date: Wed Apr 29 11:02:48 2009 -0700 am e5940eb: am 8c9b1e9: AI 147556: CTS: add test cases for android.os.Co Merge commit 'e5940ebdce7499f49f35d1fa58538790dfee4b26' * commit 'e5940ebdce7499f49f35d1fa58538790dfee4b26': AI 147556: CTS: add test cases for android.os.ConditionVariable commit a0de59338f2f45dc24ced334ece7ed36ccf79373 Merge: f58fede 40e5b05 Author: Phil Dubach <> Date: Wed Apr 29 11:02:47 2009 -0700 am 40e5b05: am a41d414: AI 147545: CTS: Handle timeout issues in unexpec Merge commit '40e5b05199f4dcc681b3211ba1e5083a71c4ff14' * commit '40e5b05199f4dcc681b3211ba1e5083a71c4ff14': AI 147545: CTS: Handle timeout issues in unexpected tests commit f58fede91aa6d3babd3033b29e9e323c24355d23 Merge: 03d52c7 8ca05f5 Author: Bill Napier <> Date: Wed Apr 29 11:02:47 2009 -0700 am 8ca05f5: am 56e6fe1: AI 147481: Include the performance tests in thei Merge commit '8ca05f583882e0ce320396c239b621f02862b6c3' * commit '8ca05f583882e0ce320396c239b621f02862b6c3': AI 147481: Include the performance tests in their own test plan. commit 03d52c721f10346448988eae138c900457879c6f Merge: 92d5a39 9b7571c Author: Phil Dubach <> Date: Wed Apr 29 11:02:47 2009 -0700 am 9b7571c: am 5d3e1b9: AI 147477: CTS: Add test for Build.VERSION.RELEA Merge commit '9b7571ca19ef67a1b1702deef319e0906591f9c0' * commit '9b7571ca19ef67a1b1702deef319e0906591f9c0': AI 147477: CTS: Add test for Build.VERSION.RELEASE commit 92d5a399582d4295385d6fb492963735d3878c71 Merge: 3dbec4a ed6e1fc Author: Scott Su <> Date: Wed Apr 29 11:02:46 2009 -0700 am ed6e1fc: am 1928a76: AI 147450: CTS: add test cases for database.Abst Merge commit 'ed6e1fc5056b2705fb8cfc9d171720582206b59c' * commit 'ed6e1fc5056b2705fb8cfc9d171720582206b59c': AI 147450: CTS: add test cases for database.AbstractCursorTest, AbstractWindowedCursor, CursorJoiner, CursorWindow, DatabaseUtils, MatrixCursor and MergeCursor commit 3dbec4af64b9fb426c56114b3f37d2ac1d961b44 Merge: 8bfb47a 81e4cc2 Author: Scott Su <> Date: Wed Apr 29 11:02:46 2009 -0700 am 81e4cc2: am b71daef: AI 147448: CTS: add missing test in RectTest, Re Merge commit '81e4cc2725d91fb64e5bf8c402c0f85d098fad2a' * commit '81e4cc2725d91fb64e5bf8c402c0f85d098fad2a': AI 147448: CTS: add missing test in RectTest, RectFTest and LayoutTest commit 8bfb47aa481cdc4714e0a5cc5dacede6d711943f Merge: 1808c43 1133203 Author: Scott Su <> Date: Wed Apr 29 11:02:46 2009 -0700 am 1133203: am c080335: AI 147445: CTS: add test case for android.widget Merge commit '11332032ec91b494964937626dfaaa1c952f081f' * commit '11332032ec91b494964937626dfaaa1c952f081f': AI 147445: CTS: add test case for android.widget.CheckBox commit 1808c4309134a28bfbfb1488394f05533b41bf56 Merge: e3e8a84 2d75d6e Author: Scott Su <> Date: Wed Apr 29 11:02:45 2009 -0700 am 2d75d6e: am 5731a54: AI 147442: CTS: add test cases for android.view. Merge commit '2d75d6ee86bbfc3b8b6426b4955406c80916af33' * commit '2d75d6ee86bbfc3b8b6426b4955406c80916af33': AI 147442: CTS: add test cases for android.view.VelocityTracker commit e3e8a844b3ecb6d23542d5ea096bd558ecedea15 Merge: ea0ecf0 5106c21 Author: Scott Su <> Date: Wed Apr 29 11:02:45 2009 -0700 am 5106c21: am 8bd2754: AI 147435: CTS: add test cases for android.widge Merge commit '5106c21fdfe17c22703c3147aa7773464f7e0491' * commit '5106c21fdfe17c22703c3147aa7773464f7e0491': AI 147435: CTS: add test cases for android.widget.ScrollView commit f40e21305b0a6f5358e3926e8ac70079d1e3bb85 Author: Scott Su <> Date: Wed Apr 29 03:12:14 2009 -0700 AI 147986: Change CTS tests to use InstrumentationCoreTestRunner, which has handled the @BrokenTest Automated import of CL 147986 commit 2f1ba0b12d880c7bc2049dc1f785bde1110d4706 Merge: 2fe778e 3a52ca1 Author: Phil Dubach <> Date: Tue Apr 28 21:53:08 2009 -0700 am 3a52ca1: AI 147980: CTS: Fix device status problem after a reset Merge commit '3a52ca1adee572f7a3eed702a5a6edd692103921' into donut * commit '3a52ca1adee572f7a3eed702a5a6edd692103921': AI 147980: CTS: Fix device status problem after a reset commit 2fe778e773cef37a2f0ffabcdcbcf31930e27d85 Merge: 01ad61f 59c0ba1 Author: Phil Dubach <> Date: Tue Apr 28 21:53:08 2009 -0700 am 59c0ba1: AI 147972: CTS: Fix a problem in Selector which would ignore Merge commit '59c0ba179cd3b955eb2ab59fe176163b2ea29aa4' into donut * commit '59c0ba179cd3b955eb2ab59fe176163b2ea29aa4': AI 147972: CTS: Fix a problem in Selector which would ignore the packages mistakenly when selecting test suites. commit 01ad61f18219130c07ff4773819f6f58d3f08384 Merge: 8e5d79a a0ec0db Author: Phil Dubach <> Date: Tue Apr 28 21:53:07 2009 -0700 am a0ec0db: AI 147957: CTS: Add configuration variable to set max size f Merge commit 'a0ec0db9ab29f1bee1abb2e4ed7e058cc65fb051' into donut * commit 'a0ec0db9ab29f1bee1abb2e4ed7e058cc65fb051': AI 147957: CTS: Add configuration variable to set max size for a package to be run in batch mode commit 8e5d79a12f69f9cee57e578392871c3f290807a0 Merge: 8507cd3 ba0c1bb Author: Phil Dubach <> Date: Tue Apr 28 21:53:07 2009 -0700 am ba0c1bb: AI 147910: CTS: Fix test failures in GravityTest and ViewGro Merge commit 'ba0c1bbe9c11885a9a63ab8ef28b91fd191a527c' into donut * commit 'ba0c1bbe9c11885a9a63ab8ef28b91fd191a527c': AI 147910: CTS: Fix test failures in GravityTest and ViewGroup_LayoutParamsTest commit 8507cd352f9734b398baa8658fa772b265afb061 Merge: 45b0c8a 4a40445 Author: Phil Dubach <> Date: Tue Apr 28 21:53:07 2009 -0700 am 4a40445: AI 147877: CTS: Sort package, suite, case and test lists for Merge commit '4a40445e61bc867e21a8f2e6d01a6896f18d27e8' into donut * commit '4a40445e61bc867e21a8f2e6d01a6896f18d27e8': AI 147877: CTS: Sort package, suite, case and test lists for interactive plan generation commit 45b0c8a5e1c3b69818c8489df02fcdc46fd199fe Merge: 6171372 c6e9382 Author: Phil Dubach <> Date: Tue Apr 28 21:53:06 2009 -0700 am c6e9382: AI 147876: CTS: Fix signature test timeout handling and add Merge commit 'c6e9382c14fcf62bbee93e565498df06dcb489c5' into donut * commit 'c6e9382c14fcf62bbee93e565498df06dcb489c5': AI 147876: CTS: Fix signature test timeout handling and add timeout value to config commit 6171372549ac843e88a28f5ab66d0499b5e2dc34 Merge: 3890d3b 6231185 Author: Phil Dubach <> Date: Tue Apr 28 21:53:06 2009 -0700 am 6231185: AI 147797: CTS: Throw exception on attempts to install a non Merge commit '62311851c88f51785e03ec3c2abed8a0060f48cf' into donut * commit '62311851c88f51785e03ec3c2abed8a0060f48cf': AI 147797: CTS: Throw exception on attempts to install a nonexistent APK commit 3890d3bb2ad2f93c357debbef76ed5aeacd61d3f Merge: ae49d40 af9a409 Author: Gaurav Mathur <> Date: Tue Apr 28 21:53:05 2009 -0700 am af9a409: AI 147786: Automated g4 rollback of changelist 147771. Merge commit 'af9a409bf54a26b78e08e7799192dad5ddfda648' into donut * commit 'af9a409bf54a26b78e08e7799192dad5ddfda648': AI 147786: Automated g4 rollback of changelist 147771. commit ae49d406d25b7df4f6c3a35b7054407a16558d46 Merge: ff7ca9b 4f35e5e Author: Phil Dubach <> Date: Tue Apr 28 21:53:05 2009 -0700 am 4f35e5e: AI 147771: CTS: Throw exception on attempts to install a non Merge commit '4f35e5e9c5fa551355e250186230ee29a4c6563f' into donut * commit '4f35e5e9c5fa551355e250186230ee29a4c6563f': AI 147771: CTS: Throw exception on attempts to install a nonexistent APK commit ff7ca9ba145ad2de361350fe464541abc19cd2bd Merge: ec5e654 d5fe3a6 Author: Phil Dubach <> Date: Tue Apr 28 21:53:05 2009 -0700 am d5fe3a6: AI 147757: CTS: Increase test timeout and fix result mixups Merge commit 'd5fe3a6913a9fa68a8f4ce44507bcd104ae64cc7' into donut * commit 'd5fe3a6913a9fa68a8f4ce44507bcd104ae64cc7': AI 147757: CTS: Increase test timeout and fix result mixups after batch timeout commit ec5e65461ca51a614325a3e1e53c5edaf9cba3ad Merge: b2e80bf d9901b8 Author: Gaurav Mathur <> Date: Tue Apr 28 21:53:04 2009 -0700 am d9901b8: AI 147750: Add soft API test for SDK version Merge commit 'd9901b81d949ec591e7b1a2378a450cd2d49bc89' into donut * commit 'd9901b81d949ec591e7b1a2378a450cd2d49bc89': AI 147750: Add soft API test for SDK version commit b2e80bf61520f6269bf7cfb9cfcfa489eb9c732a Merge: 0c86cde 4613a90 Author: Jorg Pleumann <> Date: Tue Apr 28 21:53:04 2009 -0700 am 4613a90: AI 147731: Forgot to submit the build changes for the Merge commit '4613a90144021efd2c7850728520de01232254bb' into donut * commit '4613a90144021efd2c7850728520de01232254bb': AI 147731: Forgot to submit the build changes for the commit 0c86cde97d855df0a1deed71a1b6a4e836320e20 Merge: c88b8d6 0aad978 Author: Scott Su <> Date: Tue Apr 28 21:53:04 2009 -0700 am 0aad978: AI 147679: CTS: add test cases for MessageQueue and Messenge Merge commit '0aad978f023189f6e6c9a064c21c289bafd142de' into donut * commit '0aad978f023189f6e6c9a064c21c289bafd142de': AI 147679: CTS: add test cases for MessageQueue and Messenger commit c88b8d60ab97d4747f7da0da363093ecb231d056 Merge: a600af2 d5033e8 Author: Scott Su <> Date: Tue Apr 28 21:53:03 2009 -0700 am d5033e8: AI 147675: CTS: add test cases for android.os.Parcel Merge commit 'd5033e89c5096f9f1a40a34fe9d1af3d40ac91f4' into donut * commit 'd5033e89c5096f9f1a40a34fe9d1af3d40ac91f4': AI 147675: CTS: add test cases for android.os.Parcel commit a600af2d4596b91327abcc174c33e88cbfb79594 Merge: 563b34d 381af19 Author: Scott Su <> Date: Tue Apr 28 21:53:03 2009 -0700 am 381af19: AI 147672: CTS: add test cases fro android.os.ParcelFileDesc Merge commit '381af1923f0db0ec592c582586bd4b335819a19b' into donut * commit '381af1923f0db0ec592c582586bd4b335819a19b': AI 147672: CTS: add test cases fro android.os.ParcelFileDescriptor commit 563b34d8c122c76cef03745f51eab80e43b03fcf Merge: dee1788 ce08ad3 Author: Scott Su <> Date: Tue Apr 28 21:53:03 2009 -0700 am ce08ad3: AI 147669: CTS: Add test case for android.app.Notification Merge commit 'ce08ad398544685e888a6910fad89acab028ba21' into donut * commit 'ce08ad398544685e888a6910fad89acab028ba21': AI 147669: CTS: Add test case for android.app.Notification commit dee1788971dea06b7211e494052689412fe54edf Merge: f0e44e2 56f2a42 Author: Scott Su <> Date: Tue Apr 28 21:53:02 2009 -0700 am 56f2a42: AI 147666: CTS: add test cases for android.os.Message, Handl Merge commit '56f2a42799670c9f94e012bbdfdadfd9461b4463' into donut * commit '56f2a42799670c9f94e012bbdfdadfd9461b4463': AI 147666: CTS: add test cases for android.os.Message, Handler and Looper commit f0e44e25ce9c155024880711c393811247c444f9 Merge: 0c4cc61 b430c8a Author: Scott Su <> Date: Tue Apr 28 21:53:02 2009 -0700 am b430c8a: AI 147663: CTS: add test cases for android.os.PowerManager. Merge commit 'b430c8a533ef495d222a2c09dfca60ac38f38381' into donut * commit 'b430c8a533ef495d222a2c09dfca60ac38f38381': AI 147663: CTS: add test cases for android.os.PowerManager.WakeLock commit 0c4cc61c882a31bb5e2641d074f0c5f19b0d5f0f Merge: ec087cb 810648a Author: Scott Su <> Date: Tue Apr 28 21:53:02 2009 -0700 am 810648a: AI 147658: CTS: add test cases for android.view.KeyCharacter Merge commit '810648a086fc834a3ad9de0d42e2b4d3ddaddbbb' into donut * commit '810648a086fc834a3ad9de0d42e2b4d3ddaddbbb': AI 147658: CTS: add test cases for android.view.KeyCharacterMap commit ec087cb8f1dff6e3b6e8462dc590bbc65750f193 Merge: 8e209e4 a9e8720 Author: Scott Su <> Date: Tue Apr 28 21:53:01 2009 -0700 am a9e8720: AI 147655: CTS: add test cases for android.app.KeyguardManag Merge commit 'a9e8720929c3d7978b2768319a9a6eea53233b4f' into donut * commit 'a9e8720929c3d7978b2768319a9a6eea53233b4f': AI 147655: CTS: add test cases for android.app.KeyguardManager commit 8e209e4f3a12380a9bbdc9f949d5a28a13ba0832 Merge: c7ecaf5 60db5a8 Author: Scott Su <> Date: Tue Apr 28 21:53:01 2009 -0700 am 60db5a8: AI 147652: CTS: fixed failed problem in android.app.cts.Date Merge commit '60db5a8fec187a5533b574ea408dd235595d28c5' into donut * commit '60db5a8fec187a5533b574ea408dd235595d28c5': AI 147652: CTS: fixed failed problem in android.app.cts.DatePickerDialogTest commit c7ecaf520f2399f92ef7da2d66de8a11e3267fc1 Merge: f8ed701 cdeeb5b Author: Scott Su <> Date: Tue Apr 28 21:53:01 2009 -0700 am cdeeb5b: AI 147648: CTS: add test cases for android.app.Dialog Merge commit 'cdeeb5b288e9c6a250884b3a9f7974ea91c42d24' into donut * commit 'cdeeb5b288e9c6a250884b3a9f7974ea91c42d24': AI 147648: CTS: add test cases for android.app.Dialog commit f8ed701dac34af2bed63416cc0bf0b9b3c4dca62 Merge: b35a6dd e68a4a1 Author: Scott Su <> Date: Tue Apr 28 21:53:00 2009 -0700 am e68a4a1: AI 147644: CTS: add test cases for app.ListActivity Merge commit 'e68a4a16360c58b92b1bf5f3b0efa9f062e7b7fd' into donut * commit 'e68a4a16360c58b92b1bf5f3b0efa9f062e7b7fd': AI 147644: CTS: add test cases for app.ListActivity commit b35a6dd2fa38c0f5e9a98770a35dea5d4dca42d8 Merge: 224d6dc 60cb930 Author: Scott Su <> Date: Tue Apr 28 21:53:00 2009 -0700 am 60cb930: AI 147640: CTS: add test cases for android.app.AlarmManager Merge commit '60cb930554f302ec86eaa7ec91404b32a052b962' into donut * commit '60cb930554f302ec86eaa7ec91404b32a052b962': AI 147640: CTS: add test cases for android.app.AlarmManager commit 224d6dcea88578d89fa75020e62b088267463dfe Merge: f2725d4 f479bb5 Author: Scott Su <> Date: Tue Apr 28 21:53:00 2009 -0700 am f479bb5: AI 147637: CTS: Add test case for android.app.ActivityManage Merge commit 'f479bb571660105e4a31a5cd8687717b5eb831eb' into donut * commit 'f479bb571660105e4a31a5cd8687717b5eb831eb': AI 147637: CTS: Add test case for android.app.ActivityManager commit f2725d41ce1e32f040e4a76e7850d0cad6c5fd34 Merge: 051b404 fd27abc Author: Scott Su <> Date: Tue Apr 28 21:52:59 2009 -0700 am fd27abc: AI 147634: CTS: add test cases for app.AlertDialog. Merge commit 'fd27abc3649b6f29a56428b73e88d46e28350a76' into donut * commit 'fd27abc3649b6f29a56428b73e88d46e28350a76': AI 147634: CTS: add test cases for app.AlertDialog. commit 051b4046b81507d3dc5dcea59b629a12929f6ac6 Merge: 3bc03a1 5a76025 Author: Scott Su <> Date: Tue Apr 28 21:52:59 2009 -0700 am 5a76025: AI 147631: CTS: add test cases for LauncherActivity and TabA Merge commit '5a76025fec6a58c4dd9e6d6927ca60f17952ae24' into donut * commit '5a76025fec6a58c4dd9e6d6927ca60f17952ae24': AI 147631: CTS: add test cases for LauncherActivity and TabActivity commit 3bc03a132ec0af42db739c110762ebfad518fe97 Merge: 8b9d235 42f8f66 Author: Scott Su <> Date: Tue Apr 28 21:52:59 2009 -0700 am 42f8f66: AI 147625: CTS: add test cases for content.pm.PackageManager Merge commit '42f8f66894ea07f597869656a12a2ca63c8d4846' into donut * commit '42f8f66894ea07f597869656a12a2ca63c8d4846': AI 147625: CTS: add test cases for content.pm.PackageManager and its related class. commit 8b9d23595113e49189f896b4736af98300962cfa Merge: c6ead99 29aac8d Author: Scott Su <> Date: Tue Apr 28 21:52:58 2009 -0700 am 29aac8d: AI 147618: CTS: add test cases for android.app.ExpandableLis Merge commit '29aac8d26d473cd99283a1d39436a48807d7badc' into donut * commit '29aac8d26d473cd99283a1d39436a48807d7badc': AI 147618: CTS: add test cases for android.app.ExpandableListActivity commit c6ead99e1fa4b6e60899a0e4b9d4958cf6567833 Merge: 424ae4f d776ea2 Author: Scott Su <> Date: Tue Apr 28 21:52:58 2009 -0700 am d776ea2: AI 147612: CTS: add test cases for Intent, IntentFiler and M Merge commit 'd776ea2c806564f71a7e11cf9b1a6f12fb864fe5' into donut * commit 'd776ea2c806564f71a7e11cf9b1a6f12fb864fe5': AI 147612: CTS: add test cases for Intent, IntentFiler and MutableContextWrapper commit 424ae4f8f8ef4b2a39e527b98d3007b22bf327bd Merge: 2073201 7c0bdb3 Author: Scott Su <> Date: Tue Apr 28 21:52:57 2009 -0700 am 7c0bdb3: AI 147609: CTS: add test cases for android.app.Activity. Merge commit '7c0bdb3dc9365ce7c2c0901afc6927d78ad56d2b' into donut * commit '7c0bdb3dc9365ce7c2c0901afc6927d78ad56d2b': AI 147609: CTS: add test cases for android.app.Activity. commit 2073201548d75c79fb7ba00e273fa6a448b5f108 Merge: 2760bcf 86ed74f Author: Scott Su <> Date: Tue Apr 28 21:52:57 2009 -0700 am 86ed74f: AI 147606: CTS: fix failed problem in android.graphics.Paint Merge commit '86ed74f939f577097fa1069965fa6268581d914f' into donut * commit '86ed74f939f577097fa1069965fa6268581d914f': AI 147606: CTS: fix failed problem in android.graphics.Paint commit 2760bcfef758b87bebac111a86e3d4dee0d1d457 Merge: ce9c046 2cc27de Author: Scott Su <> Date: Tue Apr 28 21:52:57 2009 -0700 am 2cc27de: AI 147603: CTS: add test case for LocalActivityManager. Merge commit '2cc27de07eb0cbb9196cc8d23a23e313b0861390' into donut * commit '2cc27de07eb0cbb9196cc8d23a23e313b0861390': AI 147603: CTS: add test case for LocalActivityManager. commit ce9c04692d79e6532957f4ec0ab116ac5808dd5d Merge: df4ed27 17a8617 Author: Scott Su <> Date: Tue Apr 28 21:52:57 2009 -0700 am 17a8617: AI 147597: CTS: add test cases for android.content.res.Typed Merge commit '17a86177b60de3a3ec872da02d511eedbb69c0f7' into donut * commit '17a86177b60de3a3ec872da02d511eedbb69c0f7': AI 147597: CTS: add test cases for android.content.res.TypedArray commit df4ed272639e67ca5d8ae0d1be2d154440d634ea Merge: 0d73614 89a0970 Author: Scott Su <> Date: Tue Apr 28 21:52:56 2009 -0700 am 89a0970: AI 147594: CTS: add test cases for android.os.TokenWatcher Merge commit '89a0970c05a889e17470de7dbdd5b762fc78b248' into donut * commit '89a0970c05a889e17470de7dbdd5b762fc78b248': AI 147594: CTS: add test cases for android.os.TokenWatcher commit 0d73614a909b0866078aaf048a398dde631b7707 Merge: d759837 501c063 Author: Scott Su <> Date: Tue Apr 28 21:52:56 2009 -0700 am 501c063: AI 147591: CTS: add test cases for app.NotificationManager Merge commit '501c06381fe0c7858f97dac8e77e6a611e9477f4' into donut * commit '501c06381fe0c7858f97dac8e77e6a611e9477f4': AI 147591: CTS: add test cases for app.NotificationManager commit d759837bafdf6099581cc49aca95c1bb28eea89e Merge: 3b681cd 383a208 Author: Scott Su <> Date: Tue Apr 28 21:52:55 2009 -0700 am 383a208: AI 147588: CTS: add test cases for android.widget.VideoView Merge commit '383a208d67b3e3a593c19e0c2360def1dc774d6c' into donut * commit '383a208d67b3e3a593c19e0c2360def1dc774d6c': AI 147588: CTS: add test cases for android.widget.VideoView commit 3b681cd5cb0e03b8411c288ce187f537dae5411b Merge: 04566ac 0af8f5c Author: Scott Su <> Date: Tue Apr 28 21:52:55 2009 -0700 am 0af8f5c: AI 147584: CTS: add test cases for provider.MediaStore Merge commit '0af8f5c255826821b5d6b6c2d9b022cf3b4e0d13' into donut * commit '0af8f5c255826821b5d6b6c2d9b022cf3b4e0d13': AI 147584: CTS: add test cases for provider.MediaStore commit 04566acda2da80653f37a11e275514d98d0340cc Merge: fa391a9 edf555c Author: Scott Su <> Date: Tue Apr 28 21:52:55 2009 -0700 am edf555c: AI 147581: CTS:add test case for android.widget.MediaControl Merge commit 'edf555cd17e03ae9546ace3ee77781c3fc70b27d' into donut * commit 'edf555cd17e03ae9546ace3ee77781c3fc70b27d': AI 147581: CTS:add test case for android.widget.MediaController commit fa391a94e54098be179961b6d10cddb68f61a0c8 Merge: 2abd7cb 85f5d8c Author: Scott Su <> Date: Tue Apr 28 21:52:54 2009 -0700 am 85f5d8c: AI 147573: CTS: add test cases for view.KeyEvent Merge commit '85f5d8c5c38b7bad63ce71621b02882a422b3fa2' into donut * commit '85f5d8c5c38b7bad63ce71621b02882a422b3fa2': AI 147573: CTS: add test cases for view.KeyEvent commit 2abd7cb7fe001250d54976277014166944214c48 Merge: 3db45a0 51f48d5 Author: Scott Su <> Date: Tue Apr 28 21:52:54 2009 -0700 am 51f48d5: AI 147570: CTS: add test cases for android.widget.HeaderView Merge commit '51f48d5bcfd3fce656379dac506fbabba04e7deb' into donut * commit '51f48d5bcfd3fce656379dac506fbabba04e7deb': AI 147570: CTS: add test cases for android.widget.HeaderViewListAdapter commit 3db45a0dd3e21550f054474bc9d7a5ae2a6aa90e Merge: 969c4f0 c05d403 Author: Scott Su <> Date: Tue Apr 28 21:52:54 2009 -0700 am c05d403: AI 147566: CTS: add test cases for android.widget.SeekBar. Merge commit 'c05d403dd75e1fa84f328c6acfbed70c497390e6' into donut * commit 'c05d403dd75e1fa84f328c6acfbed70c497390e6': AI 147566: CTS: add test cases for android.widget.SeekBar. commit 969c4f0a02ed52d513e29da417085fc81e506c0f Merge: e3d4641 c032163 Author: Scott Su <> Date: Tue Apr 28 21:52:53 2009 -0700 am c032163: AI 147561: CTS: add test cases for android.widget.FrameLayou Merge commit 'c032163376620c275a16a1426afa9bf4dd2effbd' into donut * commit 'c032163376620c275a16a1426afa9bf4dd2effbd': AI 147561: CTS: add test cases for android.widget.FrameLayout commit e3d4641db871a03055a58c7eabbbd175280ed21b Merge: e5940eb e610a1e Author: Phil Dubach <> Date: Tue Apr 28 21:52:53 2009 -0700 am e610a1e: AI 147559: CTS: Use longer timeouts to allow for class initi Merge commit 'e610a1e958b9b9b2bf6d2f3d87aff38fd9e056a8' into donut * commit 'e610a1e958b9b9b2bf6d2f3d87aff38fd9e056a8': AI 147559: CTS: Use longer timeouts to allow for class initialization delays commit e5940ebdce7499f49f35d1fa58538790dfee4b26 Merge: 40e5b05 8c9b1e9 Author: Scott Su <> Date: Tue Apr 28 21:52:53 2009 -0700 am 8c9b1e9: AI 147556: CTS: add test cases for android.os.ConditionVaria Merge commit '8c9b1e906e0293dc0f88607f8fec41b5c91e2dcb' into donut * commit '8c9b1e906e0293dc0f88607f8fec41b5c91e2dcb': AI 147556: CTS: add test cases for android.os.ConditionVariable commit 40e5b05199f4dcc681b3211ba1e5083a71c4ff14 Merge: 8ca05f5 a41d414 Author: Phil Dubach <> Date: Tue Apr 28 21:52:52 2009 -0700 am a41d414: AI 147545: CTS: Handle timeout issues in unexpected tests Merge commit 'a41d41458defd0cb87fd167b88b9d1cecf4f51dc' into donut * commit 'a41d41458defd0cb87fd167b88b9d1cecf4f51dc': AI 147545: CTS: Handle timeout issues in unexpected tests commit 8ca05f583882e0ce320396c239b621f02862b6c3 Merge: 9b7571c 56e6fe1 Author: Bill Napier <> Date: Tue Apr 28 21:52:52 2009 -0700 am 56e6fe1: AI 147481: Include the performance tests in their own test p Merge commit '56e6fe1a6794b65fa931c76b3980b13005a9c0c8' into donut * commit '56e6fe1a6794b65fa931c76b3980b13005a9c0c8': AI 147481: Include the performance tests in their own test plan. commit 9b7571ca19ef67a1b1702deef319e0906591f9c0 Merge: ed6e1fc 5d3e1b9 Author: Phil Dubach <> Date: Tue Apr 28 21:52:52 2009 -0700 am 5d3e1b9: AI 147477: CTS: Add test for Build.VERSION.RELEASE Merge commit '5d3e1b906b2c7344757dc88fbe76bbd0255e7f34' into donut * commit '5d3e1b906b2c7344757dc88fbe76bbd0255e7f34': AI 147477: CTS: Add test for Build.VERSION.RELEASE commit ed6e1fc5056b2705fb8cfc9d171720582206b59c Merge: 81e4cc2 1928a76 Author: Scott Su <> Date: Tue Apr 28 21:52:51 2009 -0700 am 1928a76: AI 147450: CTS: add test cases for database.AbstractCursorTe Merge commit '1928a769f7586214f0db4c7a7d9fa3a5366ac8cb' into donut * commit '1928a769f7586214f0db4c7a7d9fa3a5366ac8cb': AI 147450: CTS: add test cases for database.AbstractCursorTest, AbstractWindowedCursor, CursorJoiner, CursorWindow, DatabaseUtils, MatrixCursor and MergeCursor commit 81e4cc2725d91fb64e5bf8c402c0f85d098fad2a Merge: 1133203 b71daef Author: Scott Su <> Date: Tue Apr 28 21:52:51 2009 -0700 am b71daef: AI 147448: CTS: add missing test in RectTest, RectFTest and Merge commit 'b71daefe68f4a024021edbfb93d5ac8f896554e8' into donut * commit 'b71daefe68f4a024021edbfb93d5ac8f896554e8': AI 147448: CTS: add missing test in RectTest, RectFTest and LayoutTest commit 11332032ec91b494964937626dfaaa1c952f081f Merge: 2d75d6e c080335 Author: Scott Su <> Date: Tue Apr 28 21:52:51 2009 -0700 am c080335: AI 147445: CTS: add test case for android.widget.CheckBox Merge commit 'c080335e04d5039f0f8b3fc46607102635d9c6e6' into donut * commit 'c080335e04d5039f0f8b3fc46607102635d9c6e6': AI 147445: CTS: add test case for android.widget.CheckBox commit 2d75d6ee86bbfc3b8b6426b4955406c80916af33 Merge: 5106c21 5731a54 Author: Scott Su <> Date: Tue Apr 28 21:52:50 2009 -0700 am 5731a54: AI 147442: CTS: add test cases for android.view.VelocityTrac Merge commit '5731a545a0e15de437072d2f48f860b3c5a2840e' into donut * commit '5731a545a0e15de437072d2f48f860b3c5a2840e': AI 147442: CTS: add test cases for android.view.VelocityTracker commit 5106c21fdfe17c22703c3147aa7773464f7e0491 Merge: c6635d7 8bd2754 Author: Scott Su <> Date: Tue Apr 28 21:52:50 2009 -0700 am 8bd2754: AI 147435: CTS: add test cases for android.widget.ScrollView Merge commit '8bd2754c4fe8000c86a09d92b9e562bc4188a7ff' into donut * commit '8bd2754c4fe8000c86a09d92b9e562bc4188a7ff': AI 147435: CTS: add test cases for android.widget.ScrollView commit 3a52ca1adee572f7a3eed702a5a6edd692103921 Author: Phil Dubach <> Date: Tue Apr 28 20:26:43 2009 -0700 AI 147980: CTS: Fix device status problem after a reset If a device gets reset during execution of a test package, we get a new TestDevice instance upon reconnect. This fixes a problem where the status was only updated in the obsolete TestDevice instance. Automated import of CL 147980 commit 59c0ba179cd3b955eb2ab59fe176163b2ea29aa4 Author: Phil Dubach <> Date: Tue Apr 28 17:17:57 2009 -0700 AI 147972: CTS: Fix a problem in Selector which would ignore the packages mistakenly when selecting test suites. BUG=1812583 Automated import of CL 147972 commit a0ec0db9ab29f1bee1abb2e4ed7e058cc65fb051 Author: Phil Dubach <> Date: Tue Apr 28 15:28:34 2009 -0700 AI 147957: CTS: Add configuration variable to set max size for a package to be run in batch mode Currently, the value defaults to Integer.MAX_VALUE, meaning that batch mode will be used for all packages. This can be changed in host_config.xml. Note that disabling batch mode for large packages will increase test runtime significantly. Disabling batch mode for large packages may improve stability of the CTS framework. BUG=1816793 Automated import of CL 147957 commit ba0c1bbe9c11885a9a63ab8ef28b91fd191a527c Author: Phil Dubach <> Date: Tue Apr 28 13:39:33 2009 -0700 AI 147910: CTS: Fix test failures in GravityTest and ViewGroup_LayoutParamsTest Automated import of CL 147910 commit 4a40445e61bc867e21a8f2e6d01a6896f18d27e8 Author: Phil Dubach <> Date: Mon Apr 27 20:04:13 2009 -0700 AI 147877: CTS: Sort package, suite, case and test lists for interactive plan generation Automated import of CL 147877 commit c6e9382c14fcf62bbee93e565498df06dcb489c5 Author: Phil Dubach <> Date: Mon Apr 27 18:51:41 2009 -0700 AI 147876: CTS: Fix signature test timeout handling and add timeout value to config Refactored HostConfig support for integer values to use an enum. Added configuration values for signature check and package installation. Properly handled timeouts in signature check. Timeouts were previously reported as failures. Cleaned up exception classes to get rid of build warnings. Automated import of CL 147876 commit 62311851c88f51785e03ec3c2abed8a0060f48cf Author: Phil Dubach <> Date: Sun Apr 26 02:29:45 2009 -0700 AI 147797: CTS: Throw exception on attempts to install a nonexistent APK Previously submitted as CL147771, which was missing files. Automated import of CL 147797 commit af9a409bf54a26b78e08e7799192dad5ddfda648 Author: Gaurav Mathur <> Date: Fri Apr 24 22:14:48 2009 -0700 AI 147786: Automated g4 rollback of changelist 147771. *** Reason for rollback *** CL 147771 broke the build - reverting *** Original change description *** CTS: Throw exception on attempts to install a nonexistent APK Automated import of CL 147786 commit 4f35e5e9c5fa551355e250186230ee29a4c6563f Author: Phil Dubach <> Date: Fri Apr 24 17:46:50 2009 -0700 AI 147771: CTS: Throw exception on attempts to install a nonexistent APK BUG=1810821 Automated import of CL 147771 commit d5fe3a6913a9fa68a8f4ce44507bcd104ae64cc7 Author: Phil Dubach <> Date: Fri Apr 24 16:06:13 2009 -0700 AI 147757: CTS: Increase test timeout and fix result mixups after batch timeout Test timeout for individual test status updates increased to 5 min as requested by Noser. Automated import of CL 147757 commit d9901b81d949ec591e7b1a2378a450cd2d49bc89 Author: Gaurav Mathur <> Date: Fri Apr 24 15:39:17 2009 -0700 AI 147750: Add soft API test for SDK version Automated import of CL 147750 commit 4613a90144021efd2c7850728520de01232254bb Author: Jorg Pleumann <> Date: Fri Apr 24 13:40:00 2009 -0700 AI 147731: Forgot to submit the build changes for the luni.AllTests removal. Automated import of CL 147731 commit 0aad978f023189f6e6c9a064c21c289bafd142de Author: Scott Su <> Date: Fri Apr 24 02:50:57 2009 -0700 AI 147679: CTS: add test cases for MessageQueue and Messenger Automated import of CL 147679 commit d5033e89c5096f9f1a40a34fe9d1af3d40ac91f4 Author: Scott Su <> Date: Fri Apr 24 02:26:44 2009 -0700 AI 147675: CTS: add test cases for android.os.Parcel Automated import of CL 147675 commit 381af1923f0db0ec592c582586bd4b335819a19b Author: Scott Su <> Date: Fri Apr 24 02:18:53 2009 -0700 AI 147672: CTS: add test cases fro android.os.ParcelFileDescriptor Automated import of CL 147672 commit ce08ad398544685e888a6910fad89acab028ba21 Author: Scott Su <> Date: Fri Apr 24 02:10:29 2009 -0700 AI 147669: CTS: Add test case for android.app.Notification Automated import of CL 147669 commit 56f2a42799670c9f94e012bbdfdadfd9461b4463 Author: Scott Su <> Date: Fri Apr 24 02:02:01 2009 -0700 AI 147666: CTS: add test cases for android.os.Message, Handler and Looper Automated import of CL 147666 commit b430c8a533ef495d222a2c09dfca60ac38f38381 Author: Scott Su <> Date: Fri Apr 24 01:53:32 2009 -0700 AI 147663: CTS: add test cases for android.os.PowerManager.WakeLock Automated import of CL 147663 commit 810648a086fc834a3ad9de0d42e2b4d3ddaddbbb Author: Scott Su <> Date: Fri Apr 24 01:44:54 2009 -0700 AI 147658: CTS: add test cases for android.view.KeyCharacterMap Automated import of CL 147658 commit a9e8720929c3d7978b2768319a9a6eea53233b4f Author: Scott Su <> Date: Fri Apr 24 01:34:57 2009 -0700 AI 147655: CTS: add test cases for android.app.KeyguardManager Automated import of CL 147655 commit 60db5a8fec187a5533b574ea408dd235595d28c5 Author: Scott Su <> Date: Fri Apr 24 01:24:58 2009 -0700 AI 147652: CTS: fixed failed problem in android.app.cts.DatePickerDialogTest Automated import of CL 147652 commit cdeeb5b288e9c6a250884b3a9f7974ea91c42d24 Author: Scott Su <> Date: Fri Apr 24 01:15:47 2009 -0700 AI 147648: CTS: add test cases for android.app.Dialog Automated import of CL 147648 commit e68a4a16360c58b92b1bf5f3b0efa9f062e7b7fd Author: Scott Su <> Date: Fri Apr 24 00:59:06 2009 -0700 AI 147644: CTS: add test cases for app.ListActivity Automated import of CL 147644 commit 60cb930554f302ec86eaa7ec91404b32a052b962 Author: Scott Su <> Date: Fri Apr 24 00:38:37 2009 -0700 AI 147640: CTS: add test cases for android.app.AlarmManager Automated import of CL 147640 commit f479bb571660105e4a31a5cd8687717b5eb831eb Author: Scott Su <> Date: Fri Apr 24 00:24:12 2009 -0700 AI 147637: CTS: Add test case for android.app.ActivityManager Automated import of CL 147637 commit fd27abc3649b6f29a56428b73e88d46e28350a76 Author: Scott Su <> Date: Fri Apr 24 00:12:01 2009 -0700 AI 147634: CTS: add test cases for app.AlertDialog. Automated import of CL 147634 commit 5a76025fec6a58c4dd9e6d6927ca60f17952ae24 Author: Scott Su <> Date: Thu Apr 23 23:59:02 2009 -0700 AI 147631: CTS: add test cases for LauncherActivity and TabActivity Automated import of CL 147631 commit 42f8f66894ea07f597869656a12a2ca63c8d4846 Author: Scott Su <> Date: Thu Apr 23 23:40:02 2009 -0700 AI 147625: CTS: add test cases for content.pm.PackageManager and its related class. Automated import of CL 147625 commit 29aac8d26d473cd99283a1d39436a48807d7badc Author: Scott Su <> Date: Thu Apr 23 23:13:26 2009 -0700 AI 147618: CTS: add test cases for android.app.ExpandableListActivity Automated import of CL 147618 commit d776ea2c806564f71a7e11cf9b1a6f12fb864fe5 Author: Scott Su <> Date: Thu Apr 23 23:04:51 2009 -0700 AI 147612: CTS: add test cases for Intent, IntentFiler and MutableContextWrapper Automated import of CL 147612 commit 7c0bdb3dc9365ce7c2c0901afc6927d78ad56d2b Author: Scott Su <> Date: Thu Apr 23 22:54:53 2009 -0700 AI 147609: CTS: add test cases for android.app.Activity. Automated import of CL 147609 commit 86ed74f939f577097fa1069965fa6268581d914f Author: Scott Su <> Date: Thu Apr 23 22:43:24 2009 -0700 AI 147606: CTS: fix failed problem in android.graphics.Paint Automated import of CL 147606 commit 2cc27de07eb0cbb9196cc8d23a23e313b0861390 Author: Scott Su <> Date: Thu Apr 23 22:34:06 2009 -0700 AI 147603: CTS: add test case for LocalActivityManager. Automated import of CL 147603 commit 17a86177b60de3a3ec872da02d511eedbb69c0f7 Author: Scott Su <> Date: Thu Apr 23 22:12:51 2009 -0700 AI 147597: CTS: add test cases for android.content.res.TypedArray Automated import of CL 147597 commit 89a0970c05a889e17470de7dbdd5b762fc78b248 Author: Scott Su <> Date: Thu Apr 23 22:02:53 2009 -0700 AI 147594: CTS: add test cases for android.os.TokenWatcher Automated import of CL 147594 commit 501c06381fe0c7858f97dac8e77e6a611e9477f4 Author: Scott Su <> Date: Thu Apr 23 21:52:09 2009 -0700 AI 147591: CTS: add test cases for app.NotificationManager Automated import of CL 147591 commit 383a208d67b3e3a593c19e0c2360def1dc774d6c Author: Scott Su <> Date: Thu Apr 23 21:30:51 2009 -0700 AI 147588: CTS: add test cases for android.widget.VideoView Automated import of CL 147588 commit 0af8f5c255826821b5d6b6c2d9b022cf3b4e0d13 Author: Scott Su <> Date: Thu Apr 23 20:47:48 2009 -0700 AI 147584: CTS: add test cases for provider.MediaStore Automated import of CL 147584 commit edf555cd17e03ae9546ace3ee77781c3fc70b27d Author: Scott Su <> Date: Thu Apr 23 20:32:37 2009 -0700 AI 147581: CTS:add test case for android.widget.MediaController Automated import of CL 147581 commit 85f5d8c5c38b7bad63ce71621b02882a422b3fa2 Author: Scott Su <> Date: Thu Apr 23 19:25:12 2009 -0700 AI 147573: CTS: add test cases for view.KeyEvent Automated import of CL 147573 commit 51f48d5bcfd3fce656379dac506fbabba04e7deb Author: Scott Su <> Date: Thu Apr 23 19:16:47 2009 -0700 AI 147570: CTS: add test cases for android.widget.HeaderViewListAdapter Automated import of CL 147570 commit c05d403dd75e1fa84f328c6acfbed70c497390e6 Author: Scott Su <> Date: Thu Apr 23 19:02:52 2009 -0700 AI 147566: CTS: add test cases for android.widget.SeekBar. Automated import of CL 147566 commit c032163376620c275a16a1426afa9bf4dd2effbd Author: Scott Su <> Date: Thu Apr 23 18:49:10 2009 -0700 AI 147561: CTS: add test cases for android.widget.FrameLayout Automated import of CL 147561 commit e610a1e958b9b9b2bf6d2f3d87aff38fd9e056a8 Author: Phil Dubach <> Date: Thu Apr 23 18:32:25 2009 -0700 AI 147559: CTS: Use longer timeouts to allow for class initialization delays After issuing an 'am instrument' call, a significant amount of time may be spent in class initialization, especially when running tests in batch mode. This change introduces separate timeout values for starting batch and individual test runs. Also, to simplify the procedure of changing those timeouts, the values can be overridden using the host_config.xml file. The change also removes the environment variable CTS_RESTART_AFTER and uses the host_config.xml file to set this value instead. Automated import of CL 147559 commit 8c9b1e906e0293dc0f88607f8fec41b5c91e2dcb Author: Scott Su <> Date: Thu Apr 23 18:27:01 2009 -0700 AI 147556: CTS: add test cases for android.os.ConditionVariable Automated import of CL 147556 commit a41d41458defd0cb87fd167b88b9d1cecf4f51dc Author: Phil Dubach <> Date: Thu Apr 23 17:43:53 2009 -0700 AI 147545: CTS: Handle timeout issues in unexpected tests If a test is included in a test APK, but not in the test plan, it will still run in batch mode. However, the result notifications for unexpected test were not previously passed on to the TestPackage instance, which meant that no timeout task was started for the test. This change restarts the timeout timer when any test result (expected or not) comes in. This properly catches timeouts in unexpected tests, as well as timeouts that occur between two tests. BUG=1804876 Automated import of CL 147545 commit ea0ecf0189315993a707aa7c3a807bf215536932 Author: Fred Quintana Date: Thu Apr 23 13:36:24 2009 -0700 change the sync framework and users to understand Account commit 56e6fe1a6794b65fa931c76b3980b13005a9c0c8 Author: Bill Napier <> Date: Thu Apr 23 10:15:53 2009 -0700 AI 147481: Include the performance tests in their own test plan. Automated import of CL 147481 commit 5d3e1b906b2c7344757dc88fbe76bbd0255e7f34 Author: Phil Dubach <> Date: Thu Apr 23 10:12:28 2009 -0700 AI 147477: CTS: Add test for Build.VERSION.RELEASE Automated import of CL 147477 commit 1928a769f7586214f0db4c7a7d9fa3a5366ac8cb Author: Scott Su <> Date: Wed Apr 22 22:45:46 2009 -0700 AI 147450: CTS: add test cases for database.AbstractCursorTest, AbstractWindowedCursor, CursorJoiner, CursorWindow, DatabaseUtils, MatrixCursor and MergeCursor Automated import of CL 147450 commit b71daefe68f4a024021edbfb93d5ac8f896554e8 Author: Scott Su <> Date: Wed Apr 22 22:12:25 2009 -0700 AI 147448: CTS: add missing test in RectTest, RectFTest and LayoutTest Automated import of CL 147448 commit c080335e04d5039f0f8b3fc46607102635d9c6e6 Author: Scott Su <> Date: Wed Apr 22 21:52:40 2009 -0700 AI 147445: CTS: add test case for android.widget.CheckBox Automated import of CL 147445 commit 5731a545a0e15de437072d2f48f860b3c5a2840e Author: Scott Su <> Date: Wed Apr 22 20:46:01 2009 -0700 AI 147442: CTS: add test cases for android.view.VelocityTracker Automated import of CL 147442 commit 8bd2754c4fe8000c86a09d92b9e562bc4188a7ff Author: Scott Su <> Date: Wed Apr 22 18:48:16 2009 -0700 AI 147435: CTS: add test cases for android.widget.ScrollView Automated import of CL 147435 commit c96d78c36d7b9cf9dfebf4ad5de0b97e7574ffa7 Merge: ffef3e6 c6635d7 Author: Jean-Baptiste Queru Date: Wed Apr 22 18:33:12 2009 -0700 Merge donut into master commit c6635d77f991c675613f6355448a19ffcff14bb5 Merge: 9ae69a6 24236df Author: Jean-Baptiste Queru Date: Wed Apr 22 17:56:50 2009 -0700 merge cupcake into donut commit ffef3e6155d77fbe5d563558d25d35cc3a515779 Merge: f0b13f5 9ae69a6 Author: Jean-Baptiste Queru Date: Wed Apr 22 17:12:11 2009 -0700 Merge donut into master commit 9ae69a63df82e7044f7f731ff6a355a8a7f8f92b Author: Scott Su <> Date: Wed Apr 22 13:41:33 2009 -0700 AI 147348: am: CL 147345 CTS: add test cases for view.MotionEvent Original author: sus Merged from: //branches/cupcake/... Automated import of CL 147348 commit 24236dfb80234e8948c0ca3940d608feae1b67bf Author: Phil Dubach <> Date: Wed Apr 22 11:57:57 2009 -0700 AI 147398: CTS: Fix console search for test packages When the CTS host searched for a test package to run, it did so using String.startswith() to allow partial package names to be entered on the console. This caused problems with multiple packages that share the same prefix. BUG=1804876 Automated import of CL 147398 commit f0b13f5593eb04720e055e372fa546cda0f9e7f6 Merge: 0f6cd57 743b7ad Author: Scott Su <> Date: Wed Apr 22 01:10:43 2009 -0700 Merge branch 'readonly-p4-master' commit 743b7adaa363f415e2e4fd5d627ba98f13e9f4e0 Author: Scott Su <> Date: Wed Apr 22 01:09:28 2009 -0700 AI 147349: am: CL 147348 am: CL 147345 CTS: add test cases for view.MotionEvent Original author: sus Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 147349 commit 0ed2e70128071be358ef4abfa71ceed4092e4d18 Author: Scott Su <> Date: Tue Apr 21 22:58:08 2009 -0700 AI 147345: CTS: add test cases for view.MotionEvent Automated import of CL 147345 commit 0f6cd57a11430a8b82f003d1558b2497dcabfd3b Merge: c90a88e 244c6cf Author: Phil Dubach <> Date: Tue Apr 21 13:15:43 2009 -0700 Merge branch 'readonly-p4-master' commit 244c6cfc4901c0b6e8c6bc2512e7c9a1bdfd046d Author: Phil Dubach <> Date: Tue Apr 21 13:14:25 2009 -0700 AI 147187: am: CL 147184 am: CL 147182 CTS: Fix NullPointerException during device restart Original author: phillipd Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 147187 commit 241a5798dd419385f4f92f0c06ccfb8f68a5574b Author: Phil Dubach <> Date: Tue Apr 21 13:11:43 2009 -0700 AI 147184: am: CL 147182 CTS: Fix NullPointerException during device restart Original author: phillipd Merged from: //branches/cupcake/... Automated import of CL 147184 commit fb7cda7df9d6cc908cc19b3383c1327513d37343 Author: Phil Dubach <> Date: Tue Apr 21 13:08:23 2009 -0700 AI 147182: CTS: Fix NullPointerException during device restart BUG=1802445 Automated import of CL 147182 commit c90a88e1e0d63812200084bb3e6585b01c8d8a55 Merge: 44ee65c bb6b6e7 Author: Jorg Pleumann <> Date: Tue Apr 21 10:14:05 2009 -0700 Merge branch 'readonly-p4-master' commit bb6b6e710041a77ce950e7c4ef99e5324091518e Author: Jorg Pleumann <> Date: Tue Apr 21 10:12:24 2009 -0700 AI 147146: am: CL 147145 am: CL 147143 Make sure parent directory exists when we want to write out the XML test description. If we are doing a massively parallel build, this might not be the case (yet). Original author: jorgp Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 147146 commit 19ac59ac1445f18dae25e78d60b7fecb8d690f83 Author: Jorg Pleumann <> Date: Tue Apr 21 10:09:43 2009 -0700 AI 147145: am: CL 147143 Make sure parent directory exists when we want to write out the XML test description. If we are doing a massively parallel build, this might not be the case (yet). Original author: jorgp Merged from: //branches/cupcake/... Automated import of CL 147145 commit 861927026ec16318f571d1d2f6fca1cb21cd31d0 Author: Jorg Pleumann <> Date: Tue Apr 21 10:08:53 2009 -0700 AI 147143: Make sure parent directory exists when we want to write out the XML test description. If we are doing a massively parallel build, this might not be the case (yet). BUG=1800213 Automated import of CL 147143 commit ebd0730f7ca08142ce3778c98a52fefff23a5f96 Author: Scott Su <> Date: Tue Apr 21 01:16:25 2009 -0700 AI 147113: am: CL 147111 CTS: add test cases for SearchManager. Original author: sus Merged from: //branches/cupcake/... Automated import of CL 147113 commit 8b4016c1f90e7c220eaa580ab8357bcbac6c0107 Author: Scott Su <> Date: Tue Apr 21 01:13:44 2009 -0700 AI 147105: am: CL 147099 CTS: add test cases for android.database.sqlite.SQLiteClosable. Original author: sus Merged from: //branches/cupcake/... Automated import of CL 147105 commit 024e16ad4ae6643032c9203be39d681ed40b3b8d Author: Scott Su <> Date: Tue Apr 21 01:11:08 2009 -0700 AI 147098: am: CL 147097 CTS: add test cases for content.ContentResolver Original author: sus Merged from: //branches/cupcake/... Automated import of CL 147098 commit 5fecade0803bcc41eba3bd9fe976f47ecb27d171 Author: Scott Su <> Date: Tue Apr 21 01:08:21 2009 -0700 AI 147090: am: CL 147089 CTS: Added test case for SQLiteAbortException, SQLiteConstraintException, SQLiteDatabaseCorruptException, SQLiteDiskIOException, SQLiteDoneException, SQLiteException, SQLiteFullException and SQLiteMisuseException Original author: sus Merged from: //branches/cupcake/... Automated import of CL 147090 commit 9d1e2ce9aba7c2b663a3e833210dbc0974f939f7 Author: Phil Dubach <> Date: Tue Apr 21 01:02:54 2009 -0700 AI 147060: am: CL 147059 CTS: Fix LOCAL_MODULE_TAGS for CTS tests CTS tests should use local module tag 'tests' such that they are not built and included in the image by default. Original author: phillipd Merged from: //branches/cupcake/... Automated import of CL 147060 commit 44ee65c1129e3de39b670f6a95c3c60f9c63956a Merge: aba54f3 d692329 Author: Scott Su <> Date: Tue Apr 21 00:59:27 2009 -0700 Merge branch 'readonly-p4-master' commit d6923293ab31e0aa3a3e2a36019de15fe2269879 Author: Scott Su <> Date: Tue Apr 21 00:58:06 2009 -0700 AI 147114: am: CL 147113 am: CL 147111 CTS: add test cases for SearchManager. Original author: sus Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 147114 commit 4a103c41fb1563363857be06f945309517e0e50f Author: Bill Napier <> Date: Tue Apr 21 00:57:15 2009 -0700 AI 147050: am: CL 147049 Adding MultiApp Startup performance CTS test case. This is only the Test Case code. The changes to include it as part of the test suite will come in a later CL. Original author: napier Merged from: //branches/cupcake/... Automated import of CL 147050 commit aba54f311d4c58ee44eb7d0352c5fe018af7b5a2 Merge: 3ceef3b e1f2e97 Author: Scott Su <> Date: Tue Apr 21 00:56:28 2009 -0700 Merge branch 'readonly-p4-master' commit e1f2e97d439507cf9cbf59e643ee414e48b84301 Author: Scott Su <> Date: Tue Apr 21 00:55:04 2009 -0700 AI 147106: am: CL 147105 am: CL 147099 CTS: add test cases for android.database.sqlite.SQLiteClosable. Original author: sus Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 147106 commit 380ec6f8996710c951a5569ab7c98968039413d9 Author: Scott Su <> Date: Tue Apr 21 00:38:12 2009 -0700 AI 147111: CTS: add test cases for SearchManager. Automated import of CL 147111 commit 3ceef3bd430616077b6dd137362b1c285cd963b2 Merge: f2f1889 9c25925 Author: Scott Su <> Date: Tue Apr 21 00:07:32 2009 -0700 Merge branch 'readonly-p4-master' commit c968be43045008976ee8f26a740af2a6b1daa5da Author: Scott Su <> Date: Tue Apr 21 00:06:20 2009 -0700 AI 147099: CTS: add test cases for android.database.sqlite.SQLiteClosable. Automated import of CL 147099 commit 9c25925754f1660430822030455072ad1596f19b Author: Scott Su <> Date: Tue Apr 21 00:06:18 2009 -0700 AI 147102: am: CL 147098 am: CL 147097 CTS: add test cases for content.ContentResolver Original author: sus Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 147102 commit 06f6081e21bf27fad78362076d08a05daf29f901 Author: Scott Su <> Date: Tue Apr 21 00:04:24 2009 -0700 AI 147097: CTS: add test cases for content.ContentResolver Automated import of CL 147097 commit f2f18893e19e8e6401989b44bd14dac59df1e83a Merge: ff5ea3e 1de5b00 Author: Scott Su <> Date: Mon Apr 20 23:13:26 2009 -0700 Merge branch 'readonly-p4-master' commit 1de5b00cd9f7594f388ae418af15d14742db72d2 Author: Scott Su <> Date: Mon Apr 20 23:12:05 2009 -0700 AI 147093: am: CL 147090 am: CL 147089 CTS: Added test case for SQLiteAbortException, SQLiteConstraintException, SQLiteDatabaseCorruptException, SQLiteDiskIOException, SQLiteDoneException, SQLiteException, SQLiteFullException and SQLiteMisuseException Original author: sus Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 147093 commit 7fd3e031b3007bcc2f05e0027a7b2e449175f91c Author: Scott Su <> Date: Mon Apr 20 23:09:45 2009 -0700 AI 147089: CTS: Added test case for SQLiteAbortException, SQLiteConstraintException, SQLiteDatabaseCorruptException, SQLiteDiskIOException, SQLiteDoneException, SQLiteException, SQLiteFullException and SQLiteMisuseException Automated import of CL 147089 commit ff5ea3e53ed126b0408fc4e582f05cbe7a6cb441 Merge: 5dd6608 1819ba1 Author: Phil Dubach <> Date: Mon Apr 20 18:01:38 2009 -0700 Merge branch 'readonly-p4-master' commit 1819ba18f1afc7799dbc1a28aed1bbedbb83c2bc Author: Phil Dubach <> Date: Mon Apr 20 18:00:20 2009 -0700 AI 147064: am: CL 147060 am: CL 147059 CTS: Fix LOCAL_MODULE_TAGS for CTS tests CTS tests should use local module tag 'tests' such that they are not built and included in the image by default. Original author: phillipd Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 147064 commit 231bd251ac97e3e45f6f903f15ddbca29c6cf8a4 Author: Phil Dubach <> Date: Mon Apr 20 17:57:22 2009 -0700 AI 147059: CTS: Fix LOCAL_MODULE_TAGS for CTS tests CTS tests should use local module tag 'tests' such that they are not built and included in the image by default. BUG=1778334 Automated import of CL 147059 commit 5dd660889d5e614e70049e1413fada905a3528a1 Merge: d9f2a00 c7606ec Author: Bill Napier <> Date: Mon Apr 20 16:59:49 2009 -0700 Merge branch 'readonly-p4-master' commit c7606ec579dfeb95c3b40af2aa3e01136823fc0c Author: Bill Napier <> Date: Mon Apr 20 16:58:36 2009 -0700 AI 147051: am: CL 147050 am: CL 147049 Adding MultiApp Startup performance CTS test case. This is only the Test Case code. The changes to include it as part of the test suite will come in a later CL. Original author: napier Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 147051 commit 1856bd1aace6f2f8c5f2ef4c77f1325bf4269ca3 Author: Bill Napier <> Date: Mon Apr 20 16:56:00 2009 -0700 AI 147049: Adding MultiApp Startup performance CTS test case. This is only the Test Case code. The changes to include it as part of the test suite will come in a later CL. Automated import of CL 147049 commit d9f2a0037b6a7dfdafd362b333626d5bf00d7982 Merge: 9546dbc 9775ab7 Author: Bill Napier <> Date: Mon Apr 20 16:51:00 2009 -0700 Merge branch 'readonly-p4-master' commit 9775ab7d5b48aeee2307e1f844aac8dfa32354d6 Author: Bill Napier <> Date: Mon Apr 20 16:49:33 2009 -0700 AI 147046: am: CL 147045 am: CL 147044 Single App Performance tests. Since only a single app can be instrumented at a time, these tests needed to be broken up into little parts. The MAX_STARTUP_TIME for these tests is determined as the MAX startup time seen over 100 trials, plus 10% (to give some cushion). Original author: napier Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 147046 commit 63adbb632abbbb28ac26036d9f35c2224748d573 Author: Bill Napier <> Date: Mon Apr 20 16:48:58 2009 -0700 AI 147045: am: CL 147044 Single App Performance tests. Since only a single app can be instrumented at a time, these tests needed to be broken up into little parts. The MAX_STARTUP_TIME for these tests is determined as the MAX startup time seen over 100 trials, plus 10% (to give some cushion). Original author: napier Merged from: //branches/cupcake/... Automated import of CL 147045 commit 07b1ec2210150f079bd57d08798382c8704a3c73 Author: Bill Napier <> Date: Mon Apr 20 16:48:15 2009 -0700 AI 147044: Single App Performance tests. Since only a single app can be instrumented at a time, these tests needed to be broken up into little parts. The MAX_STARTUP_TIME for these tests is determined as the MAX startup time seen over 100 trials, plus 10% (to give some cushion). Automated import of CL 147044 commit 9546dbce45e5d87972e2dab22687d1c3b260f2e8 Merge: b849812 5e464f3 Author: Marco Nelissen <> Date: Mon Apr 20 14:54:58 2009 -0700 Merge branch 'readonly-p4-master' commit 5e464f33dde206d684bad4ec57426e8b6d8a1821 Author: Marco Nelissen <> Date: Mon Apr 20 14:53:14 2009 -0700 AI 146997: I think this may fix the p4 master build Automated import of CL 146997 commit b849812554f08254ce391171d6d1d06d9d2ffe4e Author: Bill Napier Date: Mon Apr 20 08:51:55 2009 -0700 Fix merge conflict that was breaking the build. commit 55f3ac199a9219b6c928b3aac7e84ad1861d484a Merge: 5404259 4e67dcb Author: Scott Su <> Date: Mon Apr 20 08:33:08 2009 -0700 Merge branch 'readonly-p4-master' commit 4e67dcba94fd6bd806e06237d898e1332312f03e Author: Scott Su <> Date: Mon Apr 20 08:31:44 2009 -0700 AI 146912: am: CL 146911 am: CL 146910 [Issue 1556587] CTS: CTS should include test cases to ensure application process and user isolation Original author: sus Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 146912 commit 5404259da817279125834c17022c267ce6fa8122 Merge: 9f79f80 9bf4cd1 Author: Scott Su <> Date: Mon Apr 20 08:29:49 2009 -0700 Merge branch 'readonly-p4-master' commit ad3518c0ce8b5e4daa3bf01a655c872a0b22f1f9 Author: Scott Su <> Date: Mon Apr 20 08:29:48 2009 -0700 AI 146911: am: CL 146910 [Issue 1556587] CTS: CTS should include test cases to ensure application process and user isolation Original author: sus Merged from: //branches/cupcake/... Automated import of CL 146911 commit 9bf4cd1e11590ec820059f6a0008bdb5e24dab54 Author: Scott Su <> Date: Mon Apr 20 08:28:21 2009 -0700 AI 146908: am: CL 146907 am: CL 146905 CTS: add test cases for android.os.Binder Original author: sus Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 146908 commit 9f79f80e66d96d5ad75326478968b9d844adaf2a Merge: b33c85c bc2eb0e Author: Scott Su <> Date: Mon Apr 20 08:26:28 2009 -0700 Merge branch 'readonly-p4-master' commit e68d5c9256d7eb886b3184126456da8a29a9cf68 Author: Scott Su <> Date: Mon Apr 20 08:26:27 2009 -0700 AI 146907: am: CL 146905 CTS: add test cases for android.os.Binder Original author: sus Merged from: //branches/cupcake/... Automated import of CL 146907 commit bc2eb0eb2eb05a1fb387f0fef56d7ddad80b0a17 Author: Scott Su <> Date: Mon Apr 20 08:25:02 2009 -0700 AI 146903: am: CL 146902 am: CL 146900 CTS: add test cases for android.os.Process Original author: sus Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 146903 commit ec5fd35b260968aec732acdeff7c50ff7d02b443 Author: Scott Su <> Date: Mon Apr 20 08:23:11 2009 -0700 AI 146902: am: CL 146900 CTS: add test cases for android.os.Process Original author: sus Merged from: //branches/cupcake/... Automated import of CL 146902 commit b33c85c214f6090cf4b292fec76662873bc0ed20 Merge: e1cc838 ca82c09 Author: Scott Su <> Date: Mon Apr 20 08:23:05 2009 -0700 Merge branch 'readonly-p4-master' commit ca82c091c41d9d34cf51090ef74b359b019c9d37 Author: Scott Su <> Date: Mon Apr 20 08:21:43 2009 -0700 AI 146896: am: CL 146895 am: CL 146894 CTS: add test cases for android.app.Service Original author: sus Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 146896 commit 91b14c4a26c89e02a7e6322188089360bf346081 Author: Scott Su <> Date: Mon Apr 20 08:20:02 2009 -0700 AI 146895: am: CL 146894 CTS: add test cases for android.app.Service Original author: sus Merged from: //branches/cupcake/... Automated import of CL 146895 commit e1cc8386b227447f67b81ce355f7de95fedb2fc8 Merge: f49e3b0 23546ce Author: Scott Su <> Date: Mon Apr 20 08:15:55 2009 -0700 Merge branch 'readonly-p4-master' commit 23546ce4f79a5fbc4bb6efba0e537425e419366b Author: Scott Su <> Date: Mon Apr 20 08:13:48 2009 -0700 AI 146878: am: CL 146877 am: CL 146876 CTS: add test cases for text.TextUtils. Original author: sus Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 146878 commit 7bdb3e9acf6a4f8250a79b9d1d0d75899f6bd430 Author: Scott Su <> Date: Mon Apr 20 08:11:34 2009 -0700 AI 146877: am: CL 146876 CTS: add test cases for text.TextUtils. Original author: sus Merged from: //branches/cupcake/... Automated import of CL 146877 commit f418d6c0c881f5b41312cefa61228ebcff6ba2c1 Author: Scott Su <> Date: Mon Apr 20 01:20:06 2009 -0700 AI 146910: [Issue 1556587] CTS: CTS should include test cases to ensure application process and user isolation Automated import of CL 146910 commit e052f88cf7a54ee71de8567e1aa97f9623256db5 Author: Scott Su <> Date: Mon Apr 20 01:19:07 2009 -0700 AI 146905: CTS: add test cases for android.os.Binder Automated import of CL 146905 commit 8f5bd296fa1ea44b2aa04e0dbabd351eb81289a5 Author: Scott Su <> Date: Mon Apr 20 01:18:07 2009 -0700 AI 146900: CTS: add test cases for android.os.Process Automated import of CL 146900 commit 9959554f397c098bc3d5cb65e78c2f0fe9cd1e8e Author: Scott Su <> Date: Mon Apr 20 01:17:03 2009 -0700 AI 146894: CTS: add test cases for android.app.Service Automated import of CL 146894 commit 5461caa9e82511581178730ff7d3913050e62d27 Author: Scott Su <> Date: Mon Apr 20 01:14:51 2009 -0700 AI 146876: CTS: add test cases for text.TextUtils. Automated import of CL 146876 commit f49e3b035f7d444a338737fd93bfad5906804d9c Merge: 73c428e 3058575 Author: Bill Napier <> Date: Sat Apr 18 23:19:16 2009 -0700 Merge branch 'readonly-p4-master' commit 3058575c7c48aab21858e969e070466160e65ef1 Author: Bill Napier <> Date: Sat Apr 18 23:18:01 2009 -0700 AI 146840: am: CL 146791 am: CL 146790 Add ApiDemos Reference Application test to CTS. Original author: napier Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 146840 commit 73c428ecb6ea81bbaa5d68fc6568a867f53d95c1 Merge: 9d1890a 8926a10 Author: Bill Napier <> Date: Sat Apr 18 23:07:56 2009 -0700 Merge branch 'readonly-p4-master' commit 8926a108666630e1a2ee0c4b517f134714413174 Author: Bill Napier <> Date: Sat Apr 18 23:06:44 2009 -0700 AI 146835: am: CL 146766 am: CL 146764 Added Reference App Testing Support to CTS host. Original author: napier Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 146835 commit 9d1890ade571b52adc77e686d68bf25eff19895b Merge: 70bf575 0b98c19 Author: Bill Napier <> Date: Sat Apr 18 23:05:08 2009 -0700 Merge branch 'readonly-p4-master' commit 0b98c19c386b615dfd3cffdcce93ba1618bc4767 Author: Bill Napier <> Date: Sat Apr 18 23:03:51 2009 -0700 AI 146834: am: CL 146765 am: CL 146763 Add the ability to read adb logcat messages to TestDevice Original author: napier Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 146834 commit 70bf575dcc155c4cfe30c6eb5739852d81491ccf Merge: 7f6e339 91b24c4 Author: Urs Grob <> Date: Sat Apr 18 22:45:41 2009 -0700 Merge branch 'readonly-p4-master' commit 91b24c401bf5c6c35830e8db733dea1d1a495c14 Author: Urs Grob <> Date: Sat Apr 18 22:44:31 2009 -0700 AI 146827: am: CL 146742 am: CL 146710 Splitting android.core.tests.apk into several smaller apks. Each libcore module gets one apk and luni gets 4. Original author: ursg Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 146827 commit 7f6e33901894aafa0d0cc7bf01b707800c83bfb7 Merge: 444e2fd 0d64848 Author: Scott Su <> Date: Sat Apr 18 20:49:11 2009 -0700 Merge branch 'readonly-p4-master' commit 0d6484832e4d2a26a27f98a5b7b2f9436ea9b8da Author: Scott Su <> Date: Sat Apr 18 20:48:00 2009 -0700 AI 146564: am: CL 146288 am: CL 146287 CTS: fixed failed problem in ProxyTest Original author: sus Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 146564 commit 444e2fd9201b0848eed6d53cfb6b57acd4f2fd40 Merge: c48deea 0fa37b7 Author: Scott Su <> Date: Sat Apr 18 20:46:28 2009 -0700 Merge branch 'readonly-p4-master' commit 0fa37b7664d9c786e362e7b484c16f14bbdad935 Author: Scott Su <> Date: Sat Apr 18 20:45:21 2009 -0700 AI 146563: am: CL 146284 am: CL 146283 CTS: add test cases for android.os.RemoteCallbackList Original author: sus Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 146563 commit c48deeac6e96397b21c7dd280cdf93e995845063 Merge: 15f014d e7180f2 Author: Scott Su <> Date: Sat Apr 18 20:41:10 2009 -0700 Merge branch 'readonly-p4-master' commit e7180f22edaea993c574944c139dd25aec631e01 Author: Scott Su <> Date: Sat Apr 18 20:39:57 2009 -0700 AI 146561: am: CL 146271 am: CL 146270 CTS: fixed failed problem in android.util.TimeUtils Original author: sus Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 146561 commit 15f014dcf6b5b25074cca452c3b3c75624eefe34 Merge: 40e74e1 1d121c3 Author: Scott Su <> Date: Sat Apr 18 20:38:24 2009 -0700 Merge branch 'readonly-p4-master' commit 1d121c3b27ce0eee699ba2986a061b5ee3dcd646 Author: Scott Su <> Date: Sat Apr 18 20:37:14 2009 -0700 AI 146560: am: CL 146268 am: CL 146267 CTS: add test cases for android.os.Debug Original author: sus Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 146560 commit 40e74e1cc4eb0892cbb1a4205271431a77b981d1 Merge: 1e19ca1 e9dccd9 Author: Scott Su <> Date: Sat Apr 18 20:35:38 2009 -0700 Merge branch 'readonly-p4-master' commit e9dccd940036625fdb9c7619cc3c309227c67dce Author: Scott Su <> Date: Sat Apr 18 20:34:29 2009 -0700 AI 146559: am: CL 146264 am: CL 146263 CTS: add test cases for android.os.Environment Original author: sus Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 146559 commit 1e19ca1371f961c2bbb9f3107880610ef08315f5 Merge: 9fda82f 7eb17c5 Author: Scott Su <> Date: Sat Apr 18 19:09:06 2009 -0700 Merge branch 'readonly-p4-master' commit 7eb17c5f67353f7fdba323dd5336bb13145e903e Author: Scott Su <> Date: Sat Apr 18 19:07:48 2009 -0700 AI 146523: am: CL 146090 am: CL 146089 CTS: add test cases for android.app.AliasActivity Original author: sus Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 146523 commit 9fda82f003fdb9f0b6df6305512650632aae657c Merge: c7e8618 f14a637 Author: Scott Su <> Date: Sat Apr 18 18:54:52 2009 -0700 Merge branch 'readonly-p4-master' commit f14a6379a9924e016e273760af1794dac65748dc Author: Scott Su <> Date: Sat Apr 18 18:53:46 2009 -0700 AI 146518: am: CL 146075 am: CL 146073 CTS: Add test case for CheckedTextView. Original author: sus Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 146518 commit c7e86189914d34d2d4a109a75681a8092a864590 Merge: d579da6 a65f8b7 Author: Scott Su <> Date: Sat Apr 18 18:43:39 2009 -0700 Merge branch 'readonly-p4-master' commit a65f8b76b4adb6c5eb5873c4c5dae08d1603691a Author: Scott Su <> Date: Sat Apr 18 18:42:29 2009 -0700 AI 146513: am: CL 146058 am: CL 146056 CTS: add test cases for android.text.method.BaseKeyListener, QwertyKeyListener, TextKeyListener, MultiTapKeyListener, DigitsKeyListener, NumberKeyListener, TimeKeyListener, DateKeyListener and DateTimeKeyListener Original author: sus Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 146513 commit d579da6def6555cacdf2694cfb985769a7259720 Merge: 7b4dd37 fecb4ab Author: Scott Su <> Date: Sat Apr 18 14:36:19 2009 -0700 Merge branch 'readonly-p4-master' commit fecb4ab65d302fe885997519318da30ada1a8f44 Author: Scott Su <> Date: Sat Apr 18 14:35:15 2009 -0700 AI 146523: am: CL 146090 am: CL 146089 CTS: add test cases for android.app.AliasActivity Original author: sus Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 146523 commit 7b4dd3701a6ee94006da801efe68e457f9a16b2f Merge: 4170f8b 0060262 Author: Scott Su <> Date: Sat Apr 18 14:22:58 2009 -0700 Merge branch 'readonly-p4-master' commit 0060262f0d0d6c9f4b34b146460d422dc74ee2c2 Author: Scott Su <> Date: Sat Apr 18 14:21:47 2009 -0700 AI 146518: am: CL 146075 am: CL 146073 CTS: Add test case for CheckedTextView. Original author: sus Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 146518 commit 4170f8be06e2e7a80812de911feff18c1fb1d9b5 Merge: 00fc8cf 01abdf7 Author: Scott Su <> Date: Sat Apr 18 14:12:19 2009 -0700 Merge branch 'readonly-p4-master' commit 01abdf7d7baefe24cdef3f73e17a9190565e291e Author: Scott Su <> Date: Sat Apr 18 14:11:02 2009 -0700 AI 146513: am: CL 146058 am: CL 146056 CTS: add test cases for android.text.method.BaseKeyListener, QwertyKeyListener, TextKeyListener, MultiTapKeyListener, DigitsKeyListener, NumberKeyListener, TimeKeyListener, DateKeyListener and DateTimeKeyListener Original author: sus Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 146513 commit e42765e10fbb0d480460b9a640f3130ffbd0f0e4 Author: Bill Napier <> Date: Sat Apr 18 12:08:58 2009 -0700 AI 146791: am: CL 146790 Add ApiDemos Reference Application test to CTS. Original author: napier Merged from: //branches/cupcake/... Automated import of CL 146791 commit 436eda2f124e9711bb96acec81e5d78a531bc1bc Author: Bill Napier <> Date: Sat Apr 18 11:59:48 2009 -0700 AI 146777: am: CL 146773 Create a CtsReferenceApp library so all CtsReferenceApp tests can have a common helpful baseclass. Original author: napier Merged from: //branches/cupcake/... Automated import of CL 146777 commit c8a5cde6a4f8f126d29fd48a9c76ca205e46d6fc Author: Bill Napier <> Date: Fri Apr 17 14:31:38 2009 -0700 AI 146790: Add ApiDemos Reference Application test to CTS. Automated import of CL 146790 commit 48dd902bc884aa50a1e067d05fe0c0a676c55681 Author: Bill Napier <> Date: Fri Apr 17 14:04:25 2009 -0700 AI 146773: Create a CtsReferenceApp library so all CtsReferenceApp tests can have a common helpful baseclass. Automated import of CL 146773 commit 9bf29d299faed6b8d187b0d346f86732fb490d3e Author: Bill Napier <> Date: Fri Apr 17 14:02:33 2009 -0700 AI 146766: am: CL 146764 Added Reference App Testing Support to CTS host. Original author: napier Merged from: //branches/cupcake/... Automated import of CL 146766 commit a74a1c255075f88502b5cd89d8b34a3675320dca Author: Bill Napier <> Date: Fri Apr 17 14:00:03 2009 -0700 AI 146764: Added Reference App Testing Support to CTS host. Automated import of CL 146764 commit 956719e979c6cff8230c90c271587b2359a047a6 Author: Bill Napier <> Date: Fri Apr 17 13:59:26 2009 -0700 AI 146765: am: CL 146763 Add the ability to read adb logcat messages to TestDevice Original author: napier Merged from: //branches/cupcake/... Automated import of CL 146765 commit 3e506e0f1bf85808694a1f668bca89dfcf02aaed Author: Bill Napier <> Date: Fri Apr 17 13:58:18 2009 -0700 AI 146763: Add the ability to read adb logcat messages to TestDevice Automated import of CL 146763 commit 6d0c40e7c6033d44414c857ac6ed14b2b460e890 Author: Urs Grob <> Date: Fri Apr 17 11:27:08 2009 -0700 AI 146742: am: CL 146710 Splitting android.core.tests.apk into several smaller apks. Each libcore module gets one apk and luni gets 4. Original author: ursg Merged from: //branches/cupcake/... Automated import of CL 146742 commit fc77f6eddfcdb4048196024e8288d09e3bc58c48 Author: Urs Grob <> Date: Fri Apr 17 02:07:14 2009 -0700 AI 146710: Splitting android.core.tests.apk into several smaller apks. Each libcore module gets one apk and luni gets 4. BUG=1789657 Automated import of CL 146710 commit 00fc8cf70a7b64ed81ea2ca29d75e3cbb5191f39 Merge: 11f787b 00b5cbb Author: Scott Su <> Date: Thu Apr 16 12:30:24 2009 -0700 Merge branch 'readonly-p4-master' commit 00b5cbb1ab70ad0b4aa5c44654194014be6fc275 Author: Scott Su <> Date: Thu Apr 16 12:28:57 2009 -0700 AI 146527: am: CL 146106 am: CL 146105 CTS: add test cases for android.os.FileObserver Original author: sus Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 146527 commit 11f787b950f23d65c1a28d371a51ff9299c1a9ac Merge: 2b9435b e56ee8d Author: Scott Su <> Date: Thu Apr 16 12:27:21 2009 -0700 Merge branch 'readonly-p4-master' commit e56ee8d1009dabce1c0897fce0efc84b6a5e04ff Author: Scott Su <> Date: Thu Apr 16 12:26:03 2009 -0700 AI 146526: am: CL 146102 am: CL 146100 CTS: add test case for util.EventLogTags, Log, SparseArray, SparseBooleanArray, SparseIntArray, StateSet and TimingLogger. Original author: sus Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 146526 commit 2b9435bd504a0ea1bbbd74f784569127170413eb Merge: 29461b4 6e7affc Author: Scott Su <> Date: Thu Apr 16 12:21:47 2009 -0700 Merge branch 'readonly-p4-master' commit 6e7affc1d0345b6f20e1b043eca0bd384c4e95b3 Author: Scott Su <> Date: Thu Apr 16 12:20:38 2009 -0700 AI 146524: am: CL 146096 am: CL 146095 CTS: fix a test failure in android.os.cts.BundleTest Original author: sus Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 146524 commit 29461b4c53683925a1ae95fa2be5066def5a3907 Merge: a84da06 1edc5c3 Author: Scott Su <> Date: Thu Apr 16 12:19:07 2009 -0700 Merge branch 'readonly-p4-master' commit 1edc5c38cd1fa189063778373482e37bbf7ffeac Author: Scott Su <> Date: Thu Apr 16 12:17:57 2009 -0700 AI 146523: am: CL 146090 am: CL 146089 CTS: add test cases for android.app.AliasActivity Original author: sus Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 146523 commit a84da06ada653cbb53d4f785bd480ea1366bfdb2 Merge: dc07ac5 b56acf1 Author: Scott Su <> Date: Thu Apr 16 12:10:52 2009 -0700 Merge branch 'readonly-p4-master' commit b56acf11b6bc7bb4c55be1b60a95684a19f1d19d Author: Scott Su <> Date: Thu Apr 16 12:09:38 2009 -0700 AI 146520: am: CL 146081 am: CL 146080 CTS: add test cases for location.LocationProvider and LocationManager. Original author: sus Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 146520 commit dc07ac54c2cefb9159d5fc737ab681fed500da7d Merge: 353a012 672fa5e Author: Scott Su <> Date: Thu Apr 16 12:07:54 2009 -0700 Merge branch 'readonly-p4-master' commit 672fa5e515081d87996703ccfe323d75e5b66eaf Author: Scott Su <> Date: Thu Apr 16 12:06:39 2009 -0700 AI 146519: am: CL 146078 am: CL 146077 CTS: add test cases for TextSwitcher and ZoomControls Original author: sus Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 146519 commit 353a0123d4b99f0cae7a360b46434d758b6e2db7 Merge: c3b9ba6 07cef57 Author: Scott Su <> Date: Thu Apr 16 12:05:08 2009 -0700 Merge branch 'readonly-p4-master' commit 07cef57c0958f81dde95e56bdf7a61ac8008aab8 Author: Scott Su <> Date: Thu Apr 16 12:03:54 2009 -0700 AI 146518: am: CL 146075 am: CL 146073 CTS: Add test case for CheckedTextView. Original author: sus Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 146518 commit c3b9ba69cc12d1750e2221f920640e192c091fc1 Merge: 1c12cdd f739670 Author: Scott Su <> Date: Thu Apr 16 12:02:18 2009 -0700 Merge branch 'readonly-p4-master' commit f739670e0b4a8485b1568512af71fca831f8f234 Author: Scott Su <> Date: Thu Apr 16 12:01:02 2009 -0700 AI 146516: am: CL 146072 am: CL 146071 CTS: Clean up test annotations Original author: sus Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 146516 commit 1c12cdd0e0a6f61d3d8474512e3702e0c06a8074 Merge: 641e0fd 3487313 Author: Scott Su <> Date: Thu Apr 16 11:54:00 2009 -0700 Merge branch 'readonly-p4-master' commit 3487313ff582d8a7ae2bf58e7379c4577522dd61 Author: Scott Su <> Date: Thu Apr 16 11:52:46 2009 -0700 AI 146513: am: CL 146058 am: CL 146056 CTS: add test cases for android.text.method.BaseKeyListener, QwertyKeyListener, TextKeyListener, MultiTapKeyListener, DigitsKeyListener, NumberKeyListener, TimeKeyListener, DateKeyListener and DateTimeKeyListener Original author: sus Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 146513 commit 641e0fd7762dfa57b7a09facff70ab755d736ad1 Merge: f5abaff 4e4308d Author: Scott Su <> Date: Thu Apr 16 11:51:12 2009 -0700 Merge branch 'readonly-p4-master' commit 4e4308dacdc077bf3e6da17388879280ab91f444 Author: Scott Su <> Date: Thu Apr 16 11:49:59 2009 -0700 AI 146512: am: CL 146052 am: CL 146049 CTS: add test cases for android.widget.Toast Original author: sus Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 146512 commit f5abafff4fe57b35b7452a82c721ee60bb82f854 Merge: 98ebbc1 2823c77 Author: Phil Dubach <> Date: Thu Apr 16 11:04:37 2009 -0700 Merge branch 'readonly-p4-master' commit 2823c778363a7c80baf299d2c6c11c44179f1023 Author: Phil Dubach <> Date: Thu Apr 16 11:03:23 2009 -0700 AI 146501: am: CL 145986 am: CL 145945 CTS: Decrease device restart interval to 200 tests Original author: phillipd Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 146501 commit 3fcf92604f00aa68117a3afcb9b5808bc9815abf Author: Scott Su <> Date: Tue Apr 14 23:34:43 2009 -0700 AI 146288: am: CL 146287 CTS: fixed failed problem in ProxyTest Original author: sus Merged from: //branches/cupcake/... Automated import of CL 146288 commit 0ace6d672273e2f5decca44b71e6f6a1fd9dcab3 Author: Scott Su <> Date: Tue Apr 14 23:34:23 2009 -0700 AI 146287: CTS: fixed failed problem in ProxyTest Automated import of CL 146287 commit ae9f4c3531128a7fed65ef910c44fec1101ffd37 Author: Scott Su <> Date: Tue Apr 14 23:13:04 2009 -0700 AI 146284: am: CL 146283 CTS: add test cases for android.os.RemoteCallbackList Original author: sus Merged from: //branches/cupcake/... Automated import of CL 146284 commit 0bcd3d086d57e8ec3d9554f6250310fb988581db Author: Scott Su <> Date: Tue Apr 14 23:11:35 2009 -0700 AI 146283: CTS: add test cases for android.os.RemoteCallbackList Automated import of CL 146283 commit 751974b369a2bbc2ea5e95f84aa0eeb5a529a685 Author: Scott Su <> Date: Tue Apr 14 20:09:43 2009 -0700 AI 146271: am: CL 146270 CTS: fixed failed problem in android.util.TimeUtils Original author: sus Merged from: //branches/cupcake/... Automated import of CL 146271 commit 167db1edb8690ad6fee00db0323afcdc6b9c6bc3 Author: Scott Su <> Date: Tue Apr 14 20:06:35 2009 -0700 AI 146270: CTS: fixed failed problem in android.util.TimeUtils Automated import of CL 146270 commit 7361f61da59adf8d11fbc4f5d3af3efe30cd4e72 Author: Scott Su <> Date: Tue Apr 14 20:00:56 2009 -0700 AI 146268: am: CL 146267 CTS: add test cases for android.os.Debug Original author: sus Merged from: //branches/cupcake/... Automated import of CL 146268 commit 9219aa8a7768b14ab881a2ea5d2521d5aad8a70a Author: Scott Su <> Date: Tue Apr 14 20:00:21 2009 -0700 AI 146267: CTS: add test cases for android.os.Debug Automated import of CL 146267 commit be0b0e7c738d38dd0315213ec5a463e2540feb8a Author: Scott Su <> Date: Tue Apr 14 19:51:26 2009 -0700 AI 146264: am: CL 146263 CTS: add test cases for android.os.Environment Original author: sus Merged from: //branches/cupcake/... Automated import of CL 146264 commit 442fc92b46fd3b988e6d0fd73e95a7de8f250b8d Author: Scott Su <> Date: Tue Apr 14 19:49:33 2009 -0700 AI 146263: CTS: add test cases for android.os.Environment Automated import of CL 146263 commit 98ebbc181aae7642a62411c419d55758cd3abe37 Merge: 13efb52 31fb751 Author: Eric Shienbrood <> Date: Tue Apr 14 15:41:31 2009 -0700 Merge branch 'readonly-p4-master' commit 31fb751e85a60b168139dd8f986f68c5066474e9 Author: Eric Shienbrood <> Date: Tue Apr 14 15:40:19 2009 -0700 AI 146222: Manual merge of 145980 from donutburger => master. Automated import of CL 146222 commit 13efb52e9bb7f084990c2961687a644766a3cd1e Merge: 4ff5810 da7d28e Author: Scott Su <> Date: Tue Apr 14 14:53:03 2009 -0700 Merge branch 'readonly-p4-master' commit da7d28e55d788988c699cef67d3ef18accf42aa1 Author: Scott Su <> Date: Tue Apr 14 14:51:49 2009 -0700 AI 146186: am: CL 145978 am: CL 145825 CTS: add test cases for android.app.Instrumentation Original author: sus Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 146186 commit 4ff5810b8f2704abfae947410e579cfb8ce1e55a Merge: 2523940 cebb5b0 Author: Scott Su <> Date: Tue Apr 14 14:50:17 2009 -0700 Merge branch 'readonly-p4-master' commit cebb5b0d46c92486e60c990e4dbfbea8cdde3dd0 Author: Scott Su <> Date: Tue Apr 14 14:49:04 2009 -0700 AI 146185: am: CL 145977 am: CL 145820 CTS: Add test cases for android.app.Application Original author: sus Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 146185 commit 25239407c1d04b81d739fa3d3fe46deae7b75ccc Merge: 2b2e78b ae07253 Author: Scott Su <> Date: Tue Apr 14 14:19:19 2009 -0700 Merge branch 'readonly-p4-master' commit ae072535a6c50e54ed60a719c5316cd4e81c18f8 Author: Scott Su <> Date: Tue Apr 14 14:18:08 2009 -0700 AI 146173: am: CL 145958 am: CL 145689 CTS: add test cases for android.view.SurfaceView Original author: sus Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 146173 commit 2b2e78b7ef181e425d68565417bd0c86f262fca7 Merge: 771f7d6 3f4cf2a Author: Scott Su <> Date: Tue Apr 14 14:08:12 2009 -0700 Merge branch 'readonly-p4-master' commit 3f4cf2a359c715a9bfb42016734f0fa60c9ee50c Author: Scott Su <> Date: Tue Apr 14 14:07:01 2009 -0700 AI 146169: am: CL 145954 am: CL 145670 CTS: add test cases for android.widget.AdapterView Original author: sus Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 146169 commit 771f7d66475378d2cdf42df426d2a3a8a6731776 Merge: afd28a5 5b71b31 Author: Phil Dubach <> Date: Tue Apr 14 12:36:48 2009 -0700 Merge branch 'readonly-p4-master' commit 5b71b31593a903c071ab109fc94cfc7559021aaa Author: Phil Dubach <> Date: Tue Apr 14 12:35:33 2009 -0700 AI 146176: am: CL 145968 am: CL 145727 CTS: Fixes and improvements for device reboots Recently, we see a new behavior where the device indicates that the boot is complete, but then the adb connection drops shortly after, while the CTS is trying to install a package. This means the CTS never sees a result for the package installation and keeps waiting forever. As a workaround, add a delay after the device indicates that the boot is complete, so that the connection is fully restored by the time the CTS resumes. Create a bugreport on the device if the connection drops during the time we wait after reboot. Also fix a problem in the disconnect notification. Original author: phillipd Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 146176 commit afd28a5a93a746e5231bd8f387f628841a2aca3c Merge: 8d5cc8f 6651814 Author: Scott Su <> Date: Tue Apr 14 12:33:46 2009 -0700 Merge branch 'readonly-p4-master' commit 66518140ab8b9d73d428087f9f8d76408f5660f2 Author: Scott Su <> Date: Tue Apr 14 12:32:26 2009 -0700 AI 146174: am: CL 145959 am: CL 145693 CTS: add test cases for android.view.ContextThemeWrapper Original author: sus Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 146174 commit 8d5cc8f619b4536fbf4120bce9e73253505679b0 Merge: 81b9c7d 3bd28a2 Author: Scott Su <> Date: Tue Apr 14 12:30:43 2009 -0700 Merge branch 'readonly-p4-master' commit 3bd28a207e66b25993b7acf41690a2bbfefd25a2 Author: Scott Su <> Date: Tue Apr 14 12:29:29 2009 -0700 AI 146173: am: CL 145958 am: CL 145689 CTS: add test cases for android.view.SurfaceView Original author: sus Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 146173 commit 81b9c7d690f0344f7c7d11256a6a0185fecc3d77 Merge: 879e868 910db2d Author: Scott Su <> Date: Tue Apr 14 12:27:55 2009 -0700 Merge branch 'readonly-p4-master' commit 910db2d3c03acf218b81304d68ec0b0d6f0ce52f Author: Scott Su <> Date: Tue Apr 14 12:26:33 2009 -0700 AI 146172: am: CL 145957 am: CL 145686 CTS: add test cases for android.view.Display Original author: sus Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 146172 commit 879e86838cd872fd46cc58db94e9d91cf1b68824 Merge: 052be19 2cc3145 Author: Scott Su <> Date: Tue Apr 14 12:24:45 2009 -0700 Merge branch 'readonly-p4-master' commit 2cc3145e1b66d5e759346240708fd4dcb712ec62 Author: Scott Su <> Date: Tue Apr 14 12:23:31 2009 -0700 AI 146171: am: CL 145956 am: CL 145675 CTS: fixed the fail bug in android.net.cts.NetworkInfoTest Original author: sus Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 146171 commit 052be198cd40ff9625aa540d886ef763ac8cae87 Merge: 86c4046 39ef24a Author: Scott Su <> Date: Tue Apr 14 12:21:58 2009 -0700 Merge branch 'readonly-p4-master' commit 39ef24a4f32d952686ade6e64e92f76ebb268e58 Author: Scott Su <> Date: Tue Apr 14 12:20:48 2009 -0700 AI 146170: am: CL 145955 am: CL 145672 CTS: add test cases for provider.Settings. Original author: sus Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 146170 commit 86c40467e87b00014df7d3ec28830ca497852fd7 Merge: 7e2c2a1 6149e8a Author: Scott Su <> Date: Tue Apr 14 12:19:17 2009 -0700 Merge branch 'readonly-p4-master' commit 6149e8a8b69a6c960bbfa982cd8e9a810f9def79 Author: Scott Su <> Date: Tue Apr 14 12:18:05 2009 -0700 AI 146169: am: CL 145954 am: CL 145670 CTS: add test cases for android.widget.AdapterView Original author: sus Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 146169 commit 7e2c2a15a11643b8d9a88b636c35a1212ee4ba59 Merge: 4777ef6 ad50584 Author: Scott Su <> Date: Tue Apr 14 12:16:32 2009 -0700 Merge branch 'readonly-p4-master' commit ad5058435893fd832f06754aead31f4290ac6758 Author: Scott Su <> Date: Tue Apr 14 12:15:18 2009 -0700 AI 146168: am: CL 145953 am: CL 145668 CTS: add test cases for net.UrlQuerySanitizer. Original author: sus Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 146168 commit 4777ef66b76db66580b8df0c33fb150d35885192 Author: Bill Napier Date: Tue Apr 14 10:19:43 2009 -0700 Remove cts refapp lib that was breaking the build. commit 9393a5360177a1097f0e6a61a928bd0c8e6c18ca Author: Scott Su <> Date: Tue Apr 14 02:15:55 2009 -0700 AI 146106: am: CL 146105 CTS: add test cases for android.os.FileObserver Original author: sus Merged from: //branches/cupcake/... Automated import of CL 146106 commit 6e026a7c6bcd10c4201b3ea676b18accd8267603 Author: Scott Su <> Date: Tue Apr 14 02:14:15 2009 -0700 AI 146105: CTS: add test cases for android.os.FileObserver Automated import of CL 146105 commit 404e7e43c4fa0a24044de4af681e89dcc5c4ba6f Author: Scott Su <> Date: Tue Apr 14 02:07:12 2009 -0700 AI 146102: am: CL 146100 CTS: add test case for util.EventLogTags, Log, SparseArray, SparseBooleanArray, SparseIntArray, StateSet and TimingLogger. Original author: sus Merged from: //branches/cupcake/... Automated import of CL 146102 commit 3f7ac770582ed13db21f2f15c0467a9db2ccae54 Author: Scott Su <> Date: Tue Apr 14 02:04:56 2009 -0700 AI 146100: CTS: add test case for util.EventLogTags, Log, SparseArray, SparseBooleanArray, SparseIntArray, StateSet and TimingLogger. Automated import of CL 146100 commit 7363a54468fc622bf54dced5437ad2402860c024 Author: Scott Su <> Date: Tue Apr 14 01:51:46 2009 -0700 AI 146096: am: CL 146095 CTS: fix a test failure in android.os.cts.BundleTest Original author: sus Merged from: //branches/cupcake/... Automated import of CL 146096 commit 48ec0cdc9b5355ea00efd7ad9236cb69073e77fd Author: Scott Su <> Date: Tue Apr 14 01:51:08 2009 -0700 AI 146095: CTS: fix a test failure in android.os.cts.BundleTest Automated import of CL 146095 commit 8897a466b570b2ef541f9ecd36815139acabb195 Author: Scott Su <> Date: Tue Apr 14 01:33:57 2009 -0700 AI 146090: am: CL 146089 CTS: add test cases for android.app.AliasActivity Original author: sus Merged from: //branches/cupcake/... Automated import of CL 146090 commit 82de51d95e18557c281222386e59ca62e8ce3905 Author: Scott Su <> Date: Tue Apr 14 01:32:49 2009 -0700 AI 146089: CTS: add test cases for android.app.AliasActivity Automated import of CL 146089 commit 1fc35330f2f878a6f2ce3c64b02260da6630642a Author: Scott Su <> Date: Mon Apr 13 23:45:19 2009 -0700 AI 146081: am: CL 146080 CTS: add test cases for location.LocationProvider and LocationManager. Original author: sus Merged from: //branches/cupcake/... Automated import of CL 146081 commit 9b860dee7c33ac89cdc9490bf0ec1df6ebb35fa9 Author: Scott Su <> Date: Mon Apr 13 23:44:45 2009 -0700 AI 146080: CTS: add test cases for location.LocationProvider and LocationManager. Automated import of CL 146080 commit a189b7833671f74919a85cb009311adadd0d6489 Author: Scott Su <> Date: Mon Apr 13 23:31:18 2009 -0700 AI 146078: am: CL 146077 CTS: add test cases for TextSwitcher and ZoomControls Original author: sus Merged from: //branches/cupcake/... Automated import of CL 146078 commit b5937881d322ac35ea985273793f49cd5cb93fc0 Author: Scott Su <> Date: Mon Apr 13 23:28:41 2009 -0700 AI 146077: CTS: add test cases for TextSwitcher and ZoomControls Automated import of CL 146077 commit f94ad3e2c662611bdd999c0455292cde1260ecab Author: Scott Su <> Date: Mon Apr 13 23:27:41 2009 -0700 AI 146075: am: CL 146073 CTS: Add test case for CheckedTextView. Original author: sus Merged from: //branches/cupcake/... Automated import of CL 146075 commit f8e6a37a44d6e915f0c73d95b5b42e2ab50b877d Author: Scott Su <> Date: Mon Apr 13 23:25:15 2009 -0700 AI 146073: CTS: Add test case for CheckedTextView. Automated import of CL 146073 commit f665594b94513adefc8c2dddd9ab4b6358aff76f Author: Scott Su <> Date: Mon Apr 13 23:24:06 2009 -0700 AI 146072: am: CL 146071 CTS: Clean up test annotations Original author: sus Merged from: //branches/cupcake/... Automated import of CL 146072 commit 7fc2185d152cb17bb67c72f52bb0043633cc5276 Author: Scott Su <> Date: Mon Apr 13 23:23:32 2009 -0700 AI 146071: CTS: Clean up test annotations BUG=1654276 Automated import of CL 146071 commit 244026ee0b3409d529efee485d3a2f4702824861 Author: Scott Su <> Date: Mon Apr 13 19:34:52 2009 -0700 AI 146058: am: CL 146056 CTS: add test cases for android.text.method.BaseKeyListener, QwertyKeyListener, TextKeyListener, MultiTapKeyListener, DigitsKeyListener, NumberKeyListener, TimeKeyListener, DateKeyListener and DateTimeKeyListener Original author: sus Merged from: //branches/cupcake/... Automated import of CL 146058 commit c3a243ab5f24769c63f1fedeadb923e2e6975251 Author: Scott Su <> Date: Mon Apr 13 19:32:36 2009 -0700 AI 146056: CTS: add test cases for android.text.method.BaseKeyListener, QwertyKeyListener, TextKeyListener, MultiTapKeyListener, DigitsKeyListener, NumberKeyListener, TimeKeyListener, DateKeyListener and DateTimeKeyListener Automated import of CL 146056 commit 0783707b32cebbcea8207701a8bd9903c3404611 Author: Scott Su <> Date: Mon Apr 13 18:55:05 2009 -0700 AI 146052: am: CL 146049 CTS: add test cases for android.widget.Toast Original author: sus Merged from: //branches/cupcake/... Automated import of CL 146052 commit aca993d642075dab77034e1c6a91e412a49e82a3 Author: Phil Dubach <> Date: Mon Apr 13 18:29:30 2009 -0700 AI 145986: am: CL 145945 CTS: Decrease device restart interval to 200 tests Original author: phillipd Merged from: //branches/cupcake/... Automated import of CL 145986 commit ce60cb73cbda681d586eda635025b87f5bf7d6a6 Author: Scott Su <> Date: Mon Apr 13 18:23:00 2009 -0700 AI 146049: CTS: add test cases for android.widget.Toast Automated import of CL 146049 commit d57807eb896c462d3c52b69e9f3280179f35f1e0 Author: Eric Shienbrood <> Date: Mon Apr 13 18:12:46 2009 -0700 AI 145980: am: CL 145881 Adding on to CL 145383, unhiding some additional methods and constants that ought to be exposed. Hid and deprecated the single-arg public constructor for NetworkInfo, and modified a CTS test that was testing it. Ran the android.net test package to make sure it still works. Original author: ers Merged from: //branches/cupcake/... Automated import of CL 145980 commit 863f7d8a3af9f8a31fc1de391457afc3682efaaf Author: Scott Su <> Date: Mon Apr 13 18:07:02 2009 -0700 AI 145978: am: CL 145825 CTS: add test cases for android.app.Instrumentation Original author: sus Merged from: //branches/cupcake/... Automated import of CL 145978 commit 0abc3515dc724eb8f269caabea9c11e24c3dc0a0 Author: Scott Su <> Date: Mon Apr 13 18:04:17 2009 -0700 AI 145977: am: CL 145820 CTS: Add test cases for android.app.Application Original author: sus Merged from: //branches/cupcake/... Automated import of CL 145977 commit f49642d7c41b7355f0aab015a84db52a7229a32d Merge: 5426216 9d1ad3a Author: Bill Napier <> Date: Mon Apr 13 16:30:45 2009 -0700 Merge branch 'readonly-p4-master' commit 9d1ad3aca6da05271496854194bd01af0ff79bb7 Author: Bill Napier <> Date: Mon Apr 13 16:29:30 2009 -0700 AI 146002: am: CL 145846 am: CL 145395 Create a CtsReferenceApp library so all CtsReferenceApp tests can have a common helpful baseclass. Original author: napier Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 146002 commit 36166f25fac65efca394f8aa6dc393e427d059b1 Author: Phil Dubach <> Date: Mon Apr 13 15:59:09 2009 -0700 AI 145968: am: CL 145727 CTS: Fixes and improvements for device reboots Recently, we see a new behavior where the device indicates that the boot is complete, but then the adb connection drops shortly after, while the CTS is trying to install a package. This means the CTS never sees a result for the package installation and keeps waiting forever. As a workaround, add a delay after the device indicates that the boot is complete, so that the connection is fully restored by the time the CTS resumes. Create a bugreport on the device if the connection drops during the time we wait after reboot. Also fix a problem in the disconnect notification. Original author: phillipd Merged from: //branches/cupcake/... Automated import of CL 145968 commit f7b0023344e1519978226d20655b3ff68ace0d68 Author: Scott Su <> Date: Mon Apr 13 15:55:41 2009 -0700 AI 145959: am: CL 145693 CTS: add test cases for android.view.ContextThemeWrapper Original author: sus Merged from: //branches/cupcake/... Automated import of CL 145959 commit b15051c3f4000c68beb2f0a6ef4e05af287d97b1 Author: Scott Su <> Date: Mon Apr 13 15:52:54 2009 -0700 AI 145958: am: CL 145689 CTS: add test cases for android.view.SurfaceView Original author: sus Merged from: //branches/cupcake/... Automated import of CL 145958 commit 5b70f84b2d5d00fe66772ef8b2a82165d8bed6da Author: Scott Su <> Date: Mon Apr 13 15:50:07 2009 -0700 AI 145957: am: CL 145686 CTS: add test cases for android.view.Display Original author: sus Merged from: //branches/cupcake/... Automated import of CL 145957 commit ab14214fd9813884722925098f4c914a2e6f4632 Author: Scott Su <> Date: Mon Apr 13 15:47:21 2009 -0700 AI 145956: am: CL 145675 CTS: fixed the fail bug in android.net.cts.NetworkInfoTest Original author: sus Merged from: //branches/cupcake/... Automated import of CL 145956 commit 5164ae32d55870a2a47b650ea1f81fae3bd415ea Author: Scott Su <> Date: Mon Apr 13 15:44:27 2009 -0700 AI 145955: am: CL 145672 CTS: add test cases for provider.Settings. Original author: sus Merged from: //branches/cupcake/... Automated import of CL 145955 commit 8db7b3452a3fcc3c933ae22e5e6385d422141cba Author: Scott Su <> Date: Mon Apr 13 15:41:26 2009 -0700 AI 145954: am: CL 145670 CTS: add test cases for android.widget.AdapterView Original author: sus Merged from: //branches/cupcake/... Automated import of CL 145954 commit 895a1f7594a253f64132ca1edc3d6ef400bfcba4 Author: Scott Su <> Date: Mon Apr 13 15:37:58 2009 -0700 AI 145953: am: CL 145668 CTS: add test cases for net.UrlQuerySanitizer. Original author: sus Merged from: //branches/cupcake/... Automated import of CL 145953 commit bd2c7b9585b3d017381394120b01482e9fb2ac9e Author: Phil Dubach <> Date: Mon Apr 13 15:07:45 2009 -0700 AI 145945: CTS: Decrease device restart interval to 200 tests Automated import of CL 145945 commit 10878e75ee375c4c5db378bf981498408693a928 Author: Bill Napier <> Date: Mon Apr 13 10:42:53 2009 -0700 AI 145884: remove cts-reference-app since it's breaking kila builds. Automated import of CL 145884 commit 5bf9da14fdf3608fc801a060b0956bf4a152e135 Author: Eric Shienbrood <> Date: Mon Apr 13 10:41:53 2009 -0700 AI 145881: Adding on to CL 145383, unhiding some additional methods and constants that ought to be exposed. Hid and deprecated the single-arg public constructor for NetworkInfo, and modified a CTS test that was testing it. Ran the android.net test package to make sure it still works. BUG=1779439 Automated import of CL 145881 commit fc823f98115187b73ab6ac9de1e1aa04de022810 Author: Bill Napier <> Date: Mon Apr 13 08:28:42 2009 -0700 AI 145846: am: CL 145395 Create a CtsReferenceApp library so all CtsReferenceApp tests can have a common helpful baseclass. Original author: napier Merged from: //branches/cupcake/... Automated import of CL 145846 commit 58a3e998f87ababe32253c888c1fa83a84132e02 Author: Scott Su <> Date: Sun Apr 12 23:43:22 2009 -0700 AI 145825: CTS: add test cases for android.app.Instrumentation Automated import of CL 145825 commit c14a50e7c00923f52b07d507ae1bd981ac7f82f9 Author: Scott Su <> Date: Sun Apr 12 22:26:54 2009 -0700 AI 145820: CTS: Add test cases for android.app.Application Automated import of CL 145820 commit 98606cd1fcc1a872803cc1e2cc666be8e41d88a3 Author: Phil Dubach <> Date: Fri Apr 10 13:31:07 2009 -0700 AI 145727: CTS: Fixes and improvements for device reboots Recently, we see a new behavior where the device indicates that the boot is complete, but then the adb connection drops shortly after, while the CTS is trying to install a package. This means the CTS never sees a result for the package installation and keeps waiting forever. As a workaround, add a delay after the device indicates that the boot is complete, so that the connection is fully restored by the time the CTS resumes. Create a bugreport on the device if the connection drops during the time we wait after reboot. Also fix a problem in the disconnect notification. Automated import of CL 145727 commit 7220854a92b083ef1e2d6a0c052d2a85b6f784c4 Author: Scott Su <> Date: Fri Apr 10 01:00:51 2009 -0700 AI 145693: CTS: add test cases for android.view.ContextThemeWrapper Automated import of CL 145693 commit af2427c64d40f0cc8744e950ebead1fd060b3a63 Author: Scott Su <> Date: Fri Apr 10 00:44:46 2009 -0700 AI 145689: CTS: add test cases for android.view.SurfaceView Automated import of CL 145689 commit ab614ecad098cac8ee03025e1d596881d3de8d3e Author: Scott Su <> Date: Fri Apr 10 00:29:19 2009 -0700 AI 145686: CTS: add test cases for android.view.Display Automated import of CL 145686 commit 7ae786780ba025c5f49bff98109882b222c3806a Author: Scott Su <> Date: Thu Apr 9 22:36:44 2009 -0700 AI 145675: CTS: fixed the fail bug in android.net.cts.NetworkInfoTest Automated import of CL 145675 commit ba45315bb7ce4d2b420067f8e157760c266374f1 Author: Scott Su <> Date: Thu Apr 9 22:30:28 2009 -0700 AI 145672: CTS: add test cases for provider.Settings. Automated import of CL 145672 commit 616c4b5802cfc172a75f91adfa8ed44fd4024102 Author: Scott Su <> Date: Thu Apr 9 22:26:28 2009 -0700 AI 145670: CTS: add test cases for android.widget.AdapterView Automated import of CL 145670 commit a695787295596dc51222cd0a199cd0e1f8d164c4 Author: Scott Su <> Date: Thu Apr 9 22:21:00 2009 -0700 AI 145668: CTS: add test cases for net.UrlQuerySanitizer. Automated import of CL 145668 commit 54262160fc9f9c2303e645939991e607906b925a Merge: a1175c4 c29429b Author: Urs Grob <> Date: Thu Apr 9 20:26:35 2009 -0700 Merge branch 'readonly-p4-master' commit c29429b2aa10763c13cf0e2bd2445a756a6e68c8 Author: Urs Grob <> Date: Thu Apr 9 20:25:26 2009 -0700 AI 145651: am: CL 145614 am: CL 145290 Taking @hide for packages into account. Original author: ursg Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 145651 commit a1175c4ffeedba89c3b0069dc3be6f6c9acf7489 Merge: 8cabd93 71042d6 Author: Scott Su <> Date: Thu Apr 9 20:18:36 2009 -0700 Merge branch 'readonly-p4-master' commit 71042d61ae38dc2624ee8ea65cb4d23a1cfa943e Author: Scott Su <> Date: Thu Apr 9 20:17:28 2009 -0700 AI 145648: am: CL 145611 am: CL 145287 CTS: add test cases for android.text.Html Original author: sus Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 145648 commit 8cabd934df5d4e3946f5c9c1e9ef701356bdc7ad Merge: 51529c1 73a8745 Author: Scott Su <> Date: Thu Apr 9 20:15:58 2009 -0700 Merge branch 'readonly-p4-master' commit 73a8745558c3d648ec1f293c4846c7b5ecae216e Author: Scott Su <> Date: Thu Apr 9 20:14:47 2009 -0700 AI 145647: am: CL 145610 am: CL 145280 CTS: add test cases for os.StatFs Original author: sus Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 145647 commit 51529c1eb3e38d268c025b8a6ece63f8aa8a3049 Merge: 33ec10b d7e02b9 Author: Scott Su <> Date: Thu Apr 9 20:13:16 2009 -0700 Merge branch 'readonly-p4-master' commit d7e02b9152f3d6993dfea30a62065d80a65c40f2 Author: Scott Su <> Date: Thu Apr 9 20:12:07 2009 -0700 AI 145646: am: CL 145609 am: CL 145278 CTS: add test cases for android.text.BoringLayout Original author: sus Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 145646 commit 33ec10b571fde363740cd0d66b5a5c3b66fb650a Merge: c281e71 15e0da4 Author: Scott Su <> Date: Thu Apr 9 20:10:39 2009 -0700 Merge branch 'readonly-p4-master' commit 15e0da4011229ccda032c48b4ad9177fc14f4635 Author: Scott Su <> Date: Thu Apr 9 20:09:29 2009 -0700 AI 145645: am: CL 145608 am: CL 145275 CTS: add test cases for android.text.InputFilter.LengthFilter and AllCaps Original author: sus Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 145645 commit c281e718eefa5a3a3702eaddf8c7172a48508762 Merge: c6f2757 fe62102 Author: Scott Su <> Date: Thu Apr 9 20:07:58 2009 -0700 Merge branch 'readonly-p4-master' commit fe6210266876074350eef1c47a51ea9ba7923aca Author: Scott Su <> Date: Thu Apr 9 20:06:47 2009 -0700 AI 145644: am: CL 145607 am: CL 145268 CTS: add test cases for android.content.res.ColorStateList Original author: sus Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 145644 commit c6f27571cdc0606360c5246f5c689221b87b58b2 Merge: 864d66a 15b47fc Author: Scott Su <> Date: Thu Apr 9 20:05:16 2009 -0700 Merge branch 'readonly-p4-master' commit 15b47fc127e9792f41338169f75dedd7eb63d747 Author: Scott Su <> Date: Thu Apr 9 20:04:01 2009 -0700 AI 145643: am: CL 145606 am: CL 145266 CTS: add test cases for android.text.AlteredCharSequence Original author: sus Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 145643 commit 864d66a411c0400950d133285d6c8f35c1b8ef78 Merge: 0a465be f70ed13 Author: Scott Su <> Date: Thu Apr 9 20:02:31 2009 -0700 Merge branch 'readonly-p4-master' commit f70ed1379f1efd37318e5febabcb7abf9a353598 Author: Scott Su <> Date: Thu Apr 9 20:01:23 2009 -0700 AI 145642: am: CL 145605 am: CL 145264 CTS: add test cases for android.text.AndroidCharacter Original author: sus Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 145642 commit 0a465be6bcd0306193f2a6c1a18fc00ee8dbe29c Merge: a947475 f082a03 Author: Scott Su <> Date: Thu Apr 9 19:59:53 2009 -0700 Merge branch 'readonly-p4-master' commit f082a03f29f69666eec5cf386a40e031c813be79 Author: Scott Su <> Date: Thu Apr 9 19:58:45 2009 -0700 AI 145641: am: CL 145604 am: CL 145258 CTS: add test cases for android.widget.TextView Original author: sus Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 145641 commit a947475e8b00361a142e77251db943ea141cc46a Merge: 0eded04 d098bd0 Author: Scott Su <> Date: Thu Apr 9 19:57:13 2009 -0700 Merge branch 'readonly-p4-master' commit d098bd08dab580d514e1820572c837c7a01fb0e6 Author: Scott Su <> Date: Thu Apr 9 19:56:04 2009 -0700 AI 145640: am: CL 145603 am: CL 145257 CTS: add test cases for android.widget.BaseAdapter Original author: sus Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 145640 commit 0eded044da915308155f6374495f35ad4d41138b Merge: cbb3906 2ef9a88 Author: Scott Su <> Date: Thu Apr 9 19:51:54 2009 -0700 Merge branch 'readonly-p4-master' commit 2ef9a889f8ecd5e543cde0f87163544a5bb9265e Author: Scott Su <> Date: Thu Apr 9 19:50:46 2009 -0700 AI 145638: am: CL 145601 am: CL 145254 CTS: add Android permissions test cases. Original author: sus Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 145638 commit cbb3906a874f60987bc1aedd60f665fef91cac18 Merge: 44cccb5 cb2832b Author: Scott Su <> Date: Thu Apr 9 19:48:31 2009 -0700 Merge branch 'readonly-p4-master' commit cb2832b92dbe9c57f5d283cfb4bd596528eb3917 Author: Scott Su <> Date: Thu Apr 9 19:47:24 2009 -0700 AI 145637: am: CL 145600 am: CL 145252 CTS: add test cases for android.widget.MultiAutoCompleteTextView Original author: sus Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 145637 commit 44cccb5c74da1b3b768a3e32755b28963d00312f Merge: adda750 6151c35 Author: Scott Su <> Date: Thu Apr 9 19:45:56 2009 -0700 Merge branch 'readonly-p4-master' commit 6151c35383c93a3156443f541d32c8837b0c7fb0 Author: Scott Su <> Date: Thu Apr 9 19:44:47 2009 -0700 AI 145636: am: CL 145599 am: CL 145251 CTS: add test cases for android.widget.ListView Original author: sus Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 145636 commit 653abcad3d91c93f3fda4601c06e24cd3e4431ef Author: Urs Grob <> Date: Thu Apr 9 19:19:33 2009 -0700 AI 145614: am: CL 145290 Taking @hide for packages into account. Original author: ursg Merged from: //branches/cupcake/... Automated import of CL 145614 commit 241502012d79db0b65f155abee6caeba04b548d3 Author: Scott Su <> Date: Thu Apr 9 19:11:19 2009 -0700 AI 145611: am: CL 145287 CTS: add test cases for android.text.Html Original author: sus Merged from: //branches/cupcake/... Automated import of CL 145611 commit 36a45184af28ff80c955de1d0d3a506421f4db07 Author: Scott Su <> Date: Thu Apr 9 19:08:36 2009 -0700 AI 145610: am: CL 145280 CTS: add test cases for os.StatFs Original author: sus Merged from: //branches/cupcake/... Automated import of CL 145610 commit d90e48d1e47754865ad49435faa531696bb53b3c Author: Scott Su <> Date: Thu Apr 9 19:05:55 2009 -0700 AI 145609: am: CL 145278 CTS: add test cases for android.text.BoringLayout Original author: sus Merged from: //branches/cupcake/... Automated import of CL 145609 commit 6cffec7051a12c0e5f90792a91434fecbd8289e0 Author: Scott Su <> Date: Thu Apr 9 19:03:10 2009 -0700 AI 145608: am: CL 145275 CTS: add test cases for android.text.InputFilter.LengthFilter and AllCaps Original author: sus Merged from: //branches/cupcake/... Automated import of CL 145608 commit ae973c1e5521d653e597b17354db23143c017680 Author: Scott Su <> Date: Thu Apr 9 19:00:27 2009 -0700 AI 145607: am: CL 145268 CTS: add test cases for android.content.res.ColorStateList Original author: sus Merged from: //branches/cupcake/... Automated import of CL 145607 commit 48fb00b9e215e95508f94d4dbde5843d2e236c31 Author: Scott Su <> Date: Thu Apr 9 18:57:40 2009 -0700 AI 145606: am: CL 145266 CTS: add test cases for android.text.AlteredCharSequence Original author: sus Merged from: //branches/cupcake/... Automated import of CL 145606 commit 400c9fc359c4d5f3e0c89d798c4e466bd93e84fa Author: Scott Su <> Date: Thu Apr 9 18:54:57 2009 -0700 AI 145605: am: CL 145264 CTS: add test cases for android.text.AndroidCharacter Original author: sus Merged from: //branches/cupcake/... Automated import of CL 145605 commit fa0bdcfa2bdacc555a6cecd0e5e0ed46afa06970 Author: Scott Su <> Date: Thu Apr 9 18:52:08 2009 -0700 AI 145604: am: CL 145258 CTS: add test cases for android.widget.TextView Original author: sus Merged from: //branches/cupcake/... Automated import of CL 145604 commit b031169460c73a8e3775cef266479b8d15d6396c Author: Scott Su <> Date: Thu Apr 9 18:49:23 2009 -0700 AI 145603: am: CL 145257 CTS: add test cases for android.widget.BaseAdapter Original author: sus Merged from: //branches/cupcake/... Automated import of CL 145603 commit 77357827ec785b86132b4ee135189beb96595729 Author: Scott Su <> Date: Thu Apr 9 18:43:54 2009 -0700 AI 145601: am: CL 145254 CTS: add Android permissions test cases. Original author: sus Merged from: //branches/cupcake/... Automated import of CL 145601 commit 3b518328bf6595230c0cf460801d53406b1084b3 Author: Scott Su <> Date: Thu Apr 9 18:41:08 2009 -0700 AI 145600: am: CL 145252 CTS: add test cases for android.widget.MultiAutoCompleteTextView Original author: sus Merged from: //branches/cupcake/... Automated import of CL 145600 commit e0a3459c02913ec9fdaf0461e4b4d9999a039d8a Author: Scott Su <> Date: Thu Apr 9 18:37:41 2009 -0700 AI 145599: am: CL 145251 CTS: add test cases for android.widget.ListView Original author: sus Merged from: //branches/cupcake/... Automated import of CL 145599 commit 176848af30e319643cd0b314a1f1b1fd98ea07f9 Author: Bill Napier <> Date: Thu Apr 9 17:18:30 2009 -0700 AI 145574: Automated g4 rollback of changelist 145551. *** Reason for rollback *** Rolling back change yet again. Automated import of CL 145574 commit fd21517a8184e02a39bfd57d75fe62afa18f3529 Author: Bill Napier <> Date: Thu Apr 9 15:47:34 2009 -0700 AI 145551: Automated g4 rollback of changelist 145504. *** Reason for rollback *** Setup the tags to ensure that the library doesn't get included in the system builds. *** Original change description *** Automated g4 rollback of changelist 145395. *** Reason for rollback *** turns out that the static library gets deployed on the device which is undesireable. (and makes kila too big) *** Original change description *** Create a CtsReferenceApp library so all CtsReferenceApp tests can have a common helpful baseclass. Automated import of CL 145551 commit adda7500dd26322d8d49110b6219ddcf7f49db8f Merge: b5b5331 10f71f6 Author: Scott Su <> Date: Thu Apr 9 15:00:44 2009 -0700 Merge branch 'readonly-p4-master' commit 10f71f6cbe232ece2fad190e3a414867076661e1 Author: Scott Su <> Date: Thu Apr 9 14:59:31 2009 -0700 AI 145533: am: CL 145525 am: CL 145248 CTS: add intent test cases for action CALL and DIAL, wrapped the lines which are longer than 100, revise annotations. Original author: sus Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 145533 commit b5b5331083dcfac9886c824893334653ab8f9e32 Merge: d5295c3 0f65ff4 Author: Scott Su <> Date: Thu Apr 9 14:58:01 2009 -0700 Merge branch 'readonly-p4-master' commit 9eaea81d35d0eb86f8fd536906281b0c074fa96b Author: Scott Su <> Date: Thu Apr 9 14:57:49 2009 -0700 AI 145525: am: CL 145248 CTS: add intent test cases for action CALL and DIAL, wrapped the lines which are longer than 100, revise annotations. Original author: sus Merged from: //branches/cupcake/... Automated import of CL 145525 commit 0f65ff45e2fb062810f97c39b8b3551ff4245afe Author: Scott Su <> Date: Thu Apr 9 14:56:50 2009 -0700 AI 145532: am: CL 145524 am: CL 145245 CTS: add test cases for android.widget.TimePicker. Original author: sus Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 145532 commit cf5254e9994496899d6deed01a782437a06307a1 Author: Scott Su <> Date: Thu Apr 9 14:54:13 2009 -0700 AI 145524: am: CL 145245 CTS: add test cases for android.widget.TimePicker. Original author: sus Merged from: //branches/cupcake/... Automated import of CL 145524 commit d5295c36295946e8b4a85163d1637fda78fc5a74 Merge: de838ab 0601b39 Author: Scott Su <> Date: Thu Apr 9 14:52:36 2009 -0700 Merge branch 'readonly-p4-master' commit 0601b39fa06189a32ee623209f998d177ce0cb16 Author: Scott Su <> Date: Thu Apr 9 14:51:20 2009 -0700 AI 145530: am: CL 145522 am: CL 145240 CTS: add test cases for android.text.StaticLayout Original author: sus Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 145530 commit dc998c549aa687a8e9a21f084a68a57686dc94b1 Author: Scott Su <> Date: Thu Apr 9 14:48:36 2009 -0700 AI 145522: am: CL 145240 CTS: add test cases for android.text.StaticLayout Original author: sus Merged from: //branches/cupcake/... Automated import of CL 145522 commit de838ab5c9ea1c948bc3b56c83b22fdcc94687be Merge: 793636d 77b8c53 Author: Scott Su <> Date: Thu Apr 9 13:50:30 2009 -0700 Merge branch 'readonly-p4-master' commit b35dd4340ee0fadcb154e53efa5133d4279ff424 Author: Scott Su <> Date: Thu Apr 9 13:49:33 2009 -0700 AI 145439: am: CL 145043 CTS: add test case for android.view.TouchDelegate Original author: sus Merged from: //branches/cupcake/... Automated import of CL 145439 commit 77b8c53e0ff87eb7000c72c09c9f0b8262d3b6a1 Author: Scott Su <> Date: Thu Apr 9 13:49:16 2009 -0700 AI 145461: am: CL 145439 am: CL 145043 CTS: add test case for android.view.TouchDelegate Original author: sus Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 145461 commit 793636d4c931cddbc9c318bf56682f7f78aeb619 Merge: 83199f3 97ef9ca Author: Scott Su <> Date: Thu Apr 9 13:47:42 2009 -0700 Merge branch 'readonly-p4-master' commit a1bbcfbdb5f04f6ce5efe71629249a0ab4741b9a Author: Scott Su <> Date: Thu Apr 9 13:46:39 2009 -0700 AI 145436: am: CL 145040 CTS: add test cases for android.text.AutoText Original author: sus Merged from: //branches/cupcake/... Automated import of CL 145436 commit 97ef9ca85dc15fb714b02c0a81de0363d72f4c92 Author: Scott Su <> Date: Thu Apr 9 13:46:28 2009 -0700 AI 145460: am: CL 145436 am: CL 145040 CTS: add test cases for android.text.AutoText Original author: sus Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 145460 commit 83199f3abf00227efd88d0a4af3addc7d6cfad6d Merge: 476903f 7ce29b8 Author: Scott Su <> Date: Thu Apr 9 13:44:55 2009 -0700 Merge branch 'readonly-p4-master' commit c4d7d771bb9d87a65858e69089ae2f96fca15d60 Author: Scott Su <> Date: Thu Apr 9 13:43:54 2009 -0700 AI 145432: am: CL 145038 CTS: add test cases for android.text.Annotation Original author: sus Merged from: //branches/cupcake/... Automated import of CL 145432 commit 7ce29b833fee011a998a71601908dfec43dd748d Author: Scott Su <> Date: Thu Apr 9 13:43:42 2009 -0700 AI 145456: am: CL 145432 am: CL 145038 CTS: add test cases for android.text.Annotation Original author: sus Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 145456 commit 476903f147735f506c5e7801d436e1551227806d Merge: 71f6b0c 93273ad Author: Scott Su <> Date: Thu Apr 9 13:42:09 2009 -0700 Merge branch 'readonly-p4-master' commit ed56a2deae195dd32c73d0d07d986257c22d9c7e Author: Scott Su <> Date: Thu Apr 9 13:41:03 2009 -0700 AI 145428: am: CL 145026 CTS: add test cases for android.text.style.AbsoluteSizeSpan and AlignmentSpan.Standard Original author: sus Merged from: //branches/cupcake/... Automated import of CL 145428 commit 93273ad4f3976a3134453d1f3e464e16b5208d69 Author: Scott Su <> Date: Thu Apr 9 13:40:57 2009 -0700 AI 145455: am: CL 145428 am: CL 145026 CTS: add test cases for android.text.style.AbsoluteSizeSpan and AlignmentSpan.Standard Original author: sus Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 145455 commit 82762ac75b7f1ec42e90f7f7ce3964e3a94396f1 Author: Bill Napier <> Date: Thu Apr 9 13:39:25 2009 -0700 AI 145504: Automated g4 rollback of changelist 145395. *** Reason for rollback *** turns out that the static library gets deployed on the device which is undesireable. (and makes kila too big) *** Original change description *** Create a CtsReferenceApp library so all CtsReferenceApp tests can have a common helpful baseclass. Automated import of CL 145504 commit 71f6b0c1bf67b6d6b3559e0125dd3fa5780fbef8 Merge: 6c59746 bce1c52 Author: Scott Su <> Date: Thu Apr 9 13:39:16 2009 -0700 Merge branch 'readonly-p4-master' commit bce1c521b8f50288baf11f6f9c7b082b6123b75b Author: Scott Su <> Date: Thu Apr 9 13:38:04 2009 -0700 AI 145452: am: CL 145424 am: CL 145025 CTS: add test cases for android.widget.ProgressBar. Original author: sus Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 145452 commit 79b1a954e7d120b1a39b6d0d3cafe53f4c57bb42 Author: Scott Su <> Date: Thu Apr 9 13:38:03 2009 -0700 AI 145424: am: CL 145025 CTS: add test cases for android.widget.ProgressBar. Original author: sus Merged from: //branches/cupcake/... Automated import of CL 145424 commit 6c597464b891e20ccddf28844af5375a634d49cd Merge: 2504dda 192e49e Author: Scott Su <> Date: Thu Apr 9 13:36:29 2009 -0700 Merge branch 'readonly-p4-master' commit 192e49e3860a2e65963fca68d397c7ca2030f66d Author: Scott Su <> Date: Thu Apr 9 13:35:20 2009 -0700 AI 145449: am: CL 145421 am: CL 145023 CTS: add test cases for android.text.style.BackgroundColorSpan and BulletSpan Original author: sus Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 145449 commit 8f6e21be71c079dd53ea4c8936bb294f96f7aa2a Author: Scott Su <> Date: Thu Apr 9 13:35:18 2009 -0700 AI 145421: am: CL 145023 CTS: add test cases for android.text.style.BackgroundColorSpan and BulletSpan Original author: sus Merged from: //branches/cupcake/... Automated import of CL 145421 commit 2504dda7fc817eae87f4a308b30ede59bc8c9370 Merge: 26e8801 a94d0f8 Author: Scott Su <> Date: Thu Apr 9 13:33:50 2009 -0700 Merge branch 'readonly-p4-master' commit a94d0f895b9c70bc6b88af74ee0cb4035bce013f Author: Scott Su <> Date: Thu Apr 9 13:32:40 2009 -0700 AI 145447: am: CL 145420 am: CL 145022 CTS: add test cases for android.text.style.CharacterStyle and ClickableSpan Original author: sus Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 145447 commit 6ea12e18c7d4c30ba1d2ae44407ae8cb02693f9d Author: Scott Su <> Date: Thu Apr 9 13:32:40 2009 -0700 AI 145420: am: CL 145022 CTS: add test cases for android.text.style.CharacterStyle and ClickableSpan Original author: sus Merged from: //branches/cupcake/... Automated import of CL 145420 commit 26e8801bf7756a37288c0fb26d8c9b5aa26e49b4 Merge: 5db484e 43b0741 Author: Scott Su <> Date: Thu Apr 9 13:31:10 2009 -0700 Merge branch 'readonly-p4-master' commit 43b0741b92c8498ad03e33cb0bd72e6d587c959a Author: Scott Su <> Date: Thu Apr 9 13:30:00 2009 -0700 AI 145445: am: CL 145416 am: CL 145021 CTS: add test cases for DrawableMarginSpan and DynamicDrawableSpan Original author: sus Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 145445 commit f802adf3b198f4a70092dd6936a4954c85dff709 Author: Scott Su <> Date: Thu Apr 9 13:29:58 2009 -0700 AI 145416: am: CL 145021 CTS: add test cases for DrawableMarginSpan and DynamicDrawableSpan Original author: sus Merged from: //branches/cupcake/... Automated import of CL 145416 commit 5db484ea5bb01abca0ca41b44daf491ba1048cf4 Merge: 2aeb181 9d1056f Author: Scott Su <> Date: Thu Apr 9 13:28:29 2009 -0700 Merge branch 'readonly-p4-master' commit 9d1056fd19801b6a7355632bb29a20a3e3b6a8cf Author: Scott Su <> Date: Thu Apr 9 13:27:15 2009 -0700 AI 145443: am: CL 145412 am: CL 145020 CTS: add test case for URLSpan, TypefaceSpan and UnderlineSpan Original author: sus Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 145443 commit aa800d770716a2f806de30b1147c667d0855e68e Author: Scott Su <> Date: Thu Apr 9 13:27:12 2009 -0700 AI 145412: am: CL 145020 CTS: add test case for URLSpan, TypefaceSpan and UnderlineSpan Original author: sus Merged from: //branches/cupcake/... Automated import of CL 145412 commit 2aeb1814db274ca0e83cb96d47d9815e1f88e609 Merge: 175d8dd 873db80 Author: Scott Su <> Date: Thu Apr 9 13:25:39 2009 -0700 Merge branch 'readonly-p4-master' commit 873db80e870795bb9159643cc30835675293a70d Author: Scott Su <> Date: Thu Apr 9 13:24:31 2009 -0700 AI 145441: am: CL 145410 am: CL 145017 CTS: add test cases for android.text.method.Touch Original author: sus Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 145441 commit 53326ada466cafc066112d35aef0588ee919f906 Author: Scott Su <> Date: Thu Apr 9 13:24:24 2009 -0700 AI 145410: am: CL 145017 CTS: add test cases for android.text.method.Touch Original author: sus Merged from: //branches/cupcake/... Automated import of CL 145410 commit 175d8dd48f199f0f111fbab85bf9f32b14eadb3d Merge: 088086f be47f52 Author: Scott Su <> Date: Thu Apr 9 13:22:50 2009 -0700 Merge branch 'readonly-p4-master' commit be47f526b78a8acd330b6ae19b8e02d9206204dd Author: Scott Su <> Date: Thu Apr 9 13:21:39 2009 -0700 AI 145438: am: CL 145408 am: CL 145016 CTS: add test cases for CharacterPickerDialog. Original author: sus Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 145438 commit 6f02576c800343ca719c6d2acc97ce5e2e7ada00 Author: Scott Su <> Date: Thu Apr 9 13:21:32 2009 -0700 AI 145408: am: CL 145016 CTS: add test cases for CharacterPickerDialog. Original author: sus Merged from: //branches/cupcake/... Automated import of CL 145408 commit 088086f711cf8ec0f6b19f6c1cc095b513cd5cfd Merge: 6d45b57 9f4ffc9 Author: Scott Su <> Date: Thu Apr 9 13:20:06 2009 -0700 Merge branch 'readonly-p4-master' commit 9f4ffc968cc16769cdb7dd8a47301240a0f5d3fc Author: Scott Su <> Date: Thu Apr 9 13:18:54 2009 -0700 AI 145434: am: CL 145407 am: CL 145015 CTS: add test cases for LinkMovementMethod and HideReturnsTransformationMethod. Original author: sus Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 145434 commit 013adfc368f57b2fba136851815031e32d601dbb Author: Scott Su <> Date: Thu Apr 9 13:18:49 2009 -0700 AI 145407: am: CL 145015 CTS: add test cases for LinkMovementMethod and HideReturnsTransformationMethod. Original author: sus Merged from: //branches/cupcake/... Automated import of CL 145407 commit 6d45b574fd70439557535fd0310993eb170e32aa Merge: 4185a09 91d0142 Author: Scott Su <> Date: Thu Apr 9 13:17:23 2009 -0700 Merge branch 'readonly-p4-master' commit 91d0142d3f7741b279bcfcead28ba173730ea0e3 Author: Scott Su <> Date: Thu Apr 9 13:16:14 2009 -0700 AI 145429: am: CL 145406 am: CL 145014 CTS: add test cases for android.text.util.Rfc822Tokenizer and Rfc822Token Original author: sus Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 145429 commit f603cc8d7bc546808379057679237215752c1910 Author: Scott Su <> Date: Thu Apr 9 13:16:05 2009 -0700 AI 145406: am: CL 145014 CTS: add test cases for android.text.util.Rfc822Tokenizer and Rfc822Token Original author: sus Merged from: //branches/cupcake/... Automated import of CL 145406 commit 4185a092894c701cd722d824f1cbf199110c976c Merge: 432bc3d 53ac042 Author: Scott Su <> Date: Thu Apr 9 13:14:37 2009 -0700 Merge branch 'readonly-p4-master' commit 53ac042409946a678eff7612097a98af1673f5e5 Author: Scott Su <> Date: Thu Apr 9 13:13:28 2009 -0700 AI 145425: am: CL 145403 am: CL 145012 CTS: add test cases for ReplacementTansformationMethod, ScrollingMovementMethod, PasswordTransformationMethod and SingleLineTransformationMethod Original author: sus Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 145425 commit 488f8ecd27d0aff0a8c540c1a6731ddbf5d193a0 Author: Scott Su <> Date: Thu Apr 9 13:13:23 2009 -0700 AI 145403: am: CL 145012 CTS: add test cases for ReplacementTansformationMethod, ScrollingMovementMethod, PasswordTransformationMethod and SingleLineTransformationMethod Original author: sus Merged from: //branches/cupcake/... Automated import of CL 145403 commit 432bc3dd144183dd3bf2ef69f1d4a2818a406f55 Merge: 1c6bcae fa4692b Author: Scott Su <> Date: Thu Apr 9 13:08:12 2009 -0700 Merge branch 'readonly-p4-master' commit fa4692b8ea45f0afcbf82adfcd13f737c032b447 Author: Scott Su <> Date: Thu Apr 9 13:07:02 2009 -0700 AI 145415: am: CL 145401 am: CL 145003 CTS: add test cases for text.SpannableString. Original author: sus Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 145415 commit d14af2d073c4d8580495160277e76b35691b3dc7 Author: Scott Su <> Date: Thu Apr 9 13:06:58 2009 -0700 AI 145401: am: CL 145003 CTS: add test cases for text.SpannableString. Original author: sus Merged from: //branches/cupcake/... Automated import of CL 145401 commit 1c6bcaec4d59104b4c6c9f1901d1101cd6afb4ca Merge: 00ad4d1 81389d7 Author: Scott Su <> Date: Thu Apr 9 13:05:21 2009 -0700 Merge branch 'readonly-p4-master' commit 81389d7f8f5cdd828ad350c05e154896fa822b0b Author: Scott Su <> Date: Thu Apr 9 13:04:02 2009 -0700 AI 145411: am: CL 145400 am: CL 145002 CTS: add test case for Spannable.Factory. Original author: sus Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 145411 commit 079003c12949a17a7bc7e081459b33dc2003e1d1 Author: Scott Su <> Date: Thu Apr 9 13:03:33 2009 -0700 AI 145400: am: CL 145002 CTS: add test case for Spannable.Factory. Original author: sus Merged from: //branches/cupcake/... Automated import of CL 145400 commit b8b7dbecb7dc1cedb7fb7c3bfaaf9198052cca89 Author: Bill Napier <> Date: Thu Apr 9 12:56:59 2009 -0700 AI 145395: Create a CtsReferenceApp library so all CtsReferenceApp tests can have a common helpful baseclass. Automated import of CL 145395 commit a6f2eaa51fcece5f408745bbdcf482c244b8f6ea Author: Urs Grob <> Date: Thu Apr 9 01:51:39 2009 -0700 AI 145290: Taking @hide for packages into account. BUG=1708789 Automated import of CL 145290 commit 8287314bd66c723c7c1bd878a7ff560f0bb534dc Author: Scott Su <> Date: Thu Apr 9 01:40:28 2009 -0700 AI 145287: CTS: add test cases for android.text.Html Automated import of CL 145287 commit f4d709dcf52d7df84a87088637dcdeaf49ea337a Author: Scott Su <> Date: Wed Apr 8 23:43:40 2009 -0700 AI 145280: CTS: add test cases for os.StatFs Automated import of CL 145280 commit 530514c14feb75749f5c5e72d0cc805b86d8755f Author: Scott Su <> Date: Wed Apr 8 23:36:42 2009 -0700 AI 145278: CTS: add test cases for android.text.BoringLayout Automated import of CL 145278 commit 1a96ff30f8b0a5e1c9056a1b25a48c6b4c92739a Author: Scott Su <> Date: Wed Apr 8 23:33:30 2009 -0700 AI 145275: CTS: add test cases for android.text.InputFilter.LengthFilter and AllCaps Automated import of CL 145275 commit cb6a59cf0977f5965ca35419260ee777f71dc4d3 Author: Scott Su <> Date: Wed Apr 8 22:19:23 2009 -0700 AI 145268: CTS: add test cases for android.content.res.ColorStateList Automated import of CL 145268 commit f9a4e4f88e609b10e5a2733911526e9deb82bb82 Author: Scott Su <> Date: Wed Apr 8 22:13:09 2009 -0700 AI 145266: CTS: add test cases for android.text.AlteredCharSequence Automated import of CL 145266 commit d2feed1d475e273a0bd68aa6de2a4607c04b418e Author: Scott Su <> Date: Wed Apr 8 22:02:26 2009 -0700 AI 145264: CTS: add test cases for android.text.AndroidCharacter Automated import of CL 145264 commit 2973deaad9d27d04583f9625f5a8c2d669f5e590 Author: Scott Su <> Date: Wed Apr 8 21:04:22 2009 -0700 AI 145258: CTS: add test cases for android.widget.TextView Automated import of CL 145258 commit 3ab476d7204663e94ee7ccbfdd9be905fa010d94 Author: Scott Su <> Date: Wed Apr 8 20:37:44 2009 -0700 AI 145257: CTS: add test cases for android.widget.BaseAdapter Automated import of CL 145257 commit 309d0e9b1af033a536fd208720fed9b98a1a605d Author: Scott Su <> Date: Wed Apr 8 20:27:35 2009 -0700 AI 145254: CTS: add Android permissions test cases. Automated import of CL 145254 commit 2d8a0a39019939e66b412fa528007d666316686c Author: Scott Su <> Date: Wed Apr 8 20:19:02 2009 -0700 AI 145252: CTS: add test cases for android.widget.MultiAutoCompleteTextView Automated import of CL 145252 commit c176137642ad20844a3905c40c4c911f1b805efe Author: Scott Su <> Date: Wed Apr 8 19:55:32 2009 -0700 AI 145251: CTS: add test cases for android.widget.ListView Automated import of CL 145251 commit 27c448a0705eb0cdf5e99eaa9775791180f3eb41 Author: Scott Su <> Date: Wed Apr 8 19:22:24 2009 -0700 AI 145248: CTS: add intent test cases for action CALL and DIAL, wrapped the lines which are longer than 100, revise annotations. BUG=1552866 Automated import of CL 145248 commit 3d864bef4d5b0fc0e1397a3dec2e6ccbfb270986 Author: Scott Su <> Date: Wed Apr 8 19:04:10 2009 -0700 AI 145245: CTS: add test cases for android.widget.TimePicker. Automated import of CL 145245 commit 068cdc5dd881b455845e594f44dc2033eb7869c7 Author: Scott Su <> Date: Wed Apr 8 18:52:56 2009 -0700 AI 145240: CTS: add test cases for android.text.StaticLayout Automated import of CL 145240 commit c5e4756d7eef220fa76f5bbb228ab36d63ca1b75 Author: Scott Su <> Date: Wed Apr 8 03:00:07 2009 -0700 AI 145043: CTS: add test case for android.view.TouchDelegate Automated import of CL 145043 commit d3b7c5c7d4a936c7b982844a8bb56f0581026ad3 Author: Scott Su <> Date: Wed Apr 8 02:44:03 2009 -0700 AI 145040: CTS: add test cases for android.text.AutoText Automated import of CL 145040 commit d8f4430989927bc49c852ab4b4a31a16b119d2b2 Author: Scott Su <> Date: Wed Apr 8 02:37:02 2009 -0700 AI 145038: CTS: add test cases for android.text.Annotation Automated import of CL 145038 commit 80b45eebbb47be40fb3d25639a68fa7c79a657d2 Author: Scott Su <> Date: Wed Apr 8 00:07:38 2009 -0700 AI 145026: CTS: add test cases for android.text.style.AbsoluteSizeSpan and AlignmentSpan.Standard Automated import of CL 145026 commit d7f29ec29d45c050f8f3395b2b40e4a61d170800 Author: Scott Su <> Date: Wed Apr 8 00:05:56 2009 -0700 AI 145025: CTS: add test cases for android.widget.ProgressBar. Automated import of CL 145025 commit 2efd84ef5d883cb626c095d75747b2d843af245e Author: Scott Su <> Date: Tue Apr 7 23:47:38 2009 -0700 AI 145023: CTS: add test cases for android.text.style.BackgroundColorSpan and BulletSpan Automated import of CL 145023 commit 735530d656c1a4174cb63292b43d3d6bb96c5160 Author: Scott Su <> Date: Tue Apr 7 23:45:49 2009 -0700 AI 145022: CTS: add test cases for android.text.style.CharacterStyle and ClickableSpan Automated import of CL 145022 commit e780071731d708030658652a3e638880a364c739 Author: Scott Su <> Date: Tue Apr 7 23:43:20 2009 -0700 AI 145021: CTS: add test cases for DrawableMarginSpan and DynamicDrawableSpan Automated import of CL 145021 commit 415a96acdddcd04d26e315f6db70d0d6326eaf6f Author: Scott Su <> Date: Tue Apr 7 23:39:19 2009 -0700 AI 145020: CTS: add test case for URLSpan, TypefaceSpan and UnderlineSpan Automated import of CL 145020 commit e86a2edaace0ecd5b140e1a6b383e23c4e3119eb Author: Scott Su <> Date: Tue Apr 7 23:11:49 2009 -0700 AI 145017: CTS: add test cases for android.text.method.Touch Automated import of CL 145017 commit bf713489d34b1464b2194bb85decb4dd7c9f9e35 Author: Scott Su <> Date: Tue Apr 7 23:10:00 2009 -0700 AI 145016: CTS: add test cases for CharacterPickerDialog. Automated import of CL 145016 commit 1c0cf09abf0fc6828f3d94b962cf417d4c356665 Author: Scott Su <> Date: Tue Apr 7 23:04:34 2009 -0700 AI 145015: CTS: add test cases for LinkMovementMethod and HideReturnsTransformationMethod. Automated import of CL 145015 commit 374a2ea627b5fdbc1cee6adfc2541aa9c0d99c79 Author: Scott Su <> Date: Tue Apr 7 22:59:52 2009 -0700 AI 145014: CTS: add test cases for android.text.util.Rfc822Tokenizer and Rfc822Token Automated import of CL 145014 commit 0b9320a68db44c2ca8a11a221c2c22bbc116e2d5 Author: Scott Su <> Date: Tue Apr 7 22:10:35 2009 -0700 AI 145012: CTS: add test cases for ReplacementTansformationMethod, ScrollingMovementMethod, PasswordTransformationMethod and SingleLineTransformationMethod Automated import of CL 145012 commit 92830fb2aca4596887a79b89560c104b4ed8e740 Author: Scott Su <> Date: Tue Apr 7 20:01:24 2009 -0700 AI 145003: CTS: add test cases for text.SpannableString. Automated import of CL 145003 commit da9f68e47f79e20829244aa28640fe546eb65bfe Author: Scott Su <> Date: Tue Apr 7 19:58:06 2009 -0700 AI 145002: CTS: add test case for Spannable.Factory. Automated import of CL 145002 commit 00ad4d1659f66541c4ef5e51f7516b785d87f51b Merge: eae77b0 925e92c Author: Scott Su <> Date: Tue Apr 7 11:28:59 2009 -0700 Merge branch 'readonly-p4-master' commit 949e2b14382270cb0219b84b92873ada6c00b508 Author: Scott Su <> Date: Tue Apr 7 11:28:18 2009 -0700 AI 144813: am: CL 144810 CTS: add test cases for ForegroundColorSpan and LeadingMarginSpan.Standard Original author: sus Merged from: //branches/cupcake/... Automated import of CL 144813 commit 925e92cb0de3281be5de7b6b42566e6d4cab809b Author: Scott Su <> Date: Tue Apr 7 11:27:47 2009 -0700 AI 144815: am: CL 144813 am: CL 144810 CTS: add test cases for ForegroundColorSpan and LeadingMarginSpan.Standard Original author: sus Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 144815 commit eae77b0311e07f147897d3911652b463df5a9085 Merge: 806f82a 194d251 Author: Scott Su <> Date: Tue Apr 7 11:26:12 2009 -0700 Merge branch 'readonly-p4-master' commit 9bba9bf7ec8db1434aee62e347db250a328375ad Author: Scott Su <> Date: Tue Apr 7 11:25:34 2009 -0700 AI 144809: am: CL 144806 CTS: add test cases for IconMarginSpan and ImageSpan Original author: sus Merged from: //branches/cupcake/... Automated import of CL 144809 commit 194d2514e818128c478c2b8e693715affa324ee9 Author: Scott Su <> Date: Tue Apr 7 11:25:02 2009 -0700 AI 144812: am: CL 144809 am: CL 144806 CTS: add test cases for IconMarginSpan and ImageSpan Original author: sus Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 144812 commit 806f82a2f6229ed079d5de5184d601cd77247dcf Merge: fac7fcd aad9603 Author: Scott Su <> Date: Tue Apr 7 11:20:42 2009 -0700 Merge branch 'readonly-p4-master' commit 97287b1f174958cf51674e862d4045778f2d48ad Author: Scott Su <> Date: Tue Apr 7 11:20:01 2009 -0700 AI 144801: am: CL 144799 CTS: add test cases for RasterizerSpan and QuoteSpan Original author: sus Merged from: //branches/cupcake/... Automated import of CL 144801 commit aad96031d037bdcf65ae22391d8b4ffd8fee8972 Author: Scott Su <> Date: Tue Apr 7 11:19:29 2009 -0700 AI 144803: am: CL 144801 am: CL 144799 CTS: add test cases for RasterizerSpan and QuoteSpan Original author: sus Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 144803 commit fac7fcd5e4c086e5fd39a134aceaf6020a80f328 Merge: e08c3d1 2310d9b Author: Scott Su <> Date: Tue Apr 7 11:17:59 2009 -0700 Merge branch 'readonly-p4-master' commit 27af16ac65f8bdf1c9199298b3ba122f2c169e82 Author: Scott Su <> Date: Tue Apr 7 11:17:22 2009 -0700 AI 144797: am: CL 144795 CTS: add test cases for MaskFilterSpan and MetricAffectingSpan Original author: sus Merged from: //branches/cupcake/... Automated import of CL 144797 commit 2310d9b1af0f942d986b6755cf0ab787e0a81e46 Author: Scott Su <> Date: Tue Apr 7 11:16:52 2009 -0700 AI 144798: am: CL 144797 am: CL 144795 CTS: add test cases for MaskFilterSpan and MetricAffectingSpan Original author: sus Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 144798 commit e08c3d1f86f33644b281593b0d2bef0986de3644 Merge: a0afd0d 2aaeadc Author: Scott Su <> Date: Tue Apr 7 11:15:22 2009 -0700 Merge branch 'readonly-p4-master' commit b58c09c19d049f2b5c402b0fb5fbf8ba87e354ad Author: Scott Su <> Date: Tue Apr 7 11:14:40 2009 -0700 AI 144793: am: CL 144791 CTS: add test cases for view.OrientationListener Original author: sus Merged from: //branches/cupcake/... Automated import of CL 144793 commit 2aaeadc4b7826ff9fb05bfdb81cfd4495c81dec2 Author: Scott Su <> Date: Tue Apr 7 11:14:12 2009 -0700 AI 144794: am: CL 144793 am: CL 144791 CTS: add test cases for view.OrientationListener Original author: sus Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 144794 commit a0afd0d7bd5a5cb575825947ff3cd068a2933887 Merge: 8a75445 29309a5 Author: Scott Su <> Date: Tue Apr 7 11:12:42 2009 -0700 Merge branch 'readonly-p4-master' commit d4ebe93932585fcfa0119891f7c00d4c00d2dae3 Author: Scott Su <> Date: Tue Apr 7 11:11:53 2009 -0700 AI 144786: am: CL 144785 CTS: add test cases for android.widget.AbsSpinner and Spinner. Original author: sus Merged from: //branches/cupcake/... Automated import of CL 144786 commit 29309a5892fe5592c56786a07839bcd82c6180fa Author: Scott Su <> Date: Tue Apr 7 11:11:30 2009 -0700 AI 144788: am: CL 144786 am: CL 144785 CTS: add test cases for android.widget.AbsSpinner and Spinner. Original author: sus Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 144788 commit 8a754455491e01e6e443790fc0432c9b3bdd382a Merge: 6a5ab04 2b42513 Author: Scott Su <> Date: Tue Apr 7 11:09:55 2009 -0700 Merge branch 'readonly-p4-master' commit 3b9afe38a3521a7ccedb7a8a5161f34337dbdc5c Author: Scott Su <> Date: Tue Apr 7 11:09:04 2009 -0700 AI 144782: am: CL 144780 CTS: add test cases for android.text.LoginFilter.PasswordFilterGMail, android.text.LoginFilter.UsernameFilterGeneric and android.text.LoginFilter.UsernameFilterGMail. Original author: sus Merged from: //branches/cupcake/... Automated import of CL 144782 commit 2b425131e54bed921983d674b53186365360dadc Author: Scott Su <> Date: Tue Apr 7 11:08:40 2009 -0700 AI 144783: am: CL 144782 am: CL 144780 CTS: add test cases for android.text.LoginFilter.PasswordFilterGMail, android.text.LoginFilter.UsernameFilterGeneric and android.text.LoginFilter.UsernameFilterGMail. Original author: sus Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 144783 commit 6a5ab04d9966ad48ce654d9899ceda30b2d592ba Merge: c84ac32 99ae774 Author: Scott Su <> Date: Tue Apr 7 11:07:01 2009 -0700 Merge branch 'readonly-p4-master' commit 9e82e66dd8aa1409239ef439e03d43667275eb50 Author: Scott Su <> Date: Tue Apr 7 11:06:14 2009 -0700 AI 144777: am: CL 144775 CTS: add test cases for android.widget.AnalogClock Original author: sus Merged from: //branches/cupcake/... Automated import of CL 144777 commit 99ae774535673734fefbced69a80aa253e09c37f Author: Scott Su <> Date: Tue Apr 7 11:05:50 2009 -0700 AI 144778: am: CL 144777 am: CL 144775 CTS: add test cases for android.widget.AnalogClock Original author: sus Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 144778 commit 2df850e907f18073ef84956e914528ba9670e364 Author: Scott Su <> Date: Tue Apr 7 02:39:31 2009 -0700 AI 144810: CTS: add test cases for ForegroundColorSpan and LeadingMarginSpan.Standard Automated import of CL 144810 commit 8eaf81ddfd4214a159bd1ad3193a9d3142919bb5 Author: Scott Su <> Date: Tue Apr 7 02:35:35 2009 -0700 AI 144806: CTS: add test cases for IconMarginSpan and ImageSpan Automated import of CL 144806 commit d5aab965bdadee9dc624a76e82fd905660f7822b Author: Scott Su <> Date: Tue Apr 7 02:29:18 2009 -0700 AI 144799: CTS: add test cases for RasterizerSpan and QuoteSpan Automated import of CL 144799 commit c29555c77a95f53a4d91fdecc8c54c9c8fc1b86f Author: Scott Su <> Date: Tue Apr 7 02:23:01 2009 -0700 AI 144795: CTS: add test cases for MaskFilterSpan and MetricAffectingSpan Automated import of CL 144795 commit 59fe41e5a523f60f6a599616ccdacb4b78db9274 Author: Scott Su <> Date: Tue Apr 7 02:16:48 2009 -0700 AI 144791: CTS: add test cases for view.OrientationListener Automated import of CL 144791 commit 8caf2c7f92a1119151af958fd37738aaddcefd73 Author: Scott Su <> Date: Tue Apr 7 01:37:19 2009 -0700 AI 144785: CTS: add test cases for android.widget.AbsSpinner and Spinner. Automated import of CL 144785 commit 38041834bcc18e01ac2bb312eac76662aa6fdab4 Author: Scott Su <> Date: Tue Apr 7 01:19:08 2009 -0700 AI 144780: CTS: add test cases for android.text.LoginFilter.PasswordFilterGMail, android.text.LoginFilter.UsernameFilterGeneric and android.text.LoginFilter.UsernameFilterGMail. Automated import of CL 144780 commit 5bf598dccfa722b1e061da2a60817fad09d1ee6e Author: Scott Su <> Date: Tue Apr 7 01:09:56 2009 -0700 AI 144775: CTS: add test cases for android.widget.AnalogClock Automated import of CL 144775 commit c84ac3282652da0bb3d6a439dff8cb37bdc9b111 Merge: a32d616 5583330 Author: Scott Su <> Date: Mon Apr 6 19:27:42 2009 -0700 Merge branch 'readonly-p4-master' commit 55833308de1e9e90f851462aa63381c99f3c1516 Author: Scott Su <> Date: Mon Apr 6 19:26:27 2009 -0700 AI 144757: am: CL 144755 am: CL 144754 CTS: Host console bug fixes - Fixes occasional problem with results being associated with the wrong test (off by one) - No longer adds multiple device info sections to the result when the device is restarted during a test run Original author: sus Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 144757 commit fa86c876df304e3e46cc2855e5d023d95dc99c82 Author: Scott Su <> Date: Mon Apr 6 19:24:42 2009 -0700 AI 144755: am: CL 144754 CTS: Host console bug fixes - Fixes occasional problem with results being associated with the wrong test (off by one) - No longer adds multiple device info sections to the result when the device is restarted during a test run Original author: sus Merged from: //branches/cupcake/... Automated import of CL 144755 commit 703909af3ebfc763b65a90703283e8235f8e6c42 Author: Scott Su <> Date: Mon Apr 6 19:23:45 2009 -0700 AI 144754: CTS: Host console bug fixes - Fixes occasional problem with results being associated with the wrong test (off by one) - No longer adds multiple device info sections to the result when the device is restarted during a test run BUG=1741186 Automated import of CL 144754 commit a32d616b576be300ea7d63040296015c5a28b0ac Merge: 0d2cb29 402c7f2 Author: Bill Napier <> Date: Mon Apr 6 10:35:27 2009 -0700 Merge branch 'readonly-p4-master' commit 402c7f248fb4e10553e9e52383d46fd8c568a718 Author: Bill Napier <> Date: Mon Apr 6 10:34:18 2009 -0700 AI 144654: am: CL 144651 am: CL 144650 readability review for napier. Original author: napier Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 144654 commit fbcc0a69a42e3df763ad57bc510fa0a908cbca7e Author: Bill Napier <> Date: Mon Apr 6 10:33:01 2009 -0700 AI 144650: readability review for napier. Automated import of CL 144650 commit 892dcf44988c7b2886da30bc94e8fa7988f74625 Author: Bill Napier <> Date: Mon Apr 6 10:31:59 2009 -0700 AI 144651: am: CL 144650 readability review for napier. Original author: napier Merged from: //branches/cupcake/... Automated import of CL 144651 commit 0d2cb29f3301d659f4db216d61227f854b512055 Merge: 63b0ed1 6e95db6 Author: Scott Su <> Date: Thu Apr 2 23:58:49 2009 -0700 Merge branch 'readonly-p4-master' commit 6e95db6d4a43c96f8cda0ede00c07e6a17d4b0e2 Author: Scott Su <> Date: Thu Apr 2 23:57:44 2009 -0700 AI 144421: am: CL 144384 am: CL 144370 CTS: add test cases for ArrayAdapter Original author: sus Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 144421 commit 63b0ed1196ec5c54a25da7a1e18fda81682547e7 Merge: 8825b94 d4bccd3 Author: Scott Su <> Date: Thu Apr 2 23:56:16 2009 -0700 Merge branch 'readonly-p4-master' commit d4bccd38c0d7bf88b6ac5564795ef241e8c14320 Author: Scott Su <> Date: Thu Apr 2 23:55:10 2009 -0700 AI 144420: am: CL 144383 am: CL 144369 CTS: Fix a bug in test-progress-new, which will introduce crash if there is @ToBeFixed without description. Original author: sus Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 144420 commit 8825b947b7f36366cf1ecb446088339c3cfbbc15 Merge: f5ffc89 58768b8 Author: Phil Dubach <> Date: Thu Apr 2 23:14:18 2009 -0700 Merge branch 'readonly-p4-master' commit 58768b8c9a30b38ad79093ee7a21756ca784d7ed Author: Phil Dubach <> Date: Thu Apr 2 23:12:51 2009 -0700 AI 144404: am: CL 144303 am: CL 144302 CTS: Improve device restart behaviour (ADB workaround) - Instead of polling the log and searching for a string that indicates that the boot is complete, query the dev.bootcomplete property. - Use the ddmlib to poll the device boot status instead of a system call to adb, because of a suspected race condition when using both simultaneously. - If the device fails to register after a restart, kill the adb server and the ddmlib adb connection again. - Minor cleanups in comments and method names. Original author: phillipd Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 144404 commit 0624ae079fb46fde2401933c086085b1957f0944 Author: Scott Su <> Date: Thu Apr 2 22:29:01 2009 -0700 AI 144384: am: CL 144370 CTS: add test cases for ArrayAdapter Original author: sus Merged from: //branches/cupcake/... Automated import of CL 144384 commit 40f95d1618623baa0668d8bcd48ba8cd6bca87c7 Author: Scott Su <> Date: Thu Apr 2 22:25:42 2009 -0700 AI 144383: am: CL 144369 CTS: Fix a bug in test-progress-new, which will introduce crash if there is @ToBeFixed without description. Original author: sus Merged from: //branches/cupcake/... Automated import of CL 144383 commit 836e69d44373908f8c84b00df29adbafc48fec5f Author: Scott Su <> Date: Thu Apr 2 21:46:28 2009 -0700 AI 144370: CTS: add test cases for ArrayAdapter Automated import of CL 144370 commit f324c21e51cbfae323fdef7356600c202ac57ebe Author: Scott Su <> Date: Thu Apr 2 21:45:16 2009 -0700 AI 144369: CTS: Fix a bug in test-progress-new, which will introduce crash if there is @ToBeFixed without description. Automated import of CL 144369 commit ea1bbcadb17b975a4ada9018432aa4161edfc677 Author: Phil Dubach <> Date: Thu Apr 2 14:49:19 2009 -0700 AI 144303: am: CL 144302 CTS: Improve device restart behaviour (ADB workaround) - Instead of polling the log and searching for a string that indicates that the boot is complete, query the dev.bootcomplete property. - Use the ddmlib to poll the device boot status instead of a system call to adb, because of a suspected race condition when using both simultaneously. - If the device fails to register after a restart, kill the adb server and the ddmlib adb connection again. - Minor cleanups in comments and method names. Original author: phillipd Merged from: //branches/cupcake/... Automated import of CL 144303 commit 12e7730c552e479a4c1fa80ec497ec995ea5e305 Author: Phil Dubach <> Date: Thu Apr 2 14:49:11 2009 -0700 AI 144302: CTS: Improve device restart behaviour (ADB workaround) - Instead of polling the log and searching for a string that indicates that the boot is complete, query the dev.bootcomplete property. - Use the ddmlib to poll the device boot status instead of a system call to adb, because of a suspected race condition when using both simultaneously. - If the device fails to register after a restart, kill the adb server and the ddmlib adb connection again. - Minor cleanups in comments and method names. Automated import of CL 144302 commit f5ffc893e12dd8fd38aba099d929b6101008afc0 Merge: 3cc612d 0ebb5c5 Author: Gaurav Mathur <> Date: Thu Apr 2 09:44:29 2009 -0700 Merge branch 'readonly-p4-master' commit 0ebb5c5d33816db8159393e4e17d8a79f6e2ee36 Author: Gaurav Mathur <> Date: Thu Apr 2 09:43:19 2009 -0700 AI 144102: am: CL 144073 am: CL 144071 Adding Ryan for Dr No approval. Corrected logic for handling of KnownFailure tests in the CTS report XSLT Original author: gmathur Merged from: //branches/cupcake/... Original author: android-build Merged from: //branches/donutburger/... Automated import of CL 144102 commit 75f4a3823d09272a793cc71fa5855fc5176a20ce Author: Gaurav Mathur <> Date: Wed Apr 1 14:01:51 2009 -0700 AI 144073: am: CL 144071 Adding Ryan for Dr No approval. Corrected logic for handling of KnownFailure tests in the CTS report XSLT Original author: gmathur Merged from: //branches/cupcake/... Automated import of CL 144073 commit 86f896fb850957bb82a458249b3c0f7074c6cd98 Author: Gaurav Mathur <> Date: Wed Apr 1 13:59:23 2009 -0700 AI 144071: Adding Ryan for Dr No approval. Corrected logic for handling of KnownFailure tests in the CTS report XSLT Automated import of CL 144071 commit 3cc612d8a3a900f52d159b40b91d1b1ad21f8028 Merge: d4dae89 9909810 Author: The Android Open Source Project Date: Sun Mar 29 08:55:03 2009 -0700 Merge branch 'open_source_no_contributions' into google_internal commit 9dcc62ae5c2395447caa54f7a36b85d2ffcc40a2 Author: Phil Dubach <> Date: Fri Mar 27 20:31:12 2009 -0700 AI 143268: am: CL 143130 CTS: fix startcts script Fix syntax errors introduced by CL 143025 and correctly pass config file to CTS. Also correct default CTS location derived from ANDROID_ROOT. Original author: phillipd Merged from: //branches/cupcake/... Automated import of CL 143268 commit 577e42f9222dc758cbff3b5e8228058226ac2be1 Author: Phil Dubach <> Date: Fri Mar 27 20:19:50 2009 -0700 AI 143264: am: CL 143117 CTS: Make device restart configurable through environment variable CTS_RESTART_AFTER Original author: phillipd Merged from: //branches/cupcake/... Automated import of CL 143264 commit 08ac5b2bb35125aa39ef0694f8089fdd44d618b3 Author: Jorg Pleumann <> Date: Fri Mar 27 19:59:59 2009 -0700 AI 143236: am: CL 143087 Automated g4 rollback of changelist 143072. *** Reason for rollback *** Broke the build. I guess acp is not yet built at the point where I tried to use it. Maybe due to more parallel processes on the build server. Looking for another solution. *** Original change description *** Tiny fix for the VM tests build. We had problems with read-only files. I think acp is able to deal with this. Original author: jorgp Merged from: //branches/cupcake/... Automated import of CL 143236 commit d4dae89bbcd173527848a72ff76ad358378cd92c Author: Phil Dubach <> Date: Fri Mar 27 19:57:09 2009 -0700 AI 143397: am: CL 143268 am: CL 143130 CTS: fix startcts script Fix syntax errors introduced by CL 143025 and correctly pass config file to CTS. Also correct default CTS location derived from ANDROID_ROOT. Original author: phillipd Merged from: //branches/cupcake/... Original author: android-build Merged from: //branches/donutburger/... Automated import of CL 143397 commit 996d5d7b464e9549a2a186655bc5d9f9ab31cda5 Author: Jorg Pleumann <> Date: Fri Mar 27 19:52:30 2009 -0700 AI 143234: am: CL 143072 Tiny fix for the VM tests build. We had problems with read-only files. I think acp is able to deal with this. Original author: jorgp Merged from: //branches/cupcake/... Automated import of CL 143234 commit f3ad09c5744bf5f6d898ece837ccb57f5f32be61 Author: Phil Dubach <> Date: Fri Mar 27 19:51:40 2009 -0700 AI 143393: am: CL 143264 am: CL 143117 CTS: Make device restart configurable through environment variable CTS_RESTART_AFTER Original author: phillipd Merged from: //branches/cupcake/... Original author: android-build Merged from: //branches/donutburger/... Automated import of CL 143393 commit b344979993b3294387e6a4cdf0984a477140a37a Author: Jorg Pleumann <> Date: Fri Mar 27 19:44:39 2009 -0700 AI 143386: am: CL 143236 am: CL 143087 Automated g4 rollback of changelist 143072. *** Reason for rollback *** Broke the build. I guess acp is not yet built at the point where I tried to use it. Maybe due to more parallel processes on the build server. Looking for another solution. *** Original change description *** Tiny fix for the VM tests build. We had problems with read-only files. I think acp is able to deal with this. Original author: jorgp Merged from: //branches/cupcake/... Original author: android-build Merged from: //branches/donutburger/... Automated import of CL 143386 commit 8188389fa1c1a9fc75ce58446614ce7eaa2ea985 Author: Jorg Pleumann <> Date: Fri Mar 27 19:42:17 2009 -0700 AI 143384: am: CL 143234 am: CL 143072 Tiny fix for the VM tests build. We had problems with read-only files. I think acp is able to deal with this. Original author: jorgp Merged from: //branches/cupcake/... Original author: android-build Merged from: //branches/donutburger/... Automated import of CL 143384 commit 4bdc7d35c487d595121fe5eefb017c7fa1aa731f Author: Phil Dubach <> Date: Fri Mar 27 19:28:40 2009 -0700 AI 143372: am: CL 143222 am: CL 143025 CTS: Modify start scripts to pass through command line parameters Original author: phillipd Merged from: //branches/cupcake/... Original author: android-build Merged from: //branches/donutburger/... Automated import of CL 143372 commit d9ca51e1e48de3d88af59772c54bffdf1c446f6a Author: Phil Dubach <> Date: Fri Mar 27 19:27:22 2009 -0700 AI 143371: am: CL 143221 am: CL 143024 CTS: Increase java heap size for coverage tool Original author: phillipd Merged from: //branches/cupcake/... Original author: android-build Merged from: //branches/donutburger/... Automated import of CL 143371 commit 12ee6fd49e24b118a60ce8be4ea4996d06aa5d95 Author: Phil Dubach <> Date: Fri Mar 27 19:10:43 2009 -0700 AI 143222: am: CL 143025 CTS: Modify start scripts to pass through command line parameters Original author: phillipd Merged from: //branches/cupcake/... Automated import of CL 143222 commit 5025eac0ce5729d8e5902b27607125b3327f6200 Author: Phil Dubach <> Date: Fri Mar 27 19:07:04 2009 -0700 AI 143221: am: CL 143024 CTS: Increase java heap size for coverage tool Original author: phillipd Merged from: //branches/cupcake/... Automated import of CL 143221 commit f8d6215261c868babee63ec9dc13ea0053af55a9 Author: Phil Dubach <> Date: Fri Mar 27 18:49:23 2009 -0700 AI 143339: am: CL 143188 am: CL 142937 CTS: Style sheet updates - handle known failures - display fully qualified name of each test suite - add spacer line between test suites Original author: phillipd Merged from: //branches/cupcake/... Original author: android-build Merged from: //branches/donutburger/... Automated import of CL 143339 commit 54e7e716c4b293d83d173fa0b3f758bafc694f1d Author: Scott Su <> Date: Fri Mar 27 18:17:33 2009 -0700 AI 143326: am: CL 143176 am: CL 142888 CTS annotation update update wrong TestLevel values update tests that were still using the old annotations minor fixes to eliminate eclipse warnings style fixes Original author: sus Merged from: //branches/cupcake/... Original author: android-build Merged from: //branches/donutburger/... Automated import of CL 143326 commit 32181bf51c667cef480f018981ae1327059b02d4 Author: Scott Su <> Date: Fri Mar 27 18:07:58 2009 -0700 AI 143317: am: CL 143168 am: CL 142868 CTS: add test cases for android.view.WindowManager Original author: sus Merged from: //branches/cupcake/... Original author: android-build Merged from: //branches/donutburger/... Automated import of CL 143317 commit 72db1ae8810ca24d2fdb0615d70c0f339d826f7a Author: Phil Dubach <> Date: Fri Mar 27 17:02:04 2009 -0700 AI 143188: am: CL 142937 CTS: Style sheet updates - handle known failures - display fully qualified name of each test suite - add spacer line between test suites Original author: phillipd Merged from: //branches/cupcake/... Automated import of CL 143188 commit 46016d69e95d5fce7fd1950c6fb85da467fc3fc5 Author: Scott Su <> Date: Fri Mar 27 16:24:28 2009 -0700 AI 143176: am: CL 142888 CTS annotation update update wrong TestLevel values update tests that were still using the old annotations minor fixes to eliminate eclipse warnings style fixes Original author: sus Merged from: //branches/cupcake/... Automated import of CL 143176 commit 0d3aa156f81e7fe9031f1a5b1fa424d600f8354e Author: Scott Su <> Date: Fri Mar 27 16:01:17 2009 -0700 AI 143168: am: CL 142868 CTS: add test cases for android.view.WindowManager Original author: sus Merged from: //branches/cupcake/... Automated import of CL 143168 commit 9909810e6a27f27e98c74f7e56e761a405322af3 Author: Phil Dubach <> Date: Fri Mar 27 13:29:28 2009 -0700 AI 143130: CTS: fix startcts script Fix syntax errors introduced by CL 143025 and correctly pass config file to CTS. Also correct default CTS location derived from ANDROID_ROOT. Automated import of CL 143130 commit b2d93647a11235e8557c60c3c71aef9f08aa123f Author: Phil Dubach <> Date: Fri Mar 27 11:52:43 2009 -0700 AI 143117: CTS: Make device restart configurable through environment variable CTS_RESTART_AFTER Automated import of CL 143117 commit a88c2ee1a07f1d0461afb3428628102465b7889b Author: Jorg Pleumann <> Date: Fri Mar 27 05:45:45 2009 -0700 AI 143087: Automated g4 rollback of changelist 143072. *** Reason for rollback *** Broke the build. I guess acp is not yet built at the point where I tried to use it. Maybe due to more parallel processes on the build server. Looking for another solution. *** Original change description *** Tiny fix for the VM tests build. We had problems with read-only files. I think acp is able to deal with this. Automated import of CL 143087 commit a56866db2bf3fa0a2db61d14fef877f92e55f064 Author: Jorg Pleumann <> Date: Fri Mar 27 03:28:24 2009 -0700 AI 143072: Tiny fix for the VM tests build. We had problems with read-only files. I think acp is able to deal with this. BUG=1389127 Automated import of CL 143072 commit 5723c1209136bfaa3e5a6524563d536a1858a949 Author: Phil Dubach <> Date: Thu Mar 26 17:32:36 2009 -0700 Automated import from //branches/cupcake/...@143025,143025 commit fb4922a13019ce350dbdd27e31804e52265b1697 Author: Phil Dubach <> Date: Thu Mar 26 17:31:40 2009 -0700 Automated import from //branches/cupcake/...@143024,143024 commit d0e90c419d63f72c890cb782ca74103f2d809e32 Author: Phil Dubach <> Date: Thu Mar 26 10:29:43 2009 -0700 Automated import from //branches/cupcake/...@142937,142937 commit 71d56716bf683c99471f596936eda5b876e4c4de Author: Scott Su <> Date: Thu Mar 26 01:42:37 2009 -0700 Automated import from //branches/cupcake/...@142888,142888 commit f953fca35186beb85cd28c0de6705a4d9e7d7e47 Author: Scott Su <> Date: Wed Mar 25 22:27:53 2009 -0700 Automated import from //branches/cupcake/...@142868,142868 commit ef7de61468edf96003c3c612cc9e04c0771e61f1 Author: Scott Su <> Date: Wed Mar 25 15:19:18 2009 -0700 Automated import from //branches/master/...@142670,142670 commit 28abde6ad73043afbb64aa3cd589ad876f919463 Author: Scott Su <> Date: Tue Mar 24 22:51:05 2009 -0700 Automated import from //branches/donutburger/...@142497,142497 commit 3b57cf734d59150c321147392ccf58397e42af4e Author: Scott Su <> Date: Tue Mar 24 21:14:33 2009 -0700 Automated import from //branches/cupcake/...@142496,142496 commit af67083d050761d9ebffc2c6b551f506ca04e467 Author: Phil Dubach <> Date: Tue Mar 24 20:31:33 2009 -0700 Automated import from //branches/master/...@141544,141544 commit 0e8652b85a14a4f1e953ed30efd5fdaeb6686469 Author: Phil Dubach <> Date: Tue Mar 24 20:31:05 2009 -0700 Automated import from //branches/donutburger/...@141542,141542 commit 066f943c5d891e56a971f72be2747cfcc9186ef4 Author: Phil Dubach <> Date: Tue Mar 24 20:10:28 2009 -0700 Automated import from //branches/donutburger/...@141378,141378 commit ae206bc40ff95c75bcc2d52d2c2f9209af8d701f Author: Phil Dubach <> Date: Tue Mar 24 20:09:38 2009 -0700 Automated import from //branches/master/...@141379,141379 commit ba501a64ade6e2d091594b645c67015c9efaf2d4 Author: Scott Su <> Date: Tue Mar 24 20:09:16 2009 -0700 Automated import from //branches/donutburger/...@141371,141371 commit f5a826b68a1d676766c4108a2be179e075c2f454 Author: Scott Su <> Date: Tue Mar 24 20:08:31 2009 -0700 Automated import from //branches/donutburger/...@141370,141370 commit 059b3714f508ca39b0b9b2bba3f75c7c5c808a08 Author: Scott Su <> Date: Tue Mar 24 20:08:30 2009 -0700 Automated import from //branches/master/...@141374,141374 commit 9c9be1c3a53d322de100f7419f9c2fa02e50d009 Author: Scott Su <> Date: Tue Mar 24 20:07:58 2009 -0700 Automated import from //branches/master/...@141373,141373 commit 7671becdf1320aa659abcb641546d636cf6a02cc Author: The Android Open Source Project Date: Thu Mar 19 23:08:36 2009 -0700 auto import from //branches/cupcake_rel/...@141571 commit a2d00fe5657e2f84afa0baf34f4e4d3509fe67e4 Author: The Android Open Source Project Date: Wed Mar 18 22:20:24 2009 -0700 auto import //branches/master/...@140412 commit 7ca56dfb7d78d0050a3da3d87c040ca7910b3344 Author: The Android Open Source Project Date: Wed Mar 18 17:39:42 2009 -0700 auto import from //branches/cupcake_rel/...@140373 commit f8057104af9cae031b544e971a52adafa7c0d9e1 Author: The Android Open Source Project Date: Sun Mar 15 16:47:16 2009 -0700 auto import from //branches/cupcake_rel/...@138607