5,807 commits

This branch

This branch

All branches

Message	SHA1
Merge changes from topic "Java async dns" am: 8c684211f0 am: 10fb7d86f8 ... am: 4757e61c18 Change-Id: I12f50513eee1c1cf3c908036fe80d3a3d8c373d0 Luke Huang   authored and   android-build-merger   commited 2019-01-23 01:24:21 -08:00	143fdd80bb
Merge changes from topic "Java async dns" am: 8c684211f0 ... am: 10fb7d86f8 Change-Id: I305cf0ae791f9503519884bdf382863002357ac7 Luke Huang   authored and   android-build-merger   commited 2019-01-23 01:14:34 -08:00	4757e61c18
Merge changes from topic "Java async dns" ... am: 8c684211f0 Change-Id: Ia08a8300887315d673f398b1340b2f44ce501b14 Luke Huang   authored and   android-build-merger   commited 2019-01-23 01:06:19 -08:00	10fb7d86f8
Merge changes from topic "Java async dns" ... * changes: Add asynchronous DNS query API in Java Add jni method for DnsResolver Luke Huang   authored and   Gerrit Code Review   commited 2019-01-23 08:48:23 +00:00	8c684211f0
Merge "Add getAvoidBadWifi system API" am: eafed7dcba am: 7afbd81a03 ... am: 86709f4871 Change-Id: I8ff56380368a340162368ccbeefcae6df1ae549f Remi NGUYEN VAN   authored and   android-build-merger   commited 2019-01-22 18:21:58 -08:00	5442118261
Merge "Add getAvoidBadWifi system API" am: eafed7dcba ... am: 7afbd81a03 Change-Id: Ide4ffc316c9301b795e8c0dabea3322aaf0b3184 Remi NGUYEN VAN   authored and   android-build-merger   commited 2019-01-22 17:53:09 -08:00	86709f4871
Merge "Add getAvoidBadWifi system API" ... am: eafed7dcba Change-Id: Ifdf913669df84df3e3b158d5527895236e6758b7 Remi NGUYEN VAN   authored and   android-build-merger   commited 2019-01-22 17:41:46 -08:00	7afbd81a03
Merge "Add getAvoidBadWifi system API" Remi NGUYEN VAN   authored and   Gerrit Code Review   commited 2019-01-23 01:13:01 +00:00	eafed7dcba
Merge changes If71fadd2,I42047185 am: a5ca09f7ce am: 0b8d5e2217 ... am: 5a79e49e8d Change-Id: Ia91e6eac1b53fabb018fb4e1f689bb986e895ca4 Chalard Jean   authored and   android-build-merger   commited 2019-01-22 15:29:37 -08:00	ad716115c8
Merge changes If71fadd2,I42047185 am: a5ca09f7ce ... am: 0b8d5e2217 Change-Id: Id181b0c617c209bdf01ce25a8920d96025f8421d Chalard Jean   authored and   android-build-merger   commited 2019-01-22 15:20:30 -08:00	5a79e49e8d
Merge changes If71fadd2,I42047185 ... am: a5ca09f7ce Change-Id: Ie15258f09adb7f1cc53c558e1d3d5fdaf8d93476 Chalard Jean   authored and   android-build-merger   commited 2019-01-22 15:12:54 -08:00	0b8d5e2217
[automerger skipped] Merge "Migrate ICaptivePortal to stable AIDL" am: eb7c53718a am: b43fd41baa ... am: e4ce181b98 -s ours am skip reason: change_id I62b457e709fa199822bb8f80b0eab990be4ded93 with SHA1 e0bc140f97 is in history Change-Id: If02574c9e6f3c77a0787c9747307d99eea4095e5 Remi NGUYEN VAN   authored and   android-build-merger   commited 2019-01-22 14:57:23 -08:00	e7b3ee5cfd
Merge changes If71fadd2,I42047185 ... * changes: [MS10] Address leftover comments on MS03 and MS07 [MS09] Implement isSameNetwork. Chalard Jean   authored and   Gerrit Code Review   commited 2019-01-22 22:50:21 +00:00	a5ca09f7ce
Merge "Migrate ICaptivePortal to stable AIDL" am: eb7c53718a ... am: b43fd41baa Change-Id: I6fa53f6f7c45aa801a1e48e04bdb3ca6004f565d Remi NGUYEN VAN   authored and   android-build-merger   commited 2019-01-22 14:35:29 -08:00	e4ce181b98
Merge "Migrate ICaptivePortal to stable AIDL" ... am: eb7c53718a Change-Id: Id0844ec4d438dcc1f6c1028552dd21da6bd76584 Remi NGUYEN VAN   authored and   android-build-merger   commited 2019-01-22 14:25:09 -08:00	b43fd41baa
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 Luke Huang   commited 2019-01-23 00:07:43 +08:00	2f6112a31a
Add jni method for DnsResolver ... Test: built, flashed, booted atest DnsResolverTest Change-Id: Iff730ec918f4db1ba0216f90a12550fe26e271d0 Luke Huang   commited 2019-01-23 00:07:43 +08:00	577b2e31fc
Add getAvoidBadWifi system API ... This helps remove the dependency on MultinetworkPolicyTracker from IpClient. Test: atest FrameworksNetTests NetworkStackTests Bug: 112869080 Change-Id: If56791dbed564772f25a859f301b8b52d84e38a3 Remi NGUYEN VAN   commited 2019-01-22 15:57:34 +00:00	3436b6ffd9
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 Remi NGUYEN VAN   commited 2019-01-23 00:53:13 +09:00	48bc72ac38
Merge "Migrate ICaptivePortal to stable AIDL" Lorenzo Colitti   authored and   Android (Google) Code Review   commited 2019-01-22 15:38:07 +00:00	c66564f296
Merge "Add API for VPN apps to query always-on and lockdown." am: c9ea55c3f7 am: 721dbccad1 ... am: ec53cd06b0 Change-Id: Ied8e5a01cdf76d8da02d2dc292943e6a559cc84e Pavel Grafov   authored and   android-build-merger   commited 2019-01-22 07:19:18 -08:00	833939a5c9
Merge "Add API for VPN apps to query always-on and lockdown." am: c9ea55c3f7 ... am: 721dbccad1 Change-Id: I48f3441f06af2a69776eacc5ee52463873739bdb Pavel Grafov   authored and   android-build-merger   commited 2019-01-22 07:09:43 -08:00	ec53cd06b0
Merge "Add API for VPN apps to query always-on and lockdown." ... am: c9ea55c3f7 Change-Id: Icb11cdd5c7384eacf1df9b7a0c42e451641f0e04 Pavel Grafov   authored and   android-build-merger   commited 2019-01-22 07:00:53 -08:00	721dbccad1
Merge "Add API for VPN apps to query always-on and lockdown." Pavel Grafov   authored and   Gerrit Code Review   commited 2019-01-22 14:43:06 +00:00	c9ea55c3f7
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 Remi NGUYEN VAN   commited 2019-01-22 21:16:47 +09:00	e0bc140f97
Merge "Add LinkProps and NetworkCaps methods to SystemApi" am: 4bde11491b am: e090d600c5 ... am: 66c8e76081 Change-Id: I7e5a733b5c581679c0e50015205d9b8a3a2e8df2 Remi NGUYEN VAN   authored and   android-build-merger   commited 2019-01-22 03:54:23 -08:00	125e15852f
Merge "Add LinkProps and NetworkCaps methods to SystemApi" am: 4bde11491b ... am: e090d600c5 Change-Id: Ic15474fe0b7da8062114367ec4f692e30e73d549 Remi NGUYEN VAN   authored and   android-build-merger   commited 2019-01-22 03:27:36 -08:00	66c8e76081
Merge "Add LinkProps and NetworkCaps methods to SystemApi" ... am: 4bde11491b Change-Id: I7ba317e49a6ad7a7413d9ff4e312aed0b700e695 Remi NGUYEN VAN   authored and   android-build-merger   commited 2019-01-22 03:14:19 -08:00	e090d600c5
[MS09] Implement isSameNetwork. ... Test: Old tests pass, new tests pass too. Bug: 113554482 Change-Id: I420471853f3fab7725cba7ae500cebdce1912e43 Chalard Jean   commited 2019-01-22 19:10:48 +09:00	e4ff75ecc2
Merge "Add NetworkStack metrics to system API" am: 8fada525d2 am: 2102e2d628 ... am: d093468b8d Change-Id: I848ac4c2bb8d35a2f756f97e57f9a61698c00f57 Remi NGUYEN VAN   authored and   android-build-merger   commited 2019-01-22 00:28:03 -08:00	9cdb11422a
Merge "Add NetworkStack metrics to system API" am: 8fada525d2 ... am: 2102e2d628 Change-Id: I8d711dcf76935d28d8a610d6a18da77cea77268e Remi NGUYEN VAN   authored and   android-build-merger   commited 2019-01-22 00:18:58 -08:00	d093468b8d
Merge "Add NetworkStack metrics to system API" ... am: 8fada525d2 Change-Id: I686e0ffb8d226d9245f1ef6c04bbc8d586c61e81 Remi NGUYEN VAN   authored and   android-build-merger   commited 2019-01-22 00:09:31 -08:00	2102e2d628
Add LinkProps and NetworkCaps methods to SystemApi ... Added methods are used by the NetworkStack. Test: atest FrameworksNetTests NetworkStackTests Bug: 112869080 Change-Id: I8822d43c1a4981ca39289525685b3f975fb0e8d5 Remi NGUYEN VAN   commited 2019-01-22 16:57:16 +09:00	048c9413e6
Merge "Add NetworkStack metrics to system API" Remi NGUYEN VAN   authored and   Gerrit Code Review   commited 2019-01-22 07:48:39 +00:00	8fada525d2
Merge "Properly expect all callbacks in testStackedLinkProperties." am: 4129d435c1 am: 6d8a63cf80 ... am: 6fb16a0ef0 Change-Id: I615f412f7696752d867337ab5cbabe24daea2ed3 Lorenzo Colitti   authored and   android-build-merger   commited 2019-01-21 23:00:00 -08:00	4782b60702
Merge "Properly expect all callbacks in testStackedLinkProperties." am: 4129d435c1 ... am: 6d8a63cf80 Change-Id: I9b066e4242d52f917e36a05911bdcd843c3f5c84 Lorenzo Colitti   authored and   android-build-merger   commited 2019-01-21 22:50:47 -08:00	6fb16a0ef0
Merge "Properly expect all callbacks in testStackedLinkProperties." ... am: 4129d435c1 Change-Id: Ida7b6da29e46856b504cc5b58afa78404a54cb4e Lorenzo Colitti   authored and   android-build-merger   commited 2019-01-21 22:41:16 -08:00	6d8a63cf80
Merge "Properly expect all callbacks in testStackedLinkProperties." Lorenzo Colitti   authored and   Gerrit Code Review   commited 2019-01-22 06:31:23 +00:00	4129d435c1
[automerger skipped] Merge "Add NetworkMonitor constants to SystemApi" am: 591de4579d am: b78f2a5d68 ... am: c90d59e401 -s ours am skip reason: change_id I8b5f0bb61c3ef0d2f33af7dd67b72ac6c5a1d1b5 with SHA1 c0e07e58ff is in history Change-Id: I2b7a39367fbd27612258adc3bf0e093e4b7fdd99 Remi NGUYEN VAN   authored and   android-build-merger   commited 2019-01-21 19:34:29 -08:00	7e09d1403e
Merge "Add NetworkMonitor constants to SystemApi" am: 591de4579d ... am: b78f2a5d68 Change-Id: I0281ff981cbd5d26a2f2874db23244bebad9c66b Remi NGUYEN VAN   authored and   android-build-merger   commited 2019-01-21 19:25:05 -08:00	c90d59e401
Merge "Add NetworkMonitor constants to SystemApi" ... am: 591de4579d Change-Id: Ic9591f31c6f2b7e613a78fa32311412952be26b8 Remi NGUYEN VAN   authored and   android-build-merger   commited 2019-01-21 19:15:59 -08:00	b78f2a5d68
Merge "Add NetworkMonitor constants to SystemApi" Remi NGUYEN VAN   authored and   Gerrit Code Review   commited 2019-01-22 03:03:37 +00:00	591de4579d
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 Lorenzo Colitti   commited 2019-01-22 10:53:00 +09:00	46eae8a765
Merge "Add NetworkMonitor constants to SystemApi" Remi NGUYEN VAN   authored and   Android (Google) Code Review   commited 2019-01-22 01:46:12 +00:00	ea76c43d5a
Merge "Add fields used by NetworkStack to the API" am: ca2d2c268b am: 81bbdbb10f ... am: 22ce4c1af7 Change-Id: I865a0298a17582c1c2d1f1eeb086979f8955ac33 Remi NGUYEN VAN   authored and   android-build-merger   commited 2019-01-21 15:57:53 -08:00	f76eb47fe3
Merge "Add fields used by NetworkStack to the API" am: ca2d2c268b ... am: 81bbdbb10f Change-Id: I5b7cce21b8692184f9d6121f0641bc2318370671 Remi NGUYEN VAN   authored and   android-build-merger   commited 2019-01-21 15:47:28 -08:00	22ce4c1af7
Merge "Add fields used by NetworkStack to the API" ... am: ca2d2c268b Change-Id: Iaf2dfea8263a1c7e78130222126e2ebbaa84fedd Remi NGUYEN VAN   authored and   android-build-merger   commited 2019-01-21 15:36:17 -08:00	81bbdbb10f
Add NetworkStack metrics to system API ... Test: atest FrameworksNetTests NetworkStackTests Bug: 112869080 Change-Id: Ie52c55f248c173e2a5ee603ecd004fbac9004ac1 Remi NGUYEN VAN   commited 2019-01-21 23:24:41 +00:00	737c49d78e
Merge "Add fields used by NetworkStack to the API" Remi NGUYEN VAN   authored and   Gerrit Code Review   commited 2019-01-21 23:20:26 +00:00	ca2d2c268b
Merge changes I2ddfef0c,I49bee0c9 am: ba4d5be35a am: 11c58491ff ... am: c8a38238fe Change-Id: I369bf5d92a3f70e789043d33bcbc85099aebbb69 Chalard Jean   authored and   android-build-merger   commited 2019-01-21 11:28:55 -08:00	467d8f991e