Commit graph

13758 commits

Author SHA1 Message Date
Anil Admal
4d739e7201 Non-framework location access visibility and control (HAL)
Define IGnssVisibilityControl(Callback).hal interfaces to tell
the GNSS HAL implementation for which non-framework non-user
initiated emergency use cases, the framework user has granted
permission to the HAL implementation to provide GNSS location
information and to notify the framework user of these GNSS location
information deliveries.

Bug: 119560261
Test: Partial testing with cuttlefish
Change-Id: Ife704eb9fa4e6113196729b002bc9dc08bb47bc3
2019-01-15 14:45:32 -08:00
Steven Moreland
9bed22a4b5 Merge "clang-format: ContinuationIndentWidth: 8" am: c696782032 am: 43c0169b8e
am: d96ee967a2

Change-Id: I825db4d707580bc3b873a23f4b9161152d4bbf36
2019-01-14 17:30:11 -08:00
Steven Moreland
d96ee967a2 Merge "clang-format: ContinuationIndentWidth: 8" am: c696782032
am: 43c0169b8e

Change-Id: I719fafb0edb60c03379ff60ebcf189e5e8a452cd
2019-01-14 17:26:23 -08:00
Android Build Merger (Role)
fcfb697641 Merge "[automerger skipped] Merge "Bluetooth Audio HAL interface v2" am: 27a3c84ebd am: 68defe6e33 am: 120e1b9cd9 -s ours am skip reason: change_id I2ee4cf50b177baee077cf0b5143dbeadda57c8fb with SHA1 fcc0732db4 is in history" 2019-01-15 01:23:06 +00:00
Pavlin Radoslavov
5d1555eb3e [automerger skipped] Merge "Bluetooth Audio HAL interface v2" am: 27a3c84ebd am: 68defe6e33
am: 120e1b9cd9 -s ours
am skip reason: change_id I2ee4cf50b177baee077cf0b5143dbeadda57c8fb with SHA1 fcc0732db4 is in history

Change-Id: Ib14dfae318aed1fa5263576714b56eab7bf8e3ae
2019-01-14 17:22:37 -08:00
Jeff Tinker
6bd553760d Merge "Add additional error conditions to MediaDrm" 2019-01-15 01:22:16 +00:00
Pavlin Radoslavov
120e1b9cd9 Merge "Bluetooth Audio HAL interface v2" am: 27a3c84ebd
am: 68defe6e33

Change-Id: If57f137a3b71e6b535c23ac92483e15984b2e613
2019-01-14 17:17:34 -08:00
Steven Moreland
43c0169b8e Merge "clang-format: ContinuationIndentWidth: 8"
am: c696782032

Change-Id: I8d83b11b96e892628649615bdb4d5a475b797a29
2019-01-14 17:15:09 -08:00
Pavlin Radoslavov
68defe6e33 Merge "Bluetooth Audio HAL interface v2"
am: 27a3c84ebd

Change-Id: I1d9cb3e968f875267cd67a8bcdb42cbd81344da2
2019-01-14 17:09:16 -08:00
Steven Moreland
c696782032 Merge "clang-format: ContinuationIndentWidth: 8" 2019-01-15 00:47:12 +00:00
Treehugger Robot
27a3c84ebd Merge "Bluetooth Audio HAL interface v2" 2019-01-15 00:35:25 +00:00
TreeHugger Robot
0dde018278 Merge "Camera: Clarify the FMQ read order for request/result" 2019-01-14 23:04:12 +00:00
TreeHugger Robot
27b2bc7782 Merge "Thermal: change default implementation target as mock" 2019-01-14 20:52:38 +00:00
Yin-Chia Yeh
e28472bede Merge "Camera: fill in bufferSize correctly" into pie-vts-dev am: d04f64ef24 am: dbb2211d32 am: 04315a3f6b
am: 97b5f014c9

Change-Id: I84197c2f1c471f31afb682126d82b81f0a05e1b9
2019-01-14 11:47:37 -08:00
Shuzhen Wang
17a371de6e Camera: Clarify the FMQ read order for request/result
If there are more than one metadata entities being passed
via FMQ, specify the framework read order.

Test: Build
Bug: 119575429
Change-Id: Ia34ac69ce670b1ebeda12d92af490c347f33c15b
2019-01-14 11:07:39 -08:00
TreeHugger Robot
b069a5d914 Merge "resolve merge conflicts of fe57c318d3 to master" 2019-01-14 19:00:43 +00:00
Steven Moreland
0169ce4e36 clang-format: ContinuationIndentWidth: 8
More normal, matches system/core.

Bug: 122835115
Test: manual
Change-Id: I41d92756ce9ddfa27b24215f5e92017756a82a25
2019-01-14 10:46:41 -08:00
Gregory Clark
6c28fc40f6 Merge "Add a trunk and sunroof." 2019-01-14 18:41:03 +00:00
Gregory Clark
ea1fe59370 Add a trunk and sunroof.
Bug: b/118139582
Test: Get and set the VHAL properties.

Exempt-From-Owner-Approval: Nobody on the owners list works on AAE.

Change-Id: Ib2274a7f347d962d80ce9213c4ae17a2f44b74ad
(cherry picked from commit 6ef517989fb25a39536c65b1636c1292f8bdcec1)
2019-01-14 18:40:32 +00:00
Emilian Peev
338a5559f3 resolve merge conflicts of fe57c318d3 to
master

Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ibe64d18c0637f22032a5aedc74da5cd0a0141e2a
2019-01-14 12:33:59 +00:00
Yin-Chia Yeh
97b5f014c9 Merge "Camera: fill in bufferSize correctly" into pie-vts-dev am: d04f64ef24 am: dbb2211d32
am: 04315a3f6b

Change-Id: Ia3705291cce824f0b4f138eeb9e00ed888943fe4
2019-01-14 04:17:55 -08:00
Yin-Chia Yeh
04315a3f6b Merge "Camera: fill in bufferSize correctly" into pie-vts-dev am: d04f64ef24
am: dbb2211d32

Change-Id: Ic769abab991e29f723c6b80f28c3388595aa7e00
2019-01-14 04:13:39 -08:00
Yin-Chia Yeh
fe57c318d3 Merge "Camera: fill in bufferSize correctly" into pie-vts-dev am: d04f64ef24
am: 31ad8ce667

Change-Id: I4d560b783331836629aa57827c6391261a826504
2019-01-14 04:13:39 -08:00
Yin-Chia Yeh
dbb2211d32 Merge "Camera: fill in bufferSize correctly" into pie-vts-dev
am: d04f64ef24

Change-Id: I33583bbfda0b8f1a480df6a2fe7c88bdf504d493
2019-01-14 04:06:37 -08:00
Yin-Chia Yeh
31ad8ce667 Merge "Camera: fill in bufferSize correctly" into pie-vts-dev
am: d04f64ef24

Change-Id: I1d3a33e8bc58d0f99167f5bc3da6b6abf81d6d52
2019-01-14 04:05:42 -08:00
Treehugger Robot
d04f64ef24 Merge "Camera: fill in bufferSize correctly" into pie-vts-dev 2019-01-14 11:53:27 +00:00
Yin-Chia Yeh
9d4ff706e1 Camera: fill in bufferSize correctly
Test: partner testing
Bug: 118724188
Change-Id: If21762467e6458f923d7f9b7eeef41d987c196a1
2019-01-14 10:54:11 +00:00
Wei Wang
b9f5e43b61 Thermal: change default implementation target as mock
Test: Build
Change-Id: I833fac3091645a7d95e71f0ef1ef4917f65be4f9
2019-01-13 20:29:40 -08:00
Pavlin Radoslavov
1ea96a3802 Bluetooth Audio HAL interface v2
Generalized Bluetooth Audio HAL interface.
It is similar to the original android.hardware.bluetooth.a2dp@1.0
interface with the following modifications:

* The session type can be one of the following:
  - A2DP Software Encoding Datapath
  - A2DP Hardware Encoding Datapath
  - Hearing Aid Software Encoding Datapath
* For Hardware Offload Datapath (A2DP), the HAL interface is used only
  for the control path
* For Software Encoding Datapath (A2DP or Hearing Aid), the HAL
  interface is used for both the control and data paths
* Added Delay Report support: IBluetoothAudioHost.getPresentationPosition()
  that was missing in the original android.hardware.bluetooth.a2dp@1.0
  HAL interface.
* Removed "oneway" calls to avoid potential reordering of HAL calls:
  b/111244402
* Updated SBC-specific codec configuration
* Added AAC-specific and LDAC-specific codec configuration
* Reorganized the original CodecConfiguration into two sections:
  - PcmDataConfiguration: Audio PCM data configuration
  - EncodedDataConfiguration: Encoded audio data codec configuration.
    It is used only if the HAL is responsible for encoding the PCM audio
    data.
* Added new HAL IBluetoothAudioProvidersFactory.
  It is used to open an audio provider for an audio session as specified by
  the session type and the codec configuration as negotiated with the
  remote device.

Bug: 111519504
Test: manual
Change-Id: I2ee4cf50b177baee077cf0b5143dbeadda57c8fb
Merged-In: I2ee4cf50b177baee077cf0b5143dbeadda57c8fb
(cherry picked from commit fcc0732db4)
2019-01-14 03:55:18 +08:00
Dan Albert
5ebf56d092 Fix comparator operator() definition. am: a6a529236e am: 3df110feae
am: b21cdfb866

Change-Id: Id0f1912c6b05481f5d720a490cb7044d7accfc26
2019-01-13 01:57:42 -08:00
Dan Albert
b21cdfb866 Fix comparator operator() definition. am: a6a529236e
am: 3df110feae

Change-Id: Ide011a450b7d7154904cc80da43e402725ad26ce
2019-01-13 01:52:36 -08:00
Dan Albert
3df110feae Fix comparator operator() definition.
am: a6a529236e

Change-Id: I10a81993c08e251f2072ba6d34e93861a9f9e116
2019-01-13 01:47:32 -08:00
TreeHugger Robot
bc91e1388c Merge "Stop Wake Lock thread if it is running" 2019-01-12 05:57:20 +00:00
Dan Albert
a6a529236e Fix comparator operator() definition.
Comparators should be const. The libc++ update checks for this and
rejects non-const comparators.

Test: m
Bug: None
Change-Id: If2f76c020943b5bcb55803f0742990c9965afd6e
2019-01-11 14:48:55 -08:00
TreeHugger Robot
b77643d06f Merge "Bluetooth Audio HAL interface v2" 2019-01-11 22:43:22 +00:00
Nathan Harold
1edaaa9bdb Merge "Require IRadio 1.4 for Devices Launching Q" am: 15213e4175 am: 228d0c28c3
am: 9fa1c9ccda

Change-Id: Id346112dccf04ac5adcf1aff6e6da838f1e995f8
2019-01-11 13:09:37 -08:00
Nathan Harold
9fa1c9ccda Merge "Require IRadio 1.4 for Devices Launching Q" am: 15213e4175
am: 228d0c28c3

Change-Id: Iad9776035e0f6103272f02da865e2283b9855e03
2019-01-11 12:58:18 -08:00
Nathan Harold
228d0c28c3 Merge "Require IRadio 1.4 for Devices Launching Q"
am: 15213e4175

Change-Id: I42b972ba2985fcb199a8f15ce067d1796686ab4c
2019-01-11 12:39:11 -08:00
Nathan Harold
15213e4175 Merge "Require IRadio 1.4 for Devices Launching Q" 2019-01-11 20:12:01 +00:00
Marissa Wall
889c94dabc graphics: update owners am: 104ecb9e60 am: af56d35175
am: 88d9ae03c4

Change-Id: I596f312798b61afe4a6f12d293e2de95b6e2d193
2019-01-11 10:51:25 -08:00
Marissa Wall
88d9ae03c4 graphics: update owners am: 104ecb9e60
am: af56d35175

Change-Id: Ica03126f85a8a31723c2631dff150810d8d27da3
2019-01-11 10:20:19 -08:00
Marissa Wall
af56d35175 graphics: update owners
am: 104ecb9e60

Change-Id: I1043e61233557a15a39707e515531503b14599ab
2019-01-11 09:53:58 -08:00
Jimmy Chen
1e0485b1f3 Merge "p2p: add vts for addGroup_1_2" 2019-01-11 05:41:58 +00:00
Xusong Wang
0ba24d97b6 Merge "Add 1.2 NN HAL interface for dynamic output shape." 2019-01-11 04:42:42 +00:00
Pavlin Radoslavov
fcc0732db4 Bluetooth Audio HAL interface v2
Generalized Bluetooth Audio HAL interface.
It is similar to the original android.hardware.bluetooth.a2dp@1.0
interface with the following modifications:

* The session type can be one of the following:
  - A2DP Software Encoding Datapath
  - A2DP Hardware Encoding Datapath
  - Hearing Aid Software Encoding Datapath
* For Hardware Offload Datapath (A2DP), the HAL interface is used only
  for the control path
* For Software Encoding Datapath (A2DP or Hearing Aid), the HAL
  interface is used for both the control and data paths
* Added Delay Report support: IBluetoothAudioHost.getPresentationPosition()
  that was missing in the original android.hardware.bluetooth.a2dp@1.0
  HAL interface.
* Removed "oneway" calls to avoid potential reordering of HAL calls:
  b/111244402
* Updated SBC-specific codec configuration
* Added AAC-specific and LDAC-specific codec configuration
* Reorganized the original CodecConfiguration into two sections:
  - PcmDataConfiguration: Audio PCM data configuration
  - EncodedDataConfiguration: Encoded audio data codec configuration.
    It is used only if the HAL is responsible for encoding the PCM audio
    data.
* Added new HAL IBluetoothAudioProvidersFactory.
  It is used to open an audio provider for an audio session as specified by
  the session type and the codec configuration as negotiated with the
  remote device.

Bug: 111519504
Test: manual
Change-Id: I2ee4cf50b177baee077cf0b5143dbeadda57c8fb
2019-01-11 12:04:51 +08:00
TreeHugger Robot
0fffa374e3 Merge "Add WakeLockQueueFlagBits to Sensors 2.0" 2019-01-11 03:08:23 +00:00
Shuo Qian
8baf2a13be Merge "Add Emergency Uniform Resource Name (URN)" 2019-01-11 02:37:27 +00:00
Jeff Tinker
8378c6625e Add additional error conditions to MediaDrm
New codes are being added to handle resource
contention, lost session state, frame size too
large and insufficient security level for
decryption. Also cleans up inconsistent use of
tamper detected error where invalid state error
should have been used.

bug:111504510
bug:111505796
test: cts and gts media test cases

Change-Id: I8581aed1871d728f7af80b246d0dba28b40fa4a3
2019-01-10 17:27:59 -08:00
TreeHugger Robot
aa2c2714ee Merge "graphics: update owners" 2019-01-11 01:23:15 +00:00
Xusong Wang
aff1c07ddd Merge "Modify operation enum." 2019-01-11 01:16:30 +00:00