655433 Commits

Author SHA1 Message Date
Kalesh Singh
3f73570646 Merge "Add system_server to readtracefs group" 2021-12-14 19:37:02 +00:00
Andy Hung
361e9e1da9 Merge "SoundPool: Implement generic garbage collection" 2021-12-14 18:34:51 +00:00
Tej Singh
10d4400cb7 Merge "Create cpp aidl_interface for libstatsbootstrap" 2021-12-14 18:05:14 +00:00
Alex Buynytskyy
99ada16f28 Merge "Allow shell/CTS to be package verifier." 2021-12-14 14:32:50 +00:00
Treehugger Robot
58093bfdec Merge "Move IpSec associated files to f/b/packages/ConnectivityT" 2021-12-14 08:28:46 +00:00
Aaron Huang
a09ac8b57b Move IpSec associated files to f/b/packages/ConnectivityT
IpSecService is going to be moved into Connectivity mainline module.
Move all ipsec associated files to packages/ConnectivityT so that
it can be easily migrate these files to connectivity module after
clearing the hidden API usages.

Bug: 204153604
Test: build pass
      FrameworksNetTests
      CtsNetTestCases
Change-Id: I562b47f18e345988a2638cf886f86818f9144b91
2021-12-14 14:06:44 +08:00
Tej Singh
9622192b37 Create cpp aidl_interface for libstatsbootstrap
Create aidl_interface for files needed for libstatsbootstrap.

Bug: 206644307
Test: manually verified atoms could be logged
Change-Id: Ic970e99b588c9e1494a390f6c18e7925e199d5a4
2021-12-13 19:12:12 -08:00
Treehugger Robot
14c8d5f0a6 Merge "ImsServiceEntitlement default values missing" 2021-12-14 03:09:15 +00:00
Paul Hu
5b78f171ec Merge "Remove Preconditions, Protocol @hide usage" 2021-12-14 02:52:11 +00:00
Alex Buynytskyy
b4dc01e32a Allow shell/CTS to be package verifier.
Bug: 204810986
Test: device boots
Test: atest PackageManagerShellCommandTest ChecksumsTest
Change-Id: I0b379714a946c18afdeca4ec02469d26646544df
2021-12-14 01:18:16 +00:00
Meng Wang
ea1adfc0e5 ImsServiceEntitlement default values missing
ImsServiceEntitlement.* configs and their default values
were added in S at
commit e600a8e4e8615410f2f45a4c35f2250d6b1b32b1.

Somehow the default values are missing now. Add back.

Bug: 210485357
Change-Id: I98d943394ed308956c5271b8efaa5094d15dc8ca
Merged-In: I98d943394ed308956c5271b8efaa5094d15dc8ca
(cherry picked from commit 33c6221c5bf0bf966cd6f2da956c1b566be54ce4)
2021-12-13 23:35:41 +00:00
Etienne Ruffieux
e44cf60fe5 Merge "Added SystemApi tag to BLUETOOTH_MAP permission." 2021-12-13 22:42:44 +00:00
Etienne Ruffieux
6123954747 Added SystemApi tag to BLUETOOTH_MAP permission.
In order for Bluetooth to be mainline compliant, we
need to update the hidden BLUETOOTH_MAP permission with
SystemApi tag.

Tag: #feature
Bug: 210470631
Test: build
Change-Id: I2033beafb1d7dda25ddcff1b14893ed576c36991
2021-12-13 19:15:36 +00:00
Treehugger Robot
6a8b9f3964 Merge "Register NSD service from ConnectivityFrameworkInitializerTiramisu" 2021-12-13 15:04:23 +00:00
Remi NGUYEN VAN
2e95b4aaa8 Remove Preconditions, Protocol @hide usage
Remove hidden API usage of the Preconditions and Protocol classes in
NsdManager.

NsdManager does not share its handler with other components, so it does
not need to use specific message IDs from Protocol.
Preconditions can also be easily replaced with stable API alternatives.

Bug: 190249673
Test: atest FrameworksNetTests CtsNetTestCases:NsdManagerTest
Change-Id: Ia173f99b82c90df702291c3690f4a7b047e90daa
2021-12-13 17:37:02 +08:00
paulhu
474a8aaffc Register NSD service from ConnectivityFrameworkInitializerTiramisu
INsdManager is going to move into connectivity mainline module
and it will be not visible to SystemServiceRegistry after
migration done. Thus, use ConnectivityFrameworkInitializerTiramisu
to register NSD service instead.

ConnectivityFrameworkInitializerTiramisu will be implemented in
the framework-connectivity-tiramisu bootclasspath JAR, which need
to be separated from the S+ framework-connectivity bootclasspath
JAR to be only loaded by the module on T+. So its methods cannot
be in the same class as ConnectivityFrameworkInitializer.

Bug: 206702844
Test: atest FrameworksNetTests CtsNetTestCases
Merged-In: Ibf89ab9a35e35dac4978ba70c7ab306b6155a4a3
Change-Id: Ibf89ab9a35e35dac4978ba70c7ab306b6155a4a3
2021-12-13 15:33:03 +08:00
Junyu Lai
40eb40302d Merge "[MS01] Move NetworkTemplate cloud backup functions to NetworkPolicy" 2021-12-10 22:14:42 +00:00
Treehugger Robot
942c713c9d Merge changes from topic "ms07-movestats"
* changes:
  [MS07.1] Move NetworkStatsCollection/IdentitySet into frameworks
  [MS08] Move NetworkStats files to f/b/package/ConnectivityT
2021-12-10 18:48:52 +00:00
Andy Hung
f0f20c17e0 Merge "SoundPool: Update queue only if streamID matches" 2021-12-10 18:35:06 +00:00
Junyu Lai
650ee7a1d1 [MS01] Move NetworkTemplate cloud backup functions to NetworkPolicy
Since NetworkTemplate will be moved into the mainline module.
It is necessary to remove hidden BackupUtil usage from
NetworkTemplate. Also, it is also a hazard to maintain
compatibility for byte buffer interfaces.

Thus, move out these cloud backup functions to NetworkPolicy
to address these concerns.

Test: atest NetworkPolicyTest NetworkPolicyManagerServiceTest
Bug: 204830222
Change-Id: I3ec55f7e419ea13db535acff2457d8e7aaebdce8
2021-12-10 16:11:09 +00:00
Junyu Lai
fa86f6ab34 [MS07.1] Move NetworkStatsCollection/IdentitySet into frameworks
These files are needed for the data migration util system Api
interfaces to allow OEMs to construct NetworkStats* objects.
Thus, they need to be moved into android.net package, and some
of them will be exposed as @SystemApi in T.

Eventually these classes will be moved into the Connectivity
module, but in the mean time they will be temporarily moved to
f/b/package/ConnectivityT for the preparation stage.
However, the tests are already in the module. Therefore for
the S-derived branch, the test cannot see the renamed classes
since any framework CLs will not be auto-merged into this branch.
Thus, the tests need to stay disabled on the S-derived branch,
and will be re-enabled after all files are moved into the module.

Test: TH
Bug: 197717846

Change-Id: I95278a99cf2437ada28001161ceea17a1d32f2a4
2021-12-10 16:11:08 +00:00
Junyu Lai
d82296cf33 [MS08] Move NetworkStats files to f/b/package/ConnectivityT
NetworkStatsService is going to be moved into ConnectivityService
module. Move all related files to packages/ConnectivityT so that
it can be easily migrate these files to connectivity module
after clearing the hidden API usages.

Bug: 197717846
Test: TH
Change-Id: Iead00832b5eb7b1dc40a92027c5a14ae8316b16c
2021-12-10 16:11:08 +00:00
Zhomart Mukhamejanov
e51a1d0254 Merge "Add javadoc to NetworkStats related classes." 2021-12-10 15:21:07 +00:00
Sorin Basca
96bbb00369 Merge "Updating locked_region_code_injection to use ASM7" 2021-12-10 13:57:51 +00:00
Himanshu Rawat
2a1dc3a8e9 Merge "Corrected comment on when BT is not disabled on entering airplane mode." 2021-12-10 07:57:09 +00:00
Zhomart Mukhamejanov
4de1f6f5a6 Add javadoc to NetworkStats related classes.
Bug: n/a
Test: n/a
Change-Id: If7f4d68ea89adbcbc02c1e0a06a11f6330f5d8f3
2021-12-09 21:28:05 -08:00
Aaron Huang
610b585502 Merge "Move f/b/packages/Nsd files to f/b/packages/ConnectivityT" 2021-12-10 02:12:38 +00:00
Treehugger Robot
62749e874a Merge "Change isCISCentralSupported() to isLeAudioSupported() API" 2021-12-10 02:10:42 +00:00
Treehugger Robot
6a2f196dca Merge "Don't require T to extend Parcelable or Serializable in Parcel" 2021-12-09 23:48:45 +00:00
Evgenii Stepanov
689bba18b3 Merge changes Ibf64db88,I033ee79c
* changes:
  Pass MTE RuntimeFlags to AppZygote.
  Revert "Pass MTE RuntimeFlags to AppZygote."
2021-12-09 20:52:08 +00:00
Etienne Ruffieux
e97c024d9a Merge "Added missing equals override in new Transport Data classes" 2021-12-09 18:26:45 +00:00
Andy Hung
151117ec0b SoundPool: Update queue only if streamID matches
SoundPool API commands are based on an atomic
compare-StreamID if match then operate (see compare-exchange).

Test: soundpool_stress
Test: atest SoundPoolAacTest
Test: atest SoundPoolHapticTest
Test: atest SoundPoolMidiTest
Test: atest SoundPoolOggTest
Bug: 201233890
Bug: 201262390
Change-Id: I63cc07d581a0ac1d5440852bfe0c75edc9d73e75
2021-12-09 10:03:26 -08:00
Cole Faust
b6df9fb2e8 Merge "Add instructions on how to annotate an AIDL interface" 2021-12-09 17:52:31 +00:00
Hao Ke
31fa514400 Don't require T to extend Parcelable or Serializable in Parcel
This is because we want to support the use-case where the caller
enforces a specific class type that doesn't implement Parcelable
or Serializable but the child classes written on the payload implement them.

One such use-case that needs this before migrating is
https://cs.android.com/android/platform/superproject/+/master:frameworks/base/core/java/com/android/internal/infra/AndroidFuture.java;l=596;drc=2d6a545e3042d7cc91b54746e774681a05e0ff22:
we need to enforce Throwable class but it doesn't implement Parcelable itself,
while its children written on the wire are expected to.

Test: atest -d android.os.cts.ParcelTest
Bug: 195622897
Change-Id: I150416d0cfb0b87ddbaff1041d8d60aa205f6f39
2021-12-09 15:40:04 +00:00
Aaron Huang
43981a856d Merge "Create ConnectivityT directory" 2021-12-09 11:03:45 +00:00
Bernardo Rufino
2ee662c767 Merge "Deprecate unsafe Parcel.readParcelableArray(ClassLoader)" 2021-12-09 10:35:34 +00:00
Victor Chang
da0880a0fe Merge changes from topic "icu70"
* changes:
  Update DateIntervalFormatTest due to ICU 70 data change
  Regenerate LocaleDataTables.cpp due to ICU 70 upgrade
2021-12-09 10:03:02 +00:00
Aaron Huang
185b02f1bc Move f/b/packages/Nsd files to f/b/packages/ConnectivityT
Move Nsd files to ConnectivityT so that nsd, ipsec,
ethernet and netstats files can live in the same
directory and it will be easier to move everything
in frameworks/base/packages/ConnectivityT to
packages/modules/Connectivity after fixing all of the
hidden API usages.

Bug: 204153604
Test: FrameworksNetTests
      CtsNetTestCases
Change-Id: I411e242e8739d15920cfc2fe274115f7f39bd89f
2021-12-09 16:22:00 +08:00
Aaron Huang
e69d46c6aa Create ConnectivityT directory
This directory is used to put nsd, ethernet, ipsec and netstats
associated files that are going to be included in connectivity
mainline module.

Bug: 204153604
Test: create directory and add owners file only
Change-Id: Ifea707e2c3d5242081e70542b1bc32e0f604ac26
2021-12-09 16:19:43 +08:00
Himanshu Rawat
8825d9aa27 Corrected comment on when BT is not disabled on entering airplane mode.
Bug: 208945756
Test: Manual
Change-Id: I790356dbe8664677c5aef7e784eb3c9b30e790cf
2021-12-09 07:15:44 +00:00
Treehugger Robot
1a0f225c83 Merge "Support parsing VcnGatewayConnectionConfig without UnderlyingNetworkPriorities" 2021-12-09 01:56:52 +00:00
Evgenii Stepanov
2e50afbd53 Pass MTE RuntimeFlags to AppZygote.
Fix AppZygote process and its children (the actual service processes)
ignoring android:memtagMode attribute in the app manifest.

When starting a new AppZygote process, apply memtag-related flags as
determined by the app manifest (and modified by compat features and
actual h/w capabilities). If this is not done, MTE is always disabled in
an AppZygote process, which makes it impossible to enable it in the
AppZygote's children.

This change has no effect unless MTE is supported in the hardware
(ARMv9) and enabled in the system.

Bug: 207557677
Test: CtsTaggingHostTestCases
Change-Id: Ibf64db8882a1fbffe6c0cc3cd3bc2299b088876a
2021-12-08 16:45:44 -08:00
Evgenii Stepanov
643bc5ce5e Revert "Pass MTE RuntimeFlags to AppZygote."
The change affects non-MTE devices, contrary to the claims in the
description.

This reverts commit 8895ef1256411a4eda96aa4aa6dd4c9147118737.

Bug: 207557677
Test: CtsTaggingHostTestCases
Change-Id: I033ee79ce05db87586358ba954ecfcaf8aaa6249
2021-12-08 16:44:04 -08:00
Treehugger Robot
9c2d1e673f Merge "replace CURRENT_OR_SELF with non hidden API" 2021-12-08 23:46:02 +00:00
Jiakai Zhang
04b45b74a1 Merge "Prefetch standalone system server jars before switching domain." 2021-12-08 20:40:45 +00:00
Yan Yan
eae9b5d0c4 Support parsing VcnGatewayConnectionConfig without UnderlyingNetworkPriorities
This commit fixes the NullPointerException issue in converting a
PersistableBundle without UnderlyingNetworkPriorities to a
VcnGatewayConnectionConfig, by adding a null check and building
the VcnGatewayConnectionConfig with the default
UnderlyingNetworkPriority list.

Bug: 209142575
Test: atest FrameworksVcnTests (new tests), CtsVcnTestCases
Change-Id: I888d2994c86ba250c3fc9ee1851dccb5e6ef3e77
2021-12-08 12:23:28 -08:00
Yan Yan
9df3f48cb0 Merge "Update #hashCode & #equals with mUnderlyingNetworkPriorities" 2021-12-08 20:15:08 +00:00
Sooraj Sasindran
761ad6eaf8 Merge "Provide last known cell id for emergency call" 2021-12-08 19:19:54 +00:00
Joe Bolinger
a18ff150bd Merge "Update biometrics OWNERS." 2021-12-08 18:30:44 +00:00
Treehugger Robot
b33ee3471d Merge "use test app's data folder as filter directory" 2021-12-08 17:45:25 +00:00