summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-12-13Merge "Added SystemApi tag to BLUETOOTH_MAP permission." am: e44cf60fe5temp_sam_210511427Etienne Ruffieux
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1918634 Change-Id: Ibcfed4617dcaea3b81e5d3a3eb68e6494488c7f7
2021-12-13Merge "Added SystemApi tag to BLUETOOTH_MAP permission."Etienne Ruffieux
2021-12-13Added SystemApi tag to BLUETOOTH_MAP permission.Etienne Ruffieux
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-13Merge "Register NSD service from ConnectivityFrameworkInitializerTiramisu" ↵Treehugger Robot
am: 6a8b9f3964 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1899035 Change-Id: I658096512da1c4eaa6b60691f6f226b86adb44fe
2021-12-13Merge "Register NSD service from ConnectivityFrameworkInitializerTiramisu"Treehugger Robot
2021-12-13Register NSD service from ConnectivityFrameworkInitializerTiramisupaulhu
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-10Merge "[MS01] Move NetworkTemplate cloud backup functions to NetworkPolicy" ↵temp-sc-samJunyu Lai
am: 40eb40302d Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1878037 Change-Id: I86a23381b25fba2512c2ad1d3ffeb60d12947202
2021-12-10Merge "[MS01] Move NetworkTemplate cloud backup functions to NetworkPolicy"Junyu Lai
2021-12-10Merge changes from topic "ms07-movestats" am: 942c713c9dTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1895044 Change-Id: I85d704b09dac07e91b8400a2bbd15867e2b80d6d
2021-12-10Merge "SoundPool: Update queue only if streamID matches" am: f0f20c17e0Andy Hung
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1905390 Change-Id: I2050c35086bf0bd3af5c600d06f399ead24417b3
2021-12-10Merge changes from topic "ms07-movestats"Treehugger Robot
* changes: [MS07.1] Move NetworkStatsCollection/IdentitySet into frameworks [MS08] Move NetworkStats files to f/b/package/ConnectivityT
2021-12-10Merge "SoundPool: Update queue only if streamID matches"Andy Hung
2021-12-10[MS01] Move NetworkTemplate cloud backup functions to NetworkPolicyJunyu Lai
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[MS07.1] Move NetworkStatsCollection/IdentitySet into frameworksJunyu Lai
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[MS08] Move NetworkStats files to f/b/package/ConnectivityTJunyu Lai
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-10Merge "Add javadoc to NetworkStats related classes." am: e51a1d0254Zhomart Mukhamejanov
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1917019 Change-Id: Ic92ff264664e714cdcf0a8deadf0e9a254ce752e
2021-12-10Merge "Add javadoc to NetworkStats related classes."Zhomart Mukhamejanov
2021-12-10Merge "Updating locked_region_code_injection to use ASM7" am: 96bbb00369Sorin Basca
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1904250 Change-Id: Id20e3b36b6bbd23c6415b01cb58ef55b362242e6
2021-12-10Merge "Updating locked_region_code_injection to use ASM7"Sorin Basca
2021-12-10Merge "Corrected comment on when BT is not disabled on entering airplane ↵Himanshu Rawat
mode." am: 2a1dc3a8e9 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1916077 Change-Id: Ia8b880bf0220f915214ce98b3d55e04d65bf416a
2021-12-10Merge "Corrected comment on when BT is not disabled on entering airplane mode."Himanshu Rawat
2021-12-09Add javadoc to NetworkStats related classes.Zhomart Mukhamejanov
Bug: n/a Test: n/a Change-Id: If7f4d68ea89adbcbc02c1e0a06a11f6330f5d8f3
2021-12-10Merge "Move f/b/packages/Nsd files to f/b/packages/ConnectivityT" am: 610b585502Aaron Huang
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1914528 Change-Id: I9675aa02c8271ecc9d8d11c5cb544f56d8ff1f93
2021-12-10Merge "Change isCISCentralSupported() to isLeAudioSupported() API" am: ↵Treehugger Robot
62749e874a Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1906211 Change-Id: If15e595027c27dbd52c24795fa4e417fff83ca1a
2021-12-10Merge "Move f/b/packages/Nsd files to f/b/packages/ConnectivityT"Aaron Huang
2021-12-10Merge "Change isCISCentralSupported() to isLeAudioSupported() API"Treehugger Robot
2021-12-10Merge "Don't require T to extend Parcelable or Serializable in Parcel" am: ↵Treehugger Robot
6a2f196dca Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1914047 Change-Id: Ie78e98103a3313414fbef82a808e2a0b3fdeba91
2021-12-09Merge "Don't require T to extend Parcelable or Serializable in Parcel"Treehugger Robot
2021-12-09Merge changes Ibf64db88,I033ee79c am: 689bba18b3Evgenii Stepanov
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1915510 Change-Id: I5558464cf53cdbab4241706eb62c5fcc3a91afaf
2021-12-09Merge changes Ibf64db88,I033ee79cEvgenii Stepanov
* changes: Pass MTE RuntimeFlags to AppZygote. Revert "Pass MTE RuntimeFlags to AppZygote."
2021-12-09Merge "Added missing equals override in new Transport Data classes" am: ↵Etienne Ruffieux
e97c024d9a Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1913506 Change-Id: I6fcda04bc055fbe4f416322948f07adce05b48a4
2021-12-09Merge "Added missing equals override in new Transport Data classes"Etienne Ruffieux
2021-12-09Merge "Add instructions on how to annotate an AIDL interface" am: b6df9fb2e8Cole Faust
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1912992 Change-Id: Ibb49b112a88bbd866b5fd32be86a0961fbfa4531
2021-12-09SoundPool: Update queue only if streamID matchesAndy Hung
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-09Merge "Add instructions on how to annotate an AIDL interface"Cole Faust
2021-12-09Don't require T to extend Parcelable or Serializable in ParcelHao Ke
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-09Merge "Create ConnectivityT directory" am: 43981a856dAaron Huang
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1914534 Change-Id: I28470c62f728e39a093c76ebdfed6f071bbe819b
2021-12-09Merge "Create ConnectivityT directory"Aaron Huang
2021-12-09Merge "Deprecate unsafe Parcel.readParcelableArray(ClassLoader)" am: 2ee662c767Bernardo Rufino
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1910046 Change-Id: I3f12c9a32b1b2146ec83f0a04eb5768cafd2eecd
2021-12-09Merge "Deprecate unsafe Parcel.readParcelableArray(ClassLoader)"Bernardo Rufino
2021-12-09Merge changes from topic "icu70" am: da0880a0feVictor Chang
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1914692 Change-Id: Ibbdc18a918397f831eac512394bd31e9f1038c18
2021-12-09Merge changes from topic "icu70"Victor Chang
* changes: Update DateIntervalFormatTest due to ICU 70 data change Regenerate LocaleDataTables.cpp due to ICU 70 upgrade
2021-12-09Move f/b/packages/Nsd files to f/b/packages/ConnectivityTAaron Huang
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-09Create ConnectivityT directoryAaron Huang
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-09Corrected comment on when BT is not disabled on entering airplane mode.Himanshu Rawat
Bug: 208945756 Test: Manual Change-Id: I790356dbe8664677c5aef7e784eb3c9b30e790cf
2021-12-09Merge "Support parsing VcnGatewayConnectionConfig without ↵Treehugger Robot
UnderlyingNetworkPriorities" am: 1a0f225c83 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1915377 Change-Id: I45c09a92c06df520711b935f3fdf9b096125953a
2021-12-09Merge "Support parsing VcnGatewayConnectionConfig without ↵Treehugger Robot
UnderlyingNetworkPriorities"
2021-12-08Pass MTE RuntimeFlags to AppZygote.Evgenii Stepanov
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-08Revert "Pass MTE RuntimeFlags to AppZygote."Evgenii Stepanov
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-09Merge "replace CURRENT_OR_SELF with non hidden API" am: 9c2d1e673fTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1901950 Change-Id: Ifc1264ccc312618f0ac22700fcf947dd24c16cdd