Commit Graph

15049 Commits

Author SHA1 Message Date
Robert Greenwalt
cfbc0528aa [automerger skipped] am 4455c599: (-s ours) am 7482d1f5: am e1d4847c: am e359c567: am 48ee02c9: (-s ours) am 8af2d559: am 703fc413: am c0274fbe: (-s ours) am 2c90609c: am 339cfdbd: am 72f9b308: am 3f829bc3: am f8c2a025: am 7f6d1ef7: am 8eac056f: DO NOT MERGE Sanitize WifiConfigs am: add1fb69e0 -s ours
am skip reason: subject contains skip directive

Original change: undetermined

Change-Id: I69647cf041c8dfdbc55bd5665b3b5acf3e0e090d
2021-05-31 07:14:37 +00:00
Robert Greenwalt
17db599f3a [automerger skipped] am f00b906f: (-s ours) am d4f3279c: am c855a28a: am 9b2dc4a4: am 8720396a: (-s ours) am d3e9af7e: am 1ab38f65: am 7ad36cd3: (-s ours) am 106627e0: am e42ce676: am ebf23a8d: am d4df4032: am 3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev am: 574d7a0c98 -s ours
am skip reason: subject contains skip directive

Original change: undetermined

Change-Id: I4d01ffbdd621d87a50e0ece2dc577908d942019a
2021-05-31 07:14:28 +00:00
Jaewan Kim
ea232ac01a Merge "Revert "Refactor IpConfiguration from WifiConfiguration"" am: 120a0a7281
Original change: undetermined

Change-Id: Id6ff0ca698d44f4664b654cec37c70fbd4dd8ad0
2021-05-31 07:14:18 +00:00
Jaewan Kim
09a70dcc5e Revert "Hide IpConfiguration" am: 7852c32e32
Original change: undetermined

Change-Id: I3fe71d0279f6efb89a3c671767b188e3d13a34dc
2021-05-31 07:13:56 +00:00
Jaewan Kim
db388bbed7 Hide IpConfiguration am: 9532c528bf
Original change: undetermined

Change-Id: Ie1b9bde3adeeb178d4a6bde714081faf400567df
2021-05-31 07:13:42 +00:00
Jaewan Kim
d9147cc924 Refactor IpConfiguration from WifiConfiguration am: 9472a8b7bc
Original change: undetermined

Change-Id: I1d7e84ddb90d3fb9fa4b2fb488588638b560a61b
2021-05-31 07:13:29 +00:00
Chad Brubaker
750e0a2b57 am 7f623d6b: am 9506e84b: am 0b397ad9: am 1fce89d9: am 38dc9b4e: Merge "Include the interface for clearDnsInterfaceForUidRange" into klp-dev am: 92975d62fe
Original change: undetermined

Change-Id: I082d8ca6d0938511ffb8fcbf127ce39560151fc0
2021-05-31 07:13:15 +00:00
Etan Cohen
cb13c33177 Merge "Catch Netd exceptions to avoid runtime restart" am: 1f025e18eb
Original change: undetermined

Change-Id: I01f25837b95daa4ef661f72c80e2b4d60fa16888
2021-05-31 07:13:02 +00:00
Robert Greenwalt
3f262ddb4a resolved conflicts for merge of 0bff77d6 to master am: 83a6089fba
Original change: undetermined

Change-Id: Ia88b4c6f53adfa8686b974a03e5176576ee5e742
2021-05-31 07:12:39 +00:00
Ashish Sharma
26a69020cf Update the tests to deal with the new timestamps in idletimer module. am: 5a07255d7e
Original change: undetermined

Change-Id: Ibe8461f7564619d5a828cd6254cdcaf157fe90cc
2021-05-31 07:12:26 +00:00
Ashish Sharma
89c7c7b754 Include elapsed realtime (nanos) of the event in the radio state change notifications. am: 601fba91e3
Original change: undetermined

Change-Id: I94e7a0add82b0858c6194a83e666b4caa2b8707c
2021-05-31 07:12:12 +00:00
JP Abgrall
e47454ff1a am d47dc7c3: am 7238585e: am f118689c: am 4ecd833e: am 6f3e6dd0: Merge "ConnectivityService: add support to set TCP initial rwnd" into klp-dev am: 22b42d6a84
Original change: undetermined

Change-Id: Icba8ead186aca4305512a9824baa31fbfd4aa9cc
2021-05-31 07:11:59 +00:00
Chad Brubaker
e01d74bce1 am ff9da494: am 4b59883a: am 5013be94: am 78f204ae: am 8e240af5: Merge "Remove SO_BINDTODEVICE from VPN protect" into klp-dev am: c0fbb3eb6e
Original change: undetermined

Change-Id: Ica20fb58f5a39f53452076e37ae594c099086513
2021-05-31 07:11:45 +00:00
Chad Brubaker
b0fcc2db89 am 0b925975: (-s ours) am 48dd8b0f: am 11a1d123: am 7fb07438: am 674f85af: Merge "Only allow System apps to make VPN exempt routes" into klp-dev am: e721c5e3a8
Original change: undetermined

Change-Id: I9b54f8db0756808c6db8e9ffdf47a8bb1be698a1
2021-05-31 07:11:30 +00:00
Chad Brubaker
2f9fa9143f am 6467e900: (-s ours) am 7f68f7f4: am fc2c67b7: am 1011960c: am decfd707: Merge "Add the calling package name to requestRouteToHost" into klp-dev am: b9982a2f77
Original change: undetermined

Change-Id: I3cb8ae5225e7a8285cb549bf5b2fcd350f91bf26
2021-05-31 07:11:17 +00:00
Robert Greenwalt
943ab7576e am 2d07e8d6: am c1ca3bac: am 4d23e4b2: am 7a54d1df: am bad3a9e6: am 2d1e8c49: Merge "Only apply tcp buffer sizes for default net" into klp-dev am: a8dd68fc6f
Original change: undetermined

Change-Id: I985a696dceefb80c1f01d91fffb1d6e1cfa0e3aa
2021-05-31 07:11:03 +00:00
Yuhao Zheng
1deb305df2 Merge "Return detailed reason of invalid proxy settings" am: 58700af05a
Original change: undetermined

Change-Id: I508afded5d574aa42800cd61b0eb61b14799e5f5
2021-05-31 07:10:51 +00:00
Robert Greenwalt
0b9dfb7e66 Merge "Only apply tcp buffer sizes for default net" am: dfdaa016bf
Original change: undetermined

Change-Id: I7e083b7050127e47144d5d98bf4a95df82c5b260
2021-05-31 07:10:28 +00:00
Dianne Hackborn
47ae66deed Hold a wake lock while dispatching network activity events. am: b4b09e8a97
Original change: undetermined

Change-Id: I210f6ca9a71d989330fc05965ff34da265a03ab1
2021-05-31 07:10:05 +00:00
Chad Brubaker
d90de0d074 Merge "Remove SO_BINDTODEVICE from VPN protect" am: 7b0eca3a7d
Original change: undetermined

Change-Id: Icadffb23a8ac119d84be54b404640fd3bb5dfdf4
2021-05-31 07:09:49 +00:00
Robert Greenwalt
ee72a15c68 [automerger skipped] am 8395aadb: (-s ours) am 860ac9e4: am 94d5c80a: am 635097ff: am cf73f46a: am df3b5e5b: am 3c73a8e8: (-s ours) am ca4ba835: am 41708e1c: DO NOT MERGE Sanitize WifiConfigs am: 9a2ef0b576 -s ours
am skip reason: subject contains skip directive

Original change: undetermined

Change-Id: I30bda2ab42163973955f56d3aa7e5e87aab02b66
2021-05-31 07:09:17 +00:00
Jake Hamby
5fcbf9a4b5 Remove unneeded new RIL command. am: 19ab991213
Original change: undetermined

Change-Id: Ibb58adc9561c39d28a0410504ae6739b8335ddcb
2021-05-31 06:58:08 +00:00
Chad Brubaker
51d51be244 Merge "Only allow System apps to make VPN exempt routes" am: c92e61c782
Original change: undetermined

Change-Id: I146461f577b48f33f2b53be6cde59ec3c3646b1b
2021-05-31 06:57:54 +00:00
Chad Brubaker
1cf6de2d22 Merge "Add the calling package name to requestRouteToHost" am: f6c68ca61a
Original change: undetermined

Change-Id: I83a31aec4b0584ed308f422aea029aabed934cb3
2021-05-31 06:57:32 +00:00
JP Abgrall
751d12e383 ConnectivityService: add support to set TCP initial rwnd am: d3bc570b7b
Original change: undetermined

Change-Id: I8b4bd1aaf800ce9383637950f4cdc50de86bbf53
2021-05-31 06:57:10 +00:00
Patrick Tjin
82496e50ce Modify unexpected mtu debug message to print mtu am: 870078d85a
Original change: undetermined

Change-Id: Iaf8559a8b433bef041cf173ffaf94ed4c08d85a0
2021-05-31 06:56:56 +00:00
Dianne Hackborn
e1deef56fa Start tracking radio up time. am: 5da0d5a316
Original change: undetermined

Change-Id: I318c7943890f81657a1091727430c9bfe69850fa
2021-05-31 06:56:42 +00:00
Jake Hamby
85e30067f9 Add new RIL commands to read/write NV items and reset NV config. am: 5f5d4337b1
Original change: undetermined

Change-Id: I5f706d2f4bbe94b61d25aeead140ec8e5e2e1ad1
2021-05-31 06:56:29 +00:00
Hui Lu
780cf94a53 am 3cab7fc1: Merge "Add proxy as another network." into klp-modular-dev am: abb57909e0
Original change: undetermined

Change-Id: Iafb06216d893daf8559d1cb76248d36ff6ed7b10
2021-05-31 06:56:16 +00:00
Robert Greenwalt
5c49ba9b35 Clean up dhcp no-op logging am: 593cc7af27
Original change: undetermined

Change-Id: Ice1b91603ecfb01afe632973f427bd230aa2e754
2021-05-31 06:56:02 +00:00
Amith Yamasani
aa0da65e93 am 6ac202be: Move some system services to separate directories am: ae31a40841
Original change: undetermined

Change-Id: Ic72d477966b77c6e3b4a7227e7b6379d985be0c2
2021-05-31 06:55:48 +00:00
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