Lucas Lin
dca35b322f
Merge changes I06ab0f2d,I8b146aa1 am: 22c42d573e am: cf985cf03e am: 24b2a334d0
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1596513
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I75c940363940f4c941cc7dc89452bed078396a7e
2021-03-02 19:55:02 +00:00
Lucas Lin
2d939b27d4
Merge changes I35ed84fc,Ie6cfd77b,I4e4f929f,I751526e8 am: 51d01615d3 am: 25d2ee9e66 am: de7ef4ab0b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1607733
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I54ef9fd59388908f38721671dd26f536fab719bb
2021-03-02 19:54:22 +00:00
Remi NGUYEN VAN
459bb01e4c
Merge "Move QoS API classes to Connectivity" am: 32a606fe54 am: c02f9028be am: fc31f05aba
...
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
Lucas Lin
24b2a334d0
Merge changes I06ab0f2d,I8b146aa1 am: 22c42d573e am: cf985cf03e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1596513
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ieff3c3cc14319782e264ed9b4a287b5581e6da90
2021-03-02 19:50:30 +00:00
Lucas Lin
de7ef4ab0b
Merge changes I35ed84fc,Ie6cfd77b,I4e4f929f,I751526e8 am: 51d01615d3 am: 25d2ee9e66
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1607733
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2f6682b86e1e8d9899ea02320dd8de347e72c724
2021-03-02 19:49:13 +00:00
Lucas Lin
cf985cf03e
Merge changes I06ab0f2d,I8b146aa1 am: 22c42d573e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1596513
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0332bf0bf07a0a958c2e75b464d577021fd57746
2021-03-02 19:13:55 +00:00
Lucas Lin
25d2ee9e66
Merge changes I35ed84fc,Ie6cfd77b,I4e4f929f,I751526e8 am: 51d01615d3
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1607733
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia438f937106645eb0d6cb91772d437676bf716fd
2021-03-02 19:08:57 +00:00
Remi NGUYEN VAN
fc31f05aba
Merge "Move QoS API classes to Connectivity" am: 32a606fe54 am: c02f9028be
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1611876
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I774c494d6e0f136547cf9175abb6662fd106a6a3
2021-03-02 18:46:39 +00:00
Paul Hu
6a1e76ab95
Merge "Implement Settings#checkAndNoteChangeNetworkStateOperation on CS" into sc-dev
2021-03-02 13:03:13 +00:00
Lucas Lin
22c42d573e
Merge changes I06ab0f2d,I8b146aa1
...
* changes:
Use UserHandle#getIdentifier to get the userid
Add test for getStartUser(), getEndUser() and createForUser()
2021-03-02 04:13:32 +00:00
Lucas Lin
51d01615d3
Merge changes I35ed84fc,Ie6cfd77b,I4e4f929f,I751526e8
...
* changes:
Fix comments left on aosp/1547454 and aosp/1556106
Remove INetworkManagementService from ConnectivityService
Remove unused INetworkManagementService
Remove BaseNetworkObserver from Nat464Xlat
2021-03-02 04:07:35 +00:00
lucaslin
cdda475652
Use UserHandle#getIdentifier to get the userid
...
UidRange uses PER_USER_RANGE to calculate and get the userid,
but PER_USER_RANGE is a hidden API, so use getIdentifier to get
the userid instead.
Bug: 170598012
Test: atest FrameworksNetTests:UidRangeTest
Change-Id: I06ab0f2da8a33d2b718bbc3a609d3d6a5fe0a095
2021-03-02 02:21:39 +00:00
Remi NGUYEN VAN
c02f9028be
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
de9477571f
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
70fb6630af
[automerger skipped] Merge "Split out the connectivity API surface" am: bdf98b8928 am: af71be4b0a am: 4593c2db69 -s ours
...
am skip reason: Change-Id I21c42f032efa6c10e36c749df3183ce9679303a7 with SHA-1 c1326dfd62 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
c9ad62c68d
Merge "[FUI08] Create NeworkStateSnapshot" am: dcd3962cbb am: f2f3c84c30 am: 1793e94183
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1536328
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia5f3cfbdd6f3b23007ea7a2581a75088ed96714f
2021-03-01 08:10:22 +00:00
Junyu Lai
e9abf0ed07
Merge "Fix copyright license of VpnTransportInfo" am: 993c655bf3 am: 03a3a561b1 am: a39f3727f9
...
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
9523c57088
Merge "Fix CaptivePortalDataTest on R" am: 32dbde1641 am: 24f7848d23 am: e753cb6d5b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1605013
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Icd6711e5caafd92bba9f251742fd3c53efeea672
2021-03-01 08:02:39 +00:00
Remi NGUYEN VAN
bb12b0df41
Merge "Add public alternative for protectFromVpn" am: a68e748601 am: c9ba0260a3 am: e1cdb63453
...
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
Chris Weir
a898ed9dac
Merge "Update tests for PANS network usage metrics" am: e6b895b488 am: df390e2e8b am: 82ba0376e5
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1578824
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I212c317f744d88bc97b34195e4f86f447fb7bd52
2021-03-01 08:00:07 +00:00
Remi NGUYEN VAN
4593c2db69
Merge "Split out the connectivity API surface" am: bdf98b8928 am: af71be4b0a
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552658
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iced065c53194f4c5bd54198e05ddc455a97ba50e
2021-03-01 02:25:13 +00:00
Remi NGUYEN VAN
af71be4b0a
Merge "Split out the connectivity API surface" am: bdf98b8928
...
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
bdf98b8928
Merge "Split out the connectivity API surface"
2021-03-01 01:07:19 +00:00
Shuo Qian
34c3c1c32a
Merge changes from topic "cp-rvc-aosp" into sc-dev
...
* changes:
[automerged blank] Add Emergency callback mode shell command 2p: b201f9b1e6
Add Emergency callback mode shell command
2021-02-26 22:56:18 +00:00
Paul Hu
ced4d94c93
Merge "Use alternative PhoneStateListener formal API" am: 4de7d07302 am: 6f12370cfc am: 340a4b0dc5
...
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
d4ec0e4160
Merge "[VCN07] Bypass VCN for non-internet app accessible cellular services" am: ef906819f9 am: b25df9f6c7 am: d71c292044
...
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
Lucas Lin
804e5d8e0b
Merge "Replace BaseNetworkObserver with BaseNetdUnsolicitedEventListener" am: 692b07f7dd am: 076ce5f262 am: 62751fc9cd
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1547454
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iaed275728a14d4554a709407a37c1cfb5df1f943
2021-02-26 17:24:21 +00:00
James Mattis
140398ea37
Merge "Unit test automation for Multi-Default Tracking" am: 8b3ccda6bb am: 2660c17a1d am: b98cbf8c82
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1579207
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1ddb565af1106f10186c83debd6d20be850d4198
2021-02-26 13:05:37 +00:00
Junyu Lai
1793e94183
Merge "[FUI08] Create NeworkStateSnapshot" am: dcd3962cbb am: f2f3c84c30
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1536328
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7a88984dbd2c8171837bd1cf2e58ed07c1d6c0d7
2021-02-26 12:43:58 +00:00
Junyu Lai
f2f3c84c30
Merge "[FUI08] Create NeworkStateSnapshot" am: dcd3962cbb
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1536328
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If6f0e981228ef886496f55626b499f9c487af320
2021-02-26 11:30:53 +00:00
Junyu Lai
dcd3962cbb
Merge "[FUI08] Create NeworkStateSnapshot"
2021-02-26 10:53:36 +00:00
Remi NGUYEN VAN
2079e355ac
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
a39f3727f9
Merge "Fix copyright license of VpnTransportInfo" am: 993c655bf3 am: 03a3a561b1
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1607313
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1172acbf1f7cb693dd06db368fe5fe70dcc11858
2021-02-26 04:35:13 +00:00
Remi NGUYEN VAN
e753cb6d5b
Merge "Fix CaptivePortalDataTest on R" am: 32dbde1641 am: 24f7848d23
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1605013
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib748e01e114866042996e61383151c2500fa8868
2021-02-26 04:16:35 +00:00
Remi NGUYEN VAN
e1cdb63453
Merge "Add public alternative for protectFromVpn" am: a68e748601 am: c9ba0260a3
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1605094
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I95739021d8f70ce1d5371b21ab4357061082bf16
2021-02-26 04:16:21 +00:00
junyulai
4b836cfb98
[FUI08] Create NeworkStateSnapshot
...
Since NetworkState has UnsupportedAppUsage APIs that cannot
be changed, create another class for follow-up patches
to expose as system API.
Test: NetworkStateSnapshotTest
Bug: 174123988
Change-Id: I54ef872847f34166aa34a79f6178c90ac12b6c72
2021-02-26 11:57:06 +08:00
Junyu Lai
03a3a561b1
Merge "Fix copyright license of VpnTransportInfo" am: 993c655bf3
...
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
993c655bf3
Merge "Fix copyright license of VpnTransportInfo"
2021-02-26 03:38:59 +00:00
Remi NGUYEN VAN
24f7848d23
Merge "Fix CaptivePortalDataTest on R" am: 32dbde1641
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1605013
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ifbfed272ece8e1f4c437281fc6ca46de793520fe
2021-02-26 03:25:46 +00:00
Remi NGUYEN VAN
c9ba0260a3
Merge "Add public alternative for protectFromVpn" am: a68e748601
...
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
32dbde1641
Merge "Fix CaptivePortalDataTest on R"
2021-02-26 01:51:14 +00:00
Remi NGUYEN VAN
a68e748601
Merge "Add public alternative for protectFromVpn"
2021-02-26 01:50:32 +00:00
Chris Weir
82ba0376e5
Merge "Update tests for PANS network usage metrics" am: e6b895b488 am: df390e2e8b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1578824
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic312169c70b34bb8a834efae5ebb6b1a6cbb0296
2021-02-25 22:27:54 +00:00
Chris Weir
df390e2e8b
Merge "Update tests for PANS network usage metrics" am: e6b895b488
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1578824
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8ac8031b7e405226a1b055be3c80eb902d48338b
2021-02-25 21:52:40 +00:00
Chris Weir
e6b895b488
Merge "Update tests for PANS network usage metrics"
2021-02-25 21:37:42 +00:00
Shuo Qian
5137452db3
[automerged blank] Add Emergency callback mode shell command 2p: b201f9b1e6
...
Blank merge reason: Change-Id If6ca01283a02a4c1f762eaa0f4cd798d48781761 with SHA-1 dac5b6f32d is in history
Original change: undetermined
Change-Id: Iaccdf8db9afd2013561972a5006c450e0a30e02b
2021-02-25 20:05:41 +00:00
Paul Hu
340a4b0dc5
Merge "Use alternative PhoneStateListener formal API" am: 4de7d07302 am: 6f12370cfc
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1554994
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2071765aba00d8520d3715831d267bcd35795d43
2021-02-25 13:38:42 +00:00
Paul Hu
6f12370cfc
Merge "Use alternative PhoneStateListener formal API" am: 4de7d07302
...
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
Junyu Lai
d71c292044
Merge "[VCN07] Bypass VCN for non-internet app accessible cellular services" am: ef906819f9 am: b25df9f6c7
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1597954
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If935ced9f977749e1ce4d86fe74d186f5efcd896
2021-02-25 12:48:07 +00:00
Paul Hu
4de7d07302
Merge "Use alternative PhoneStateListener formal API"
2021-02-25 12:14:53 +00:00