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 |
|
Lorenzo Colitti
|
8c89e220bc
|
am b8aa06c7: Merge "Add a string constructor to LinkAddress." into klp-dev am: 8f90fe3f0b
Original change: undetermined
Change-Id: I10c7bc5bb270bbf5c970f2b59078263015af253c
|
2021-05-31 06:30:06 +00:00 |
|
The Android Open Source Project
|
6ea529bcdd
|
[automerger skipped] Reconcile with klp-release - do not merge am: fa2ff1e0f8 -s ours
am skip reason: subject contains skip directive
Original change: undetermined
Change-Id: I12887982ccea2ae133ee2a59fe6588777b45a1d3
|
2021-05-31 06:29:54 +00:00 |
|
The Android Open Source Project
|
81e5a6999e
|
[automerger skipped] am f9a676ac: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release jb-mr2-zeroday-deb-release - do not merge am: 511eaf802a -s ours
am skip reason: subject contains skip directive
Original change: undetermined
Change-Id: I9eb4b79f731cbce19d03e385f1755473effacd29
|
2021-05-31 06:29:46 +00:00 |
|
Wink Saville
|
73238896e1
|
In isMobileOk don't execute finally if mobile data is not supported. am: 37e7312e12
Original change: undetermined
Change-Id: I402bf474fe46ddf2e6d55f1be81d9774117947b2
|
2021-05-31 06:29:39 +00:00 |
|
Wink Saville
|
6016fa5b8b
|
am 4157cb24: am 02eab434: am 3f58ba89: Merge "If in a mobile captive portal is detected enable fail fast." into jb-mr2-dev am: 78f8907ae1
Original change: undetermined
Change-Id: I9d3a8e70a6d7259e71125298a5fd0bba0b7ee9e6
|
2021-05-31 06:29:26 +00:00 |
|
Wink Saville
|
7e079f1cde
|
am a0ffa2ed: am 55adb390: am 6db564f6: Merge "Have CaptivePortalTracker use gservices updateable provisioning urls." into jb-mr2-dev am: 0d406dffc0
Original change: undetermined
Change-Id: Id8262b90c7a05301e78334ae42badbcabe16edb0
|
2021-05-31 06:29:14 +00:00 |
|
Wink Saville
|
b6d08bb2f2
|
am 80cc1ebd: am 9b6363e5: am cbad1243: Merge "Check that hipri has started." into jb-mr2-dev am: 5ae370c753
Original change: undetermined
Change-Id: I6c9a7c2a1de2022b1af0a0dbf411dafc78edce51
|
2021-05-31 06:29:02 +00:00 |
|
Vinit Deshapnde
|
07b4d8fa0b
|
Use a single socket to communicate with supplicant am: 00c193e308
Original change: undetermined
Change-Id: I18e18867545a11b9ce8ce44576517779bd0ddbab
|
2021-05-31 06:28:49 +00:00 |
|
Lorenzo Colitti
|
45df03f8a7
|
Merge "Simplify LinkPropertiesTest." am: e5976a0167
Original change: undetermined
Change-Id: I10a52823752353efa4351dfffef34b9523c9f01b
|
2021-05-31 06:28:36 +00:00 |
|
Jason Monk
|
fa22d4e7c1
|
Add PAC File support for proxy configuration am: 43324ee732
Original change: undetermined
Change-Id: Ief038751d70a9b8ee43d8c3282a25ee6321d75d7
|
2021-05-31 06:28:15 +00:00 |
|
David Christie
|
11aea0485d
|
Merge "Revert "Fix broken unit test"" am: 27bd621bd4
Original change: undetermined
Change-Id: I60af5da0213f120d8914e3828c1f76847b4f7935
|
2021-05-31 06:28:02 +00:00 |
|
David Christie
|
a655851a00
|
Merge "Fix broken unit test" am: 2f3150e97d
Original change: undetermined
Change-Id: Ic5c0726d5878a607606633804a311b8b3a81bd45
|
2021-05-31 06:27:40 +00:00 |
|
Elliott Hughes
|
799d0a3074
|
am 6b67e07d: am 60ae2617: Merge "If frameworks wants ASCII casing, it should explicity ask for it." am: 7ada256efa
Original change: undetermined
Change-Id: Iea6e4afa1d13609dcd4fae872a974bb3651c931b
|
2021-05-31 06:27:17 +00:00 |
|
Dmitry Shmidt
|
2ad49c4678
|
dhcp: Get mtu property from dhcp results am: feb443e59d
Original change: undetermined
Change-Id: Ifd7874c05cd228e693e4ae41001c0521d93834f4
|
2021-05-31 06:27:04 +00:00 |
|
David Christie
|
24fd8acfb8
|
Fix build breakage am: 14298807a1
Original change: undetermined
Change-Id: Ic03e12bedaad6fd23c4026d74d43f725718661a7
|
2021-05-31 06:26:51 +00:00 |
|
David Christie
|
fb015c1144
|
Add WorkSource capability to AlarmManager. am: a62588a133
Original change: undetermined
Change-Id: I7f498a6a4d49b00399c6ed09d717201d23c33bf3
|
2021-05-31 06:26:38 +00:00 |
|
Lorenzo Colitti
|
4528dd2648
|
Merge "Add accessors for all addresses and clarify compare* methods" am: a5094dc770
Original change: undetermined
Change-Id: Ia5641ab72e9cf81bca7fd8253ff009565fc5c0b0
|
2021-05-31 06:26:25 +00:00 |
|
Wink Saville
|
78d89c8e66
|
Fix excessive log spew. am: 27f9273cf3
Original change: undetermined
Change-Id: I531f52c9349db9b49746592f93a1be4793cf802f
|
2021-05-31 06:26:04 +00:00 |
|
Lorenzo Colitti
|
858bc67884
|
am 178acfce: am 15884007: Merge "464xlat: use a gatewayed route, not point-to-point" am: 1f3e3bec7f
Original change: undetermined
Change-Id: Ic12778066a3dcb69c2932118275ea0e8fa338348
|
2021-05-31 06:25:51 +00:00 |
|
Wink Saville
|
a902d03147
|
Add network type TYPE_MOBILE_IA. am: 70dbdcc418
Original change: undetermined
Change-Id: I69594d2cc44151c2103cf7358c9ab09e7073e6d3
|
2021-05-31 06:25:37 +00:00 |
|
Geremy Condra
|
e6b5691142
|
Merge "Remove unused mDnsOverridden" am: 45a5bf908e
Original change: undetermined
Change-Id: I9e0ea7ac17ec718d84d4d57a4ed2d176ff7ccf72
|
2021-05-31 06:25:25 +00:00 |
|
Geremy Condra
|
1042b37eca
|
Merge "Fix default DNS not being set on network changes" am: 3b8e7328bd
Original change: undetermined
Change-Id: I0129b294cf060c23fec769ae43e684022653e771
|
2021-05-31 06:25:03 +00:00 |
|
Geremy Condra
|
ea3d9c62ce
|
Merge "Fix supplimentary network connections with VPNs" am: 2b07accdee
Original change: undetermined
Change-Id: If275fabc320d51fffc7cadd92197c8ad46f7524a
|
2021-05-31 06:24:42 +00:00 |
|
Geremy Condra
|
869f50a71f
|
Merge "Support multiple Vpn ManageDialogs" am: 12e55c99af
Original change: undetermined
Change-Id: I738035a6c3407c7a97f2b700c1f5f1b248ddf477
|
2021-05-31 06:24:19 +00:00 |
|
Guang Zhu
|
b97634eaad
|
fix build am: f466bf9e1d
Original change: undetermined
Change-Id: Ibcc6d09e13495163c53e682f5e9ed06094e7de6d
|
2021-05-31 06:23:58 +00:00 |
|
The Android Open Source Project
|
b4f37f345e
|
[automerger skipped] am 7d0a85e2: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge am: b91b601f3e -s ours
am skip reason: subject contains skip directive
Original change: undetermined
Change-Id: Ic1e3d2efca847eb1b47ea4c9fa894e7a2dab3893
|
2021-05-31 06:23:45 +00:00 |
|
Robert Greenwalt
|
471b6dc5f5
|
resolved conflicts for merge of 64031ab2 to master am: 00eb17fb05
Original change: undetermined
Change-Id: Icd150ff51d9769e35038aca70af80bc9f92162cd
|
2021-05-31 06:23:36 +00:00 |
|