am: 6591499e44 -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 d51ae5760d is in history
Change-Id: Ief035b800d86e2e08af9f8488c4468f47b253071
am: 257e3faca3 -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 d51ae5760d is in history
Change-Id: I0a3f9ee8bfb0a20aefbed1eecdbdf95ff782c67d
am: ffaed0bbc0 -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 d51ae5760d is in history
Change-Id: I513c89fadd93716b099f2b21f44ae47fb70516ec
Vpn test would destroy socket. If adb run over network, adb
socket would be killed during Vpn test. Then, test stop due to
adb disconnect.
Bug: 119382723
Bug: 117194347
Test: - I solemnly swear I tested this conflict resolution
Change-Id: I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629
Merged-In: I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629
(cherry picked from commit de0f268f78)
Add getFrequency() to WifiInfoTest (along with other missing getters),
and test that it is consistent with ScanResult in ScanResultTest.
Test: atest android.net.wifi.cts.ScanResultTest
Fixes: b/138929469
Merged-In: I070b16661bc72a5c5035b0b227821b680d7d71ba
(cherry picked from commit 2d504956e63eefb0a6a90844d1d00b99c097891b)
Change-Id: Ie99011acbbe66e9088f73964fd0c39d640594011
am: 2c5ac01165 -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 d51ae5760d is in history
Change-Id: I1d24f04eaeb01f72b7448688a6c63c359f1a97c8
am: e6bf3b799e -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 d51ae5760d is in history
Change-Id: I57a24748b4bb6abaa50a9ff43fffb235ce54d6c1
am: 9b319aa0ef -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 d51ae5760d is in history
Change-Id: Ia0a4c5b6dacdb18ddfeead56ebbc9d5d843f9a3d
am: ecaabe8f3e -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 d51ae5760d is in history
Change-Id: I8f7399472b3060ad1c2a2c22e534855d8ed15486
am: 704a9a46d8 -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 d51ae5760d is in history
Change-Id: If59203a033c02f870646db01d5f15029ffc8ac5c
Vpn test would destroy socket. If adb run over network, adb
socket would be killed during Vpn test. Then, test stop due to
adb disconnect.
Bug: 119382723
Bug: 135225500
Bug: 126645908
Test: Just cherry-pick with conflict fix
Change-Id: I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629
Merged-In: I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629
Merged-In: Id6f986aacc3cadf713ebbc8305ca535b861390fc
(cherry picked from commit de0f268f78)
am: 288024db11 -s ours
am skip reason: change_id Ic44b31ed9acc48b9bcba7e1e70cc18a65bc0a8f6 with SHA1 5764173a9f is in history
Change-Id: Ie2fec5bdde1a7c3bf7fced8ca28bd30493cf3374
am: 318b0296dd -s ours
am skip reason: change_id Iee8bfe418bf6003e5c78df77d75f6f9745249267 with SHA1 3a984ca812 is in history
Change-Id: Ic1bd0bc8ca4972739af578e6e8f305a9fc111e63
am: ac180af96d -s ours
am skip reason: change_id Iee8bfe418bf6003e5c78df77d75f6f9745249267 with SHA1 3a984ca812 is in history
Change-Id: Ieb4935ff494284c71dd7e7bc186076745a563606
am: 6b43dd2a19 -s ours
am skip reason: change_id Iee8bfe418bf6003e5c78df77d75f6f9745249267 with SHA1 3a984ca812 is in history
Change-Id: I60f7d208ec780c241b674b78b656eec1781b768c
am: c37cc1e4f1 -s ours
am skip reason: change_id Iee8bfe418bf6003e5c78df77d75f6f9745249267 with SHA1 3a984ca812 is in history
Change-Id: Ie1bb4a36b1e572bfccf1c9e074835cbc1c9a464d
am: d66e639f31 -s ours
am skip reason: change_id Iee8bfe418bf6003e5c78df77d75f6f9745249267 with SHA1 3a984ca812 is in history
Change-Id: I74cbd632b1a20501cfead409b87632adb1acc339
This change also remove some unused references.
Bug: 136638851
Test: atest android.net.cts.ConnectivityManagerTest
Merged-In: Ic44b31ed9acc48b9bcba7e1e70cc18a65bc0a8f6
Change-Id: Ic44b31ed9acc48b9bcba7e1e70cc18a65bc0a8f6
(cherry-pick from ag/8500407)
This change also remove some unused references.
Bug: 136638851
Test: atest android.net.cts.ConnectivityManagerTest
Change-Id: Ic44b31ed9acc48b9bcba7e1e70cc18a65bc0a8f6
DnsTest.testDnsWorks expects that reverse lookup for the Google
public DNS servers will return something with google.com in the
name. This no longer works because the reverse DNS entries have
changed to dns.google.
Bug: 129452237
Test: atest android.net.cts.DnsTest.testDnsWorks
Change-Id: Iee8bfe418bf6003e5c78df77d75f6f9745249267
Merged-In: Iee8bfe418bf6003e5c78df77d75f6f9745249267
(cherry picked from commit 3852fd92f5)
am: f090f3de05 -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 d51ae5760d is in history
Change-Id: I79f36a32d6415390ddfce6eacce3bffca3d7c11e
am: b8b8d703d9 -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 d51ae5760d is in history
Change-Id: Ic9514c32f1e0c6e9565b114f98f02cb4c97d35b7
am: cdef8b40ad -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 de0f268f78 is in history
Change-Id: I3bd1878cdc5b94797309928d150deb1accb9059c
am: 956b28af13 -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 d51ae5760d is in history
Change-Id: I47ea61fd0bdc9c2b4fe080e29550b5fc0d2c1b38
am: 5ecbd991d5 -s ours
am skip reason: change_id Id6f986aacc3cadf713ebbc8305ca535b861390fc with SHA1 b84038696c is in history
Change-Id: I338e250514cd7b7c94d9eee24ce4ce738e000366
am: caee99b3cf -s ours
am skip reason: change_id Id6f986aacc3cadf713ebbc8305ca535b861390fc with SHA1 b84038696c is in history
Change-Id: I216e490624ce14e2b4dacff9381a7d8c96276349
am: 0ff953bf1b -s ours
am skip reason: change_id Id6f986aacc3cadf713ebbc8305ca535b861390fc with SHA1 b84038696c is in history
Change-Id: Ia65a5ed54dd61a36d9f0f22fe2eae518c373230c
am: 14586e59ae -s ours
am skip reason: change_id Ifec84425febf38d732367fae6b43fa80c427c79f with SHA1 802549c8de is in history
Change-Id: Ifb8f628a98a57a5845c476f29775b1bc4ec5a31a