660091 Commits

Author SHA1 Message Date
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
daa3f0519a Merge "Add javadoc to NetworkStats related classes." am: e51a1d0254
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1917019

Change-Id: Ic92ff264664e714cdcf0a8deadf0e9a254ce752e
2021-12-10 15:39:26 +00:00
Zhomart Mukhamejanov
e51a1d0254 Merge "Add javadoc to NetworkStats related classes." 2021-12-10 15:21:07 +00:00
Sorin Basca
8c95814002 Merge "Updating locked_region_code_injection to use ASM7" am: 96bbb00369
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1904250

Change-Id: Id20e3b36b6bbd23c6415b01cb58ef55b362242e6
2021-12-10 14:21:24 +00:00
Sorin Basca
96bbb00369 Merge "Updating locked_region_code_injection to use ASM7" 2021-12-10 13:57:51 +00:00
Himanshu Rawat
fcfa8b5345 Merge "Corrected comment on when BT is not disabled on entering airplane mode." am: 2a1dc3a8e9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1916077

Change-Id: Ia8b880bf0220f915214ce98b3d55e04d65bf416a
2021-12-10 08:14:36 +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
c7b4a75b30 Merge "Move f/b/packages/Nsd files to f/b/packages/ConnectivityT" am: 610b585502
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1914528

Change-Id: I9675aa02c8271ecc9d8d11c5cb544f56d8ff1f93
2021-12-10 02:30:08 +00:00
Treehugger Robot
d954a3dd2a Merge "Change isCISCentralSupported() to isLeAudioSupported() API" am: 62749e874a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1906211

Change-Id: If15e595027c27dbd52c24795fa4e417fff83ca1a
2021-12-10 02:29:44 +00: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
425b8699bb Merge "Don't require T to extend Parcelable or Serializable in Parcel" am: 6a2f196dca
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1914047

Change-Id: Ie78e98103a3313414fbef82a808e2a0b3fdeba91
2021-12-10 00:11:01 +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
215b89a5c4 Merge changes Ibf64db88,I033ee79c am: 689bba18b3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1915510

Change-Id: I5558464cf53cdbab4241706eb62c5fcc3a91afaf
2021-12-09 21:24:39 +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
320e2a12de Merge "Added missing equals override in new Transport Data classes" am: e97c024d9a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1913506

Change-Id: I6fcda04bc055fbe4f416322948f07adce05b48a4
2021-12-09 18:45:46 +00:00
Etienne Ruffieux
e97c024d9a Merge "Added missing equals override in new Transport Data classes" 2021-12-09 18:26:45 +00:00
Cole Faust
b691d9ce36 Merge "Add instructions on how to annotate an AIDL interface" am: b6df9fb2e8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1912992

Change-Id: Ibb49b112a88bbd866b5fd32be86a0961fbfa4531
2021-12-09 18:14:46 +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
127b4ccee5 Merge "Create ConnectivityT directory" am: 43981a856d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1914534

Change-Id: I28470c62f728e39a093c76ebdfed6f071bbe819b
2021-12-09 11:42:02 +00:00
Aaron Huang
43981a856d Merge "Create ConnectivityT directory" 2021-12-09 11:03:45 +00:00
Bernardo Rufino
91e53b04aa Merge "Deprecate unsafe Parcel.readParcelableArray(ClassLoader)" am: 2ee662c767
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1910046

Change-Id: I3f12c9a32b1b2146ec83f0a04eb5768cafd2eecd
2021-12-09 10:54:30 +00:00
Bernardo Rufino
2ee662c767 Merge "Deprecate unsafe Parcel.readParcelableArray(ClassLoader)" 2021-12-09 10:35:34 +00:00
Victor Chang
4bd88f5cd6 Merge changes from topic "icu70" am: da0880a0fe
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1914692

Change-Id: Ibbdc18a918397f831eac512394bd31e9f1038c18
2021-12-09 10:20:52 +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
b3a9bce506 Merge "Support parsing VcnGatewayConnectionConfig without UnderlyingNetworkPriorities" am: 1a0f225c83
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1915377

Change-Id: I45c09a92c06df520711b935f3fdf9b096125953a
2021-12-09 02:15:28 +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
8ae74e0055 Merge "replace CURRENT_OR_SELF with non hidden API" am: 9c2d1e673f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1901950

Change-Id: Ifc1264ccc312618f0ac22700fcf947dd24c16cdd
2021-12-09 00:12:20 +00:00
Treehugger Robot
9c2d1e673f Merge "replace CURRENT_OR_SELF with non hidden API" 2021-12-08 23:46:02 +00:00
Jiakai Zhang
16895824d0 Merge "Prefetch standalone system server jars before switching domain." am: 04b45b74a1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1909973

Change-Id: I1c66a904c3688717853ce34a2952d976960b21a7
2021-12-08 22:56:25 +00:00
Yan Yan
dcd0583719 Merge "Update #hashCode & #equals with mUnderlyingNetworkPriorities" am: 9df3f48cb0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1914192

Change-Id: I03475260c5dfa8f3e6f947f8939c0e75ca4459a6
2021-12-08 22:54:18 +00:00
Sooraj Sasindran
fffe4f6865 Merge "Provide last known cell id for emergency call" am: 761ad6eaf8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1870513

Change-Id: I4891c23dc6b5dd78618913d365c858f1c4b270bf
2021-12-08 22:52:32 +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
cccdedcb69 Merge "Update biometrics OWNERS." am: a18ff150bd
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1901191

Change-Id: I0032bc24f9c71a844dfdc29987efdd5c06dc4aa1
2021-12-08 18:37:58 +00:00
Joe Bolinger
a18ff150bd Merge "Update biometrics OWNERS." 2021-12-08 18:30:44 +00:00
Treehugger Robot
49e2256fb4 Merge "use test app's data folder as filter directory" am: b33ee3471d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1910040

Change-Id: Ib29ec55ec27f79cd0ae54d0177e301bdecf2624b
2021-12-08 18:13:25 +00:00
Treehugger Robot
b33ee3471d Merge "use test app's data folder as filter directory" 2021-12-08 17:45:25 +00:00