summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-10-19Merge changes from topic "used_channels_leakage"pie-tempRuchi Kandoi
am: 32ade37df9 Change-Id: Id69c20e0d653832dffa80ef4cf397f7a2b068635
2018-10-19Merge changes from topic "used_channels_leakage"Ruchi Kandoi
* changes: Replace assertEquals() with assertThat() Close the used channels even after test cases failed
2018-10-19Merge "Remove unused refs to core library jars"Neil Fuller
am: 643363fe01 Change-Id: I96d097218a8062a8974ea490c47e31f2ae27fb60
2018-10-19Merge "Remove unused refs to core library jars"Neil Fuller
2018-10-19Merge "Tests for reading/writing primitive arrays."Steven Moreland
am: 7f0f7cc62d Change-Id: Icbdd74eab295e5f0c4d8a069821e8d428f496e88
2018-10-19Merge "Tests for reading/writing primitive arrays."Steven Moreland
2018-10-19Remove unused refs to core library jarsNeil Fuller
oj_jar, libart_jar and simple_jar were only being used to build PRIVATE_DALVIK_SUITE_CLASSPATH, which is unused and not referenced elsewhere. Bug: 113148576 Test: build Change-Id: Ia93752b86bcad2c682fab925bb260e19a8a5af4e
2018-10-19Merge "Add Uri tests for IPv6 literal adresses"Chalard Jean
am: b78e1acea8 Change-Id: I7b1722c93a24c10cbcae0449d7f8cb2acdefa967
2018-10-19Merge "Add Uri tests for IPv6 literal adresses"Treehugger Robot
2018-10-19Add Uri tests for IPv6 literal adressesChalard Jean
Bug: 25540738 Test: this Change-Id: Id63a5dd17293014218df78bcb440993cc5f3beb8
2018-10-18Merge "[automerger skipped] Merge "DO NOT MERGE: missing API file." into ↵Jiyong Park
pie-cts-dev am: adbab00d80 -s ours" am: 103cdc05f8 -s ours Change-Id: I7530a8f7fa64537eb41a029ddc628509804c8585
2018-10-18Merge "Merge "Fix CtsDevicePolicyManagerTestCases not to rely on default ↵Takamasa Kuramitsu
ringtone" into pie-cts-dev am: d96fa78b19" am: 246eb8cbbb Change-Id: I9b18ed32ec89b94b29c63a52c65b358045897b5d
2018-10-19Merge "[automerger skipped] Merge "DO NOT MERGE: missing API file." into ↵Android Merger
pie-cts-dev am: adbab00d80 -s ours"
2018-10-18[automerger skipped] Merge "DO NOT MERGE: missing API file." into pie-cts-devJiyong Park
am: adbab00d80 -s ours Change-Id: Icc1d5705b5bb6e3ccdade3ebba20ee6fd2a89812
2018-10-19Merge "DO NOT MERGE: missing API file." into pie-cts-devTreehugger Robot
2018-10-19Merge "Merge "Fix CtsDevicePolicyManagerTestCases not to rely on default ↵Android Merger
ringtone" into pie-cts-dev am: d96fa78b19"
2018-10-18Merge "Fix CtsDevicePolicyManagerTestCases not to rely on default ringtone" ↵Takamasa Kuramitsu
into pie-cts-dev am: d96fa78b19 Change-Id: Icf7deaf337dec43aa5862555f5cb64f6a8201220
2018-10-18Merge "Fix CtsDevicePolicyManagerTestCases not to rely on default ringtone" ↵Treehugger Robot
into pie-cts-dev
2018-10-18Replace assertEquals() with assertThat()Yoshiaki Naka
As the order of the expected value and the actual value are wrong in assertEquals(), the assertion method is replaced with assertThat(). Bug: 117628190 Test: Executed CtsOmapiTestCases and observed no issue. Change-Id: I12225299d20304b4d73edcf3197346e2dd59ef1a
2018-10-17Merge "Merge "App Standby Settings key is set incorrectly" into pie-cts-dev ↵Mahesh Kumar
am: 8f74ba97f8" am: 0f42165611 Change-Id: I20c523354d3f3ce7065c66b8ffbba25bf698214c
2018-10-18Merge "Merge "App Standby Settings key is set incorrectly" into pie-cts-dev ↵Android Merger
am: 8f74ba97f8"
2018-10-17Merge "App Standby Settings key is set incorrectly" into pie-cts-devMahesh Kumar
am: 8f74ba97f8 Change-Id: I4b397dc03e24a4ee553b6b42256daad309d9d8fd
2018-10-18Merge "App Standby Settings key is set incorrectly" into pie-cts-devTreehugger Robot
2018-10-17Merge "Merge "Modified code at testRemoteUserInfo to set playback active" ↵Abhijeet Chakraborty
into pie-cts-dev am: 42beceb43a" am: e70b637f7c Change-Id: I85264443dbf758c6f2cc50cfb504a62739f3fdf5
2018-10-18Merge "Merge "Modified code at testRemoteUserInfo to set playback active" ↵Android Merger
into pie-cts-dev am: 42beceb43a"
2018-10-17Merge "Modified code at testRemoteUserInfo to set playback active" into ↵Abhijeet Chakraborty
pie-cts-dev am: 42beceb43a Change-Id: I35a00be408d7669b6be51da1ef36dfa8fd7b26f0
2018-10-18Merge "Modified code at testRemoteUserInfo to set playback active" into ↵Treehugger Robot
pie-cts-dev
2018-10-17Merge "Merge "Merge "Merge "Merge "Merge "Allow onLoadResource before ↵Bo Liu
onPageLoadStarted" into nougat-cts-dev am: 1c7c67ae03" into nougat-mr1-cts-dev am: 0652536be3" into oreo-cts-dev am: fc57748481" into oreo-mr1-cts-dev am: f04f9c7f5d" into pie-cts-dev am: 1fc4de3c87" am: 8a78c4a862 Change-Id: I9fbde4a15d096202e140c524e2c62ef49b408f79
2018-10-17Merge "NdkBinderTest: sanity check source implementation"Steven Moreland
am: d2332aabd0 Change-Id: I26fb4f7db91c787470a6dc12aa835163c020a172
2018-10-17Merge "Merge "Merge "[automerger skipped] Merge "DO NOT MERGE: Whitelist ↵Claudia Lee
android.intent.action.View" into oreo-cts-dev am: b579d910de -s ours" into oreo-mr1-cts-dev am: f21213ef69 -s ours" into pie-cts-dev am: 2d9065b54f -s ours" am: 7ebc60c77c -s ours Change-Id: I08658cd62c282d53b08748fc86ec164aba2d5022
2018-10-17Merge "[automerger skipped] Merge "DO NOT MERGE: Whitelist ↵Claudia Lee
android.intent.action.View" into pie-cts-dev am: f637c69a44 -s ours" am: de3ae659dc -s ours Change-Id: I10638753d4ed3dc4bc46200cf033796229b9bee7
2018-10-17Merge "Merge "Merge "Merge "Merge "Merge "Allow onLoadResource before ↵Android Merger
onPageLoadStarted" into nougat-cts-dev am: 1c7c67ae03" into nougat-mr1-cts-dev am: 0652536be3" into oreo-cts-dev am: fc57748481" into oreo-mr1-cts-dev am: f04f9c7f5d" into pie-cts-dev am: 1fc4de3c87"
2018-10-17Merge "Merge "Merge "Merge "Merge "Allow onLoadResource before ↵Bo Liu
onPageLoadStarted" into nougat-cts-dev am: 1c7c67ae03" into nougat-mr1-cts-dev am: 0652536be3" into oreo-cts-dev am: fc57748481" into oreo-mr1-cts-dev am: f04f9c7f5d" into pie-cts-dev am: 1fc4de3c87 Change-Id: I900a36f19d8da505a168e31e81be69a090bf1745
2018-10-17Merge "Merge "Merge "Merge "Merge "Allow onLoadResource before ↵Android Merger
onPageLoadStarted" into nougat-cts-dev am: 1c7c67ae03" into nougat-mr1-cts-dev am: 0652536be3" into oreo-cts-dev am: fc57748481" into oreo-mr1-cts-dev am: f04f9c7f5d" into pie-cts-dev
2018-10-17Merge "Merge "Merge "Merge "Allow onLoadResource before onPageLoadStarted" ↵Bo Liu
into nougat-cts-dev am: 1c7c67ae03" into nougat-mr1-cts-dev am: 0652536be3" into oreo-cts-dev am: fc57748481" into oreo-mr1-cts-dev am: f04f9c7f5d Change-Id: Ie3e7b1028b9a2c3d44015d8c9ee94825bf2545d4
2018-10-17Merge "Merge "Merge "Merge "Allow onLoadResource before onPageLoadStarted" ↵Android Merger
into nougat-cts-dev am: 1c7c67ae03" into nougat-mr1-cts-dev am: 0652536be3" into oreo-cts-dev am: fc57748481" into oreo-mr1-cts-dev
2018-10-17Merge "Merge "Merge "Allow onLoadResource before onPageLoadStarted" into ↵Bo Liu
nougat-cts-dev am: 1c7c67ae03" into nougat-mr1-cts-dev am: 0652536be3" into oreo-cts-dev am: fc57748481 Change-Id: I48d251fb0a7ede648e1b859c0a2d623b4d43f3e6
2018-10-17Merge "Merge "Merge "Allow onLoadResource before onPageLoadStarted" into ↵Android Merger
nougat-cts-dev am: 1c7c67ae03" into nougat-mr1-cts-dev am: 0652536be3" into oreo-cts-dev
2018-10-17Merge "Merge "Allow onLoadResource before onPageLoadStarted" into ↵Bo Liu
nougat-cts-dev am: 1c7c67ae03" into nougat-mr1-cts-dev am: 0652536be3 Change-Id: I9a2be7880c240e653866bf1e792fdc55dbb143b9
2018-10-17Merge "Merge "Allow onLoadResource before onPageLoadStarted" into ↵Android Merger
nougat-cts-dev am: 1c7c67ae03" into nougat-mr1-cts-dev
2018-10-17Merge "Allow onLoadResource before onPageLoadStarted" into nougat-cts-devBo Liu
am: 1c7c67ae03 Change-Id: I5cce35973e44a332c574e5a4b7ae86a65967c28e
2018-10-17Merge "NdkBinderTest: sanity check source implementation"Treehugger Robot
2018-10-17Merge "Allow onLoadResource before onPageLoadStarted" into nougat-cts-devTreehugger Robot
2018-10-17Merge "Merge "Merge "[automerger skipped] Merge "DO NOT MERGE: Whitelist ↵Android Merger
android.intent.action.View" into oreo-cts-dev am: b579d910de -s ours" into oreo-mr1-cts-dev am: f21213ef69 -s ours" into pie-cts-dev am: 2d9065b54f -s ours"
2018-10-17Merge "Merge "[automerger skipped] Merge "DO NOT MERGE: Whitelist ↵Claudia Lee
android.intent.action.View" into oreo-cts-dev am: b579d910de -s ours" into oreo-mr1-cts-dev am: f21213ef69 -s ours" into pie-cts-dev am: 2d9065b54f -s ours Change-Id: Ie28f7d2e73afed045352ce5f7ff2ce39bbca8e31
2018-10-17Merge "[automerger skipped] Merge "DO NOT MERGE: Whitelist ↵Android Merger
android.intent.action.View" into pie-cts-dev am: f637c69a44 -s ours"
2018-10-17[automerger skipped] Merge "DO NOT MERGE: Whitelist ↵Claudia Lee
android.intent.action.View" into pie-cts-dev am: f637c69a44 -s ours Change-Id: I2d713ecf9fbbdef34920f68f5b422a6788bf5cf6
2018-10-17Merge "Merge "[automerger skipped] Merge "DO NOT MERGE: Whitelist ↵Claudia Lee
android.intent.action.View" into oreo-mr1-cts-dev am: 1503fb1578 -s ours" into pie-cts-dev am: b48a0d0e9d -s ours" am: a1b90a0687 -s ours Change-Id: I2aa286e088ddccb7135a6da6b29ec2ff48ab872d
2018-10-17Merge "Merge "[automerger skipped] Merge "DO NOT MERGE: Whitelist ↵Android Merger
android.intent.action.View" into oreo-cts-dev am: b579d910de -s ours" into oreo-mr1-cts-dev am: f21213ef69 -s ours" into pie-cts-dev
2018-10-17Merge "[automerger skipped] Merge "DO NOT MERGE: Whitelist ↵Claudia Lee
android.intent.action.View" into oreo-cts-dev am: b579d910de -s ours" into oreo-mr1-cts-dev am: f21213ef69 -s ours Change-Id: I8405b2324143a3dd21722d5776c93cc043f2d6df
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-09 20:37:15 +0000