Commit graph

1,558 commits

Message SHA1
Replace utility classes
This commit replaces utility classes that will no longer be
accessible after VCN moves out of the platform

Bug: 369703242
Test: atest CtsVcnTestCases && atest FrameworksVcnTests
Flag: EXEMPT code refactoring; no functional change
Change-Id: Ia5c987c25728a1ef6ac4aeda02e1c9339c2a3af9

Yan Yan   commited 2024-10-19 00:33:21 +00:00
abb90bf8cd
Merge "Clean up flag network_metric_monitor" into main
Yan Yan   authored and   Gerrit Code Review   commited 2024-10-18 20:29:42 +00:00
2aab3cef8b
Register VcnManager with VcnFrameworkInitializer
When VCN is moved out of framework.jar, SystemServiceRegistry
will not be able to register VCN service via IVcnManagementService
anymore because the aidl interface will not be accessible. To
solve this issue, this CL follows
go/android-api-guidelines#the-moduleframeworkinitializer-pattern
to create an FrameworkInitializer for service registration.
Followup CLs will expose this class as @SystemApi.

Bug: 369703242
Test: atest CtsVcnTestCases
Flag: EXEMPT code refactoring; no functional change
Change-Id: Ic9668a60f195f0a21de5114c1bb0bc38b72ee4d5
Merged-In: Ic9668a60f195f0a21de5114c1bb0bc38b72ee4d5

Yan Yan   commited 2024-10-17 20:04:40 +00:00
69bdb450f9
Clean up flag network_metric_monitor
Bug: 282996138
Test: atest FrameworksVcnTests && atest CtsVcnTestCases
Flag: EXEMPT flag clean up
Change-Id: I300d9c391d0aeb26ca6a589960244641de76ac1b

Yan Yan   commited 2024-10-17 11:38:35 -07:00
133d92eb2c
Merge "Create VCN folder" into main
Yan Yan   authored and   Gerrit Code Review   commited 2024-10-16 01:11:17 +00:00
b5eefc591a
Create VCN folder
This is a preparation CL to decouple VCN from the platform code.
It follow the steps suggested by go/mainline-onboarding-in-trunk-stable.
Eventually VCN will be moved to Tethering module. Followup CLs will
migrate all VCN source code to this folder and thus VCN will not
automatically be built into the framework.jar and services.jar anymore.

Bug: 369703242
Test: build and boot
Flag: EXEMPT no functional change
Change-Id: I41484406ab88a8910a87f8df9e53199731c0ce08

Yan Yan   commited 2024-10-16 00:52:22 +00:00
09ee271198
Clean up FLAG_VALIDATE_NETWORK_ON_IPSEC_LOSS
This CL also fixes incorrect code comments

Bug: 329139898
Test: atest FrameworksVcnTests && atest CtsVcnTestCases
Flag: EXEMPT flag cleanup
Change-Id: Ib61dfbf9c3e147766530dbc519a785b8b13fac9d

Yan Yan   commited 2024-10-10 13:15:07 -07:00
56c0b9f0ec
Clean up FLAG_EVALUATE_IPSEC_LOSS_ON_LP_NC_CHANGE
Bug: 323238888
Test: atest FrameworksVcnTests && atest CtsVcnTestCases
Flag: EXEMPT flag cleanup
Change-Id: I18a6c5b32806b6cd20bfa6b5b475d220be975a7c

Yan Yan   commited 2024-10-10 11:53:55 -07:00
aa3971b14c
Clean up FLAG_ENFORCE_MAIN_USER
Bug: 310310661
Test: atest FrameworksVcnTests && atest CtsVcnTestCases
Flag: EXEMPT flag cleanup
Change-Id: I461c4167397608fffbf366c90e4d3bb42e2564f5

Yan Yan   commited 2024-10-10 11:49:41 -07:00
06dc8ecb93
Clean up FLAG_HANDLE_SEQ_NUM_LEAP
Bug: 332598276
Test: atest FrameworksVcnTests && atest CtsVcnTestCases
Flag: EXEMPT flag clean up
Change-Id: I3d0dd6251337d85a4c6f193d9a627e66024a79ab

Yan Yan   commited 2024-10-10 11:01:37 -07:00
87c094581d
Merge "Add VcnUtils to easily get WifiInfo and subId from NetworkCapabilities" into main
Yan Yan   authored and   Gerrit Code Review   commited 2024-10-02 21:19:51 +00:00
c7409c81ab
Add VcnUtils to easily get WifiInfo and subId from NetworkCapabilities
This is a preparation CL for mainlining VCN. This patch adds utility
methods for callers to easily get WifiInfo and subId. It also adds
a Builder class that will be exposed as a @SystemApi in a followup
CL.

Bug: 369710077
Test: atest FrameworksVcnTests(new tests) && atest CtsVcnTestCases
Flag: Exempt low risk utilities for pure refactoring
Change-Id: I257b031dabfc48286e8bae2a0854c81aca2f189c

Yan Yan   commited 2024-10-01 17:28:04 -07:00
1f76313177
Merge "Expose getPackagesWithCarrierPrivileges as @SystemApi" into main
Yan Yan   authored and   Gerrit Code Review   commited 2024-10-01 23:59:21 +00:00
995af5ede4
Expose getPackagesWithCarrierPrivileges as @SystemApi
This is a preparation CL for moving VCN to mainline

Bug: 366598445
Bug: 367831385
Test: atest CtsTelephonyTestCases:TelephonyManagerTest
Flag: android.os.mainline_vcn_platform_api
Change-Id: Ic6098978f034678e6f42f1777ae93d3973bc099e

Yan Yan   commited 2024-09-26 15:15:36 -07:00
c24356e348
Merge "VCN: Remove hidden APIs for build type and vcn service string" into main
Yan Yan   authored and   Gerrit Code Review   commited 2024-09-25 17:49:12 +00:00
aa9d43e1d6
Merge "VCN: Remove hidden APIs for data directory and Settings constants" into main
Yan Yan   authored and   Gerrit Code Review   commited 2024-09-25 00:09:20 +00:00
db071780c8
VCN: Remove hidden APIs for data directory and Settings constants
This patch removes following hidden API usages for mainling VCN:
- Environment#getDataSystemDirectory()
- Settings.Global.MOBILE_DATA

Bug: 288465472
Test: atest FrameworksVcnTest && atest CtsVcnTestCases
Flag: EXEMPT pure refactoring
Change-Id: I66a605c4f460d456ac4349ffb67ecd5e7acc7438

Yan Yan   commited 2024-09-21 00:40:13 +00:00
313a0e107b
VCN: Remove hidden APIs for build type and vcn service string
This is a preparation CL for moving VCN to a mainline module

Bug: 288465472
Test: atest FrameworksVcnTest && atest CtsVcnTestCases
Flag: EXEMPT pure refactoring
Change-Id: Ifb834448f1aafb2aa7eacd11981473405b39eddf

Yan Yan   commited 2024-09-19 11:40:10 -07:00
6bffcb344f
Merge "VCN: Remove ArrayUtils hidden API usages" into main
Yan Yan   authored and   Gerrit Code Review   commited 2024-09-18 22:56:40 +00:00
598b5e0848
VCN: Remove ArrayUtils hidden API usages
This patch removes two hidden API usages for moving
VCN to a mainline module. They are:
- ArrayUtils#convertToIntArray(List<Integer>)
- ArrayUtils#contains(int[], int)

Bug: 288465472
Test: atest FrameworksVcnTest && atest CtsVcnTestCases
Flag: EXEMPT pure refactoring
Change-Id: Iac10befda01c5ed52db85dfcd8ddc66b99782cac

Yan Yan   commited 2024-09-18 12:42:52 -07:00
1f1424bab4
Merge "VCN: Replace hidden API getCarrierConfigSubset(Context, int, String)" into main
Yan Yan   authored and   Gerrit Code Review   commited 2024-09-18 19:13:47 +00:00
f9faa48f37
VCN: Replace hidden API getCarrierConfigSubset(Context, int, String)
This is a preparation CL for moving VCN to a mainline module

Bug: 288465472
Test: atest FrameworksVcnTest && atest CtsVcnTestCases
Flag: EXEMPT pure refactoring
Change-Id: I44470a231cdcf4c0a35c54aba5b1967a0bdb2dd7

Yan Yan   commited 2024-09-17 11:46:46 -07:00
ac01d5583f
Merge "VCN: Remove Telephony hidden API usages" into main
Yan Yan   authored and   Gerrit Code Review   commited 2024-09-16 21:04:36 +00:00
c03f2215a5
VCN: Remove Telephony hidden API usages
This patch removes three hidden API usages for moving
VCN to a mainline module. They are:
- TelephonyManager#getNetworkTypeName(int)
- TelephonyNetworkSpecifier(int)
- SubscriptionManager#isValidSlotIndex

Bug: 288465472
Test: atest FrameworksVcnTest && atest CtsVcnTestCases
Flag: EXEMPT pure refactoring
Change-Id: I09e68006461ac9c5a69eddd27f801f9ed40d15fa

Yan Yan   commited 2024-09-13 16:34:08 -07:00
895cc94d89
Clean up flag fix_crash_on_getting_config_when_phone_is_gone
Flag fix_crash_on_getting_config_when_phone_is_gone has been advanced to
next for a while and no regression is observed. Clean it up for now to
keep code healthy.

Bug: 319791612
Test: atest TelephonySubscriptionTrackerTest
Flag: EXEMPT flag clean up only
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:4078c0f51a1d7d3f27534bc9026778859b7442bd)
Merged-In: I8d02430b70c1ed432826e02bc5938c6772ff1f95
Change-Id: I8d02430b70c1ed432826e02bc5938c6772ff1f95

rambowang   authored and   Android Build Cherrypicker Worker   commited 2024-09-12 02:17:44 +00:00
8e55800e9a
Merge "Make java_sdk_library dependencies explicit" into main
Treehugger Robot   authored and   Gerrit Code Review   commited 2024-09-11 18:49:39 +00:00
d3bd5bef15
Make java_sdk_library dependencies explicit
modules should specify the submodule of java_sdk_library that the module
actually depends on

Test: CI
Flag: EXEMPT build dependency cleanup
Bug: 358613520
Merged-In: I80af0b9efa88c668306f0ff1d51491a8180dc57f
Change-Id: I80af0b9efa88c668306f0ff1d51491a8180dc57f

Jihoon Kang   commited 2024-09-11 00:15:14 +00:00
ea68a78008
Merge "Clean up allow_disable_ipsec_loss_detector flag" into main
Yan Yan   authored and   Gerrit Code Review   commited 2024-09-09 22:06:46 +00:00
78b10c45a2
Clean up allow_disable_ipsec_loss_detector flag
Bug: 336638836
Test: atest FrameworksVcnTests && atest CtsVcnTestCases
Flag: EXEMPT flag clean up
Change-Id: Ifbeaf7c4baa31a782a0632345af9016f6b6456fb

Yan Yan   commited 2024-09-05 18:56:40 -07:00
e07e82c4d4
Merge 24Q3 (ab/11976889) to aosp-main-future
Bug: 347831320
Merged-In: I668022c2d567a188917754d1482f227dec84dc46
Change-Id: Ib56de31f39e816581046f39ecb00557e0178f79b

Xin Li   commited 2024-06-19 23:47:40 -07:00
3744a33689
Merge Android 14 QPR3 to AOSP main
Bug: 346855327
Merged-In:
Change-Id: I34dc25cf5395911579d89263981fbdbe72b7ee14

Xin Li   commited 2024-06-14 10:46:01 -07:00
1317e492c0
[automerger skipped] Merge 2024-06 Release (ab/AP2A.240605.024) to aosp-main-future am: bf2cec5629 -s ours
am skip reason: Merged-In I20b3d485a00109060a6ed206503aa3c12c812969 with SHA-1 fa74cd7671 is already in history

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

Change-Id: I3ec7df2b2a98d72fd0a9992d0130b4978ece822a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Xin Li   authored and   Automerger Merge Worker   commited 2024-06-06 21:36:31 +00:00
2a97735e82
Mark commit b9524e89e1 as merged.
Bug: 343312239
Change-Id: Icafcd2c8d4b5cf608c30a6f8c258281dd1c43056

Xin Li   commited 2024-05-29 11:50:36 -07:00
6d74021380
Merge 2024-06 Release (ab/AP2A.240605.024) to aosp-main-future
Bug: 343100748
Merged-In: I20b3d485a00109060a6ed206503aa3c12c812969
Change-Id: Ibbed3bbb7e2dbf06614ed1f86a628e4377bacec5

Xin Li   commited 2024-05-27 22:59:06 -07:00
bf2cec5629
Merge Android 24Q2 Release (ab/11526283) to aosp-main-future
Bug: 337098550
Merged-In: Ie71e752f0224aa239ba1350d50996ce4b510949a
Change-Id: Ib25c1abf055b0114e0494088df5585f65df27595

Xin Li   commited 2024-05-24 11:35:17 -07:00
b9524e89e1
Merge "Make VCN HSUM compatible" into main am: 472ec212b1 am: 861434d4e8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2847205

Change-Id: Ie49bc69e884e252e43c16cf87b96cfb67da9c127
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Yan Yan   authored and   Automerger Merge Worker   commited 2024-05-08 23:10:11 +00:00
4921eb02fa
Merge "Make VCN HSUM compatible" into main am: 472ec212b1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2847205

Change-Id: I0f0df93859e6a3ae65218b4c3787fa072e68032c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Yan Yan   authored and   Automerger Merge Worker   commited 2024-05-08 22:51:49 +00:00
861434d4e8
Merge "Make VCN HSUM compatible" into main
Yan Yan   authored and   Gerrit Code Review   commited 2024-05-08 21:57:42 +00:00
472ec212b1
Make VCN HSUM compatible
Require VCN to be used by a "main user" instead of a "system user"
since "system user" will no longer be a full user on HSUM devices

Bug: 310310661
Test: FrameworksVcnTests, CtsVcnTestCases on non-hsum and hsum devices
Flag: android.net.vcn.enforce_main_user
Change-Id: I5abfa7ba82055cd953083b1ab3f83e61bafd8a55

Yan Yan   commited 2024-05-07 18:40:04 +00:00
0468b73169
Merge "Support disabling IPsec packet loss detector" into main am: 1e09d8f2b0 am: f64035b67d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3069243

Change-Id: Ib92d07483b657b6abf6bf6ebd3019cd4a1d57201
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Yan Yan   authored and   Automerger Merge Worker   commited 2024-05-07 18:11:07 +00:00
74566f04d7
Merge "Support disabling IPsec packet loss detector" into main am: 1e09d8f2b0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3069243

Change-Id: Ic39efe8220df399dd76ce5d0fce8754751297833
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Yan Yan   authored and   Automerger Merge Worker   commited 2024-05-07 17:55:38 +00:00
f64035b67d
Merge "Support disabling IPsec packet loss detector" into main
Yan Yan   authored and   Gerrit Code Review   commited 2024-05-07 17:26:41 +00:00
1e09d8f2b0
Support disabling IPsec packet loss detector
Allow disabling detector for better configurability

Bug: 336638836
Test: atest FrameworksVcnTests(new tests) && atest CtsVcnTestCases
Flag: android.net.vcn.allow_disable_ipsec_loss_detector
Change-Id: Icd7183d12fb287399a500ea9c0ee4125c749275c

Yan Yan   commited 2024-05-06 19:10:07 +00:00
d978bdcffa
[automerger skipped] RESTRICT AUTOMERGE am: 359ee4691e am: f0aeb6c36d -s ours
am skip reason: contains skip directive

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

Change-Id: Ie17229ac8da3b5fea76c32db9b9cdd9c5d10c2a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Oriol Prieto Gasco   authored and   Automerger Merge Worker   commited 2024-05-03 14:52:25 +00:00
2e0747a7c3
RESTRICT AUTOMERGE am: 359ee4691e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3068562

Change-Id: I13af83ecda2798b14e02a8f9d90de15de20eb4eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Oriol Prieto Gasco   authored and   Automerger Merge Worker   commited 2024-05-03 14:25:55 +00:00
f0aeb6c36d
RESTRICT AUTOMERGE
Set the container field of aconfig flags

Test: printflags --format='{package}:{container}:' | grep "::"
Bug: 312769710
Flag: NONE
Change-Id: I84fda0d5e9813940609436d825738ff786908ff0

Oriol Prieto Gasco   authored and   Oriol Prieto Gascó   commited 2024-05-03 11:42:54 +00:00
359ee4691e
Merge "Revert^2 "Set container to system for aconfig_declarations in AconfigFlags.bp"" into main
Dennis Shen   authored and   Android (Google) Code Review   commited 2024-04-19 22:05:19 +00:00
8c9b802bbd
Merge "Dump IkeSession in VcnGatewayConnection#dump" into main am: ad55dc3177 am: 53ce1943a5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3047432

Change-Id: I098390eaab55700648b7fcc47cba073efdbf907a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Yan Yan   authored and   Automerger Merge Worker   commited 2024-04-19 21:55:30 +00:00
cdd47625b8
Merge "Dump IkeSession in VcnGatewayConnection#dump" into main am: ad55dc3177
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3047432

Change-Id: I5e9a3d23ccbbe9a051333d3c1dbbe2104e5fcf92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Yan Yan   authored and   Automerger Merge Worker   commited 2024-04-19 21:34:05 +00:00
53ce1943a5
Merge "Dump IkeSession in VcnGatewayConnection#dump" into main
Yan Yan   authored and   Gerrit Code Review   commited 2024-04-19 21:16:30 +00:00
ad55dc3177