Commit Graph

14936 Commits

Author SHA1 Message Date
Lorenzo Colitti
5cd981cbf2 am 263c4788: am a58711d5: am b4ccc540: Merge "Add address flags and scope to LinkAddress." am: fdd455785e
Original change: undetermined

Change-Id: Ic29162d8c3f831363e93c3efab4100b38237b13b
2021-05-31 06:55:33 +00:00
The Android Open Source Project
fe14f86efb am dcff5cef: am 35e36de6: am 8a49a518: Merge commit \'bac61807d3bcfff957b358cb9ad77850bd373689\' into HEAD am: 93dfe5add6
Original change: undetermined

Change-Id: Iad1811a7fe695a55a1f84850e4d3fdcc2ced3558
2021-05-31 06:55:20 +00:00
Lorenzo Colitti
0532de0191 am 13d9dfb4: am e097407f: am 8fc3d9a2: Merge "Minor changes to LinkAddress." am: a9f3961f77
Original change: undetermined

Change-Id: I14fed78a7c8d2400aa610f82e8dbb4a1d7e76ce1
2021-05-31 06:55:06 +00:00
Lorenzo Colitti
9dc860cc7b am 025b1edc: am f226bc60: Merge "Use LinkAddress in address notifications." am: ff6daa9aff
Original change: undetermined

Change-Id: I6ce4bd2c4d19c29cf84f3e4a6261fc8583d04ebe
2021-05-31 06:54:52 +00:00
Lorenzo Colitti
851f6e99fc am 48a93c46: am 9d4ac970: Merge "Pass DNS server info notifications to observers." am: 6ee1306c53
Original change: undetermined

Change-Id: I3afb55d4dc8918a52bff77b7281eb3e507991e32
2021-05-31 06:54:38 +00:00
Lorenzo Colitti
3a579d3eba am 4eeb8ad4: am eede7e89: Merge "Minor cleanups to NetdCallbackReceiver.onEvent." am: 3b6f820e6b
Original change: undetermined

Change-Id: Ia46e40cdcc6921b8c97ce0bc10f8f1ae6bed829e
2021-05-31 06:54:24 +00:00
The Android Open Source Project
e16281a4b5 am ac29b5a6: am b4c0ead9: (-s ours) Merge commit \'b873a17ce7be0a9771c24999adca6964431728f6\' into HEAD am: 2c3004bf9e
Original change: undetermined

Change-Id: I856eea9188b75ca278891041d7f69f8549d7c9a9
2021-05-31 06:54:11 +00:00
Lorenzo Colitti
42067852db Merge "Pass DNS server info notifications to observers." am: 3b49b08e33
Original change: undetermined

Change-Id: I31e0a9724ade85a9354d75d6ceb6fa1c7e3cf2b9
2021-05-31 06:53:57 +00:00
John Spurlock
94a1ef8d0b Remove unused imports from frameworks/base. am: 10cbbeebcc
Original change: undetermined

Change-Id: I05bd9f3e4c51c2a4e74db040b22d2c1b7c7b4c1e
2021-05-31 06:53:36 +00:00
Robert Greenwalt
e7ecff7cdc am 6668bcdc: am a8a448da: am e568672c: Merge "Fix NPE in ConnectivityService" into klp-dev am: 2b1ac58fdf
Original change: undetermined

Change-Id: Ie885a39b42ca2d5a2438f6ca705f911986de29af
2021-05-31 06:53:21 +00:00
Robert Greenwalt
ac3381efa2 am 989bbbdd: resolved conflicts for merge of 639aed71 to klp-dev-plus-aosp am: bfe9d334c4
Original change: undetermined

Change-Id: Ibcaad168bd502767d65c641324288a4e9f9ea5ac
2021-05-31 06:53:08 +00:00
Robert Greenwalt
403287eeea am 2a1fb433: am 4c514f2a: am 594eeb08: Merge "Fix for the invalid Global Proxy Setting" into klp-dev am: 8fa42e3cfb
Original change: undetermined

Change-Id: I3c3a1a9975716b59183e9ba5aeea059e4514c3ac
2021-05-31 06:52:55 +00:00
Robert Greenwalt
59c395b9ad am b6344cef: am 48eded0e: am 18490abd: Merge "Fix NPE in ConnectivityService" am: f4f53e0f33
Original change: undetermined

Change-Id: Idc934755ca67b3f4e813e4f6b8bf8c1ce4f41e99
2021-05-31 06:52:41 +00:00
Lorenzo Colitti
9563eb5a74 Minor cleanups to NetdCallbackReceiver.onEvent. am: 4f85a08091
Original change: undetermined

Change-Id: I680136ed73dc6a10f9d27538f085219521b4a6f6
2021-05-31 06:52:26 +00:00
Wink Saville
cc41f5689b am 9f6d0280: am 6952b6fa: am b4f673e2: Merge "Use HttpsURLConnection to by pass proxies." into klp-dev am: 36379d0545
Original change: undetermined

Change-Id: I0b8129ba9d2b33ad42e334360649aa1c964c2f15
2021-05-31 06:52:13 +00:00
Andrew Flynn
269f584d3c Check for presence of carrier app in data notification. am: 2f158287c3
Original change: undetermined

Change-Id: I718a832e122c1608aa96ee2a6a698e53f4ea875d
2021-05-31 06:51:59 +00:00
Robert Greenwalt
4cd1545bdb am 11ea8afe: am 20c811dd: am 72c4d609: Merge "Change how we use provisioning url so post works" into klp-dev am: 2e3db0c19a
Original change: undetermined

Change-Id: I70cc67423ade94e24c53f5af6ea77f01c0461c21
2021-05-31 06:51:45 +00:00
Ed Heyl
b7d867e2be am 15af1a12: am e704c3c9: am 41e6e50c: merge in klp-release (no-op) am: 25323fac95
Original change: undetermined

Change-Id: I35eed0bfbe5c853bd74b7bf0f0a77db9281e5258
2021-05-31 06:51:32 +00:00
Narayan Kamath
b0d07fb337 Remove captive portal code that has no effect. am: 605bb642f0
Original change: undetermined

Change-Id: Ie6ec595f99feb31a92b83a75bf108286a83cd879
2021-05-31 06:51:18 +00:00
Robert Greenwalt
35a55c70db am 680a35ba: am ec4d5da6: am 1b7f99b9: Merge "Retry captiveportal check even if only one addr" into klp-dev am: 252b3e6f51
Original change: undetermined

Change-Id: I99d975f59bc7af5d11ec772957da8ab748d0edc0
2021-05-31 06:51:03 +00:00
Narayan Kamath
cb0724b270 Fix minor thread corectness issue in NetworkInfo am: 32dd3cc091
Original change: undetermined

Change-Id: I8a48fe82ce0423788eda4c84b0a66417db0e8e8e
2021-05-31 06:50:49 +00:00
Jason Monk
f7a942933f am 6b57033b: am 8b81a638: Merge "getProxy in ConnectivityService returns port w/PAC" into klp-dev am: 4c6caa5172
Original change: undetermined

Change-Id: Id52adef84915b37dac848701913b566d2768a5d3
2021-05-31 06:50:37 +00:00
Lorenzo Colitti
2348678a73 am 18225508: am 49052093: Merge "Fix captive portal detection on IPv6 networks." into klp-dev am: cf9596ddee
Original change: undetermined

Change-Id: I40f94adfd7f7ef9719d8cca9f18433a18c5547bc
2021-05-31 06:50:23 +00:00
Ed Heyl
d54cc5debd am 4951ebb9: am f372ba45: merge in KQS81M am: 3ac333722e
Original change: undetermined

Change-Id: Ib508d46ad03fbcbfd6d24c14adbd5c0873a507f1
2021-05-31 06:50:09 +00:00
Robert Greenwalt
b01fc444dc [automerger skipped] am 81d1af26: am 7922764b: am 81371b98: (-s ours) am 64e02e64: am 5a1519f8: DO NOT MERGE Un-deprecate getDhcpInfo am: 50a520b2e8 -s ours
am skip reason: subject contains skip directive

Original change: undetermined

Change-Id: I11ad489025192a054b11aae6439de07e9a495b47
2021-05-31 06:49:56 +00:00
Robert Greenwalt
de2c292648 [automerger skipped] am 8070ffcc: am 319323d7: am 8fbc8797: (-s ours) am 202965ca: am 5b41b261: (-s ours) DO NOT MERGE Un-deprecate getDhcpInfo am: 5d772b6f98 -s ours
am skip reason: subject contains skip directive

Original change: undetermined

Change-Id: I7bc5be202cdabc96f36b3f9f19bd8dc9e5229073
2021-05-31 06:49:46 +00:00
Robert Greenwalt
940e3c1b6a am 2e23484e: am 990c224f: Merge "Un-deprecate getDhcpInfo" into klp-dev am: 51ff2b0d9e
Original change: undetermined

Change-Id: Ia36d6e2f77b3045e8ddc4121c314937c6f2fdcad
2021-05-31 06:49:37 +00:00
Robert Greenwalt
6582829004 am 32c9cd84: am 939def7d: Merge "Don\'t redirect dns to an iface without dns servers" into klp-dev am: 978c8728f5
Original change: undetermined

Change-Id: I2240e26ff2f8f7388952390d969e18e5a3863848
2021-05-31 06:49:23 +00:00
Wink Saville
97837d595f am fe587dba: am a48ccdd6: Merge "Use networkType to display wifi and mobile notification separately." into klp-dev am: 6ed7bfda87
Original change: undetermined

Change-Id: I270154a42655111532447e94fc684a2ad1e13af5
2021-05-31 06:49:10 +00:00
Wink Saville
32be134d5d am 78d0cf79: Merge "Tighten condition for calling checkMobileProvisioning." into klp-dev am: 3418e65e81
Original change: undetermined

Change-Id: Ia7c2488e850d474fb16991ab02c61ddf0676a092
2021-05-31 06:48:57 +00:00
Wink Saville
5a7977d487 am 6bcb8cd7: Merge "checkMobileProvisioning should not block." into klp-dev am: d0fe9386b2
Original change: undetermined

Change-Id: I1d259b8b8617461c3198355879524597dcfa4359
2021-05-31 06:48:44 +00:00
Jason Monk
9e4c37823a am c10eef7e: Merge "Guarantee that PAC Local Proxy owns Port" into klp-dev am: 41abc43aff
Original change: undetermined

Change-Id: Ia9799ab70f2469e710e4eceae392cb828a707c15
2021-05-31 06:48:31 +00:00
Jeff Sharkey
9d20200acf am 4a13f358: Merge changes Ib1274847,I2eb2a1bf into klp-dev am: 8d08a9bdc7
Original change: undetermined

Change-Id: Iab81652a57b1a2c7a26e66da0b384e9448577968
2021-05-31 06:48:17 +00:00
Yuhao Zheng
9097ef38a6 am 518c0afa: Merge "Fix for the toggle airplane mode hidden API" into klp-dev am: 3a2617c02d
Original change: undetermined

Change-Id: I50446d2a4c5feb96e4f7276e026df1a7eba56105
2021-05-31 06:48:03 +00:00
Yuhao Zheng
6e8041807b am e91a3f52: Merge "Add a hidden API to toggle airplane mode." into klp-dev am: aa3d64c616
Original change: undetermined

Change-Id: Ie5386efffc4b194610f2930a6f0a27548bb212db
2021-05-31 06:47:50 +00:00
Wink Saville
3e97556bf3 am bfe9ea46: Merge "Tighten test for warm sim and add more debug." into klp-dev am: 1ff666199a
Original change: undetermined

Change-Id: I5ee1bb3d1ad953c98469277b5acfbd8c6509a29a
2021-05-31 06:47:37 +00:00
Ying Wang
529ddde1fe am 60283285: Fix docs build. am: 36b2f9f21a
Original change: undetermined

Change-Id: I692d323ea124fe469fc728b10c834390244426eb
2021-05-31 06:44:39 +00:00
Robert Greenwalt
68c9a90138 am dac56db6: Merge "Fix the build." into klp-dev am: a5fa380a82
Original change: undetermined

Change-Id: I8304d0be475bdb675dbdf0afc347b51eb0174f64
2021-05-31 06:33:24 +00:00
Robert Greenwalt
dd3013dd61 am 8fc23fe7: Merge "Setting MTU size for specific network." into klp-dev am: 67f7cb9d32
Original change: undetermined

Change-Id: I72b42f405c78f12df265c7ecea8c7f1c0c45acba
2021-05-31 06:33:09 +00:00
Sreeram Ramachandran
4ab539421b am 1cd74aca: Merge "Minor fixes: Add a missing "break" and some cosmetic fixes." into klp-dev am: 404a30d115
Original change: undetermined

Change-Id: Ic7a1a4f5199a19b7ac112ca99e7d53494d029073
2021-05-31 06:32:57 +00:00
Wink Saville
118d43b77d am 690edd3a: am 2a6edf50: am 50f86448: am 59a9884b: Merge "Do not change NetworkInfo.DetailedState." into jb-mr2-dev am: 8d55d44d27
Original change: undetermined

Change-Id: Ib3f0713976e8e23fe3d31078c133034376e2b1bb
2021-05-31 06:32:44 +00:00
Lorenzo Colitti
4ff81bf61e am 07b72c3d: Merge "Add a function to replace all the link addresses." into klp-dev am: 8f776df19c
Original change: undetermined

Change-Id: I9026fa389e9b259655e124383c80a75f503e9333
2021-05-31 06:32:31 +00:00
Vinit Deshapnde
b601da0cf7 am 64a967ba: Merge "Rename LinkInfo to LinkQualityInfo" into klp-dev am: b823d3d305
Original change: undetermined

Change-Id: I8b4d24080ac482c40cb68d695bbbdc3b5efde1f4
2021-05-31 06:32:13 +00:00
Wink Saville
fdd7ca76e6 am 35bd30b1: Merge "Merge commit \'bc6ecbf7\' into manualmerge" into klp-dev am: d2b36f0ae4
Original change: undetermined

Change-Id: Id8276aeebc6ab35fb6212e15671365e0cf433479
2021-05-31 06:31:49 +00:00
Jason Monk
fb69c9aee9 am 090e8f5a: Merge "Don\'t clear Global Proxy on boot." into klp-dev am: 48bc6038c9
Original change: undetermined

Change-Id: Iff2199f4103274b2bd57167533c5efc26a96df9b
2021-05-31 06:31:32 +00:00
Lorenzo Colitti
79151a6501 am a507ce10: Merge "Add a simple test for NetworkManagementService." into klp-dev am: 869f9566fb
Original change: undetermined

Change-Id: I650609cd64fb5994f4c668c6c29b26dc15bf331b
2021-05-31 06:31:17 +00:00
Wink Saville
368c0cafbf [automerger skipped] am cfcabebd: am c27bc9f3: (-s ours) am 33283a97: am bc58840a: DO NOT MERGE: MDST is not ready until connected to DcTracker. am: 82f76744b0 -s ours
am skip reason: subject contains skip directive

Original change: undetermined

Change-Id: Icd81f5c7680bf69f82bc344fd8554f02b8d397e4
2021-05-31 06:31:01 +00:00
Wink Saville
7b688236e9 am be374429: am 94c7865c: am b42beeaf: am fb03c6e5: In isMobileOk don\'t execute finally if mobile data is not supported. am: adccd9143e
Original change: undetermined

Change-Id: I42e34de4c476e49b7db54d6af38a3c9d41bf8750
2021-05-31 06:30:49 +00:00
Vinit Deshapnde
f2b2e457fa am 48f4246a: Merge "Introduce network link quality statistics" into klp-dev am: db6c0b95f5
Original change: undetermined

Change-Id: Ie1a79feee57b699f80079e45cfa5749ff53878ea
2021-05-31 06:30:32 +00:00
Lorenzo Colitti
d37ad0aa46 am 4d3d5f1f: Merge "Modify LinkProperties address update methods." into klp-dev am: 93868bfe9b
Original change: undetermined

Change-Id: Iad7b5789e92fe81f31fb27697154ef36289fbc95
2021-05-31 06:30:19 +00:00