Commit graph

10,842 commits

Message SHA1
Merge changes from topic "revert-1353490-revert-1323251-ipv6_prov_loss_quirk_parcelable-DVBHZDYMHA-MDHWFKJABZ" am: 780d3d2115
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1460265

Change-Id: I49ce3e1c7794dc6db0e410cba481eb98144bc4e5

Xiao Ma   authored and   Automerger Merge Worker   commited 2020-10-29 06:17:22 +00:00
ee3d2e049d
Revert "Revert "Test IPv6ProvisioningLossParcelable in the NetworkAttributes""" am: ef20ba23a4
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1460264

Change-Id: Ie13b2bb8037d85ab4782e06cfc31e108397fc78b

Xiao Ma   authored and   Automerger Merge Worker   commited 2020-10-29 06:09:44 +00:00
8323b72ef0
Merge changes from topic "revert-1353490-revert-1323251-ipv6_prov_loss_quirk_parcelable-DVBHZDYMHA-MDHWFKJABZ"
* changes:
  Add jarjar rule for IPv6ProvisioningLossQuirk.
  Revert "Revert "Test IPv6ProvisioningLossParcelable in the NetworkAttributes"""

Xiao Ma   authored and   Gerrit Code Review   commited 2020-10-29 05:39:16 +00:00
780d3d2115
Merge changes I6a51d803,I162fae5c
* changes:
  Replace hidden NMS API for setting MTU
  Replace hidden NMS default network configuration API

Chiachang Wang   authored and   Gerrit Code Review   commited 2020-10-29 05:03:43 +00:00
b75c584971
Merge "Replace hidden NMS interface to network API"
Chiachang Wang   authored and   Gerrit Code Review   commited 2020-10-29 05:02:21 +00:00
689399aa75
Replace hidden NMS API for setting MTU
Replace the hidden NMS setMtu API with calling INetd directly
for incoming ConnectivityService mainline.

Bug: 170598012
Test: atest FrameworksNetTests
Test: manually connect and disconnect network
Change-Id: I6a51d8033b3354824d4cfb953c2bbe3055d00102

Chiachang Wang   commited 2020-10-28 14:38:18 +08:00
fd47831a5c
Replace hidden NMS interface to network API
Replace the hidden NMS addInterfaceToNetwork and
removeInterfaceFromNetwork with calling INetd directly for
incoming ConnectivityService mainline.

Bug: 170598012
Test: atest FrameworksNetTests
Test: manually connect and disconnect network
Change-Id: I0f1f866be2f8084b992b340aeabfb5d62420686b

Chiachang Wang   commited 2020-10-28 14:38:18 +08:00
a93ddb250b
Replace hidden NMS default network configuration API
Replace the hidden setDefaultNetId and clearDefaultNetId NMS
APIs with accessing INetd directly for the incoming
ConnectivityService mainline.

Bug: 170598012
Test: atest FrameworksNetTests
Test: manually connect and disconnect wifi
Change-Id: I162fae5ca444207a037e5ac4bf8fa0a77a648ca1

Chiachang Wang   commited 2020-10-28 14:38:18 +08:00
c1fe7a0a37
Add OEM_PRIVATE NetworkCapability
Adding network capability to be used with networks to be only used by
OEM apps.

Bug: 171505922
Test: atest CtsNetTestCasesLatestSdk:NetworkCapabilitiesTest
Change-Id: Ib55ebec0e178b6317d92f17e1aff060dacdfb2b1

James Mattis   commited 2020-10-27 13:14:06 -07:00
b3b4899980
Add jarjar rule for IPv6ProvisioningLossQuirk.
A new stable parcelable IPv6ProvisioningLossQuirk added in network
stack module, which is used to record the network quirk info which
causes IPv6 provisioning loss, e.g. the router lifetime in RA is 0
and the default route will be removed from LinkProperties.

Previously this change breaks CtsStrictJavaPackagesTestCases due to
a jarjar rule is missed. Also rename the package name based on the
revert change.

Also include slight stable AIDL package and variable rename.

Bug: 157534516
Test: atest CtsStrictJavaPackagesTestCases FrameworksNetTests
Change-Id: Ic2f6b75beefb574f7e2fb4c157667e7734eccd05

Xiao Ma   commited 2020-10-27 08:04:29 +00:00
1cd2532d26
Revert "Revert "Test IPv6ProvisioningLossParcelable in the NetworkAttributes"""
Test IPv6ProvisioningLossParcelable in the NetworkAttributes.

Bug: 157534516
Test: atest NetworkStackTests

This reverts commit_3740bfadadaaf268f92aaf35dd92e4ce432b39cb

Reason for revert:
Roll forward the previous change, as the CtsStrictJavaPackagesTestCases
breakage has been addressed by adding the jarjar rule in wifi module.

Change-Id: Ib4d70ce557cad98643c811b219f51e9b68179ee8

Xiao Ma   commited 2020-10-27 07:49:05 +00:00
ef20ba23a4
Merge "Replace PendingIntent @hide APIs"
Paul Hu   authored and   Gerrit Code Review   commited 2020-10-26 07:32:56 +00:00
3b32517990
Merge "Add a mutability flag to the PendingIntent"
Treehugger Robot   authored and   Gerrit Code Review   commited 2020-10-23 09:49:27 +00:00
315a097740
Using Context#getSystemService instead of ServiceManager#checkService
ConnectivityService is going to be a mainline module, it can only
use formal APIs or @SystemApi. So use public API -
Context#getSystemService() instead of hidden API -
ServiceManager#checkService().

Bug: 170598012
Test: atest FrameworksNetTests
Change-Id: I9824caa7aec57e70f0ba405fcce39f9bc068732d

lucaslin   authored and   Lucas Lin   commited 2020-10-23 03:07:07 +00:00
f0d393d530
Merge "Address comments on aosp/1448415"
Treehugger Robot   authored and   Gerrit Code Review   commited 2020-10-21 07:05:49 +00:00
bc7602e296
Merge "Do not use hidden SystemProperties.set"
Chiachang Wang   authored and   Gerrit Code Review   commited 2020-10-21 07:00:56 +00:00
93961f7b21
Address comments on aosp/1448415
Adds the necessary jarjar rules to FrameworksTestNet and
removes the test for CompareResult which has moved to its
right place.

Test: FrameworksTestNet
Change-Id: I50e51e72268e432a65a831aa5eebd606584ac721

Chalard Jean   commited 2020-10-21 13:54:02 +09:00
c8b4e0124d
Merge "Remove @TestApi from @SystemApi symbols"
Anton Hansson   authored and   Gerrit Code Review   commited 2020-10-20 13:45:13 +00:00
49ca9d3ca9
Do not use hidden SystemProperties.set
ConnectivityService is going to become a mainline module, and
it will not able to use hidden method anymore. Thus, use
alternative new sysprop as API to control the tcp init rwnd
value.

Bug: 170917042
Test: adb shell getprop net.tcp_def_init_rwnd and check if
      value is set correctly
Test: atest FrameworksNetTests
Change-Id: If9e99c88de50b6829721b0dfacc430a3b53c7728

Chiachang Wang   commited 2020-10-20 19:35:01 +08:00
c43d68f0d0
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

Chiachang Wang   commited 2020-10-20 15:46:30 +08:00
6710686910
Merge "Create service-connectivity.jar"
Aaron Huang   authored and   Gerrit Code Review   commited 2020-10-20 06:09:41 +00:00
4a19a57729
Remove @TestApi from @SystemApi symbols
I ran these commands:
    cd frameworks/base
    grep -rl '@TestApi' --include '*.java' | xargs perl -i -p0e \
        's/\@SystemApi[\s\n]+(\@\w+[\s\n]+)?\@TestApi/\@SystemApi\1/gs'
    grep -rl '@TestApi' --include '*.java' | xargs perl -i -p0e \
        's/\@TestApi[\s\n]+(\@\w+[\s\n]+)?\@SystemApi/\1\@SystemApi/gs'

Bug: 171179806
Test: m checkapi
Change-Id: I772790b783b0a8730b8bf680c9e569a886b8d789
Merged-In: I772790b783b0a8730b8bf680c9e569a886b8d789

Anton Hansson   commited 2020-10-19 16:41:01 +01:00
f4d863eb95
Merge "Remove unused methods from LinkProperties." am: 88e32a8ae6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1448415

Change-Id: I7adcc9920cc2bdebe9a1dc22f32ce0955a4524dd

Chalard Jean   authored and   Automerger Merge Worker   commited 2020-10-19 09:50:44 +00:00
f812dc9b77
Merge "Remove unused methods from LinkProperties."
Chalard Jean   authored and   Gerrit Code Review   commited 2020-10-19 09:37:26 +00:00
88e32a8ae6
Merge changes from topic "new-ipsec-api" am: 644a034eed
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1398433

Change-Id: I074e1cc2d9b8e38d242c4a1c9b2176d3b8338774

Yan Yan   authored and   Automerger Merge Worker   commited 2020-10-16 22:52:03 +00:00
e0dd7159d5
Merge changes from topic "new-ipsec-api"
* changes:
  Expose new algorithms as public API
  Add new mandatory IPsec algorithms

Yan Yan   authored and   Gerrit Code Review   commited 2020-10-16 22:30:37 +00:00
644a034eed
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

Aaron Huang   commited 2020-10-16 22:46:14 +08:00
925d09b779
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

Bernie Innocenti   authored and   Automerger Merge Worker   commited 2020-10-16 14:03:43 +00:00
ab60aa4add
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

Chiachang Wang   commited 2020-10-16 08:19:25 +00:00
e62f378b9c
Remove unused methods from LinkProperties.
LinkProperties.compare{Dnses,ValidatedPrivateDnses,AllRoutes,
AllInterfaceNames} actually have no users.

Test: LinkPropertiesTest
Change-Id: Ic54ab3c5520fbbc2be1309aeaf1e5a7857dbd194

Chalard Jean   commited 2020-10-16 15:32:19 +09:00
badc37d4fe
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

Yan Yan   commited 2020-10-15 17:35:17 -07:00
2274995a29
Merge "Add imports to networking test mapping" am: a9d1392d0b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1461982

Change-Id: I835d9c17377cee5adcc5f44cff3e1d4f0774aaa2

Treehugger Robot   authored and   Automerger Merge Worker   commited 2020-10-15 11:07:41 +00:00
a2558cbfc2
Merge "Add imports to networking test mapping"
Treehugger Robot   authored and   Gerrit Code Review   commited 2020-10-15 10:21:25 +00:00
a9d1392d0b
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

Remi NGUYEN VAN   commited 2020-10-15 09:16:40 +00:00
1932b12535
Merge "Fix a typo in a comment" am: 968238aa92
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1459885

Change-Id: I9174acc91209d83526901587bf4603d61aa30acc

Treehugger Robot   authored and   Automerger Merge Worker   commited 2020-10-14 11:24:43 +00:00
0df34e3024
Merge "Fix a typo in a comment"
Treehugger Robot   authored and   Gerrit Code Review   commited 2020-10-14 10:54:25 +00:00
968238aa92
Replace PendingIntent @hide APIs
Connectivity service module is using some PendingIntent @hide
APIs but they are not able to call after CS becomes a mainline
module. Thus, replace them with similar System APIs.

Bug: 170593746
Test: atest FrameworksNetTests
      Manually test notifications can show normally.
Change-Id: I92ab7216f5fd46d449b6d8f80d3441f8966ac890

paulhu   commited 2020-10-14 15:23:25 +08:00
fea8f29dc6
Fix a typo in a comment
Test: is not necessary for fixing typos in comments
Change-Id: Idf48d2649e728cafda5c1ca32d21102094cf23f5

Chalard Jean   commited 2020-10-14 04:56:20 +00:00
05fcb2e43e
Add a mutability flag to the PendingIntent
It's soon going to be required for apps targeting S+ to specify
explicitly either FLAG_MUTABLE or FLAG_IMMUTABLE when creating
a PendingIntent. Thus, add a mutability flag to the
PendingIntent that doesn't specify it before.

Bug: 170602021
Bug: 170766590
Test: atest FrameworksNetTests
Change-Id: I56581033c0a1b450b6626112cdae5e5d9aac873f

paulhu   commited 2020-10-14 11:44:39 +08:00
17ea3c0bcc
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

Chiachang Wang   authored and   Automerger Merge Worker   commited 2020-10-13 09:29:47 +00:00
231acbca1b
Merge "Use system api for shell command handling"
Chiachang Wang   authored and   Gerrit Code Review   commited 2020-10-13 08:41:40 +00:00
3da3af2a10
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

Chiachang Wang   commited 2020-10-13 08:41:24 +00:00
0efaff8cbc
Merge "Merge ab/6749736 in stage." into stage-aosp-master
TreeHugger Robot   authored and   Android (Google) Code Review   commited 2020-10-13 03:31:35 +00:00
009ac78c7b
Merge "Support dynamically update IMSI" am: 2d74c2e267
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1418348

Change-Id: Id06d5d37ad5f12e689643c916548e9a59089eb3b

Junyu Lai   authored and   Automerger Merge Worker   commited 2020-10-13 03:22:09 +00:00
e981a87c00
Merge "Support dynamically update IMSI"
Junyu Lai   authored and   Gerrit Code Review   commited 2020-10-13 02:41:47 +00:00
2d74c2e267
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

junyulai   commited 2020-10-12 15:31:02 +08:00
c822fe5e07
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

Lorenzo Colitti   authored and   Automerger Merge Worker   commited 2020-10-12 01:06:47 +00:00
d3bf9a15a0
Merge "Speculatively fix L2TP keepalive issues by reducing mtu"
Lorenzo Colitti   authored and   Gerrit Code Review   commited 2020-10-12 00:40:44 +00:00
f67e00b803
Merge ab/6749736 in stage.
Bug: 167233921
Merged-In: Iecef31f7bf10ad97b7e0075cf302ae94e248474a
Change-Id: I9e9c873bc2e05a0cfe3af0bf74725500f3f108db

Xin Li   commited 2020-10-10 20:38:57 -07:00
7d27412dad
Merge "Don't let NAW.mNetworkInfo escape" am: 6e8c64b349
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1455976

Change-Id: I01ef40f341c653a524ee4565c3d9bf2564e0f98f

Treehugger Robot   authored and   Automerger Merge Worker   commited 2020-10-09 10:48:42 +00:00
497eab9a18