Commit Graph

661469 Commits

Author SHA1 Message Date
Sal Savage
881867d5e1 Merge "Make BluetoothHeadsetClient and associated functions @SystemApi" am: e70578157d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1954516

Change-Id: I6d42cb97803c2c6e85c58475c5ce005468012de9
2022-01-24 22:06:54 +00:00
Elliott Hughes
b46bf19b90 usb: remove duplication in descriptor reading code.
The motivation for this is Sony needing to deal with >4KiB descriptor on
a UVC device. Let's factor out the callers here and combine them with
the code in libusbhost that also needs a limit. (I've separately bumped
libusbhost to 16KiB, which was the largest of the three places we had a
limit previously.)

Also remove some inappropriate <asm/*> includes --- that's never a good
idea, and they weren't needed anyway.

(#include re-ordering was insisted upon by a presubmit hook.)

Test: treehugger
Change-Id: I552d97adc2a4ade4b89b9fe6b3262e012fdb8602
2022-01-24 13:57:58 -08:00
Sal Savage
e70578157d Merge "Make BluetoothHeadsetClient and associated functions @SystemApi" 2022-01-24 21:52:21 +00:00
Peter Collingbourne
373ab4c0d8 Merge "Disable pointer authentication in app processes." am: 4b799b3691
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1954983

Change-Id: Icbcc94245e6fcd5f4e2ad40f9a7e1d31af4278f2
2022-01-24 21:33:42 +00:00
Peter Collingbourne
4b799b3691 Merge "Disable pointer authentication in app processes." 2022-01-24 21:17:30 +00:00
Eric Biggers
9d2bb776ed StorageManagerService: don't ignore failures to prepare user storage
We must never leave directories unencrypted.

Bug: 164488924
(cherry picked from commit 50946dd15f)
Merged-In: I9a38ab5cca1ae9c9ebff81fca04615fd83ebe4b2
Change-Id: I9a38ab5cca1ae9c9ebff81fca04615fd83ebe4b2
2022-01-24 20:15:05 +00:00
Maciej Żenczykowski
0e5a1b21cf Merge "Monitor interface added and update bpf interface map" am: d6ba5ab1b5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1954391

Change-Id: I9e22aa42dc0b878ea6a89c9003acebcf07a508bb
2022-01-24 19:15:00 +00:00
Sudheer Shanka
f1ade4643d Add OWNERS for UsageStats related classes.
Test: n/a
Change-Id: I86bfb95be2c5a8c560c6270ac876bf4eced3ab5a
2022-01-24 11:06:26 -08:00
Maciej Żenczykowski
d6ba5ab1b5 Merge "Monitor interface added and update bpf interface map" 2022-01-24 19:05:27 +00:00
Yan Yan
e6286ba332 Merge "Improve the API doc for setVcnUnderlyingNetworkPriorities" am: b85c5d7634
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1945490

Change-Id: Iad3b19f722a20cdd6ebcfaaf3c5a551f3bf4d197
2022-01-24 19:02:46 +00:00
Yan Yan
b85c5d7634 Merge "Improve the API doc for setVcnUnderlyingNetworkPriorities" 2022-01-24 18:37:31 +00:00
Andrew Cheng
490121697e Merge "New @SystemApi's in BluetoothMapClient" am: f97b80ebd7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1954736

Change-Id: I3a0c6f4206693f6c68d4a39575c366b1c4e14d74
2022-01-24 18:23:38 +00:00
Andrew Cheng
f97b80ebd7 Merge "New @SystemApi's in BluetoothMapClient" 2022-01-24 18:11:45 +00:00
Anton Hansson
e55397e910 Merge "Split android-non-updatable-stubs-defaults in two" am: 70ab0685cf
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1958860

Change-Id: I89ea760ec38328347a7946d17f352438ac3341c9
2022-01-24 17:30:28 +00:00
Anton Hansson
70ab0685cf Merge "Split android-non-updatable-stubs-defaults in two" 2022-01-24 17:15:15 +00:00
Sooraj Sasindran
0cd153c240 Merge "Make sure to udpate enterprise id" am: 724e9d6a7f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1956749

Change-Id: I197e3ffcb876739c724942915c08a323565c7a35
2022-01-24 16:42:02 +00:00
Etienne Ruffieux
75f26cb8fb Migrating Bluetooth resources to Bluetooth module
In order for the Bluetooth module to build as an apex
all non-public resources must be located in the same
package.
Power usage configs are made system properties to
enable android.internal.os to read them and still have
per device overlays.
All configs used only by the Bluetooth app are moved to
the Bluetooth module.
Vendor overlays will be updated once the migration is done.

Tag: #feature
Bug: 211570675
Test: build, manual
Test: make RunSettingsRoboTests
Test: Added and logged system properties in vendors
Change-Id: I2b0134b97b687d6c7e96f7700be0c196168f0601
2022-01-24 16:39:34 +00:00
Anton Hansson
87f04b8d57 Make framework-doc-stubs use jarstub defaults
These stubs used to duplicate all the properties in the defaults
we had already defined, but did not set e.g. sdk_version: "none",
which meant certain symbols were imported twice (which is error
prone / wrong as they could potentially be different).

Test: m framework-doc-stubs before & after and diff soong intermediates
Change-Id: I96dfa66a9deea3564980678fd64f2bfc6460eebd
2022-01-24 16:29:13 +00:00
Sooraj Sasindran
724e9d6a7f Merge "Make sure to udpate enterprise id" 2022-01-24 16:26:03 +00:00
Lorenzo Colitti
8093d78d1c Add a module-lib API for constructing a LocalSocket from an fd.
This allows constructing a LocalSocket from a FileDescriptor
referring to an already-connected socket. The LocalSocket can
then be used to exchange ancillary filedescriptors and fetch
peer socket credentials for the existing FD.

The fd is not dup'd or closed by the API, and the caller is
responsible for closing it. This is consistent with the
constructor of the related LocalServerSocket class, which also
takes an fd and does not manage its lifecycle.

Bug: 200200870
Test: atest CoreTests:android.net.LocalSocketTest CtsNetTestCases:android.net.cts.LocalSocketTest
Change-Id: I86448ba80475c4563194a4a2d9a0c0bbd0b76444
2022-01-25 00:56:44 +09:00
Anton Hansson
9dce832eea Split android-non-updatable-stubs-defaults in two
Put the module classpath defaults into a separate defaults module,
such that users can choose to add the module symbols in a different
way.

Update all the current users to apply both defaults.

Test: m nothing
Change-Id: I22f9518c2e205bfa8ad8d4b630ec976921786b73
2022-01-24 15:50:59 +00:00
Jerome Gaillard
d4b635fa4d Merge "Add more owners for LayoutlibLoader.cpp" am: 64085cd5db
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1909192

Change-Id: I54b98c2177e91b910a16f29b149f3c821a7b76fc
2022-01-24 14:59:10 +00:00
Jerome Gaillard
64085cd5db Merge "Add more owners for LayoutlibLoader.cpp" 2022-01-24 14:44:46 +00:00
Alex Florescu
cdaf2613cf Merge "Adding alexflo@'s team" am: 5bfe18ca55
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1954316

Change-Id: Iacf418a0b38ee6c014ab27c3294b9d9915496ea6
2022-01-24 14:35:27 +00:00
Alex Florescu
5bfe18ca55 Merge "Adding alexflo@'s team" 2022-01-24 14:19:59 +00:00
Junyu Lai
d0dcf4d412 Merge changes I54c2258c,I47b2d3ac am: 53de4cb310
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1936446

Change-Id: Id51ceff565e5d5467f3a236b5d43e5395d65bdac
2022-01-24 14:12:24 +00:00
Junyu Lai
53de4cb310 Merge changes I54c2258c,I47b2d3ac
* changes:
  [MS38] Remove android.os.HandlerExecutor dependencies
  [MS58] Expose Apis which will be used by data migration utility
2022-01-24 14:08:56 +00:00
Anton Hansson
f8319bd662 Merge "Remove defaults that add nothing" am: 4c11ce8ee3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1952384

Change-Id: Ic280f40686a07f95e948974606727eda916a5091
2022-01-24 14:01:35 +00:00
Siim Sammul
b24b15c6f9 Merge "Move binder latency data logging to a background thread to improve performance of the main thread." am: 3af0c6a106
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1942954

Change-Id: I35ceec5144a13ef836055569b1d0f2a01106a828
2022-01-24 13:56:38 +00:00
Anton Hansson
4c11ce8ee3 Merge "Remove defaults that add nothing" 2022-01-24 13:56:13 +00:00
Siim Sammul
3af0c6a106 Merge "Move binder latency data logging to a background thread to improve performance of the main thread." 2022-01-24 13:40:33 +00:00
junyulai
cb9f3af8ec [MS68.1] Register usage callback from NetworkPolicyManagerService
Use usage callback to replace the need of intent receiver.

Test: atest TrafficStatsTest NetworkUsageStatsTest FrameworksNetTests
Bug: 204830222
Change-Id: I40967c2b6c86d25c7db93e6d3a4908b72ed76154
2022-01-24 21:07:04 +08:00
Xiao Ma
bf089a8cd1 Merge "Move Ethernet related files to f/b/packages/ConnectivityT." am: 487a9cc8a4
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1934465

Change-Id: I56397ac11a2d41b10fe2880b432f56861f13edeb
2022-01-24 13:06:50 +00:00
Xiao Ma
487a9cc8a4 Merge "Move Ethernet related files to f/b/packages/ConnectivityT." 2022-01-24 12:50:39 +00:00
Aaron Huang
d671ff59b9 Use public resouce in android.R package
Use public resource since IpSec is planed to be moved into
Connectivity mainline module.

Bug: 204153604
Test: build
Change-Id: I0aafef6b9b08307c3aebce597a2dd24925c6b09a
Merged-In: I0aafef6b9b08307c3aebce597a2dd24925c6b09a
2022-01-24 11:41:35 +00:00
Aaron Huang
1d0076b339 Make ipsec resource as SystemApi
Make config_optionalIpSecAlgorithms @SystemApi so that it can
be used in mainline module.

Bug: 204153604
Test: FrameworksNetTests
Change-Id: Ia082f0e1749f1399bd0b41dab6612744cc67e62a
Merged-In: Ia082f0e1749f1399bd0b41dab6612744cc67e62a
2022-01-24 11:41:26 +00:00
Aaron Huang
9c10c4463e Add <staging-public-group> tags to T
To prevent apps from having to respin atomically with SDK finalization,
<staging-public-group> must be created with type ids that do not
overlap the public resource id namespace.

Test: builds, aapt2_tests
Change-Id: Ife61f2abd673db93d4af6ee9affd4119cc17f7f2
Merged-In: Ia7835d04d988127d061d3a454b8391294346a915
2022-01-24 11:39:06 +00:00
junyulai
3d5840d72d [MS67.1] Expose registerUsageCallback with template
Test: atest FrameworksNetTests
Bug: 204830222
Change-Id: I643e2d96144210852fc8916ec9c483f2b207a48b
2022-01-24 19:38:06 +08:00
Aaron Huang
25ca3f0e73 Remove hidden API dependencies from StatsPullAtomService
NetworkStatsService is going to be moved into mainline module so
the hidden API usages should be removed. Thus, this patch uses
formal API to query data usage and refactor the slice networks stats
method by formal API.

Bug: 210073043
Test: build
      BytesTransferredTest and check the output of atoms
      adb shell cmd stats pull-source $ATOM_ID
Change-Id: Ie609f6c3d381f097adc30dbb9b88c0cc933e16e2
2022-01-24 17:20:46 +08:00
junyulai
a7d85f0028 [MS38] Remove android.os.HandlerExecutor dependencies
Mainline module can't use internal HandlerExecutor, so inline
the implementation instead.

Test: atest FrameworksNetTests NetworkPolicyManagerServiceTest
Bug: 204830222
Change-Id: I54c2258cb3cee5fb862409441de293d6fed6b32c
2022-01-24 15:53:42 +08:00
Junyu Lai
6629435836 [MS58] Expose Apis which will be used by data migration utility
This includes:
1. NetworkIdentity
2. NetworkIdentitySet
3. NetworkStatsHistory

NetworkStatsCollection Apis will be exposed in a separate CL.

Test: TH
Bug: 204830222
Change-Id: I47b2d3ac3b86cb4e6879afaae34326ca3c050ffa
2022-01-24 15:44:27 +08:00
Junyu Lai
7246788b30 Merge changes from topics "ms56-historybuilder", "ms65.3" am: 54bc16fc64
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1951478

Change-Id: I8f727a73716c3f06d8c946a7e014793c5c8046eb
2022-01-24 05:55:03 +00:00
Junyu Lai
54bc16fc64 Merge changes from topics "ms56-historybuilder", "ms65.3"
* changes:
  [MS56.1] Add NetworkStatsHistory#Builder
  [MS65.3] Address comments at aosp/1954383
2022-01-24 05:41:10 +00:00
Xiao Ma
824840d16d Move Ethernet related files to f/b/packages/ConnectivityT.
ethernet-service is going to be moved into Connectivity mainline module.
Notice that below sources are also only used in the ethernet framework
during compiling the filegroup: framework-connectivity-ethernet-sources.
Move them from f/b to f/b/packages/ConnectivityT as well.

Ethernet framework only related files:
    - IInternalNetworkManagementListener.aidl
    - InternalNetworkManagementException.java
    - InternalNetworkManagementException.aidl
    - InternalNetworkUpdateRequest.java
    - InternalNetworkUpdateRequest.aidl

Ethernet service only related files:
    - DelayedDiskWrite.java(IpConfigStore imports this class)

Bug: 210586283
Test: build pass
      atest FrameworksNetTests
      atest EthernetServiceTests
Change-Id: I1ec2d1d182c04f3f2acc9b757d5061ca749a4a3c
2022-01-24 04:15:14 +00:00
Ken Chen
2c73071f79 Merge "Delete libnetdbpf from linked libs used by libandroid_runtime" am: e0b5cb4c91
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1956981

Change-Id: I1bdcc1561ab0f707b7d65487fedeca440c455aae
2022-01-24 04:07:15 +00:00
Ken Chen
e0b5cb4c91 Merge "Delete libnetdbpf from linked libs used by libandroid_runtime" 2022-01-24 03:49:23 +00:00
Ken Chen
6b1e78332a Use libnetworkstats instead of libnetdbpf
The libnetdbpf is renamed to libnetworkstats.

Bug: 202086915
Test: m
Change-Id: I09a073b14dc74511ba9dc09a89ae6e89dff51f4d
2022-01-23 21:11:07 +08:00
Ken Chen
f6ec5cb588 Delete libnetdbpf from linked libs used by libandroid_runtime
libandroid_runtime does not depend on libnetdbpf

Bug: 202086915
Test: m
Change-Id: I4aab43851b1b3e4faada147d9e70f39777d74648
2022-01-23 17:26:07 +08:00
Junyu Lai
504c37630d [MS56.1] Add NetworkStatsHistory#Builder
NetworkStatsHistory will need to be exposed and constructed
from the data migration tool in the follow-up changes.
Add a Builder class to prevent from exposing internal array
structures.

Test: atest NetworkStatsHistoryTest#testBuilder
Bug: 204830222
Change-Id: I5f8ea1c825d601de0aac8623034ef896999fc1a0
2022-01-23 16:47:44 +08:00
Junyu Lai
8de23851a0 [MS65.3] Address comments at aosp/1954383
This change also remove dependencies from
NetworkPolicyManagerService.

Test: atest NetworkIdentityTest#testBuilder \
      NetworkPolicyManagerServiceTest
Bug: 204830222
Change-Id: Ib1ec1968746d88165cbf5421d4ba30a00f4b678f
2022-01-23 16:47:36 +08:00