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 |
|
Robert Greenwalt
|
ba7913f987
|
resolved conflicts for merge of 248d8d2c to master am: 1bf31d7571
Original change: undetermined
Change-Id: Ida8af1276fd2b3f0758fa72c8f5cf26dfd3dab75
|
2021-05-31 06:23:23 +00:00 |
|
Wink Saville
|
fb18335eb4
|
am d7aeae15: am df43ba82: am e3badc10: Merge "When a SIM is changed check mobile provisioning." into jb-mr2-dev am: 48f0c5a396
Original change: undetermined
Change-Id: I8f4794ba927c5a6d44d9df2bec7072b7701c7704
|
2021-05-31 06:23:11 +00:00 |
|
Wink Saville
|
d82944ad02
|
Merge "checkMobileProvisioning is not using sendNotification." am: feb4923c50
Original change: undetermined
Change-Id: I4644a64151204620b879aab26975550126f90eb5
|
2021-05-31 06:22:59 +00:00 |
|
Christopher Tate
|
d31ddf07c1
|
Fix build & preserve DHCP scheduling as-is am: 53d68e16d8
Original change: undetermined
Change-Id: I155a40c9d6445f5515b151b3fc6a1b9964d2d8ba
|
2021-05-31 06:22:37 +00:00 |
|
Chad Brubaker
|
49e6b291be
|
Move markSocketAsUser to the top of IConnectivityManager.aidl am: b24810e7f7
Original change: undetermined
Change-Id: I33b1b616052bb451627b010098e19d1eac543e42
|
2021-05-31 06:22:24 +00:00 |
|
Geremy Condra
|
73da981fad
|
Merge "Support routing sockets as another user" am: cd7b82033d
Original change: undetermined
Change-Id: Ia99844b9e2dc9035468561a19c7e91d0c8b4cddf
|
2021-05-31 06:22:12 +00:00 |
|
Geremy Condra
|
2bac3abdf7
|
Merge changes Ia6646363,I94389b64 am: c4f78f6100
Original change: undetermined
Change-Id: I5ba9dd64f2b8d01925a574d0361430aabd6f7f4d
|
2021-05-31 06:21:50 +00:00 |
|
The Android Open Source Project
|
a33592c387
|
[automerger skipped] am 9bd03ece: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge am: 6fc25cfd15 -s ours
am skip reason: subject contains skip directive
Original change: undetermined
Change-Id: I3e7b2076fdf65935e37cc9af623022d926fd1a47
|
2021-05-31 06:21:20 +00:00 |
|
Wink Saville
|
ff2efcc2d8
|
am 7d8ad734: am 42a85412: am 925ec03f: Merge "VZW wants the phoneNumber to be 10 zero\'s if there isn\'t one." into jb-mr2-dev am: c137d87017
Original change: undetermined
Change-Id: Ic551594fb25e12ad1e6f60fac133bcd811b31d95
|
2021-05-31 06:21:07 +00:00 |
|
The Android Open Source Project
|
3d1d067a08
|
[automerger skipped] am 29dd8449: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge am: 5c0dd380d0 -s ours
am skip reason: subject contains skip directive
Original change: undetermined
Change-Id: I9c5077481945f8d7fcc034399d64676310206e55
|
2021-05-31 06:18:57 +00:00 |
|
The Android Open Source Project
|
41f367116d
|
[automerger skipped] am d25b6b73: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge am: 013df9a0a7 -s ours
am skip reason: subject contains skip directive
Original change: undetermined
Change-Id: Ibd7f7e9173948e2fec1357efb978dcb05450503e
|
2021-05-31 06:18:49 +00:00 |
|
Wink Saville
|
f5aa1759c4
|
am ef5c31ae: am db011499: am 753d754c: Merge "Fix NPE if mobile is not supported in checkMobileProvisioning." into jb-mr2-dev am: b72702da1f
Original change: undetermined
Change-Id: I1da8d500af399d7d947768c2f80ce96bd62de230
|
2021-05-31 06:18:40 +00:00 |
|
Wink Saville
|
6aee687710
|
Merge commit '68513498' into fix-merge-conflict am: 2e63bb7ef5
Original change: undetermined
Change-Id: If2b9f04d2bd5a0cb24a6a63f875e19c08aa17470
|
2021-05-31 06:18:27 +00:00 |
|
Lorenzo Colitti
|
afdd755504
|
464xlat: use a gatewayed route, not point-to-point am: 25f5af234f
Original change: undetermined
Change-Id: Ia53eb50f6b52abd5a1c3dde8de87883feea9310d
|
2021-05-31 06:18:13 +00:00 |
|
John Spurlock
|
ca1f3c5205
|
Move battery stats call from SystemUI to system server. am: 4ba7e413e7
Original change: undetermined
Change-Id: I5d7d56379154c2e1a5b05c60a494515bafcd5ebe
|
2021-05-31 06:18:00 +00:00 |
|
Jeff Sharkey
|
6cff4bbde8
|
Explicit locale when formatting machine strings. am: cf6e4d80e8
Original change: undetermined
Change-Id: I440be4a7292fc6001c41338b8c310e5eaf653c9b
|
2021-05-31 06:17:46 +00:00 |
|