summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* merge in gingerbread-release history after reset to gingerbreadandroid-2.3.7_r1android-2.3.6_r1android-2.3.6_r0.9android-2.3.5_r1The Android Automerger2011-06-160-0/+0
|\
| * merge in gingerbread-release history after reset to gingerbreadThe Android Automerger2011-06-100-0/+0
| |\
| | * merge in gingerbread-release history after reset to gingerbreadThe Android Automerger2011-06-090-0/+0
| | |\
| | | * merge in gingerbread-release history after reset to gingerbreadThe Android Automerger2011-06-060-0/+0
| | | |\
| | | | * merge in gingerbread-release history after reset to gingerbreadThe Android Automerger2011-05-250-0/+0
| | | | |\
| | | | | * merge in gingerbread-release history after reset to gingerbreadThe Android Automerger2011-05-130-0/+0
| | | | | |\
| | | | | | * Revert "CTS: Fixes a possible "out of memory" exception"android-2.3.4_r1Brian Muramatsu2011-04-221-15/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | | | * Backport from HC to Fix NetworkInfoTestXia Wang2011-04-222-149/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | | | * Enhance the options check so that if we expect to see a nullFred Quintana2011-04-221-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | options bundle we accept a non-null but empty bundle as well. Bug: 4182396 Change-Id: Ic10dc9aa33df01565fcacb8b3aef2852e2b3535b
| | | | | | * keep previous historyandroid-2.3.4_r0.9android-merger2011-04-060-0/+0
| | | | | | |\
* | | | | | | \ Merge "Clarify vold isn't exploitable when no sd card exists" into gingerbreadBrian Muramatsu2011-06-161-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Clarify vold isn't exploitable when no sd card existsNick Kralevich2011-06-161-2/+2
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I24903ca0f6267c0034df068abcece6091f25f38e
* | | | | | | | Merge "Test for Checking Package Signatures" into gingerbreadBrian Muramatsu2011-06-165-0/+128
|\ \ \ \ \ \ \ \
| * | | | | | | | Test for Checking Package SignaturesBrian Muramatsu2011-06-155-0/+128
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | Merge "Detect when BT Pairing Dialog is Incorrectly Shown" into gingerbreadBrian Muramatsu2011-06-153-0/+49
|\ \ \ \ \ \ \ \
| * | | | | | | | Detect when BT Pairing Dialog is Incorrectly ShownBrian Muramatsu2011-06-093-0/+49
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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
* | | | | | | | Merge "Wait for completing the initialization of WebViewCore" into gingerbreadBrian Muramatsu2011-06-131-5/+12
|\ \ \ \ \ \ \ \
| * | | | | | | | Wait for completing the initialization of WebViewCoreMasanori Ogino2011-05-261-5/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | Merge "Add some strings for screen where the text stayed in" into gingerbreadBrian Muramatsu2011-06-131-1/+3
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Add some strings for screen where the text stayed inKaoriFujimoto2011-06-101-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | Merge "Remove testUnknownSourcesByDefaultTest" into gingerbreadBrian Muramatsu2011-06-101-5/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove testUnknownSourcesByDefaultTestBrian Muramatsu2011-06-101-5/+0
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | Merge "Increment Version to 2.3_r4" into gingerbreadBrian Muramatsu2011-06-101-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Increment Version to 2.3_r4Brian Muramatsu2011-06-101-1/+1
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 4588939 Change-Id: I7aca7f0bc309b4e63ff59c0c2abf0aa28cf5e008
* | | | | | | | Merge "Fixes for the location manager cts tests" into gingerbreadBrian Muramatsu2011-06-091-3/+13
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Fixes for the location manager cts testsJason Bayer2011-06-091-3/+13
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the gps feature isn't declared on the system, it should not be required to return a gps provider Change-Id: I1eda27e133d78a384f77b7b2bf09863631479313
* | | | | | | Merge "location provider fixes: test the provider without assuming presence ↵Brian Muramatsu2011-06-071-4/+30
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | of any particular provider on the device" into gingerbread
| * | | | | | | location provider fixes: test the provider without assuming presence of any ↵Jason Bayer2011-06-071-4/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | particular provider on the device Change-Id: Ibac21f9f29f8ab5583cadae8e4a6dded209ebe67
* | | | | | | | Merge "Merge remote branch 'korg/froyo' into manualmerge" into gingerbreadBrian Muramatsu2011-06-064-7/+58
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Merge remote branch 'korg/froyo' into manualmergeBrian Muramatsu2011-06-064-7/+58
|/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tools/host/src/com/android/cts/Version.java Change-Id: I742c222786c9b883c152cbb0cac1008451188106
| * | | | | | | Merge "Revert "Check "Unknown Sources" is Enabled by Default"" into froyoBrian Muramatsu2011-06-061-6/+0
| |\ \ \ \ \ \ \
| | * | | | | | | Revert "Check "Unknown Sources" is Enabled by Default"Brian Muramatsu2011-06-061-6/+0
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 594e9852cc4d34e966f2389c8be67aebb69fdc53.
| * | | | | | | Merge "Increment Version to 2.2_r6" into froyoBrian Muramatsu2011-06-031-1/+1
| |\ \ \ \ \ \ \
| | * | | | | | | Increment Version to 2.2_r6Brian Muramatsu2011-06-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3a344fe0aa70d39b9ba2d13e4b81e21a89e50df4
| * | | | | | | | Merge "Add more CTS tests." into froyoBrian Muramatsu2011-06-024-7/+58
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Add more CTS tests.Marco Nelissen2011-06-024-7/+58
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | Merge "Check "Unknown Sources" is Enabled by Default" into froyoBrian Muramatsu2011-05-241-0/+6
| |\ \ \ \ \ \ \
| | * | | | | | | Check "Unknown Sources" is Enabled by DefaultBrian Muramatsu2011-05-241-0/+6
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 4080822 Change-Id: Idba3b1871650eb7dea1e96e630e8ac15f4f03ec1
| * | | | | | | Merge "Don't fail if vold.fstab is empty" into froyoBrian Muramatsu2011-05-231-1/+5
| |\ \ \ \ \ \ \
| | * | | | | | | Don't fail if vold.fstab is emptyNick Kralevich2011-05-231-1/+5
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | Merge "Don't fail on netlink socket closing." into froyoBrian Muramatsu2011-05-051-2/+11
| |\ \ \ \ \ \ \
| | * | | | | | | Don't fail on netlink socket closing.Nick Kralevich2011-05-051-2/+11
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the process listening on the netlink socket closes the listener socket, don't consider that a security hole. Change-Id: If7e0800011e2bf477586a80266f837a722308af1
* | | | | | | | Merge "Make sensors optional" into gingerbreadBrian Muramatsu2011-06-061-6/+24
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Make sensors optionalDylan Reid2011-06-061-6/+24
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Change-Id: I44526a902fa5e7ad326e82bb2eb6d4b0f6706ca3
* | | | | | | Merge "Copy Verifier Results to Clipboard" into gingerbreadBrian Muramatsu2011-06-034-3/+20
|\ \ \ \ \ \ \
| * | | | | | | Copy Verifier Results to ClipboardBrian Muramatsu2011-06-034-3/+20
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 4478619 Change-Id: Ie8c57f03332b31be3b69d65eda091810c52b980d
* | | | | | | Merge "Audio Latency Tests" into gingerbreadBrian Muramatsu2011-06-039-14/+657
|\ \ \ \ \ \ \
| * | | | | | | Audio Latency TestsBrian Muramatsu2011-06-039-14/+657
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | Merge "Skip Bluetooth tests if the device doesn't support Bluetooth." into ↵Brian Muramatsu2011-06-021-8/+43
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | gingerbread
| * | | | | | | Skip Bluetooth tests if the device doesn't support Bluetooth.fujimoto.kaori2011-06-021-8/+43
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | Change-Id: Iad247a9538cdbe5ac8fc1e6a9522791cfde20262
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-17 18:18:04 +0000