661073 Commits

Author SHA1 Message Date
Treehugger Robot
ba28bb57ad Merge "Add myself to Keystore owners" 2022-02-09 11:41:25 +00:00
Chiachang Wang
c0699fe9d8 Merge "Correct typo in the year of copyright" 2022-02-09 11:38:50 +00:00
Chiachang Wang
d0f68250f7 Correct typo in the year of copyright
Test: m
Change-Id: I68e9925b5b6deb7c5c9d57aa4a397c80f8b8d869
2022-02-09 11:38:37 +00:00
Aaron Huang
ca1c4e2fc2 Merge "Have FrameworksVcnTests access hidden API" 2022-02-09 10:48:45 +00:00
Treehugger Robot
26de69ea34 Merge "Delete NetworkStatsFactoryBenchmark" 2022-02-09 10:48:40 +00:00
Junyu Lai
e616cb6779 Merge "[MS53] Add connectivity aidl exports to stubs" 2022-02-09 10:02:53 +00:00
Treehugger Robot
87050dde70 Merge "Create framework-connectivity shared filegroup" 2022-02-09 10:02:33 +00:00
Ken Chen
f584f880ab Merge "Add system_server to net_admin group" 2022-02-09 09:42:29 +00:00
Junyu Lai
39c30b8546 Merge "Remove @hide usage in DataUsageUtilsTest" 2022-02-09 09:30:37 +00:00
Treehugger Robot
5e7da1cfc4 Merge "Update VPN event strings for the IKE lib update" 2022-02-09 06:28:39 +00:00
Treehugger Robot
982daf25b8 Merge "Fix BatteryStats counts foreground activity time." 2022-02-09 06:27:17 +00:00
Lang Yu
19758a38a4 Fix BatteryStats counts foreground activity time.
When an application crashes or ANRs in the foreground, or when the
application actively commits suicide in the foreground. It is often
impossible to switch to the PAUSED state of ActivityRecord. At this
time, the Timer in BatteryStats cannot be terminated, and it will keep
timing, which will eventually lead to errors in foreground activity time
statistics. So we'll settle in the handleAppDied function to fix that.

Bug: 208355716
Change-Id: I23baf545105e0bb9322dc4a1702e38e0ef825c53
Signed-off-by: unknown <80264454@adc.com>
2022-02-09 06:24:58 +00:00
Jean Chalard
cbb2fa2f00 Merge "Allow VPN apps to ask for running the validation checks" 2022-02-09 06:03:45 +00:00
Thiébaud Weksteen
b845dbac21 Merge "Migrate DynamicSystemService to @EnforcePermission" 2022-02-09 05:21:06 +00:00
Treehugger Robot
adeac26d27 Merge "Adds OWNERS to com.androd.util.Dump*" 2022-02-09 04:07:53 +00:00
Ken Chen
5c5b682b6d Add system_server to net_admin group
This allows system_server to search/read skfilter BPF programs. Skfilter
BPF programs status were previously dumped by Netd. In Android T, the
related code are mainlined and dumped by system_server process.
system_server needs to be in net_admin group so that it can read program
status.

$ adb root; adb shell ls -l /sys/fs/bpf/
-r--r----- 1 root net_admin ... prog_netd_skfilter_allowlist_xtbpf
-r--r----- 1 root net_admin ... prog_netd_skfilter_denylist_xtbpf
-r--r----- 1 root net_admin ... prog_netd_skfilter_egress_xtbpf
-r--r----- 1 root net_admin ... prog_netd_skfilter_ingress_xtbpf

Bug: 202086915
Test: test in Ib0e935ee2b714ac61daceba6d13fa7a20f97f68f
Change-Id: I8c48230a5da6873eee7d0ba183cb83e1d92cd8f6
2022-02-09 03:47:18 +00:00
Hakjun Choi
ff46fea55c Merge changes from topics "imsservice subid notifications", "provisioning improvement", "provisioning_improvement_2"
* changes:
  Fix CTS failure caused by ag/16284012
  Add Provisioning bundle for indicating if MMTEL/RCS provisioning is required
  Add public API to ProvisioningManager for IMS/RCS provisioning by updatable provisioning app
  ImsService Subscription Notifications
2022-02-09 02:39:23 +00:00
Lucas Lin
f0524f1698 Merge "Add a new API startProvisionedVpnProfileSession()" 2022-02-09 01:12:03 +00:00
Treehugger Robot
ab1fbb18fe Merge "Unhide API setAllowedNetworkTypesForReason and getSupportedRadioAccessFamily" 2022-02-09 00:29:38 +00:00
Felipe Leme
ab085b2792 Adds OWNERS to com.androd.util.Dump*
Test: no, thanks
Bug: 149254050

Change-Id: Ie7ca5bcba00177efde125246354a88cec29a38a4
2022-02-08 16:26:38 -08:00
Sudheer Shanka
09de945c74 Merge "Fix NPE in NetworkPolicyLogger.networkBlocked()." 2022-02-08 22:04:01 +00:00
Aurimas Liutikas
bb3df0c09a Merge "Adding metalava team to OWNERS to be able to disable metalava checks that will break platform build." 2022-02-08 21:35:17 +00:00
Meng Wang
61ca1475a4 Merge "Carrier config KEY_CARRIER_SUPPORTS_TETHERING_BOOL" 2022-02-08 21:24:06 +00:00
Melvin Moreno
3c48391809 Merge "Fixed documentation typo on TextAlign getter and setter methods - Reported on http://b/216852542" 2022-02-08 19:37:05 +00:00
Treehugger Robot
d1f4639c86 Merge "Merge SQ1A.220205.002" 2022-02-08 18:52:07 +00:00
Sudheer Shanka
3d0db6a08b Fix NPE in NetworkPolicyLogger.networkBlocked().
Fixes: 203822380
Test: atest cts/hostsidetests/net/src/com/android/cts/net/HostsideRestrictBackgroundNetworkTests.java
Change-Id: Ibe5340caf6a7f6b1457c9230e34607cf293f39f3
Merged-In: Ibe5340caf6a7f6b1457c9230e34607cf293f39f3
2022-02-08 10:49:29 -08:00
Felipe Leme
0b6e3a959b Merge "Adds OWNERS to com.androd.internal.util.Dump*" 2022-02-08 18:14:23 +00:00
Virkumar Karavate
984a31a9fb Merge "(ImsService API changes for Better IMS Threading) ImsService to execute binder calls in Executor." 2022-02-08 18:08:15 +00:00
Melvin Moreno
4f24757202 Fixed documentation typo on TextAlign getter and setter methods - Reported on http://b/216852542
Change-Id: I950251451d49f97c8c3ef0539218189d4ff74ab6
2022-02-08 17:45:42 +00:00
Eran Messeri
af771eb908 Merge "Keystore: Surface service error message" 2022-02-08 17:33:52 +00:00
Chiachang Wang
3fc98d5ebd Allow VPN apps to ask for running the validation checks
Expose an API to allow VPNs app to ask for running the validation
check on the VPN network built from Ikev2VpnProfile.

Bug: 184750836
Test: New test in Ikev2VpnTest
      Also FrameworksNetTests
Change-Id: I385bb887b6c697d8f5d87af750dbd2aab44afca6
CTS-Coverage-Bug: 184750836
 (but CTS is in the same topic, just not detected by the tool)
2022-02-09 02:19:15 +09:00
Felipe Leme
3c5dea3fe4 Adds OWNERS to com.androd.internal.util.Dump*
Test: no, thanks
Bug: 149254050

Change-Id: I1dbb8a4c04817f39de147927c26c14e461eb564b
2022-02-08 08:50:43 -08:00
Aaron Huang
23e4f46c1a Have FrameworksVcnTests access hidden API
(cherry picked from commit 023328e204d2ab167f45827a13bc31b68ee27d59)
Bug: 204153604
Test: build, FrameworksVcnTests
Change-Id: I2e92f27b4d10612d9000c0fc0d5866dd0313a336
Merged-In: I2e92f27b4d10612d9000c0fc0d5866dd0313a336
2022-02-08 14:31:46 +00:00
Eran Messeri
5eedf5a373 Keystore: Surface service error message
Surface the service-specific error message. To avoid API changes, the
error message is surfaced in the toString / getMessage methods.

Test: atest android.security.keystore.KeyStoreExceptionTest
Bug: 217593122
Change-Id: Id4090564b46db9b3b10ea390390f6683f7314463
2022-02-08 13:26:57 +00:00
Eran Messeri
9422f2076d Add myself to Keystore owners
Update the Keystore owners file:
* Remove Rob Barnes
* Add myself.

This will remove the dependency on US-based reviewers for all Keystore
Java CLs.
Non-trivial CLs, CLs that are not strictly in the Java layer, or both,
would still be sent to the right US-based reviewer.

Bug: N/A
Test: N/A
Change-Id: Id8931516b90be4b97e684cb8d7f9de8d71643db4
2022-02-08 11:45:23 +00:00
Junyu Lai
0580abcc9a Create framework-connectivity shared filegroup
Since data usage related code is going to move to mainline module,
hidden classes and methods can no longer be accessed. However,
some of the hidden classes in the platform are still needed, and
cannot be moved because of other callers.

Thus, create a shared srcs filegroup to allow these classes
build with the module to solve the dependencies.

Test: TH
Bug: 204830222
  (cherry-picked from ag/16656704)
Change-Id: I3813bc2177b2f0b4237056f64c57c63fa29c3081
Merged-In: I3813bc2177b2f0b4237056f64c57c63fa29c3081
2022-02-08 19:12:41 +08:00
Remi NGUYEN VAN
5968400839 Remove @hide usage in DataUsageUtilsTest
Replace matchesSubscriberId with an equivalent check based on the stable
API getSubscriberIds().

Bug: 197717846
Test: atest DataUsageUtilsTest
  (cherry-picked from ag/16801786)
Change-Id: Icf86598dc2e4e8b24e08135de8a842f52ac4ab5b
Merged-In: Icf86598dc2e4e8b24e08135de8a842f52ac4ab5b
2022-02-08 19:06:52 +08:00
Remi NGUYEN VAN
95b018288b Delete NetworkStatsFactoryBenchmark
As commented in the test, it is broken today and barely builds.

Nothing seems to be referencing this library anywhere: remove it.

Ignore-AOSP-First: submitting in AOSP separately from topic
Bug: 197717846
Test: m
  (cherry-picked from ag/16781269)
Change-Id: I0dd12dfd3f9bf99c9723d58e2dc656ea7db3a1f3
Merged-In: I0dd12dfd3f9bf99c9723d58e2dc656ea7db3a1f3
2022-02-08 18:58:33 +08:00
Treehugger Robot
9b73fc72a1 Merge "CEC: Modify Standby Mode Handler" 2022-02-08 10:32:16 +00:00
Junyu Lai
66760b299b [MS53] Add connectivity aidl exports to stubs
This is needed to solve the dependencies where platform
code such as ITelephony.aidl needs aidl definitions.

Test: TH
Bug: 204830222
Change-Id: Ie19a258c2e8a724dc087bc5ad5f8f522e29feca5
Merged-In: Ie19a258c2e8a724dc087bc5ad5f8f522e29feca5
2022-02-08 10:21:53 +00:00
Xin Li
f55c524f34 Merge SQ1A.220205.002
Bug: 213904741
Merged-In: Ib2b0342af85679c0514fb4d88530376b58e6e12a
Change-Id: I82a9718a548507487ab9fa1795e08fc42dca0086
2022-02-07 23:18:56 -08:00
Chalard Jean
87d4c529e0 Update VPN event strings for the IKE lib update
With a recent update, the IKEv2 library exposed the internal
errors happening on the link. This had us realize one error
code was a little bit ill-named and the other can't be exposed
because the system doesn't know about it happening.

Update the name of the events for this.

Test: m
Change-Id: I228b8309acbb5f599b908633923b16cd09e9c0af
2022-02-08 11:18:24 +09:00
Shubham Dubey
433468ed0b Fix CTS failure caused by ag/16284012
BUG:216049141
Test: CTS ImsServiceTest#testProvisioningManagerWhen(Mmtel/Rcs)ProvisionIs(Not)Required

Change-Id: I5265485feac8c5d718288702025c6276f20bb1f0
Merged-In: I5265485feac8c5d718288702025c6276f20bb1f0
2022-02-08 02:10:12 +00:00
Hakjun Choi
0860f1b1b9 Add Provisioning bundle for indicating if MMTEL/RCS provisioning is required
Bug: 214885306
Test: CTS ImsServiceTest#testProvisioningManagerWhen(Mmtel/Rcs)ProvisionIs(Not)Required

Change-Id: I9e0eff60dde4a9f4ea254fa5f8efedd9f5881632
Merged-In: I9e0eff60dde4a9f4ea254fa5f8efedd9f5881632
2022-02-08 02:08:47 +00:00
Hakjun Choi
893cc94036 Add public API to ProvisioningManager for IMS/RCS provisioning by
updatable provisioning app

Bug: 197992603
Test: CTS ImsServiceTest#testProvisioningManagerWhen(Mmtel/Rcs)ProvisionIs(Not)Required
Change-Id: I4fc0759111d15cec01a49a78cda5065bfb7e6c65
Merged-In: I4fc0759111d15cec01a49a78cda5065bfb7e6c65
2022-02-08 02:08:17 +00:00
Jonggeon Kim
5e08b37786 ImsService Subscription Notifications
Provide a new API in ImsService that creates a new version of each ImsFeature and dependencies when a new subId is loaded.
The ImsService handles ImsFeature setup and teardown procedures to happen on a per-subscription basis instead of on a per-slot basis.
Provide the compatibility behavior for older devices that are not upgrading to using the new API.

Bug: 197991451
Test: atest FrameworksTelephonyTests:ImsServiceTest, atest CtsTelephonyTestCases:ImsServiceTest
Merged-In: I231da2f4479d4a4fb272edbf27e49f46833a082a
Change-Id: I231da2f4479d4a4fb272edbf27e49f46833a082a
2022-02-08 02:07:53 +00:00
virkumar
e5c38399ec (ImsService API changes for Better IMS Threading) ImsService to execute binder calls in Executor.
In order to avoid undefined behavior when the framework calls a method through IPC, the ImsService
will now be able to define an Executor that the ImsService can be used to execute the methods

By default all ImsService level method calls will use this Executor.
Sub-classes will also use this Executor unless specified via constuctor which takes executor as an argument.

Test: atest CtsTelephonyTestCases:ImsCallingTest
Bug: 171037053
Merged-In: I10621f9a767ba5bc55373f49caf426e66adbec77
Change-Id: I10621f9a767ba5bc55373f49caf426e66adbec77
2022-02-08 02:07:26 +00:00
Treehugger Robot
81568fa22f Merge "Delete legacy fs-verity support" 2022-02-08 00:48:19 +00:00
Felipe Leme
5f09bb49f0 Merge "Adds OWNERS to com.androd.internal.util.dump" 2022-02-08 00:24:38 +00:00
Joonhun Shin
bbe3fe79ee Merge "Add RCS UP 2.4 profile string" 2022-02-08 00:03:51 +00:00