Commit Graph

567498 Commits

Author SHA1 Message Date
Junyu Lai
71bc2b560d Merge "[VCN14] Expose registerBestMatchingNetworkCallback" am: 29908cf3c4 am: 07f3bc9d6e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1635047

Change-Id: I3882363a6c08372c2f50f209452123b50c7ec4e5
2021-03-16 23:55:13 +00:00
Hall Liu
0c9184f87e Merge "Add carrier config keys for RTT-VT compat" am: 2ab1cc0fac am: 4b4f0e38a1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1636900

Change-Id: Ie917e29b77236665308dde0384d88073b6439125
2021-03-16 23:54:42 +00:00
Junyu Lai
07f3bc9d6e Merge "[VCN14] Expose registerBestMatchingNetworkCallback" am: 29908cf3c4
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1635047

Change-Id: I4d475e1a681473c244afe4d3eaaabbcfaa9af9d6
2021-03-16 23:43:07 +00:00
Christian Wailes
adbdbbf168 Merge "Adds tests for Install Scenarios to DexManagerTests" am: 98432e96b0 am: 719599d844
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1634484

Change-Id: I33b77eb9e3601e2744e4e354d34a743e845bb773
2021-03-16 23:35:50 +00:00
Hall Liu
4b4f0e38a1 Merge "Add carrier config keys for RTT-VT compat" am: 2ab1cc0fac
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1636900

Change-Id: I4eda5a40309922e27d2171617ad6b50469d5ae67
2021-03-16 23:35:26 +00:00
Andy Hung
d7ebcd20f9 Merge "SoundPool: Improve single stream SoundPool handling" am: 0f8c08544a am: 4140a29ad5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1640980

Change-Id: Ia9a5ec255a1d35dbefe882980db682a077079888
2021-03-16 23:35:24 +00:00
Junyu Lai
29908cf3c4 Merge "[VCN14] Expose registerBestMatchingNetworkCallback" 2021-03-16 23:31:29 +00:00
Hall Liu
2ab1cc0fac Merge "Add carrier config keys for RTT-VT compat" 2021-03-16 23:21:34 +00:00
Christian Wailes
719599d844 Merge "Adds tests for Install Scenarios to DexManagerTests" am: 98432e96b0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1634484

Change-Id: Iad727f1f205ae44b624694273c671da1f8267466
2021-03-16 23:16:42 +00:00
Christian Wailes
98432e96b0 Merge "Adds tests for Install Scenarios to DexManagerTests" 2021-03-16 23:02:39 +00:00
Andy Hung
4140a29ad5 Merge "SoundPool: Improve single stream SoundPool handling" am: 0f8c08544a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1640980

Change-Id: I3c7531be6f4783a87f54c01329eb519c15f95318
2021-03-16 22:56:39 +00:00
Andy Hung
0f8c08544a Merge "SoundPool: Improve single stream SoundPool handling" 2021-03-16 22:24:05 +00:00
Andy Hung
43da3d54c4 SoundPool: Improve single stream SoundPool handling
By design, the StreamManager ramps down volume
on a Stream stop to prevent pops and glitches.
When the SoundPool is configured only with a single stream,
there may be a short period of unavailability of that stream
while stop is called by the worker thread; an immediate
play after a stop may return 0 (failure).

To allow immediate play after stop for a *single* Stream configured
SoundPool, we lock the StreamManager worker thread so that the
stop call is processed and the stream is visible to the client for use.

We prefer not to keep this lock for the multiple Stream case as it
prevents concurrent initiation of sounds from multiple StreamManager
worker threads and such blocking is not appropriate for games.

Test: SoundPoolAacTest SoundPoolHapticTest
Test: SoundPoolMidiTest SoundPoolOggTest
Bug: 175097719
Bug: 177287876
Merged-In: Iec777d6319d5ed76000d4c5b12336b106dacede4
Change-Id: Iec777d6319d5ed76000d4c5b12336b106dacede4
2021-03-16 21:01:05 +00:00
Yan Wang
ed0d068f0c Merge "Rename enum in ArtDexMetadataType with appropriate prefix." am: 59437812ad am: 637ebffc04
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1639439

Change-Id: Ia0335c3e5e391f170a0a9893cf43980c4d268c37
2021-03-16 18:40:03 +00:00
Henry Fang
bd07cdc90b Merge "Tuner FW: clean up Dvr/Filter message-queue resources upon close" am: e42498a501 am: c86d34a950
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1634480

Change-Id: I747f2bb48f1464e996c6fd460f51b3709f6d471a
2021-03-16 18:39:36 +00:00
Yan Wang
637ebffc04 Merge "Rename enum in ArtDexMetadataType with appropriate prefix." am: 59437812ad
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1639439

Change-Id: Icdd6a1986fbe418532aedc1c99be7964bab95098
2021-03-16 18:13:30 +00:00
Henry Fang
c86d34a950 Merge "Tuner FW: clean up Dvr/Filter message-queue resources upon close" am: e42498a501
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1634480

Change-Id: I78dc795490b8df139cda241be12fcbbbaf2fbb3b
2021-03-16 18:04:44 +00:00
Yan Wang
59437812ad Merge "Rename enum in ArtDexMetadataType with appropriate prefix." 2021-03-16 17:34:51 +00:00
Henry Fang
e42498a501 Merge "Tuner FW: clean up Dvr/Filter message-queue resources upon close" 2021-03-16 17:18:48 +00:00
Treehugger Robot
de535f6eb2 Merge "Use ro.boot.qemu to check if the device is an emulator" am: 62d82e0b33 am: 4ba8fde9ba
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1625662

Change-Id: I039b17ca0bf956ee3d86c72edcbf81957938ae4b
2021-03-16 17:17:20 +00:00
Junyu Lai
14865c4e07 Merge "[VCN13] Implement tracking best matching network" am: f98037abb3 am: a2a3640aab
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1633519

Change-Id: I49f94fb997e770874e851afaa5266c6fd2ba1396
2021-03-16 17:17:08 +00:00
Treehugger Robot
4ba8fde9ba Merge "Use ro.boot.qemu to check if the device is an emulator" am: 62d82e0b33
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1625662

Change-Id: I6d5cc128c81b01cbd3200c6e2e42812586cf29c1
2021-03-16 16:48:02 +00:00
Junyu Lai
a2a3640aab Merge "[VCN13] Implement tracking best matching network" am: f98037abb3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1633519

Change-Id: I58da6ebe747fe05609d9937814f4d47834418964
2021-03-16 16:39:41 +00:00
Treehugger Robot
62d82e0b33 Merge "Use ro.boot.qemu to check if the device is an emulator" 2021-03-16 16:31:57 +00:00
Nader Jawad
783410679c Merge "Update owners for EdgeEffect" am: 0ebddf5fdc am: 1693ebd5d5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1636081

Change-Id: I6f146b1d11f3fcf016aee15c93d853046b6186a1
2021-03-16 16:00:25 +00:00
Michele Berionne
a3e52d2724 Merge "Clarification for PREPARE_UNATTENDED_REBOOT_ERROR" am: 11773facb7 am: 8e7f7303cf
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1613109

Change-Id: I8636f713d0c81e8b7796e24efa7b41e3b17ede86
2021-03-16 16:00:01 +00:00
Junyu Lai
f98037abb3 Merge "[VCN13] Implement tracking best matching network" 2021-03-16 15:59:52 +00:00
Pierre Couillaud
ee14d5ea42 Tuner FW: clean up Dvr/Filter message-queue resources upon close
Bug: 182546718
Signed-off-by: Pierre Couillaud <pierre@broadcom.com>
Change-Id: I89374a334e86dd934a972989c318b5222f4ce769
Merged-In: Iea28f07a0800cbab88a1348fa7ae21ac17e1cfd8
2021-03-16 15:45:45 +00:00
Nader Jawad
1693ebd5d5 Merge "Update owners for EdgeEffect" am: 0ebddf5fdc
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1636081

Change-Id: I1d2f2f5f85759a54e99f20deead1ea9d64d8cb8b
2021-03-16 15:42:45 +00:00
Nader Jawad
0ebddf5fdc Merge "Update owners for EdgeEffect" 2021-03-16 15:28:24 +00:00
Michele Berionne
8e7f7303cf Merge "Clarification for PREPARE_UNATTENDED_REBOOT_ERROR" am: 11773facb7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1613109

Change-Id: I7adfce2945fd58cecad95bb194921fc5e120d74d
2021-03-16 15:23:10 +00:00
Michele Berionne
11773facb7 Merge "Clarification for PREPARE_UNATTENDED_REBOOT_ERROR" 2021-03-16 14:55:58 +00:00
junyulai
1eda2f6689 [VCN14] Expose registerBestMatchingNetworkCallback
Test: m -j doc-comment-check-docs
Bug: 175662146
Change-Id: Ie67dd2f4f8d973de37bc64a03908d7cbb7c2b7ad
2021-03-16 21:30:56 +08:00
junyulai
dbf52a2834 [VCN13] Implement tracking best matching network
This is done by:
  1. In requestNetwork, provide a basic permission check.
  2. rematchNetworksAndRequests: no change, since non listen
     requests will be automatically processed to track
     best satisfying network.
  3. applyNetworkReassignment: no change, since non-request
     will not be sent to factories.

Test: atest ConnectivityServiceTest#testRegisterBestMatchingNetworkCallback_noIssueToFactory
Test: atest ConnectivityServiceTest#testRegisterBestMatchingNetworkCallback_trackBestNetwork
Bug: 175662146
Change-Id: I8cf4ab334df6812d84cdda160e9b72b6f54062af
2021-03-16 21:30:55 +08:00
Paul Hu
542786989d Merge "Replace interal okhttp APIs" am: 96a89d8f43 am: 2989d99072
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1622669

Change-Id: I11df051ca4a32ab72b93cf0e7ebb21457e9a5196
2021-03-16 13:03:58 +00:00
Paul Hu
2989d99072 Merge "Replace interal okhttp APIs" am: 96a89d8f43
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1622669

Change-Id: I9f4e11b6e2ed2c5c09d7ea38e885de7186871edf
2021-03-16 12:44:35 +00:00
Lucas Lin
e64e4d52e7 Merge "Remove NETWORK_STACK_UID check" am: 7044a8f3c7 am: 9b45108b82
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1635323

Change-Id: I82eec664bd11bfb713e52c08fc38dc49dec973c4
2021-03-16 12:44:29 +00:00
Paul Hu
96a89d8f43 Merge "Replace interal okhttp APIs" 2021-03-16 12:18:49 +00:00
Lucas Lin
9b45108b82 Merge "Remove NETWORK_STACK_UID check" am: 7044a8f3c7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1635323

Change-Id: I5ae4b49d3168e48ccd6b61ee349ae89041e3de05
2021-03-16 12:06:10 +00:00
Lucas Lin
7044a8f3c7 Merge "Remove NETWORK_STACK_UID check" 2021-03-16 11:26:24 +00:00
Automerger Merge Worker
d29ed707b8 Merge "[automerger skipped] Merge "[RESTRICT AUTOMERGE]Fix launching app from work profile cannot show splash screen." into rvc-qpr-dev am: 7874170373 -s ours" into rvc-qpr-dev-plus-aosp 2021-03-16 09:45:45 +00:00
Lucas Lin
172cce09da Merge "Add comments to describe the value of converting hex to decimal" am: 5b30e438de am: 9307980e95
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1635221

Change-Id: I200d8ccb606e3bf440aaba0a875097b56b79a0c6
2021-03-16 09:45:35 +00:00
Wei Sheng Shih
c5718e901f [automerger skipped] Merge "[RESTRICT AUTOMERGE]Fix launching app from work profile cannot show splash screen." into rvc-qpr-dev am: 7874170373 -s ours
am skip reason: Change-Id I1bfd48fc32d549feee687c56fe9cdbcae789813f with SHA-1 413456e640 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13783255

Change-Id: Ic3c178496dfa4ada9a36963fde8e709b94ebc155
2021-03-16 09:45:32 +00:00
lucaslin
5c29439697 Remove NETWORK_STACK_UID check
NETWORK_STACK_UID check was introduced by aosp/1134635, and it
assumed that wifi factories/agents will be running on the network
stack process, but it didn't eventually. It runs in the system
server instead. So remove this check.

Bug: 170598012
Test: atest FrameworksNetTests
Change-Id: Ie11268738e364e252f18876f7a4a0dc064ca8b9c
2021-03-16 09:16:38 +00:00
Wei Sheng Shih
7874170373 Merge "[RESTRICT AUTOMERGE]Fix launching app from work profile cannot show splash screen." into rvc-qpr-dev 2021-03-16 09:14:10 +00:00
Lucas Lin
9307980e95 Merge "Add comments to describe the value of converting hex to decimal" am: 5b30e438de
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1635221

Change-Id: Id012600c0f06b25c90598543a20673e6f515bf29
2021-03-16 09:05:38 +00:00
Lucas Lin
3373b94c0d Merge "Have a new API to get private DNS mode" am: 179ecda65f am: 114103eaf2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1620860

Change-Id: I5441212823663f02d20cecfbfdba126c8ed6e0de
2021-03-16 08:46:31 +00:00
Lucas Lin
5b30e438de Merge "Add comments to describe the value of converting hex to decimal" 2021-03-16 08:31:10 +00:00
Lucas Lin
114103eaf2 Merge "Have a new API to get private DNS mode" am: 179ecda65f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1620860

Change-Id: I2600965b38f3039c0cca1c39d294ad9665aeab17
2021-03-16 08:06:35 +00:00
Lucas Lin
179ecda65f Merge "Have a new API to get private DNS mode" 2021-03-16 07:39:35 +00:00