Automerger Merge Worker
f8ffb88d99
Merge "Add an Indication for Barring Info" am: b89ad206e8 am: fa48664be2
...
Change-Id: I684a7b509612acebb166c2a1607814ad9c5c07e6
2020-01-14 19:21:28 +00:00
Nathan Harold
fa48664be2
Merge "Add an Indication for Barring Info"
...
am: b89ad206e8
Change-Id: I9ca8e93fceaddf15f76562289a4687ebe83f921d
2020-01-14 11:06:28 -08:00
Nathan Harold
b89ad206e8
Merge "Add an Indication for Barring Info"
2020-01-14 18:53:26 +00:00
Automerger Merge Worker
48ea7213f3
Merge "vibrator vts: use CompositePrimitives enum_range" am: d895913f1b am: 8679c62cb7
...
Change-Id: I0ebc9c9add8bb89406fe0e9890ed688c7e8eb3f5
2020-01-14 17:31:16 +00:00
Steven Moreland
8679c62cb7
Merge "vibrator vts: use CompositePrimitives enum_range"
...
am: d895913f1b
Change-Id: I7c8dbfe94c00daf855560b904e443d6bc8ab3522
2020-01-14 09:17:41 -08:00
Steven Moreland
d895913f1b
Merge "vibrator vts: use CompositePrimitives enum_range"
2020-01-14 17:16:33 +00:00
Nathan Harold
4bb9d310d4
Add an Indication for Barring Info
...
Add an indication and request+response to get updated
barring information for the current cell.
Bug: 143231559
Bug: 143226991
Test: compilation && atest VtsHalRadioV1_5TargetTest
Change-Id: I226cf66dd6b9b71a6c020cdd618fe5e2af0baa20
2020-01-14 01:09:08 +00:00
Automerger Merge Worker
bb395c0eec
Merge "Audio HAL: Add API to attach an effect to a device" am: 77367c822f am: e8c3a65032
...
Change-Id: I64cb5b918357c7cb83e7482421cf7f6f19220f54
2020-01-13 22:06:07 +00:00
Automerger Merge Worker
84e61fa46d
Merge "Audio effect HAL: Add device ID to createEffect API" am: 7408b1d575 am: a462b797c2
...
Change-Id: I942c516054a0e6c9ad83edbe767db15b2422e96f
2020-01-13 22:05:38 +00:00
Automerger Merge Worker
82f10ce231
Merge "audio: add audio session for device effects" am: 65dd35c9bf am: f0e10d0bbd
...
Change-Id: I4831446fcd687909791bd64afa633d4bd2a8adfc
2020-01-13 22:03:45 +00:00
Eric Laurent
e8c3a65032
Merge "Audio HAL: Add API to attach an effect to a device"
...
am: 77367c822f
Change-Id: Icaa3489b5121261862bc5f86a278719199210ce2
2020-01-13 13:57:40 -08:00
Eric Laurent
a462b797c2
Merge "Audio effect HAL: Add device ID to createEffect API"
...
am: 7408b1d575
Change-Id: Ia045745c0f0fd90bfe065075ab09fea4cbc338f8
2020-01-13 13:55:41 -08:00
Eric Laurent
f0e10d0bbd
Merge "audio: add audio session for device effects"
...
am: 65dd35c9bf
Change-Id: Ia7f9dcdde50ecd05c4f038188e1ca3b0868e6e9f
2020-01-13 13:48:25 -08:00
Eric Laurent
77367c822f
Merge "Audio HAL: Add API to attach an effect to a device"
2020-01-13 21:40:24 +00:00
Eric Laurent
7408b1d575
Merge "Audio effect HAL: Add device ID to createEffect API"
2020-01-13 21:39:45 +00:00
Eric Laurent
65dd35c9bf
Merge "audio: add audio session for device effects"
2020-01-13 21:38:31 +00:00
Automerger Merge Worker
c767ab1482
Add Some Buffer Lines to Avoid Merge Conflicts am: 1fd6b723df am: 68bd27a397
...
Change-Id: If316a397c9ff98ef9ee5d89b78949643f104c8d1
2020-01-11 00:23:54 +00:00
Nathan Harold
68bd27a397
Add Some Buffer Lines to Avoid Merge Conflicts
...
am: 1fd6b723df
Change-Id: I8259a5012113d2c85d81be63249b50e214c02770
2020-01-10 16:07:10 -08:00
Nathan Harold
1fd6b723df
Add Some Buffer Lines to Avoid Merge Conflicts
...
Because other teams are changing HAL hashes downstream,
the git conflict resolution algorithm detects conflicts
due to changes in adjacent lines, even though they aren't
real conflicts. This CL adds buffer lines to convince git
and by extension the auto-merger that the changes may be
safely merged.
Note: these should be removed prior to release.
Bug: 144366823
Test: make (non-functional change)
Merged-In: Ie8785da99ce68e1db85face30c6c633385ecb085
Change-Id: Ie8785da99ce68e1db85face30c6c633385ecb085
(cherry picked from commit 857821c288 )
2020-01-10 23:07:05 +00:00
Automerger Merge Worker
db335ad7fb
Add quantized LSTM op. am: 232cfebd5b am: f3c5bf1cc8
...
Change-Id: Id65be5918a4443aed80d5fc1b62eda3b7cf0c404
2020-01-10 21:01:03 +00:00
Viet Dang
f3c5bf1cc8
Add quantized LSTM op.
...
am: 232cfebd5b
Change-Id: I5ad0d25f2ce99cf452c9d485516b8f2323325443
2020-01-10 12:48:54 -08:00
Steven Moreland
1c26978dd1
vibrator vts: use CompositePrimitives enum_range
...
Bug: 143992652
Test: TH (added TEST_MAPPING now)
Change-Id: If36ba0d2fa41db1b05bb1d65e6ee062b22c1b564
2020-01-10 19:27:14 +00:00
Eric Laurent
2c75ca6b27
Audio HAL: Add API to attach an effect to a device
...
Add a method to IDevice interface allowing the attachement of an
audio effect to an audio device.
This is used when an audio effect is implemented below the HAL (e.g by an audio DSP)
and is attached/enabled when a particular sink(e.g speaker) or source(e.g mic) device
is selected.
Bug: 136294538
Test: make
Change-Id: I73d78c4f234fd80443a1cb3772c2d65457968652
Merged-In: I73d78c4f234fd80443a1cb3772c2d65457968652
2020-01-10 11:16:42 -08:00
Eric Laurent
d33e6935e0
Audio effect HAL: Add device ID to createEffect API
...
Add the possibility to specify a target audio device when
creating an audio effect by passing its audio port handle
to createEffect API.
To attach an effect to a device, the framework will use
session ID AudioSessionConsts.DEVICE and provide a valid
AudioPortHandle as device ID.
Bug: 136294538
Test: make
Change-Id: Ic697eeafbd5df6800ad4c7fd9e0698e3d8e3beae
Merged-In: Ic697eeafbd5df6800ad4c7fd9e0698e3d8e3beae
2020-01-10 11:16:32 -08:00
Eric Laurent
5f9bb1b027
audio: add audio session for device effects
...
Add specific audio session ID for effects applied to a
particular audio device.
Bug: 136294538
Test: make
Change-Id: Iea3e3a07f404e1075844422c740d2dc4d5163598
Merged-In: Iea3e3a07f404e1075844422c740d2dc4d5163598
2020-01-10 11:16:12 -08:00
Viet Dang
232cfebd5b
Add quantized LSTM op.
...
Bug: 144841609
Test: NeuralNetworksTest_static
Change-Id: I8aab51695382211e003d8fc442d33bae3006dc13
Merged-In: I8aab51695382211e003d8fc442d33bae3006dc13
(cherry picked from commit c8b0cd33b9 )
2020-01-10 11:15:14 +00:00
Automerger Merge Worker
6ebbd1fcb9
Merge "Update health 2.1 readme for file_contexts" am: a676535934 am: 29812d24ae
...
Change-Id: I321e36cacc2d80246296c3fa57c3fd28d89d8ab3
2020-01-10 10:32:02 +00:00
Yifan Hong
29812d24ae
Merge "Update health 2.1 readme for file_contexts"
...
am: a676535934
Change-Id: Ife24c7407631472a283f1ca3844a27c803637fb8
2020-01-10 02:20:23 -08:00
Yifan Hong
a676535934
Merge "Update health 2.1 readme for file_contexts"
2020-01-10 10:17:14 +00:00
Yifan Hong
ca44707aea
Update health 2.1 readme for file_contexts
...
-impl file needs to be marked as same_process_hal_file
for charger to work.
Test: none
Change-Id: I998493949284362fbd1dcb8e2a1d48958feb1324
2020-01-09 17:20:10 -08:00
Automerger Merge Worker
be0f9bb836
Add Indication Filter for Registration Failure am: bacb8216d5 am: ebc2d054f2
...
Change-Id: I51caac2b66d4b166612feee5f401b7bc40b81471
2020-01-10 00:50:52 +00:00
Nathan Harold
ebc2d054f2
Add Indication Filter for Registration Failure
...
am: bacb8216d5
Change-Id: I1f47b0f0cdd9ae5bf3fdb18deb9f23187601ab23
2020-01-09 16:40:10 -08:00
Nathan Harold
bacb8216d5
Add Indication Filter for Registration Failure
...
-Add IndicationFilter support for Radio 1.5.
-Add a new flag for disabling Registration Failure
indications.
Bug: 146805410
Test: make && atest VtsHalRadioV1_5TargetTest
Change-Id: Idcfb3ed64624fe7549b6fa0e434f24ca0f5d42f1
2020-01-09 10:42:40 -08:00
Automerger Merge Worker
66fb6492f5
default drm hidl: Fix decrypt destination base ptr am: d79abbb0d3 am: 86828796ac am: 44fa9a5cf0 am: 0e8630788f am: 119b9ea01d am: 43f65e0f60
...
Change-Id: I66ebe64f3387a8b46eb745c6b037877605e05945
2020-01-09 05:21:10 +00:00
Automerger Merge Worker
43f65e0f60
default drm hidl: Fix decrypt destination base ptr am: d79abbb0d3 am: 86828796ac am: 44fa9a5cf0 am: 0e8630788f am: 119b9ea01d
...
Change-Id: I3aa8e6635baf17b395bd54e03fb6e59160bc9c7f
2020-01-09 05:04:00 +00:00
Automerger Merge Worker
119b9ea01d
default drm hidl: Fix decrypt destination base ptr am: d79abbb0d3 am: 86828796ac am: 44fa9a5cf0 am: 0e8630788f
...
Change-Id: I73b41a1aebe7dec987e637ca30c9d65b1aedc41e
2020-01-09 04:51:59 +00:00
Automerger Merge Worker
0e8630788f
default drm hidl: Fix decrypt destination base ptr am: d79abbb0d3 am: 86828796ac am: 44fa9a5cf0
...
Change-Id: Ie67b811fe2a172d9a33458ed5c23578c71a0a221
2020-01-09 04:33:04 +00:00
Automerger Merge Worker
44fa9a5cf0
default drm hidl: Fix decrypt destination base ptr am: d79abbb0d3 am: 86828796ac
...
Change-Id: I4fac71fd9946d37a7a3b1d32a611f007de3e5303
2020-01-09 04:14:08 +00:00
Automerger Merge Worker
86828796ac
default drm hidl: Fix decrypt destination base ptr am: d79abbb0d3
...
Change-Id: Ifaa69ef0ed98f90a42a66b7b64ef9d61457af107
2020-01-09 03:59:10 +00:00
Automerger Merge Worker
c34bb73c70
[DO NOT MERGE] Fix SHAs in IRadio 1.5 am: 755bf306ef am: 193716eee2
...
Change-Id: Ia07b60fc539a2e1bd2d723b68fc5a1d7baf4ddae
2020-01-09 01:16:34 +00:00
Nathan Harold
193716eee2
[DO NOT MERGE] Fix SHAs in IRadio 1.5
...
am: 755bf306ef
Change-Id: Ic5c021ae3e0066e05ba4fc52aaf890edf75bd307
2020-01-08 17:02:47 -08:00
Nathan Harold
755bf306ef
[DO NOT MERGE] Fix SHAs in IRadio 1.5
...
Tweak files in AOSP and update SHAs to match internal master.
Bug: 147379351
Test: update-makefiles
Change-Id: Iac00853bc00c003848b3d45ebb19d15c4f6fba0b
2020-01-08 23:48:01 +00:00
Automerger Merge Worker
c5ef701aae
Merge "Add audio stream and usage for virtual assistant" am: 653c876b5b am: d271a631d0
...
Change-Id: I3ec66f2331f1d7fe51dcf93068696089dfbce11c
2020-01-08 22:46:30 +00:00
Baekgyeong Kim
d271a631d0
Merge "Add audio stream and usage for virtual assistant"
...
am: 653c876b5b
Change-Id: Ie568e4ef23a687249fd5bfbf9f27d7de5a09bf9e
2020-01-08 14:29:45 -08:00
Treehugger Robot
653c876b5b
Merge "Add audio stream and usage for virtual assistant"
2020-01-08 22:23:27 +00:00
Baekgyeong Kim
09e665e61c
Add audio stream and usage for virtual assistant
...
New stream type: AUDIO_STREAM_ASSISTANT
This is intended to be used by a virtual assistant like
Google Assistant, Bixby, etc.
The audio stream has own volume alias and the volume
does not change by volume changes of other streams.
Bug: 123745215
Test: make
Change-Id: I3696d8fba32070954cc6a330574af8507fea7a74
Merged-In: I3696d8fba32070954cc6a330574af8507fea7a74
2020-01-08 11:53:59 -08:00
Automerger Merge Worker
e876443913
Merge "[vts-core] add VtsHalAudioEffectV*_0TargetTest to vts-core" am: 4472878a42 am: 96dd61d29b
...
Change-Id: I8841dfe4b46102173e64755dfe36b09e32af6ee5
2020-01-08 03:25:43 +00:00
nelsonli
96dd61d29b
Merge "[vts-core] add VtsHalAudioEffectV*_0TargetTest to vts-core"
...
am: 4472878a42
Change-Id: Icc9fd217f09b8a1f31efde01f1fe9c00e845e90d
2020-01-07 19:09:51 -08:00
Treehugger Robot
4472878a42
Merge "[vts-core] add VtsHalAudioEffectV*_0TargetTest to vts-core"
2020-01-08 02:12:09 +00:00
Automerger Merge Worker
ef9e0c98d9
Merge "vibrator: use package as name" am: 91a5aa4ea2 am: 8aa0dd830f
...
Change-Id: I3aa4a55b19914066198c44f28bef0f4232ab8f3d
2020-01-07 23:07:39 +00:00