LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,930 Commits 2 Branches 0 Tags
015c1706e78832f2c63a34f08d17c0c13f08d15e
Commit Graph

2930 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yan Yan
015c1706e7 Merge changes Ifc8ad902,I6d1b8d0e am: 8d659bb1ec am: 488687d11f am: e669fe43cd 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1453730

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6f3235dd38e4c4912f986cbb27867ff14fe38e81
 2021-02-12 22:46:32 +00:00
Yan Yan
e669fe43cd Merge changes Ifc8ad902,I6d1b8d0e am: 8d659bb1ec am: 488687d11f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1453730

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If7bedd741266a08bf2eef515f1fb72a9aebc74e3
 2021-02-12 22:12:07 +00:00
Yan Yan
488687d11f Merge changes Ifc8ad902,I6d1b8d0e am: 8d659bb1ec 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1453730

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I12bd81925142b20a04448952de67cb72d77b4ccd
 2021-02-12 21:41:59 +00:00
Yan Yan
441e35f612 [API] Expose IpSecTunnelInterface#setUnderlyingNetwork 
This API is required to perform MOBIKE. This API allows an IPsec
peer to change the underlying network of its established IPsec
tunnel without re-establishing the tunnel.

Bug: 169855650
Test: atest IpSecManagerTunnelTest (new tests added)
Change-Id: Ifc8ad902cbfbe4ad07e715f2fef0faa1bf9d68f3
 2021-02-10 14:52:18 -08:00
Yan Yan
a2f3b49f10 Update underlying network of IpSecTunnelInterface 
Bug: 169855650
Test: atest IpSecManagerTunnelTest
Change-Id: I6d1b8d0e49f89c67ddc2caf4ba63fb0b1eb062c0
 2021-02-10 14:51:43 -08:00
Junyu Lai
fe5b645d52 Merge changes from topic "removeNI" am: 5e1ec81e2f am: ecb34129dc am: 925f60252b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1536707

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3553ff41d85f44c481ea065e6cbda5d286f9e1fa
 2021-02-09 05:49:15 +00:00
Junyu Lai
925f60252b Merge changes from topic "removeNI" am: 5e1ec81e2f am: ecb34129dc 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1536707

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iec45cb7f553f08e4e3ec91827964a8eec8f96a91
 2021-02-09 05:00:28 +00:00
Junyu Lai
ecb34129dc Merge changes from topic "removeNI" am: 5e1ec81e2f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1536707

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia7c6e3bf8f10b98fc2c4d83d41e65c64737753f0
 2021-02-09 04:26:28 +00:00
Junyu Lai
5e1ec81e2f Merge changes from topic "removeNI" 
* changes:
  [FUI07] Stop making NetworkState with NetworkInfo from external callers
  [FUI06] Stop using NetworkInfo in NetworkState from external callers
 2021-02-09 03:37:59 +00:00
junyulai
64b1cfb7db [FUI06] Stop using NetworkInfo in NetworkState from external callers 
This is achieved by:
  1. Use legacy network type inside NetworkState to replace the
     needs of referencing NetworkInfo.getType().
  2. Let getAllNetworkState only return networks with isConnected()
     equals true. This allows callers such as NPMS or NSS does not
     have to reference to NetworkInfo.isConnected().

Test: atest FrameworksNetTests NetworkPolicyManagerServiceTest
Bug: 174123988
Change-Id: I1c4eb08d18ca973eb8f41d06258872eabc0006b8
 2021-02-08 21:40:49 +08:00
Treehugger Robot
234f87c847 [automerger skipped] Merge "Add @Nullable to Object#equals()" am: 577fd4a912 am: e20d178f56 am: 8f3e3f4541 -s ours 
am skip reason: Change-Id I5eedb571c9d78862115dfdc5dae1cf2a35343580 with SHA-1 76a6131fdb is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie94057a64223064bd8b74af521ccc3c67f8e54d0
 2021-02-05 10:51:19 +00:00
Treehugger Robot
8f3e3f4541 Merge "Add @Nullable to Object#equals()" am: 577fd4a912 am: e20d178f56 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1574815

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7d13a249fabc93baaa0d01de3f9c6cec7ddd11e4
 2021-02-05 10:20:50 +00:00
Treehugger Robot
e20d178f56 Merge "Add @Nullable to Object#equals()" am: 577fd4a912 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1574815

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I523eb00d30bfedeb6e7533a94868016171846a59
 2021-02-05 10:01:23 +00:00
Roman Kalukiewicz
61a6c947ff Add @Nullable to Object#equals() 
This is a partial cherry-pick of change:
I5eedb571c9d78862115dfdc5dae1cf2a35343580

for connectivity classes.

Bug: 170883422
Test: m
Merged-In: I5eedb571c9d78862115dfdc5dae1cf2a35343580
Change-Id: I7dc661863b73f4198ddb4f3a1566583d0f07db3c
 2021-02-05 07:28:44 +00:00
Junyu Lai
dcd24a8f68 Merge "[FUI21] Move scrubSubscriberId to utils class" am: f6c7f61d27 am: 21f732e67c am: 0d8de9dbbc 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1565195

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If957a1c5017ab9600bbdece527543885a17ed2aa
 2021-02-03 10:25:20 +00:00
Junyu Lai
0d8de9dbbc Merge "[FUI21] Move scrubSubscriberId to utils class" am: f6c7f61d27 am: 21f732e67c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1565195

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I59c31da9c2ba69ee74cbf64e3af42331e9b7bfca
 2021-02-03 10:10:22 +00:00
Junyu Lai
21f732e67c Merge "[FUI21] Move scrubSubscriberId to utils class" am: f6c7f61d27 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1565195

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7afe5684997a5c47bcee269d2310fc61715ec13a
 2021-02-03 09:36:38 +00:00
Junyu Lai
ee36c35c17 Merge "[FUI20] Expose UnderlyingNetworkInfo as system Api" am: 75b50a5c73 am: 3a36e9affb am: 4e82645555 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1563496

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia294d4ec349db10f5486b27f733d4f6d223079bf
 2021-02-03 04:32:04 +00:00
Junyu Lai
4e82645555 Merge "[FUI20] Expose UnderlyingNetworkInfo as system Api" am: 75b50a5c73 am: 3a36e9affb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1563496

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2cb57c40fd5679dbd710396f3c69deafbac9d1c3
 2021-02-03 03:31:59 +00:00
Junyu Lai
3a36e9affb Merge "[FUI20] Expose UnderlyingNetworkInfo as system Api" am: 75b50a5c73 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1563496

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icbc3c9f8e1ac8064e2e006587b4d4870d74cee2d
 2021-02-03 03:03:01 +00:00
junyulai
b17ea56d30 [FUI21] Move scrubSubscriberId to utils class 
This patch also removes the functionality of returning
original subscriberId in eng build since it is not really useful.

Test: atest NetworkIdentityUtilsTest
Bug: 174123988
Change-Id: I721457e571aa9403a2200b3e4261b4895e4f7a3e
 2021-02-02 23:45:54 +08:00
junyulai
005f79c2d7 [FUI20] Expose UnderlyingNetworkInfo as system Api 
Test: atest android.net.UnderlyingNetworkInfoTest
Bug: 174123988
Change-Id: Id602fbe744669f472d27fb466d00dcc601bd8f17
 2021-02-02 23:12:10 +08:00
Lorenzo Colitti
48a67aa5e8 Merge "Revert "Expose IPsec tunnel APIs from @SystemApi to public APIs"" am: 32141be3dd am: 99c7e943ca am: bb7214697a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1564979

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id8e99aeefffddf88240cf5f1d7117e022242708f
 2021-02-01 17:12:33 +00:00
Lorenzo Colitti
bb7214697a Merge "Revert "Expose IPsec tunnel APIs from @SystemApi to public APIs"" am: 32141be3dd am: 99c7e943ca 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1564979

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I324ea0a931e3b8da4b0bd11ef550312a21156f1f
 2021-02-01 16:43:26 +00:00
Lorenzo Colitti
99c7e943ca Merge "Revert "Expose IPsec tunnel APIs from @SystemApi to public APIs"" am: 32141be3dd 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1564979

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I147a86d5252f29a88d3a0fdb5c27d4c101791e7c
 2021-02-01 16:04:06 +00:00
Lorenzo Colitti
32141be3dd Merge "Revert "Expose IPsec tunnel APIs from @SystemApi to public APIs"" 2021-02-01 15:33:11 +00:00
Remi NGUYEN VAN
6e69f1704c resolve merge conflicts of 80f288a715 to sc-dev 
Bug: None, merge conflict
Change-Id: Id07440d6a55111a1a7ddbf3df306f4466073fd1d
 2021-02-01 11:29:28 +00:00
Remi NGUYEN VAN
80f288a715 Merge "Move module sources to packages/Connectivity" am: 3d70ab73eb am: 811b4c6ffc 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552656

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8261b01b976b4d8009cd028fa113ef8bede74acb
 2021-02-01 08:41:56 +00:00
Lorenzo Colitti
388f41621f Revert "Expose IPsec tunnel APIs from @SystemApi to public APIs" 
This reverts commit 160aac3fa0.

Reason for revert: not necessary, since VCN already has access to system APIs

Bug: 174606949
Test: revert with no conflicts
Change-Id: Ife2d0fc08c540265d52cdf930d0b6df005990ac8
 2021-02-01 08:13:32 +00:00
Remi NGUYEN VAN
811b4c6ffc Merge "Move module sources to packages/Connectivity" am: 3d70ab73eb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552656

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I42989abf6e81a4c0e7bed6b0890a1ee4f2c30191
 2021-02-01 06:09:33 +00:00
Remi NGUYEN VAN
b71fc45e17 Move module sources to packages/Connectivity 
Files that are planned to be part of the connectivity module are grouped
in packages/Connectivity, so they can be built separately and moved in
one operation with their history into packages/modules/Connectivity.

This places the files in the existing framework-connectivity-sources
filegroup instead of the current framework-core-sources filegroup. Both
are used the same way in framework-non-updatable-sources.

Bug: 171540887
Test: m
Change-Id: I62d9d91574ace6f5c4624035d190260c3126b91e
 2021-02-01 11:52:14 +09:00
Junyu Lai
5905a23e64 Merge "[FUI04] Refactor VpnInfo" am: 561626b20d am: a109d80a47 am: f9445c8a07 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1537211

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icfa9918e41fc3f952a23956108df4db449741364
 2021-01-29 23:38:06 +00:00
Junyu Lai
f9445c8a07 Merge "[FUI04] Refactor VpnInfo" am: 561626b20d am: a109d80a47 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1537211

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idee0985fa0feb2c3fd572c66c12a4ee5f0e236e7
 2021-01-29 23:21:49 +00:00
Junyu Lai
a109d80a47 Merge "[FUI04] Refactor VpnInfo" am: 561626b20d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1537211

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I59054bfe1761e28cdfb8e8e6d67e4aabda399adc
 2021-01-29 22:55:54 +00:00
junyulai
0592b920cb [FUI04] Refactor VpnInfo 
As a preparation of exposing system API. This patch does some
harmless refactoring, which includes:
  1. Change raw arrays into lists according to API guidelines.
  2. Write test.
  3. Rename class to UnderlyingNetworkInfo.
  4. Rename vpnIface to iface.
  5. Make underlyingIfaces @NonNull in order to adapt new
     unparceling code.
  6. implement equals and hashCode for testing.

Test: atest android.net.UnderlyingNetworkInfoTest
Bug: 174123988

Change-Id: I405c21e57c4af8a12a9dd0a1749b9e6690f87045
 2021-01-29 17:44:32 +08:00
Treehugger Robot
a3eaf95b98 Merge "[FUI03] No-op refactoring of VpnInfo" am: f9dbe61693 am: 9a9c17579a am: 9f37e0e929 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1547637

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I05e6b14fca44919610317831c147413b0a431224
 2021-01-27 14:16:00 +00:00
Treehugger Robot
9f37e0e929 Merge "[FUI03] No-op refactoring of VpnInfo" am: f9dbe61693 am: 9a9c17579a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1547637

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic947ae7aabd4e0095e94977dffb66c2f6b7b9e57
 2021-01-27 13:57:34 +00:00
Treehugger Robot
9a9c17579a Merge "[FUI03] No-op refactoring of VpnInfo" am: f9dbe61693 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1547637

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iae15ffcf1fbf31ab004a36eb662f39e4439146d0
 2021-01-27 13:11:28 +00:00
Chiachang Wang
64dc55bfb8 Merge "Expose UdpEncapsulationSocket.getResourceId()" am: 8dc248c84a am: 569e241d5c am: 9ee71fd652 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1547642

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I67420def56b12c3008daaa001b8f09680439d940
 2021-01-27 08:05:05 +00:00
Treehugger Robot
93f61ef742 Merge changes I713bc2ec,Ib9ab07c9 am: 6fe4b878e5 am: db887739f9 am: 1ec09a7e48 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1537264

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4b291a4e82b89d3808e9bcd980d5b2aa4d2b1b71
 2021-01-27 07:53:30 +00:00
Yan Yan
9d5f64d15f Merge "Expose IPsec tunnel APIs from @SystemApi to public APIs" am: 5b8a0c8d89 am: a1c981966e am: db45d09925 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1517517

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie6f17fde71e1c7ca36e88e554874939cfc9e78ab
 2021-01-27 07:51:43 +00:00
junyulai
67c69ad73f [FUI03] No-op refactoring of VpnInfo 
As a preparation of exposing system API. This patch does some
harmless refactoring, which includes:
  1. Move VpnInfo to android.net
  2. Add nullability annotations
  3. Make members final

Bug: 174123988
Test: TH
Change-Id: I1530bb45d0e84c28c6deac33596bc686058afc0d
 2021-01-27 15:03:06 +08:00
Chiachang Wang
9ee71fd652 Merge "Expose UdpEncapsulationSocket.getResourceId()" am: 8dc248c84a am: 569e241d5c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1547642

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie79141820782688b8705cf0edc59cf7a60c74f13
 2021-01-27 05:45:07 +00:00
Chiachang Wang
569e241d5c Merge "Expose UdpEncapsulationSocket.getResourceId()" am: 8dc248c84a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1547642

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iabe3fe4ab7fcad9e8c3f7ad89a49d3d5b1a874ce
 2021-01-27 05:22:15 +00:00
Chiachang Wang
a034331a56 Expose UdpEncapsulationSocket.getResourceId() 
ConnectivityManager.createSocketKeepalive() will need to get
the socket resource ID as a parameter for creating a new
NattSocketKeepalive. ConnectivityManager is a part of incoming
ConnectivityService mainline, so expose getResourceId() as an
API since the hidden APIs are not accessible for a mainline
module. This API should not be exposed to apps, so make it a
MODULE_LIBRARIES system API.

Bug: 172183305
Test: make update-api
Change-Id: Ic0722352ea186fcb18a2d91cc3969f771fde9e86
 2021-01-27 09:27:26 +08:00
Treehugger Robot
1ec09a7e48 Merge changes I713bc2ec,Ib9ab07c9 am: 6fe4b878e5 am: db887739f9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1537264

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I31e71444d5b40981058b5a4152e5f1a0521527d0
 2021-01-26 23:08:40 +00:00
Yan Yan
db45d09925 Merge "Expose IPsec tunnel APIs from @SystemApi to public APIs" am: 5b8a0c8d89 am: a1c981966e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1517517

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I395e7b7ba8c5e1752ad162b0428597587e425e3c
 2021-01-26 23:06:22 +00:00
Treehugger Robot
db887739f9 Merge changes I713bc2ec,Ib9ab07c9 am: 6fe4b878e5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1537264

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I27116d11a4a61c2ca76f687d8d47a4a973ae1e77
 2021-01-26 13:49:20 +00:00
Treehugger Robot
6fe4b878e5 Merge changes I713bc2ec,Ib9ab07c9 
* changes:
  [FUI05] Remove wimax data usage unit test
  [FUI14] Get SSID from NetworkCapabilities
 2021-01-26 13:13:24 +00:00
Yan Yan
a1c981966e Merge "Expose IPsec tunnel APIs from @SystemApi to public APIs" am: 5b8a0c8d89 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1517517

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I274765b51f942562dbe5683c9339866a0f55d13f
 2021-01-26 03:51:17 +00:00