Lorenzo Colitti
4fd5a42479
Merge "Stop depending on the ConnectivityService default request." am: bb5952107d am: 0b27bd5aeb
...
am: dd1c03b05c
Change-Id: Ia3730d55442da165b779242a35c7c66bd0d9b8fe
2019-01-23 08:36:21 -08:00
Lorenzo Colitti
dd1c03b05c
Merge "Stop depending on the ConnectivityService default request." am: bb5952107d
...
am: 0b27bd5aeb
Change-Id: I93532a44b070dfbca74e8b68c3e26aa96ed5c480
2019-01-23 08:25:19 -08:00
Lorenzo Colitti
0b27bd5aeb
Merge "Stop depending on the ConnectivityService default request."
...
am: bb5952107d
Change-Id: Iae908cb959d50870923bce4dbe1bfed5f4c26c2c
2019-01-23 08:14:33 -08:00
Lorenzo Colitti
bb5952107d
Merge "Stop depending on the ConnectivityService default request."
2019-01-23 12:29:40 +00:00
Luke Huang
45c9f33845
Merge changes from topic "Java async dns" am: 6fd9d58242 am: ee35d6a4f2
...
am: 743161b3e4
Change-Id: I12f50513eee1c1cf3c908036fe80d3a3d8c373d0
2019-01-23 01:24:21 -08:00
Luke Huang
743161b3e4
Merge changes from topic "Java async dns" am: 6fd9d58242
...
am: ee35d6a4f2
Change-Id: I305cf0ae791f9503519884bdf382863002357ac7
2019-01-23 01:14:34 -08:00
Lorenzo Colitti
0d1aaee1dd
Stop depending on the ConnectivityService default request.
...
This avoids the need to expose ConnectivityService implementation
details as @SystemApi and the complexities that would be required
to make NetworkCapabilities parcelable in stable AIDL.
Bug: 112869080
Test: atest FrameworksNetTests NetworkStackTests
Change-Id: Icd5d25b9b8e9b7a7d1899b000c92dc4976c3b3d7
2019-01-23 18:10:06 +09:00
Luke Huang
ee35d6a4f2
Merge changes from topic "Java async dns"
...
am: 6fd9d58242
Change-Id: Ia08a8300887315d673f398b1340b2f44ce501b14
2019-01-23 01:06:19 -08:00
Luke Huang
6fd9d58242
Merge changes from topic "Java async dns"
...
* changes:
Add asynchronous DNS query API in Java
Add jni method for DnsResolver
2019-01-23 08:48:23 +00:00
Remi NGUYEN VAN
416c04033e
Merge "Add getAvoidBadWifi system API" am: 1aa810b0f3 am: edcf128bbc
...
am: 9371bb2165
Change-Id: I8ff56380368a340162368ccbeefcae6df1ae549f
2019-01-22 18:21:58 -08:00
Remi NGUYEN VAN
9371bb2165
Merge "Add getAvoidBadWifi system API" am: 1aa810b0f3
...
am: edcf128bbc
Change-Id: Ide4ffc316c9301b795e8c0dabea3322aaf0b3184
2019-01-22 17:53:09 -08:00
Remi NGUYEN VAN
edcf128bbc
Merge "Add getAvoidBadWifi system API"
...
am: 1aa810b0f3
Change-Id: Ifdf913669df84df3e3b158d5527895236e6758b7
2019-01-22 17:41:46 -08:00
Remi NGUYEN VAN
1aa810b0f3
Merge "Add getAvoidBadWifi system API"
2019-01-23 01:13:01 +00:00
Chalard Jean
ee2429335b
Merge changes If71fadd2,I42047185 am: 2b428221cb am: 3b0efeaf61
...
am: db127de672
Change-Id: Ia91e6eac1b53fabb018fb4e1f689bb986e895ca4
2019-01-22 15:29:37 -08:00
Chalard Jean
db127de672
Merge changes If71fadd2,I42047185 am: 2b428221cb
...
am: 3b0efeaf61
Change-Id: Id181b0c617c209bdf01ce25a8920d96025f8421d
2019-01-22 15:20:30 -08:00
Chalard Jean
3b0efeaf61
Merge changes If71fadd2,I42047185
...
am: 2b428221cb
Change-Id: Ie15258f09adb7f1cc53c558e1d3d5fdaf8d93476
2019-01-22 15:12:54 -08:00
Remi NGUYEN VAN
fd0192fda3
[automerger skipped] Merge "Migrate ICaptivePortal to stable AIDL" am: eb7c53718a am: 03ee99b190
...
am: 8071bbdd32 -s ours
am skip reason: change_id I62b457e709fa199822bb8f80b0eab990be4ded93 with SHA1 e761c0b364 is in history
Change-Id: If02574c9e6f3c77a0787c9747307d99eea4095e5
2019-01-22 14:57:23 -08:00
Chalard Jean
2b428221cb
Merge changes If71fadd2,I42047185
...
* changes:
[MS10] Address leftover comments on MS03 and MS07
[MS09] Implement isSameNetwork.
2019-01-22 22:50:21 +00:00
Remi NGUYEN VAN
8071bbdd32
Merge "Migrate ICaptivePortal to stable AIDL" am: eb7c53718a
...
am: 03ee99b190
Change-Id: I6fa53f6f7c45aa801a1e48e04bdb3ca6004f565d
2019-01-22 14:35:29 -08:00
Remi NGUYEN VAN
03ee99b190
Merge "Migrate ICaptivePortal to stable AIDL"
...
am: eb7c53718a
Change-Id: Id0844ec4d438dcc1f6c1028552dd21da6bd76584
2019-01-22 14:25:09 -08:00
Luke Huang
6d23e740f8
Add asynchronous DNS query API in Java
...
DnsResolver for asynchronous DNS querying
DnsPacket for parsing answer
Test: built, flashed, booted
atest DnsResolverTest
atest DnsPacketTest
Change-Id: Id014bc7387dd940cfaa270f68e7d4d85fab320a0
2019-01-23 00:07:43 +08:00
Luke Huang
4e5831aecc
Add jni method for DnsResolver
...
Test: built, flashed, booted
atest DnsResolverTest
Change-Id: Iff730ec918f4db1ba0216f90a12550fe26e271d0
2019-01-23 00:07:43 +08:00
Remi NGUYEN VAN
27de63e494
Add getAvoidBadWifi system API
...
This helps remove the dependency on MultinetworkPolicyTracker from
IpClient.
Test: atest FrameworksNetTests NetworkStackTests
Bug: 112869080
Change-Id: If56791dbed564772f25a859f301b8b52d84e38a3
2019-01-22 15:57:34 +00:00
Remi NGUYEN VAN
44ed85862c
Migrate ICaptivePortal to stable AIDL
...
Also add required API for the captive portal app to stop using hidden
members.
Test: atest FrameworksNetTests NetworkStackTests
Bug: 112869080
Merged-In: I62b457e709fa199822bb8f80b0eab990be4ded93
Change-Id: I62b457e709fa199822bb8f80b0eab990be4ded93
2019-01-23 00:53:13 +09:00
Lorenzo Colitti
230fad7923
Merge "Migrate ICaptivePortal to stable AIDL"
2019-01-22 15:38:07 +00:00
Pavel Grafov
1ad4ef9385
Merge "Add API for VPN apps to query always-on and lockdown." am: 5e135e2bdc am: d332a50c1f
...
am: 8bfc3feb3f
Change-Id: Ied8e5a01cdf76d8da02d2dc292943e6a559cc84e
2019-01-22 07:19:18 -08:00
Pavel Grafov
8bfc3feb3f
Merge "Add API for VPN apps to query always-on and lockdown." am: 5e135e2bdc
...
am: d332a50c1f
Change-Id: I48f3441f06af2a69776eacc5ee52463873739bdb
2019-01-22 07:09:43 -08:00
Pavel Grafov
d332a50c1f
Merge "Add API for VPN apps to query always-on and lockdown."
...
am: 5e135e2bdc
Change-Id: Icb11cdd5c7384eacf1df9b7a0c42e451641f0e04
2019-01-22 07:00:53 -08:00
Pavel Grafov
5e135e2bdc
Merge "Add API for VPN apps to query always-on and lockdown."
2019-01-22 14:43:06 +00:00
Remi NGUYEN VAN
e761c0b364
Migrate ICaptivePortal to stable AIDL
...
Also add required API for the captive portal app to stop using hidden
members.
Test: atest FrameworksNetTests NetworkStackTests
Bug: 112869080
Change-Id: I62b457e709fa199822bb8f80b0eab990be4ded93
2019-01-22 21:16:47 +09:00
Remi NGUYEN VAN
049478be96
Merge "Add LinkProps and NetworkCaps methods to SystemApi" am: 4bde11491b am: d16b91fddd
...
am: 8e3c713db0
Change-Id: I7e5a733b5c581679c0e50015205d9b8a3a2e8df2
2019-01-22 03:54:23 -08:00
Remi NGUYEN VAN
8e3c713db0
Merge "Add LinkProps and NetworkCaps methods to SystemApi" am: 4bde11491b
...
am: d16b91fddd
Change-Id: Ic15474fe0b7da8062114367ec4f692e30e73d549
2019-01-22 03:27:36 -08:00
Remi NGUYEN VAN
d16b91fddd
Merge "Add LinkProps and NetworkCaps methods to SystemApi"
...
am: 4bde11491b
Change-Id: I7ba317e49a6ad7a7413d9ff4e312aed0b700e695
2019-01-22 03:14:19 -08:00
Chalard Jean
7f8be9f6ca
[MS09] Implement isSameNetwork.
...
Test: Old tests pass, new tests pass too.
Bug: 113554482
Change-Id: I420471853f3fab7725cba7ae500cebdce1912e43
2019-01-22 19:10:48 +09:00
Remi NGUYEN VAN
d943a3ad36
Merge "Add NetworkStack metrics to system API" am: bda2c4fe17 am: 65599b3ca1
...
am: 330a49d63c
Change-Id: I848ac4c2bb8d35a2f756f97e57f9a61698c00f57
2019-01-22 00:28:03 -08:00
Remi NGUYEN VAN
330a49d63c
Merge "Add NetworkStack metrics to system API" am: bda2c4fe17
...
am: 65599b3ca1
Change-Id: I8d711dcf76935d28d8a610d6a18da77cea77268e
2019-01-22 00:18:58 -08:00
Remi NGUYEN VAN
65599b3ca1
Merge "Add NetworkStack metrics to system API"
...
am: bda2c4fe17
Change-Id: I686e0ffb8d226d9245f1ef6c04bbc8d586c61e81
2019-01-22 00:09:31 -08:00
Remi NGUYEN VAN
109f8d5585
Add LinkProps and NetworkCaps methods to SystemApi
...
Added methods are used by the NetworkStack.
Test: atest FrameworksNetTests NetworkStackTests
Bug: 112869080
Change-Id: I8822d43c1a4981ca39289525685b3f975fb0e8d5
2019-01-22 16:57:16 +09:00
Remi NGUYEN VAN
bda2c4fe17
Merge "Add NetworkStack metrics to system API"
2019-01-22 07:48:39 +00:00
Lorenzo Colitti
9484decee4
Merge "Properly expect all callbacks in testStackedLinkProperties." am: 98dda351ac am: 2244ef14a8
...
am: 63b0c7c37f
Change-Id: I615f412f7696752d867337ab5cbabe24daea2ed3
2019-01-21 23:00:00 -08:00
Lorenzo Colitti
63b0c7c37f
Merge "Properly expect all callbacks in testStackedLinkProperties." am: 98dda351ac
...
am: 2244ef14a8
Change-Id: I9b066e4242d52f917e36a05911bdcd843c3f5c84
2019-01-21 22:50:47 -08:00
Lorenzo Colitti
2244ef14a8
Merge "Properly expect all callbacks in testStackedLinkProperties."
...
am: 98dda351ac
Change-Id: Ida7b6da29e46856b504cc5b58afa78404a54cb4e
2019-01-21 22:41:16 -08:00
Lorenzo Colitti
98dda351ac
Merge "Properly expect all callbacks in testStackedLinkProperties."
2019-01-22 06:31:23 +00:00
Remi NGUYEN VAN
f6907af000
[automerger skipped] Merge "Add NetworkMonitor constants to SystemApi" am: a1e4e0bc23 am: 50cf5400b6
...
am: 54fb67a42e -s ours
am skip reason: change_id I8b5f0bb61c3ef0d2f33af7dd67b72ac6c5a1d1b5 with SHA1 2e4422598d is in history
Change-Id: I2b7a39367fbd27612258adc3bf0e093e4b7fdd99
2019-01-21 19:34:29 -08:00
Remi NGUYEN VAN
54fb67a42e
Merge "Add NetworkMonitor constants to SystemApi" am: a1e4e0bc23
...
am: 50cf5400b6
Change-Id: I0281ff981cbd5d26a2f2874db23244bebad9c66b
2019-01-21 19:25:05 -08:00
Remi NGUYEN VAN
50cf5400b6
Merge "Add NetworkMonitor constants to SystemApi"
...
am: a1e4e0bc23
Change-Id: Ic9591f31c6f2b7e613a78fa32311412952be26b8
2019-01-21 19:15:59 -08:00
Remi NGUYEN VAN
a1e4e0bc23
Merge "Add NetworkMonitor constants to SystemApi"
2019-01-22 03:03:37 +00:00
Lorenzo Colitti
4433025623
Properly expect all callbacks in testStackedLinkProperties.
...
Currently testStackedLinkProperties accounts for some of the
NetworkCallbacks that are fired, but not all of them. The test
passes because it only ever expects LinkProperties changed
callbacks (and not, e.g., lost callbacks), because it uses
waitForIdle(), and because at the end, when the callback is
unregistered, it does not call assertNoCallback().
Add the missing callback expectation and expect a LOST callback
at the end. Also add an assertNoCallback, even though it's not
strictly necessary. Remove all the waitForIdle statements, which
are no longer necessary because every assertion happens after
waiting for a callback.
Making the expectations more precise in a separate CL will help
ensure that upcoming changes to this code don't break anything,
and will make said changes easier to review.
Bug: 65674744
Test: atest FrameworksNetTests
Test: ConnectivityServiceTest#testStackedLinkProperties passes 400 times
Change-Id: I73cda0dd029a0e6546f7272beedf841ce5a4c0dc
2019-01-22 10:53:00 +09:00
Remi NGUYEN VAN
d76d1e4921
Merge "Add NetworkMonitor constants to SystemApi"
2019-01-22 01:46:12 +00:00
Remi NGUYEN VAN
fc5fb92ff3
Merge "Add fields used by NetworkStack to the API" am: aa983b7f1c am: cbd795dff7
...
am: b1f5762741
Change-Id: I865a0298a17582c1c2d1f1eeb086979f8955ac33
2019-01-21 15:57:53 -08:00