Commit Graph

10888 Commits

Author SHA1 Message Date
Chiachang Wang
672ee3eef5 Merge "Remove unused MockableSystemProperties from DnsManager constructor" am: 3e23d7271b am: 250a9d3d20
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1466231

Change-Id: Ib8464068df47baebd3d56c66f6b517d8f59da4f9
2020-10-20 19:44:46 +00:00
Aaron Huang
acc01f1346 Merge "Create service-connectivity.jar" am: 4a19a57729 am: b91257f553
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1351252

Change-Id: Ic068be012bee6d8b1cd7b974896da9750e6ca453
2020-10-20 19:42:46 +00:00
Chiachang Wang
6710686910 Remove unused MockableSystemProperties from DnsManager constructor
DnsManager does not use MockableSystemProperties to communicate
with netd to configure the dns server anymore. ConnectivityService
does not need to take it into DnsManager as a parameter. Thus,
clean up the unused code.

Bug: 33308258
Test: atest FrameworksNetTests
Change-Id: I2ac89944391f7d1fd5d67f26cf7f2b11a4a4cf84
2020-10-20 15:46:30 +08:00
Aaron Huang
4a19a57729 Merge "Create service-connectivity.jar" 2020-10-20 06:09:41 +00:00
Chalard Jean
57899a690d Merge "Remove unused methods from LinkProperties." am: 88e32a8ae6 am: f812dc9b77
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1448415

Change-Id: Idfd7ca6b4448623110ac6f98d96ddcea7ca43c5b
2020-10-19 10:23:04 +00:00
Chalard Jean
f812dc9b77 Merge "Remove unused methods from LinkProperties." am: 88e32a8ae6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1448415

Change-Id: I7adcc9920cc2bdebe9a1dc22f32ce0955a4524dd
2020-10-19 09:50:44 +00:00
Chalard Jean
88e32a8ae6 Merge "Remove unused methods from LinkProperties." 2020-10-19 09:37:26 +00:00
Yan Yan
24c72089d7 Merge changes from topic "new-ipsec-api" am: 644a034eed am: e0dd7159d5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1398433

Change-Id: I45530694608909ddbb21d037cc3302130d8140c7
2020-10-16 23:07:31 +00:00
Yan Yan
e0dd7159d5 Merge changes from topic "new-ipsec-api" am: 644a034eed
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1398433

Change-Id: I074e1cc2d9b8e38d242c4a1c9b2176d3b8338774
2020-10-16 22:52:03 +00:00
Yan Yan
644a034eed Merge changes from topic "new-ipsec-api"
* changes:
  Expose new algorithms as public API
  Add new mandatory IPsec algorithms
2020-10-16 22:30:37 +00:00
Aaron Huang
925d09b779 Create service-connectivity.jar
Create a new target service-connectivity to split
ConnectivityService from services.core.

Add ConnectivityServiceInitializer for initializing
ConnectivityService and add systemReady() in
ConnectivityManager so that SystemServer can call systemReady()
through ConnectivityManager which won't change current behavior.

Bug: 158268939
Test: make target-java, make host-java
      atest FrameworksNetIntegrationTests
      atest FrameworksNetTests
      make, device can boot,
      atest CtsStrictJavaPackagesTestCases
      wifi and mobile data work.
Change-Id: I99401772ba9c1c34adca20040da3c7c72d86ddd9
Merged-In: Ie732bfaf381404af0bb599ca2f421a96e7aa4257
2020-10-16 22:46:14 +08:00
Bernie Innocenti
5e29d0c679 Merge "Stop setting the legacy net.dnsX system properties" am: 61da71aa03 am: ab60aa4add
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1229561

Change-Id: I347b1bd257775204499e1c880b4205c04c76710d
2020-10-16 14:18:20 +00:00
Bernie Innocenti
ab60aa4add Merge "Stop setting the legacy net.dnsX system properties" am: 61da71aa03
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1229561

Change-Id: Id30674df53eead41a626eef81a0d7e449dfd7c83
2020-10-16 14:03:43 +00:00
Chiachang Wang
e62f378b9c Stop setting the legacy net.dnsX system properties
These have been locked down via SELinux for a while and thus
they should be safe to delete at this point.

Test: atest FrameworksNetTest
Bug: 33308258
Bug: 148724751
Change-Id: I3a1e9c6ad92c8d2367e0048e5d6cd7d06bbc6e80
2020-10-16 08:19:25 +00:00
Chalard Jean
badc37d4fe Remove unused methods from LinkProperties.
LinkProperties.compare{Dnses,ValidatedPrivateDnses,AllRoutes,
AllInterfaceNames} actually have no users.

Test: LinkPropertiesTest
Change-Id: Ic54ab3c5520fbbc2be1309aeaf1e5a7857dbd194
2020-10-16 15:32:19 +09:00
Yan Yan
2274995a29 Add new mandatory IPsec algorithms
This CL adds new mandatory IPsec algorithms and allows
OEM to enable them on old devices using resource overlay

Bug: 161716062
Test: FrameworksNetTests:IpSecAlgorithmTest
Change-Id: Ib827b05ea27dbe61b14ad236e858f825293ed994
2020-10-15 17:35:17 -07:00
Treehugger Robot
1bb4204e60 Merge "Add imports to networking test mapping" am: a9d1392d0b am: a2558cbfc2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1461982

Change-Id: If6e2aec576eea261aa648cc027e4047c99363841
2020-10-15 11:28:49 +00:00
Treehugger Robot
a2558cbfc2 Merge "Add imports to networking test mapping" am: a9d1392d0b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1461982

Change-Id: I835d9c17377cee5adcc5f44cff3e1d4f0774aaa2
2020-10-15 11:07:41 +00:00
Treehugger Robot
a9d1392d0b Merge "Add imports to networking test mapping" 2020-10-15 10:21:25 +00:00
Remi NGUYEN VAN
1932b12535 Add imports to networking test mapping
Ensure that appropriate networking tests are triggered when submitting
changes in the frameworks/base directories.

Change-Id: Ibf8b567fa7721299120b0a6c6836dd770d92a9fc
Test: treehugger runs TEST_MAPPING tests
2020-10-15 09:16:40 +00:00
Treehugger Robot
173b634aab Merge "Fix a typo in a comment" am: 968238aa92 am: 0df34e3024
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1459885

Change-Id: Ifdaed83a7696ad37df0487a91bcb089de229de07
2020-10-14 11:54:57 +00:00
Treehugger Robot
0df34e3024 Merge "Fix a typo in a comment" am: 968238aa92
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1459885

Change-Id: I9174acc91209d83526901587bf4603d61aa30acc
2020-10-14 11:24:43 +00:00
Treehugger Robot
968238aa92 Merge "Fix a typo in a comment" 2020-10-14 10:54:25 +00:00
Chalard Jean
05fcb2e43e Fix a typo in a comment
Test: is not necessary for fixing typos in comments
Change-Id: Idf48d2649e728cafda5c1ca32d21102094cf23f5
2020-10-14 04:56:20 +00:00
Chiachang Wang
8d5767de05 Merge "Use system api for shell command handling" am: 3da3af2a10 am: 231acbca1b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1456126

Change-Id: Id33a233789eb58e6ef5be2d5edf3f504c9b4eb12
2020-10-13 09:50:11 +00:00
Chiachang Wang
231acbca1b Merge "Use system api for shell command handling" am: 3da3af2a10
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1456126

Change-Id: I322bbe2f711f8c50efe9d50056787c0e60051fbb
2020-10-13 09:29:47 +00:00
Chiachang Wang
3da3af2a10 Merge "Use system api for shell command handling" 2020-10-13 08:41:40 +00:00
Chiachang Wang
0efaff8cbc Use system api for shell command handling
ConnectivityService should not use ShellCommand since it's @hide
which does not accessible in mainline modules. Replace it with
system api for mainline.

Bug: 170598012
Test: adb shell cmd connectivity airplane-mode enable
Test: adb shell cmd connectivity airplane-mode disable
Change-Id: I47e7a371c19eb18eac643fe9a2ab481bec5743c2
2020-10-13 08:41:24 +00:00
TreeHugger Robot
973d635675 [automerger skipped] Merge "Merge ab/6749736 in stage." into stage-aosp-master am: 009ac78c7b -s ours
am skip reason: Change-Id Iecef31f7bf10ad97b7e0075cf302ae94e248474a with SHA-1 539d92beb7 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12803991

Change-Id: I35256efaa6acc9a9f28371993587f888c1a77252
2020-10-13 03:51:03 +00:00
Junyu Lai
36b8c1d919 Merge "Support dynamically update IMSI" am: 2d74c2e267 am: e981a87c00
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1418348

Change-Id: Ic369f77eb09979e8ed36e4207fe42f293548ba90
2020-10-13 03:49:06 +00:00
TreeHugger Robot
009ac78c7b Merge "Merge ab/6749736 in stage." into stage-aosp-master 2020-10-13 03:31:35 +00:00
Junyu Lai
e981a87c00 Merge "Support dynamically update IMSI" am: 2d74c2e267
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1418348

Change-Id: Id06d5d37ad5f12e689643c916548e9a59089eb3b
2020-10-13 03:22:09 +00:00
Junyu Lai
2d74c2e267 Merge "Support dynamically update IMSI" 2020-10-13 02:41:47 +00:00
junyulai
c822fe5e07 Support dynamically update IMSI
Currently, NetworkStatsSubscriptionsMonitor will skip the
listener registration until the IMSI is available to deal
with SIM PIN locked case. However, this solution can only
handle the case that IMSI changes from/to null. And it also
relies on the assumption that IMSI never changes for a subId.

Thus, support dynamically update IMSI to handle IMSI changes
more robustly.

This patch also address leftover comments at ag/12400327.

Test: enable SIM PIN and manually test
Test: atest NetworkStatsSubscriptionsMonitorTest#testSubscriberIdUnavailable
Test: atest NetworkStatsSubscriptionsMonitorTest#testSubscriberIdChanged
Test: ./out/host/linux-x86/bin/statsd_testdrive 10082
Bug: 160941101

Change-Id: I625a5b10ee4806f6fee99c2d9d6c5e7977ff785e
2020-10-12 15:31:02 +08:00
Lorenzo Colitti
23a036cd42 Merge "Speculatively fix L2TP keepalive issues by reducing mtu" am: f67e00b803 am: d3bf9a15a0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1399646

Change-Id: Ie6a7fdb8e1ce035ce145b90645290e7e4777f7e6
2020-10-12 01:20:47 +00:00
Lorenzo Colitti
d3bf9a15a0 Merge "Speculatively fix L2TP keepalive issues by reducing mtu" am: f67e00b803
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1399646

Change-Id: Iac7fc24c531db663469df1b1161d9f85a4c6f3ee
2020-10-12 01:06:47 +00:00
Lorenzo Colitti
f67e00b803 Merge "Speculatively fix L2TP keepalive issues by reducing mtu" 2020-10-12 00:40:44 +00:00
Xin Li
7d27412dad Merge ab/6749736 in stage.
Bug: 167233921
Merged-In: Iecef31f7bf10ad97b7e0075cf302ae94e248474a
Change-Id: I9e9c873bc2e05a0cfe3af0bf74725500f3f108db
2020-10-10 20:38:57 -07:00
Treehugger Robot
a6fa1d584b Merge "Don't let NAW.mNetworkInfo escape" am: 6e8c64b349 am: 497eab9a18
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1455976

Change-Id: I8a9899d9a5d7eba8423cbba99f085174ae383e6a
2020-10-09 11:05:01 +00:00
Treehugger Robot
497eab9a18 Merge "Don't let NAW.mNetworkInfo escape" am: 6e8c64b349
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1455976

Change-Id: I01ef40f341c653a524ee4565c3d9bf2564e0f98f
2020-10-09 10:48:42 +00:00
Treehugger Robot
6e8c64b349 Merge "Don't let NAW.mNetworkInfo escape" 2020-10-09 10:33:47 +00:00
Chalard Jean
c8c06be939 Don't let NAW.mNetworkInfo escape
Thankfully this has no users.

This agent needs to be migrated to the modern API for
NetworkAgent, which does not have NetworkInfo at all
so this would be a hindrance

Test: FrameworksNetTests NetworkStackTests
Change-Id: I091a6ca8cdf18860f23832ae1008fa02cf0472e8
2020-10-09 17:06:30 +09:00
Remi NGUYEN VAN
ff1cfa230d Merge "Move IpUtils to frameworks/libs/net" am: 1ea097fcb2 am: 5d47632002
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1440234

Change-Id: I03872655d1ef3a7bb436666196ed67bd61601f65
2020-10-09 00:52:31 +00:00
Remi NGUYEN VAN
5d47632002 Merge "Move IpUtils to frameworks/libs/net" am: 1ea097fcb2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1440234

Change-Id: Ibd41a02a9a185667a7fe332213ef692c4d8bf515
2020-10-09 00:30:36 +00:00
Remi NGUYEN VAN
1ea097fcb2 Merge "Move IpUtils to frameworks/libs/net" 2020-10-09 00:13:40 +00:00
Paul Hu
ecf81b9f6f Merge "Remove unused ACTION_PACKAGE_ADDED intent." am: eba570a209 am: cc74ac7b8e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1450335

Change-Id: I3330b90cc1bb56b4c0964f47826d607c2f1e907c
2020-10-08 02:49:43 +00:00
Paul Hu
cc74ac7b8e Merge "Remove unused ACTION_PACKAGE_ADDED intent." am: eba570a209
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1450335

Change-Id: I53a20a48053889357e62f29799e091d22a3ffc59
2020-10-08 02:19:12 +00:00
Paul Hu
eba570a209 Merge "Remove unused ACTION_PACKAGE_ADDED intent." 2020-10-08 02:05:17 +00:00
Chiachang Wang
656901d024 Merge "Update to positive logic to better match the method naming" am: 1c7bc039ea am: 37fc16ad0a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1450336

Change-Id: I6e823ac8769864d9a1bfd6d675331d4b683da331
2020-10-07 09:50:45 +00:00
Chiachang Wang
37fc16ad0a Merge "Update to positive logic to better match the method naming" am: 1c7bc039ea
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1450336

Change-Id: Ib01ae19fb846fdd75cf792e85dc1776a4a6876ee
2020-10-07 09:22:49 +00:00