Commit Graph

200 Commits

Author SHA1 Message Date
Remi NGUYEN VAN
ed29c2cf8d Merge "Move OemNetworkPreferences aidl to connectivity" am: 4daa02ee79 am: 1063e9ff33 am: e268e877c6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612038

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib37a92a20b907faed245cca914b46be9b8c1e7fb
2021-03-02 21:09:58 +00:00
Remi NGUYEN VAN
6fd9e1b31d Merge "Move UidRange to connectivity" am: f251c52efb am: c46edc6c24 am: 6dd910c726
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612295

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie9d41595a21c494931e9bf45bfc4e8b2aa9803f3
2021-03-02 21:09:32 +00:00
Treehugger Robot
786edfae7a Merge "Add modules-utils-os to service-connectivity" am: 6da87e0692 am: a941d46227 am: 939790b120
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612195

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7bf0262dc4542e8cdf07ebf19a3367fa9b57f385
2021-03-02 21:09:13 +00:00
Remi NGUYEN VAN
eb0cc323ce Merge "Move Proxy, PacProxySelector out of Connectivity" am: a103c450bc am: 694f952a30 am: a7005ec455
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1598157

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib253a7ccf3beb8e9e5d0988db3d0662074dedda7
2021-03-02 20:37:24 +00:00
Remi NGUYEN VAN
1063e9ff33 Merge "Move OemNetworkPreferences aidl to connectivity" am: 4daa02ee79
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612038

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I11b9be22935b9fd7cf53b268103a1ce4635a6afd
2021-03-02 20:27:29 +00:00
Remi NGUYEN VAN
c46edc6c24 Merge "Move UidRange to connectivity" am: f251c52efb
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612295

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I672615b0804b9a9de4befa1ba5aea2efb9c962df
2021-03-02 20:24:20 +00:00
Treehugger Robot
a941d46227 Merge "Add modules-utils-os to service-connectivity" am: 6da87e0692
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612195

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I22df4afec8f8b5024d099966c0ca0f78b55ff08a
2021-03-02 20:19:24 +00:00
Remi NGUYEN VAN
32e2c767fe Merge "Move SocketUtils out of the connectivity module" am: e467f13ace am: 3c2c63e525 am: 1efb1bf4a8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1592273

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9de14464ebb9d43e7c4fdc683c23ddbbcc7ef269
2021-03-02 19:56:48 +00:00
Remi NGUYEN VAN
3d6cee3c7d Merge "Move QoS API classes to Connectivity" am: 32a606fe54 am: c535ef183f am: 045c615bb2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1611876

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8b7416a1d5c8103415246016f43dddc932d0be2b
2021-03-02 19:53:40 +00:00
Remi NGUYEN VAN
694f952a30 Merge "Move Proxy, PacProxySelector out of Connectivity" am: a103c450bc
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1598157

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id81273b33752ff353dfebdd2cd3faf43429f1a29
2021-03-02 19:52:58 +00:00
Remi NGUYEN VAN
3c2c63e525 Merge "Move SocketUtils out of the connectivity module" am: e467f13ace
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1592273

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib2d4b5574ba710eb50c438144e2b87f6c8954336
2021-03-02 19:48:26 +00:00
Paul Hu
324ccfa064 Merge "Implement Settings#checkAndNoteChangeNetworkStateOperation on CS" into sc-dev 2021-03-02 13:03:13 +00:00
Remi NGUYEN VAN
4daa02ee79 Merge "Move OemNetworkPreferences aidl to connectivity" 2021-03-02 09:29:07 +00:00
Remi NGUYEN VAN
f251c52efb Merge "Move UidRange to connectivity" 2021-03-02 09:27:50 +00:00
Treehugger Robot
6da87e0692 Merge "Add modules-utils-os to service-connectivity" 2021-03-02 08:59:35 +00:00
Remi NGUYEN VAN
a103c450bc Merge "Move Proxy, PacProxySelector out of Connectivity" 2021-03-02 07:49:00 +00:00
Remi NGUYEN VAN
e467f13ace Merge "Move SocketUtils out of the connectivity module" 2021-03-02 06:44:01 +00:00
Remi NGUYEN VAN
5115480e8f Move UidRange to connectivity
UidRange is a data class that is an implementation detail of
Connectivity. Move it to the connectivity boundary.

Remaining usages of UidRange outside of Connectivity (in VPN) should be
migrated to other classes, like Range<Integer> or UidRangeParcel.

Bug: 181512874
Test: m
Change-Id: I6f2e3685ad1c07171dd90480d1e546329de8732d
2021-03-02 15:35:36 +09:00
Remi NGUYEN VAN
24d950ce5a Move OemNetworkPreferences aidl to connectivity
Move the IOnSetOemNetworkPreferenceListener aidl definition to
framework-connectivity.
The interface is an internal implementation detail of
framework-connectivity, so it should be built inside the jar.

Bug: 181512874
Test: m
Change-Id: I898049b50fc620ee629587a9303f058e0a6d0272
2021-03-02 13:56:38 +09:00
Remi NGUYEN VAN
96a931b5b2 Add modules-utils-os to service-connectivity
service-connectivity needs the library so that module utilities are statically
linked, not picked up from the framework jar as hidden symbols.

Bug: 170598012
Change-Id: I1045b3784a4bdb902f44d848ccddb304986631c3
Test: m
2021-03-02 03:28:58 +00:00
Remi NGUYEN VAN
c535ef183f Merge "Move QoS API classes to Connectivity" am: 32a606fe54
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1611876

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idad1f51e7f269c2cef9e836efa668a5a0afd4c5a
2021-03-02 01:28:59 +00:00
Remi NGUYEN VAN
a1433566fe Move Proxy, PacProxySelector out of Connectivity
PacProxySelector is tied to IProxyService, which does not have a formal
API.
Proxy is the interface with ConnectivityService, and all its methods are
public or module API.

Bug: 171540887
Test: m
Change-Id: I8ceba961a81661c3e11d8179955b594d3cab6ff7
2021-03-01 18:35:26 +09:00
Remi NGUYEN VAN
070ff8bb9c Move QoS API classes to Connectivity
The classes were added in S and are used to back ConnectivityManager
APIs. Add them to the connectivity boundary as they belong together with
ConnectivityManager.

Bug: 181512874
Test: m
Change-Id: I03b5978949b200a72813d1ebc4812d851fe3df37
2021-03-01 18:09:30 +09:00
Remi NGUYEN VAN
c99495dc3e [automerger skipped] Merge "Split out the connectivity API surface" am: 306da2a1b5 am: 4a448c175f am: 51b9ccb115 -s ours
am skip reason: Change-Id I21c42f032efa6c10e36c749df3183ce9679303a7 with SHA-1 11b5a5cc71 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0494841fdc78274eda4698e1650be898fc4faf75
2021-03-01 08:50:52 +00:00
Junyu Lai
b083e81f73 Merge "Fix copyright license of VpnTransportInfo" am: 9b9f823f11 am: f83741d25d am: bc88904010
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1607313

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibf6ba342dfbc92fc4852b96d1c3f3b3f34cc3322
2021-03-01 08:07:27 +00:00
Remi NGUYEN VAN
fb559351e4 Merge "Add public alternative for protectFromVpn" am: 0c04e41e7b am: 14b6af4431 am: e456ac2061
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1605094

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If0c46c990def1b6884a6008841f3d5bd912b8650
2021-03-01 08:01:51 +00:00
Remi NGUYEN VAN
1e29080037 Move SocketUtils out of the connectivity module
SocketUtils contains system APIs for modules to interact for sockets,
wrapping internal APIs. It should be part of the platform to keep access
to the internal APIs.

This involves splitting NetworkUtils.protectVpn to NetworkUtilsInternal,
since SocketUtils and VpnService are the only users of that method.

The @UnsupportedAppUsage NetworkUtils.protectVpn has low usage
count, and is already available through VpnService.protect.

Bug: 181512874
Test: boots, VPN working
Change-Id: I7028d334975f7536c06afac7a22200c33db707ac
2021-03-01 16:50:08 +09:00
Remi NGUYEN VAN
4a448c175f Merge "Split out the connectivity API surface" am: 306da2a1b5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552658

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6e51465cfeab43ff5f154771e2e22a7cd981d066
2021-03-01 02:10:04 +00:00
Remi NGUYEN VAN
306da2a1b5 Merge "Split out the connectivity API surface" 2021-03-01 01:07:19 +00:00
Paul Hu
40435af9f7 Merge "Use alternative PhoneStateListener formal API" am: 73e1c90697 am: 181827f862 am: 5611936630
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1554994

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib176dcbf9d2d60f3f7393e50d765f296a83b77ce
2021-02-26 17:25:40 +00:00
Junyu Lai
85393f6b78 Merge "[VCN07] Bypass VCN for non-internet app accessible cellular services" am: 8be73b451f am: 1dda31390d am: 54319cbd0a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1597954

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iade334bfade0457afc6ab2806e481a5e0c85616c
2021-02-26 17:25:16 +00:00
Remi NGUYEN VAN
f15fc7f9a8 Split out the connectivity API surface
Split out connectivity APIs to connectivity module directories. This
prepares future move of the connectivity code into a mainline module,
but still keeps it implemented by framework-minus-apex for now: the API
stubs are moved to framework-connectivity.stubs, but the implementation
on device remains in the same place.

This allows moving the connectivity code in/out of APEX with minimal
changes.

BYPASS_INCLUSIVE_LANGUAGE_REASON=Moving files, can't modify released API

Bug: 171540887
Test: device boots, connectivity working

Merged-In: I21c42f032efa6c10e36c749df3183ce9679303a7
(cherry-pick from internal branch with API files conflicts)

Change-Id: I21c42f032efa6c10e36c749df3183ce9679303a7
2021-02-26 19:23:25 +09:00
Junyu Lai
f83741d25d Merge "Fix copyright license of VpnTransportInfo" am: 9b9f823f11
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1607313

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifed529b4a91bb3c52acb3d1ce708a5999a2bb595
2021-02-26 03:56:16 +00:00
Junyu Lai
9b9f823f11 Merge "Fix copyright license of VpnTransportInfo" 2021-02-26 03:38:59 +00:00
Remi NGUYEN VAN
14b6af4431 Merge "Add public alternative for protectFromVpn" am: 0c04e41e7b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1605094

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I759af534bdf50f647351056275857c056998bf14
2021-02-26 03:22:03 +00:00
Remi NGUYEN VAN
0c04e41e7b Merge "Add public alternative for protectFromVpn" 2021-02-26 01:50:32 +00:00
Paul Hu
181827f862 Merge "Use alternative PhoneStateListener formal API" am: 73e1c90697
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1554994

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I221f70b66e229c7209111227c40a0f4c0e616d85
2021-02-25 13:04:23 +00:00
Paul Hu
73e1c90697 Merge "Use alternative PhoneStateListener formal API" 2021-02-25 12:14:53 +00:00
Junyu Lai
1dda31390d Merge "[VCN07] Bypass VCN for non-internet app accessible cellular services" am: 8be73b451f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1597954

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ied1e0628645c1320cf306fe508820cb80d03373a
2021-02-25 11:03:33 +00:00
Junyu Lai
8be73b451f Merge "[VCN07] Bypass VCN for non-internet app accessible cellular services" 2021-02-25 10:16:03 +00:00
junyulai
5f658cbb9b Fix copyright license of VpnTransportInfo
Test: TH
Bug: None
Change-Id: Id1fe2c62a0fd60b9833d8b00d2fa2ddc2f031004
2021-02-25 10:31:56 +08:00
Remi NGUYEN VAN
11b5a5cc71 Split out the connectivity API surface
Split out connectivity APIs to connectivity module directories. This
prepares future move of the connectivity code into a mainline module,
but still keeps it implemented by framework-minus-apex for now: the API
stubs are moved to framework-connectivity.stubs, but the implementation
on device remains in the same place.

This allows moving the connectivity code in/out of APEX with minimal
changes.

BYPASS_INCLUSIVE_LANGUAGE_REASON=Moving files, can't modify released API

Bug: 171540887
Test: device boots, connectivity working

Change-Id: I21c42f032efa6c10e36c749df3183ce9679303a7
2021-02-25 11:01:24 +09:00
Sarah Chin
983abe47bb Merge "APIs for 5G slicing" into sc-dev 2021-02-24 17:36:45 +00:00
Remi NGUYEN VAN
5b1411c636 Add public alternative for protectFromVpn
The method is called directly by VpnService#protect.

Bug: 171540887
Test: m
Change-Id: I7cbb1ef1301dcf8d27b2cc39c0431a0156fe3442
2021-02-24 14:49:35 +09:00
Chiachang Wang
f823bbc5ff Merge "Move shared methods to net shared lib" am: 6a67b78d2b am: 5ca975bf07 am: 4529181d4f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1571901

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0b7028aa8bb303edf27f4ff93f54a753d0b4ee78
2021-02-24 01:08:24 +00:00
Treehugger Robot
de371923c9 Merge "Clean up T&C implementation" am: 1b3cd84d1c am: 6a810afd15 am: 064b340c56
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1583505

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I35f732fbfa73d8b207c0e1b22595d2fd0135152c
2021-02-24 00:19:18 +00:00
Chiachang Wang
5ca975bf07 Merge "Move shared methods to net shared lib" am: 6a67b78d2b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1571901

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3baac3770814ea1aba213e54430c44308b0c07bc
2021-02-24 00:16:42 +00:00
Treehugger Robot
6a810afd15 Merge "Clean up T&C implementation" am: 1b3cd84d1c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1583505

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I28c5722b7d9e4089be8f42149c3a0407ea3500a7
2021-02-23 23:49:21 +00:00
Treehugger Robot
33ae237686 Merge "Revert "Revert "Delete VPN methods in ConnectivityManager.""" am: 10de86f5e5 am: bdbd425a3b am: ec81e831f6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1597635

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iff8ce4686f52a73c4a5a2d66218c9a6e3e883a3b
2021-02-23 22:56:21 +00:00
Treehugger Robot
bdbd425a3b Merge "Revert "Revert "Delete VPN methods in ConnectivityManager.""" am: 10de86f5e5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1597635

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie9256f3912623619be712b82810f4086c6773bba
2021-02-23 22:24:15 +00:00