Commit Graph

12331 Commits

Author SHA1 Message Date
Remi NGUYEN VAN
6ebd98efc1 Add TcpKeepalivePacketData to SystemApi am: 11511b31f6 am: 349ba03274 am: 7240fd9ea1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1494038

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1aa9deefefcaf75959463e8a8a87bfeefb98f0ee
2020-12-15 11:42:19 +00:00
Sarah Chin
1be00b7b29 Merge "Move phone ID to extra for action provision" 2020-12-15 11:07:25 +00:00
Remi NGUYEN VAN
7240fd9ea1 Add TcpKeepalivePacketData to SystemApi am: 11511b31f6 am: 349ba03274
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1494038

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic764adda49e414e6ed34a101fd83c3fc62f5734c
2020-12-15 10:23:21 +00:00
Remi NGUYEN VAN
349ba03274 Add TcpKeepalivePacketData to SystemApi am: 11511b31f6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1494038

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibe3df65b4e12ecda5d95737f3b1ea18dabc2461d
2020-12-15 09:38:38 +00:00
Chiachang Wang
9f994053b3 Merge "Remove hidden deprecated getActiveNetworkQuotaInfo" am: 6443bf4c41 am: 8413fe564e am: 53ffa8edac
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1527738

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3f3b1e288635d84e93115fddbbafb5321f55646e
2020-12-15 08:55:43 +00:00
Sarah Chin
cab74db6c0 Move phone ID to extra for action provision
Previously, the phone ID was appended to the broadcast in DCT and sent
to ConnectivityManager. Instead of sending both as an action, send the
phone ID as an extra instead to make the action a protected broadcast.

Test: manually verify a SecurityException when action provision is sent
Test: atest DcTrackerTest
Bug: 172459128
Change-Id: Ic4129def86949d7191d15056852718dadbd72fba
2020-12-15 00:25:01 -08:00
Chiachang Wang
53ffa8edac Merge "Remove hidden deprecated getActiveNetworkQuotaInfo" am: 6443bf4c41 am: 8413fe564e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1527738

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic4d06df07e1ee4d856ceabff0a7928d04a19f29f
2020-12-15 08:12:16 +00:00
Chiachang Wang
8413fe564e Merge "Remove hidden deprecated getActiveNetworkQuotaInfo" am: 6443bf4c41
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1527738

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia59544cd76712acdcc406f0f0391a0bbfe5c2f9e
2020-12-15 07:39:15 +00:00
Chiachang Wang
6443bf4c41 Merge "Remove hidden deprecated getActiveNetworkQuotaInfo" 2020-12-15 07:02:54 +00:00
Chiachang Wang
7fe67c1961 Remove hidden deprecated getActiveNetworkQuotaInfo
getActiveNetworkQuotaInfo has never been in API surface since it
was introduced. It became essentially functionless since android O,
so there should be no usage dependency upon the hidden method,
In order to support ConnectivityService mainline, remove the
useless function to prevent necessary dependency.

Bug: 172183305
Test: atest FrameworksNetTests
Change-Id: Ia685b3260256d465ef614b2f577d13344074c787
2020-12-15 06:45:50 +00:00
Treehugger Robot
3bcad48a82 Merge "Add OWNERS for packages/Connectivity" am: 3efe49a31f am: 57ec33bb99 am: 6fe6e75fa1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1527821

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1d1a911e4de7a6ee590bed3f257366d697808ed7
2020-12-14 14:59:06 +00:00
Treehugger Robot
6fe6e75fa1 Merge "Add OWNERS for packages/Connectivity" am: 3efe49a31f am: 57ec33bb99
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1527821

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia8636eac306c01778bdf79fa82fb9f4f7efe2db6
2020-12-14 14:48:52 +00:00
Treehugger Robot
57ec33bb99 Merge "Add OWNERS for packages/Connectivity" am: 3efe49a31f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1527821

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifd4cf4bd8f333adab27eeceae4aa48a8bdee4c89
2020-12-14 14:38:13 +00:00
Treehugger Robot
3efe49a31f Merge "Add OWNERS for packages/Connectivity" 2020-12-14 14:12:36 +00:00
Remi NGUYEN VAN
11511b31f6 Add TcpKeepalivePacketData to SystemApi
This is consistent with NattKeepalivePacketData, which is also a
subclass of KeepalivePacketData.

TcpKeepalivePacketData is already used by the wifi module, but
statically linked.

Bug: 172789687
Test: m
Change-Id: I6aee1ae205987521bea4a3838bbece279ffa0e37
2020-12-14 18:43:44 +09:00
Remi NGUYEN VAN
afebd5c3fe Add OWNERS for packages/Connectivity
In preparation of future modularization of connectivity classes, a large
part of frameworks/base/services/net is planned to be moved to
packages/modules/Connectivity. However moving each class "manually"
to that git project would lose their commit history, and require many
cross-repository topics.

To facilitate the work, create frameworks/base/packages/Connectivity,
which will be used to move the classes at first, before they can all be
moved together with their history to packages/modules/Connectivity. This
mirrors the procedure used for NetworkStack, Tethering,
CaptivePortalLogin, etc. previously.

The added OWNERS file just imports owners from the previous file
location.

Bug: 171540887
Test: m
Change-Id: Ic1c0dbbe8c1f07582c04757ced0ead2fc5b10ca7
2020-12-14 18:34:39 +09:00
Lorenzo Colitti
50c30ed67f Merge "Generalize support for underlying networks." am: ca830d9239 am: 51c973d4b7 am: 2be66008a0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1513052

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ida4e4d7b6d607d6c9f6efc2d06732f7826f7942e
2020-12-14 06:40:27 +00:00
Treehugger Robot
1e7b9bca3d Merge "Fix a crash in eng builds" am: 26d146ff7f am: 99890b486d am: f65b271328
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1527538

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6e1c20b4c1004e8205d65f318939ee7d8b006f00
2020-12-14 06:39:50 +00:00
Lorenzo Colitti
2be66008a0 Merge "Generalize support for underlying networks." am: ca830d9239 am: 51c973d4b7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1513052

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4748f059d035219adcec0a75dac53968ea82af84
2020-12-14 06:11:47 +00:00
Treehugger Robot
f65b271328 Merge "Fix a crash in eng builds" am: 26d146ff7f am: 99890b486d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1527538

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If9e83003de2a3a0b227ca558264403be312fa1e6
2020-12-14 06:11:21 +00:00
Lorenzo Colitti
51c973d4b7 Merge "Generalize support for underlying networks." am: ca830d9239
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1513052

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia252eb29dbccb0105c3f4a46c7597abb56de0c21
2020-12-14 05:59:51 +00:00
Treehugger Robot
99890b486d Merge "Fix a crash in eng builds" am: 26d146ff7f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1527538

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I245a8498d89e73fefa448a23d71a30d3f34b56ca
2020-12-14 05:50:17 +00:00
Lorenzo Colitti
ca830d9239 Merge "Generalize support for underlying networks." 2020-12-14 05:19:49 +00:00
Treehugger Robot
26d146ff7f Merge "Fix a crash in eng builds" 2020-12-14 05:17:15 +00:00
Chiachang Wang
83e35e70c4 Merge "Resolve UidRange dependency between NMS and CS module" am: c5be33af21 am: 8a3181b166 am: 2ec8e8071a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1495869

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6c3474e6522fc67aec5333b323768692619019ee
2020-12-14 04:23:43 +00:00
Chiachang Wang
2ec8e8071a Merge "Resolve UidRange dependency between NMS and CS module" am: c5be33af21 am: 8a3181b166
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1495869

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If34efef1e3b485de6c93f78c4401ea92fa8edfe4
2020-12-14 03:49:42 +00:00
Chiachang Wang
8a3181b166 Merge "Resolve UidRange dependency between NMS and CS module" am: c5be33af21
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1495869

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2e55c3c4bed3d71eb48242428c179809aae00a1f
2020-12-14 03:10:01 +00:00
Chiachang Wang
c5be33af21 Merge "Resolve UidRange dependency between NMS and CS module" 2020-12-14 02:55:41 +00:00
Chalard Jean
8fb84150bf Fix a crash in eng builds
CAPTIVE_PORTAL is a CS-managed capability, and causes CS to log a wtf.
When this test is run on an eng build, this sends SIGSEGV to the test,
which is pretty difficult to debug.

Test: FrameworksNetTests NetworkStackTests
Change-Id: I72fc46a6daa4e886425b4dc967318cca9f1a5302
2020-12-13 23:02:08 +09:00
Lorenzo Colitti
01d3763c5e Generalize support for underlying networks.
Currently, ConnectivityService assumes that only VPNs can have
underlying networks. Make the code decide this based only on the
return value of NetworkAgentInfo#supportsUnderlyingNetworks.
This allows non-VPN network types to support underlying networks
in the future.

This requires storing the original agent's capabilities in
NetworkAgentInfo so that applyUnderlyingCapabilities can mix in
the underlying network capabilities without overwriting the
capabilities of the network itself. Currently, the only
information that applyUnderlyingCapabilities takes from the
original agent's capabilities are the metered bit (stored in
NetworkAgentInfo#declaredMetered) and the transports (assumed to
be exactly {TRANSPORT_VPN}. Store the full capabilities instead.
This is more state than needed but it ensures that we do not need
to make any changes if in the future we want to propagate new
types of information from the underlying networks.

This should have no impact on current use cases (i.e., VPNs).

There is a change in ordering: in disconnectAndDestroyNetwork,
the new code propagates underlying network capabilities before
removing the network from LegacyTypeTracker, instead of after.

This is done to simplify the new code. When the new code
propagates underlying network capabilities in response to a
change for a particular network (e.g., connect, disconnect,
capabilities change), it only considers networks that have the
changed network as underlying. Because determining the
underlying networks requires knowing the default network,
the new code runs before the default network is changed and
LegacyTypeTracker is updated.

This shouldn't have app implications because the connectivity
broadcasts sent by LegacyTypeTracker and the callbacks cannot be
ordered, since they run on separate threads with unpredictable
delays. The capability change callbacks resulting from
propagation of underlying network capabilities were already
sent before the rematch, so the callbacks themselves are not
reordered in any way.

Bug: 173331190
Test: atest FrameworksNetTests \
            CtsNetTestCases:NetworkAgentTest \
	    CtsNetTestCases:Ikev2VpnTest \
	    CtsNetTestCases:VpnServiceTest \
	    CtsNetTestCases:android.net.cts.ConnectivityDiagnosticsManagerTest \
	    HostsideVpnTests com.android.server.connectivity.VpnTest
Change-Id: Ic5353a928a3a3541dcf953c35f47277c5e295db8
2020-12-13 00:10:56 +09:00
Paul Hu
36628bfc96 Merge "Replace PackageManager @hide APIs" am: dddbd4f495 am: 7ebc0f1ab3 am: 088de50335
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1523340

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I553db1721ab56fce663bc6db10aa23735f5788d8
2020-12-11 11:06:55 +00:00
Paul Hu
19606c6e32 Merge "Expose TcpRepairWindow as module-lib API" am: ec942a8e70 am: 3988f15290 am: 3bee0fbcc8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519961

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iae69946c88267eca4c350d902df0af50fca9de5b
2020-12-11 11:04:22 +00:00
Chalard Jean
d2c548d880 Merge changes from topic "remove_legacy_NA" am: 71ab824707 am: a698a47ada am: 7ba18da6b6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1456097

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If9cd6ce929a7103d2d6b7195a71ee64ea0a4ee0a
2020-12-11 11:03:36 +00:00
Lucas Lin
1061b76b27 Merge "Use getUserHandles() instead of getUsers() to get user id" am: df93f1c06c am: 7936252059 am: 865683a998
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1513050

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7fa8802614bf28453501cdc2bc1989b3531b2280
2020-12-11 11:02:48 +00:00
Treehugger Robot
b7f07a5371 Merge "Add a mutability flag to the PendingIntent" am: e5046ca23b am: 590c8766b6 am: a97a84a6cf
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1505734

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2d71235f8a61e617f95094da1154342c00e9b8d5
2020-12-11 10:53:02 +00:00
Paul Hu
91c64b9b11 Merge "Address leftover comments" am: 6e253df579 am: 3b29da5cf7 am: 3bd18cce4a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1495899

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3f46b0c6d5c2dcce540fcb1f9d7f2cc22c934f93
2020-12-11 10:51:37 +00:00
Paul Hu
088de50335 Merge "Replace PackageManager @hide APIs" am: dddbd4f495 am: 7ebc0f1ab3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1523340

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I018004ee98ac6b9fada57972ca2affeb94ef4956
2020-12-11 10:49:04 +00:00
Paul Hu
7ebc0f1ab3 Merge "Replace PackageManager @hide APIs" am: dddbd4f495
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1523340

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id4e2fab962ba401f2c941c58c0eb2210a8f835e7
2020-12-11 10:05:38 +00:00
Paul Hu
dddbd4f495 Merge "Replace PackageManager @hide APIs" 2020-12-11 09:50:28 +00:00
Paul Hu
3bee0fbcc8 Merge "Expose TcpRepairWindow as module-lib API" am: ec942a8e70 am: 3988f15290
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519961

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7a125dfa9b4bccc9e8943c4b972ff8cb25d4ccaf
2020-12-11 06:31:07 +00:00
Paul Hu
3988f15290 Merge "Expose TcpRepairWindow as module-lib API" am: ec942a8e70
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519961

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2621e4f244e70dfdbd6e6e228f9c6401326fc56a
2020-12-11 06:15:36 +00:00
Paul Hu
ec942a8e70 Merge "Expose TcpRepairWindow as module-lib API" 2020-12-11 05:37:10 +00:00
Chalard Jean
7ba18da6b6 Merge changes from topic "remove_legacy_NA" am: 71ab824707 am: a698a47ada
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1456097

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I87cc62579b19699438704f472fc754837d878038
2020-12-11 03:29:50 +00:00
Lucas Lin
865683a998 Merge "Use getUserHandles() instead of getUsers() to get user id" am: df93f1c06c am: 7936252059
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1513050

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id16394df0ad8e97efe8e75c00a406242a1cac206
2020-12-11 03:29:25 +00:00
Chalard Jean
a698a47ada Merge changes from topic "remove_legacy_NA" am: 71ab824707
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1456097

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I141e67982f1119d5fc700ed2cb75e2f8220f5383
2020-12-11 02:40:14 +00:00
Lucas Lin
7936252059 Merge "Use getUserHandles() instead of getUsers() to get user id" am: df93f1c06c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1513050

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6e03c6f4317e11ffe64b7bcf170f70f535995e85
2020-12-11 02:37:54 +00:00
Chalard Jean
71ab824707 Merge changes from topic "remove_legacy_NA"
* changes:
  Remove support for legacy network agents
  Remove deprecated constructors for NetworkAgent
  Migrate NetworkAgentWrapper to the new NA API
  Cleanup TestNetworkService
2020-12-11 02:32:57 +00:00
Chalard Jean
abb6617d31 [automerger skipped] Merge "Move module utils to the module package." into mainline-prod am: 30c0e47829 -s ours
am skip reason: Change-Id I067eeecd458c34b7f2fbfa439072682661ac750c with SHA-1 863fb9b9d9 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2c7bb055686d87509ecd9ccdfdacb5dc72551e8e
2020-12-11 02:18:48 +00:00
Chalard Jean
30c0e47829 Merge "Move module utils to the module package." into mainline-prod 2020-12-11 02:07:48 +00:00
Lucas Lin
df93f1c06c Merge "Use getUserHandles() instead of getUsers() to get user id" 2020-12-11 02:02:37 +00:00