654724 Commits

Author SHA1 Message Date
Thiébaud Weksteen
2130d975b5 Merge "Replace security_context_t type" am: 8bf8b19e84
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1827241

Change-Id: Ib903b986d77efb785d4e3fa1509f0146b66f3609
2021-09-20 07:22:48 +00:00
Thiébaud Weksteen
8bf8b19e84 Merge "Replace security_context_t type" 2021-09-20 07:06:33 +00:00
Yi Kong
daa2a19c60 Merge "Fix an instance of -Wunused-but-set-variable." am: c10adebed6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1829955

Change-Id: I7095f3e7ce171f0be9402d91475b74e623316545
2021-09-18 08:14:34 +00:00
Yi Kong
c10adebed6 Merge "Fix an instance of -Wunused-but-set-variable." 2021-09-18 07:57:46 +00:00
Alice Kuo
399c36babb csip: Expose an extra data with intent and store in CachedBluetoothDevice
Bug: 178981521
Bug: 150670922
Test: Discover and pair with the CSIP supported device, and check the
pairing string in the dialog

Merged-In: I3e99c59e0cb974409291e1b4c28393106784e133
Change-Id: I3e99c59e0cb974409291e1b4c28393106784e133
2021-09-18 01:02:32 +00:00
Alice Kuo
cc3fb6dd85 Merge "csip: Expose an extra data with intent and store in CachedBluetoothDevice" into stage-aosp-master 2021-09-18 00:40:17 +00:00
wescande
4f2420f84b Migrate dependency from base to modules-utils
Use stand-alone modules-utils library.

Bug: 198418216
Tag: #refactor
Test: Build
Merged-In: I248dc29e68d3564c6723626b683b10c8a863853f
Change-Id: I248dc29e68d3564c6723626b683b10c8a863853f
2021-09-17 20:41:26 +00:00
Yi Kong
b5cab25730 Fix an instance of -Wunused-but-set-variable.
Test: presubmit
Bug: 197240255
Change-Id: Iedb28903cfada8d23e931196b72059a0fc8797aa
2021-09-18 02:28:22 +08:00
Alice Kuo
e12ff23a6d csip: Expose an extra data with intent and store in CachedBluetoothDevice
Bug: 178981521
Bug: 150670922
Test: Discover and pair with the CSIP supported device, and check the
pairing string in the dialog

Change-Id: I3e99c59e0cb974409291e1b4c28393106784e133
2021-09-17 17:29:11 +00:00
Anton Hansson
fa5d0bc676 Add doc stubs target that uses module stub source
The framework-doc-stubs target currently takes the module source code
as input. Work is being done to change that over to use module sdk
artifacts, primarily the jar stub source code. Check in a
work-in-progress target that does so, to avoid it breaking and to
simplify iterating on improvements.

Bug: 186197911
Test: m framework-doc-stubs{,-module-stubs}
Change-Id: I1a275b3f44632e6655dc84d711a58fc0c5b3a46a
2021-09-17 17:22:03 +01:00
Anton Hansson
6492126ca3 Add doc stubs target that uses module stub source
The framework-doc-stubs target currently takes the module source code
as input. Work is being done to change that over to use module sdk
artifacts, primarily the jar stub source code. Check in a
work-in-progress target that does so, to avoid it breaking and to
simplify iterating on improvements.

Bug: 186197911
Test: m framework-doc-stubs{,-module-stubs}
Merged-In: I1a275b3f44632e6655dc84d711a58fc0c5b3a46a
Change-Id: I1a275b3f44632e6655dc84d711a58fc0c5b3a46a
2021-09-17 17:21:41 +01:00
Pedro Loureiro
6476e035da Add patb@ as a owner of SystemConfig tests
Giving ownership of
    services/tests/servicestests/src/com/android/server/systemconfig/

Test: N/A
Change-Id: Ifae11b700bd5f2134cb7e31d50d02d204b649f7c
2021-09-17 16:06:08 +00:00
TreeHugger Robot
973054171a Merge "Migrate dependency from base to modules-utils" into stage-aosp-master 2021-09-17 15:34:45 +00:00
Anton Hansson
fabe544f0f Merge "Move annotations in public api to frameworks/base" am: f664101210
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1827246

Change-Id: Ifcb7b8b4e186c5815b0602d22f0dbae1dbbe03b1
2021-09-17 14:20:05 +00:00
Anton Hansson
f664101210 Merge "Move annotations in public api to frameworks/base" 2021-09-17 14:01:20 +00:00
Anton Hansson
e0f3d2348f Move annotations in public api to frameworks/base
These two are the only annotations in the android.annotations package
that are not @hide -- they are actually in the public API.

As such, they are not suitable in the annotations library. Move them
back to frameworks/base where the other core java APIs live.

Bug: 186197911
Test: m
Merged-In: Ide01e4e7840bddf1e024e9024771e528d17a1d80
Change-Id: Ide01e4e7840bddf1e024e9024771e528d17a1d80
2021-09-17 12:31:50 +00:00
Aaron Huang
b8b78051eb Merge "Remove forceAllNetworkTypes from test" am: bc48cdaf46
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1824613

Change-Id: I460b93a1a9d04ecdf687761eea3461ecf0346860
2021-09-17 12:25:04 +00:00
Aaron Huang
bc48cdaf46 Merge "Remove forceAllNetworkTypes from test" 2021-09-17 12:08:59 +00:00
Roopa Sattiraju
b3ba6cdbed Adding sattiraju@ as OWNER and also changing the order of ldaps to be
alphabetical

Tag: #feature
Bug: 200240100
Test: Manual
Change-Id: I15ccfeae1e1a061a002be9c2e202104352b1ce98
2021-09-16 23:47:19 -07:00
Treehugger Robot
90e0a894eb Merge "Keep only the classes in the android.test.mock package" am: 70a0869f49
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1824624

Change-Id: I5b4e93c719b31489611e64da97b041fc60b19c8a
2021-09-17 04:29:40 +00:00
Treehugger Robot
70a0869f49 Merge "Keep only the classes in the android.test.mock package" 2021-09-17 04:15:39 +00:00
Colin Cross
b0272195f6 [automerger skipped] Merge "Fix idmap2 compiling against musl" am: 3ba8a37ee5 -s ours
am skip reason: Merged-In If8829cebb0c62b539d7a336b75cf106755588cdd with SHA-1 9192abcf13 is already in history

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

Change-Id: Iddf148ed57158d917fcfd1aec0d1cbd1de48bcb7
2021-09-17 02:03:38 +00:00
Colin Cross
d5b3d74850 Merge "Fix framworks/base compiling against musl" am: 2cba49ac56
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1828072

Change-Id: Icb43a2cb677d14772044cfe62e16e9cce5327f45
2021-09-17 02:02:58 +00:00
Colin Cross
3ba8a37ee5 Merge "Fix idmap2 compiling against musl" 2021-09-17 01:48:03 +00:00
Colin Cross
2cba49ac56 Merge "Fix framworks/base compiling against musl" 2021-09-17 01:47:58 +00:00
Qasim Javed
d93483f74b Make createBond(int) a system API
BUG: 195156317
Test: Manual

Change-Id: I10d9ac305cbc1bb28c8150e1b167a0e61ad3f04e
Merged-In: I10d9ac305cbc1bb28c8150e1b167a0e61ad3f04e
2021-09-16 22:38:47 +00:00
Qasim Javed
5a4c7d4aaa Merge "Make createBond(int) a system API" into stage-aosp-master 2021-09-16 22:34:47 +00:00
Qasim Javed
5cebaaa562 Make createBond(int) a system API
BUG: 195156317
Test: Manual

Change-Id: I10d9ac305cbc1bb28c8150e1b167a0e61ad3f04e
2021-09-16 13:07:58 -07:00
Colin Cross
8af0caf41d Fix idmap2 compiling against musl
Add missing includes that are not transitively provided when compiling
against musl.

Bug: 190084016
Test: m USE_HOST_MUSL=true
Change-Id: If8829cebb0c62b539d7a336b75cf106755588cdd
Merged-In: If8829cebb0c62b539d7a336b75cf106755588cdd
2021-09-16 19:25:28 +00:00
Jakub Pawlowski
f3ed7d2553 Merge "settingslib: Add Coordinated Set Profile" am: b77efab6f3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1749723

Change-Id: Ica3e76aabf1b993c52acce676ced4fd4b6a1a9e5
2021-09-16 18:39:27 +00:00
Jakub Pawlowski
b77efab6f3 Merge "settingslib: Add Coordinated Set Profile" 2021-09-16 18:22:19 +00:00
Jakub Tyszkowski
565cd270ca settingslib: Add Coordinated Set Profile
Test: manually tested
Bug: 150670922
Sponsor: jpawlowski@
Change-Id: I9dc21c011ee2e2d6c9d4d671210d7fef390419e9
2021-09-16 18:20:10 +00:00
Colin Cross
5f9fe6e37c Merge "Fix idmap2 compiling against musl" into stage-aosp-master 2021-09-16 16:25:38 +00:00
Treehugger Robot
8b93d78c01 Merge changes I8c36f5af,I800bc352 am: 9acfdcf214
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1826714

Change-Id: I5b6c9dc465cd733569ec33afacee530e5b27eb11
2021-09-15 23:45:25 +00:00
Treehugger Robot
9acfdcf214 Merge changes I8c36f5af,I800bc352
* changes:
  AudioEffect: fix racy access to callback data
  Analyze native crash in AudioEffect via event listener
2021-09-15 23:26:15 +00:00
Colin Cross
9192abcf13 Fix idmap2 compiling against musl
Add missing includes that are not transitively provided when compiling
against musl.

Bug: 190084016
Test: m USE_HOST_MUSL=true
Change-Id: If8829cebb0c62b539d7a336b75cf106755588cdd
2021-09-15 15:08:20 -07:00
Colin Cross
7cdbd68610 Fix framworks/base compiling against musl
Add missing includes that are not transitively provided when compiling
against musl.

Bug: 190084016
Test: m USE_HOST_MUSL=true
Change-Id: Ia22c3df2e904e7a479bb636b7db22e5a0c341b98
2021-09-15 14:59:24 -07:00
Mikhail Naganov
9690a02f80 AudioEffect: fix racy access to callback data
Since the EffectCallback in android::AudioEffect can
keep an instance of the latter alive for a longer time
than Java AudioEffect is alive, the callback need to
ensure that it's not trying to use deallocated objects
and deleted JVM references.

Bug: 178363662
Test: manual using EffectsTest app
Test: atest CtsMediaTestCases:AudioEffectTest
Test: atest CtsMediaTestCases:BassBoostTest
Test: atest CtsMediaTestCases:DynamicsProcessingTest
Test: atest CtsMediaTestCases:EnvReverbTest
Test: atest CtsMediaTestCases:EqualizerTest
Test: atest CtsMediaTestCases:LoudnessEnhancerTest
Test: atest CtsMediaTestCases:PresetReverbTest
Test: atest CtsMediaTestCases:VisualizerTest
Change-Id: I8c36f5af4a1a2b14e81b1344570d2f8746ffa91e
2021-09-15 13:58:30 -07:00
Thiébaud Weksteen
1fa50e17f4 Replace security_context_t type
security_context_t has been marked as deprecated in libselinux from
version 3.2. Update to the `char*` type.

Bug: 190808996
Test: m
Change-Id: Ia632230e28c313d08119286973a5cf6401ef6910
2021-09-15 19:50:31 +02:00
Samiul Islam
bdbf40efd6 libbinder: split out PackageManagerNative aidl
Very few clients of libbinder use PackageManagerNative service, as such
it's a waste to couple them together. Now, user of PackageManagerNative
service need to add the corresponding aidl files as shared library.

Bug: 183654927
Test: builds + presubmit

Change-Id: Ie64fb3502d8e5164df4710feb2f525db7c4234a2
Merged-In: Ie64fb3502d8e5164df4710feb2f525db7c4234a2
2021-09-15 12:48:13 +00:00
Aaron Huang
8216831b36 Remove forceAllNetworkTypes from test
A test should test the actual behavior as much as possible.
However, if the flag is true, matchesMobile/matchesMobileWildcard
will always return true regardless of the network type and metered.
Thus, remove this flag would be closer to the actual behavior.

Bug: 183776809
Test: atest FrameworksNetTests
Change-Id: I0907a08ca1dd8a14a738db4057ea5ff6a0cd925a
2021-09-15 18:30:09 +08:00
Samiul Islam
dc11f7e67a libbinder: split out PackageManagerNative aidl
Very few clients of libbinder use PackageManagerNative service, as such
it's a waste to couple them together. Now, user of PackageManagerNative
service need to add the corresponding aidl files as shared library.

Bug: 183654927
Test: builds + presubmit

Change-Id: Ie64fb3502d8e5164df4710feb2f525db7c4234a2
Merged-In: Ie64fb3502d8e5164df4710feb2f525db7c4234a2
(cherry picked from commit e45612731034e6a5283516424325a7ab108722e8)
2021-09-15 11:18:53 +01:00
Austin Shin
f3b6f05c6a Merge "Fix onStateChanged issue." am: 61c3d559c8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1822992

Change-Id: Ie729ef7defddbe3fd55699480f6f3cf63d32b8c8
2021-09-15 04:15:50 +00:00
Austin Shin
61c3d559c8 Merge "Fix onStateChanged issue." 2021-09-15 03:57:16 +00:00
Roopa Sattiraju
f46dea86b0 [automerger skipped] Merge "Changing BluetoothHeadset APIs from @hide to @SystemApi" am: 2ef5e10f45 -s ours
am skip reason: Merged-In I02b2e7e5e0be3b462f7c25b655e669e2c7fe47eb with SHA-1 ce1d2e1fb4 is already in history

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

Change-Id: I84d8265b2cdbd6f5ed005d968f04b9f27f1aee79
2021-09-15 01:24:38 +00:00
Roopa Sattiraju
2ef5e10f45 Merge "Changing BluetoothHeadset APIs from @hide to @SystemApi" 2021-09-15 01:12:09 +00:00
Mikhail Naganov
7d6d9bd6c3 Analyze native crash in AudioEffect via event listener
Add repro code to the EffectsTest app. Steps:
 1. Start playback on the "Environmental Reverb Test",
    memorize the session id.
 2. Enter the session id on the "Bass Boost Test" or
    the "Visualizer" tab.
 3. Press "Hammer on release()" multiple times and check
    if the app crashes. Currently this happens for
    the Bass Boost effect.

Bug: 178363662
Test: see above
Change-Id: I800bc352fc8bc7073d1523c837008dc6fcfb957a
2021-09-14 17:55:36 -07:00
Treehugger Robot
41bf6fa76f Merge "MediaCodecInfo: do not alter performance points for 32-bit processes (2)" am: a78fa61ba8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1787047

Change-Id: Ifb7b56c1e3088183cc2881a1b75b6b09ab549255
2021-09-14 23:35:17 +00:00
Treehugger Robot
a78fa61ba8 Merge "MediaCodecInfo: do not alter performance points for 32-bit processes (2)" 2021-09-14 23:21:32 +00:00
Treehugger Robot
7052180c60 Merge "Fix typos in IdentityCredential.java javadoc" am: 37677f40d0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1826574

Change-Id: I9f59a551b33b3d030b2a4718ad48d29690875d15
2021-09-14 22:24:08 +00:00