Commit graph

4769 commits

Author SHA1 Message Date
Xin Li
b95fa02a51 Merge "Merge Android Pie into master" am: 65d52dd3c9
am: 4937ac2dda

Change-Id: I53baa9079616d7336f4f8022aefe122b3a3f9f60
2018-08-07 17:55:53 -07:00
Xin Li
4937ac2dda Merge "Merge Android Pie into master"
am: 65d52dd3c9

Change-Id: If9c8448a3432d23833fcf2abbfad46b62d04c738
2018-08-07 14:21:02 -07:00
Xin Li
65d52dd3c9 Merge "Merge Android Pie into master" 2018-08-07 16:51:26 +00:00
Xin Li
06939479d6 Merge Android Pie into master
Bug: 112104996
Change-Id: If5c595a523f58a9ee90037ff03c0b8143104f6de
2018-08-06 16:51:06 -07:00
Ernie Hua
1a7b396a0a Merge "Wrong variable being printed in ALOGV statement." am: f8248731ab
am: 1c48df531f

Change-Id: I89fc058862892c8a374634a4456bff8d41537ec4
2018-07-11 10:06:30 -07:00
Ernie Hua
1c48df531f Merge "Wrong variable being printed in ALOGV statement."
am: f8248731ab

Change-Id: I4f7554a3277f37f662111916f0acf69c73c6a46c
2018-07-11 10:02:28 -07:00
Treehugger Robot
f8248731ab Merge "Wrong variable being printed in ALOGV statement." 2018-07-11 16:52:06 +00:00
Ernie Hua
5c7a3bd4f9 Wrong variable being printed in ALOGV statement.
Bug: b/111308664
Test: Force on the log message to ensure it is printed.
Change-Id: Id7df120ee024b1bf5530cd06ee4c386da6b75d29
2018-07-10 15:21:24 -07:00
Xin Li
e6e1500581 Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master
am: e1e9f555d0

Change-Id: I60b186392344b464016c0b5415e4a9d4a57f72de
2018-06-09 02:41:18 -07:00
Xin Li
e1e9f555d0 Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master
Bug: 79597307
Change-Id: I63d5ae1b953d740a11179f97f0555e4dbd38d7f9
2018-06-08 11:07:52 -07:00
Dan Stoza
5ee2def1cc hwc2: Fix readback docs
am: af153e0a5d

Change-Id: Ida605bc803cc7e3d79e5f298c8b4a405435e18f2
2018-05-16 15:52:55 -07:00
Dan Stoza
af153e0a5d hwc2: Fix readback docs
Fixes a couple of problems with the return codes in the readback
documentation and adds a paragraph of clarification about when
getReadbackBufferAttributes will be called.

Bug: 67048889
Test: N/A, doc fix only
Change-Id: I3ea1a6993323f7ce12c36a377bf69e2866b18082
2018-05-15 13:09:51 -07:00
Marissa Wall
c5347d9440 gralloc1: security hardening
am: 5838dff356

Change-Id: Iae3d0e3dd6c31cd4548056fc8dd1341496e635d8
2018-05-03 15:58:13 -07:00
Marissa Wall
5838dff356 gralloc1: security hardening
Add support for getTransportSize, validateBufferSize and importBuffer
to gralloc1.

Bug: 66876469
Test: Manual

Change-Id: Ie3435297cff2d3272df658af262905c13f403e4b
2018-05-02 12:14:52 -07:00
Chia-I Wu
d40704c21a Merge "hwcomposer2: add render intent support" into pi-dev
am: 8aeeb241f1

Change-Id: I3b6ec05b1bc238b84879214afa10762759dca46b
2018-04-02 23:47:41 +00:00
Chia-I Wu
8aeeb241f1 Merge "hwcomposer2: add render intent support" into pi-dev 2018-04-02 22:22:28 +00:00
Kevin Rocard
c77f799ff1 Audio V4: Add metadata update to legacy API
am: 0360e255f1

Change-Id: I175e5ad8c7f913d8b810f064dc223c3a478ea949
2018-03-31 00:03:32 +00:00
rago
d6c41dd831 Merge "Support query microphones information." into pi-dev
am: 721f4e8984

Change-Id: I15046f99a5fd4e29a6ccb48f11d54d0fb1f14d67
2018-03-30 18:49:04 +00:00
Chia-I Wu
28310aa868 hwcomposer2: add render intent support
Add

 HWC2_FUNCTION_GET_RENDER_INTENTS
 HWC2_FUNCTION_SET_COLOR_MODE_WITH_RENDER_INTENT
 HWC2_FUNCTION_GET_DATASPACE_SATURATION_MATRIX

and fix HWC2_FUNCTION_SET_PER_FRAME_METADATA to be per-layer.

Bug: 73824924
Test: manual
Change-Id: I25e34c4bf3dc5d496ea23c2d13419dd28f3e6cca
2018-03-30 11:47:09 -07:00
Kevin Rocard
0360e255f1 Audio V4: Add metadata update to legacy API
The metadata API was not present in the legacy HAL API
which lots of developer still use.

Test: Check the method is correctly called on each track change
Bug: 38184704
Bug: 69623109
Change-Id: I46a9db5a67baef52844ed85296a529402e00f4cb
Signed-off-by: Kevin Rocard <krocard@google.com>
2018-03-30 11:29:11 -07:00
Brian Young
2d744d867c Add "Unlocked device required" key API
am: 8cf2862f94

Change-Id: Ibe0d9d993337fa05d8b69fe2d580d0f4ab67d083
2018-03-30 17:06:05 +00:00
TreeHugger Robot
721f4e8984 Merge "Support query microphones information." into pi-dev 2018-03-30 16:59:41 +00:00
Brian Young
8cf2862f94 Add "Unlocked device required" key API
Add a keymaster parameter for keys that should be inaccessible when
the device screen is locked. "Locked" here is a state where the device
can be used or accessed without any further trust factor such as a
PIN, password, fingerprint, or trusted face or voice.

This parameter is added to the Java keystore interface for key
creation and import, as well as enums specified by and for the native
keystore process.

Test: CTS tests in I8a5affd1eaed176756175158e3057e44934fffed

Bug: 67752510

Merged-In: I94d8bc5543d00d28064c6e555b38823b70dbfbe6
Change-Id: I94d8bc5543d00d28064c6e555b38823b70dbfbe6
(cherry picked from commit a47bb10496)
2018-03-28 08:38:57 -07:00
rago
909a8f988b Support query microphones information.
Get list of all/currently active microphones from input stream.
Part of the device enumeration feature.

Bug: 64038649
Test: Manual Testing and Cts integration test
Change-Id: Ibe231c430186c18ce43497c351b7d3e3b2425811
2018-03-21 14:16:52 -07:00
Kevin Rocard
75ae7e343b Merge "Audio V4: Add missing parameter keys" into pi-dev
am: 762407ccc3

Change-Id: I2f2e43fb2501308127b0bbb3c048323bf7a39d90
2018-03-07 03:59:25 +00:00
TreeHugger Robot
762407ccc3 Merge "Audio V4: Add missing parameter keys" into pi-dev 2018-03-07 03:23:51 +00:00
Ashutosh Joshi
7db0ba983a Merge "Update OWNERS" into pi-dev
am: b07ab6fd1d

Change-Id: I065dde9fa997c32e66600da3f80e0832e14a6c35
2018-03-07 00:31:26 +00:00
Ashutosh Joshi
b07ab6fd1d Merge "Update OWNERS" into pi-dev 2018-03-06 23:12:45 +00:00
Kevin Rocard
d55a49a01e Audio V4: Add missing parameter keys
Those keys were used as literal strings
instead of having a declaration.

Bug: 38184704
Test: compile
Change-Id: I45709a4a9120e98014d2a4f763fc17f9ef1267ac
Merged-In: I45709a4a9120e98014d2a4f763fc17f9ef1267ac
Cherry-picked from master
Signed-off-by: Kevin Rocard <krocard@google.com>
2018-03-06 11:30:53 -08:00
Ashutosh Joshi
797ae998eb Update OWNERS
Update OWNERS to new stewards.

Test: Build compiles.
Change-Id: I98f9f58bce6b3686f3ff67f28f3e8d2f2ddf0a88
2018-03-06 03:46:20 +00:00
Mikhail Naganov
8579af332c Revert recent r_submix patches
am: 16ad46ef48

Change-Id: I81847b326f175e1d9f8f8fe0a17774f2ae5e5a00
2018-03-06 00:27:39 +00:00
Mikhail Naganov
16ad46ef48 Revert recent r_submix patches
Revert "r_submix: Fix logspam on pipe corruption"
This reverts commit ab5b51838c.
Revert "r_submix: Use intermediate pipe in non-blocking mode"
This reverts commit 1df8a0039f.

Reason: breaks Android Auto projected mode

Bug: 74142786
Test: with Android Auto head unit simulator
Change-Id: I8e1bc146a131cb5b1ab88cf242b03a6b02a84339
2018-03-05 20:39:30 +00:00
Mikhail Naganov
ab5b51838c r_submix: Fix logspam on pipe corruption
Prevent logging an error message on every attempt to write
if the FIFO backing up the MonoPipe got corrupted. This condition
can be detected by checking for -EIO error code.

Bug: 74067530
Test: make audio_utils_fifo_base::mIsShutdown to be set by default,
      run r_submix_tests and observe logcat

Change-Id: I5d67997e902e834f04c10f9ffb39b16cba9c5739
2018-03-01 13:49:58 -08:00
Mikhail Naganov
1df8a0039f r_submix: Use intermediate pipe in non-blocking mode
Switch the pipe into non-blocking mode to prevent stalling
when attempting to close it.

Simulate circular buffer behavior by flushing old data if
there is no more space in the pipe.

This removes the need for "exiting=1" parameter.

Bug: 73175392
Test: r_submix_tests
Change-Id: Iff89980af71112892ff262030e471ae736b1f62a
2018-02-27 10:11:33 -08:00
Mikhail Naganov
bf115538e8 r_submix: Add more tests
From analyzing the coverage data, these tests seem to cover
all the critical functionality of the remote submix module.

Bug: 73175392
Test: r_submix_tests
Change-Id: I7f6be95245c6ab59611fc5e269e3f9f2079b8ee4
2018-02-27 10:02:33 -08:00
TreeHugger Robot
3fb93a3708 Merge "Revert "Restore "Add "Unlocked device required" parameter to keys""" 2018-02-23 17:42:45 +00:00
Brian Young
968f997468 Revert "Restore "Add "Unlocked device required" parameter to keys""
This reverts commit a684cb6c2c.

Reason for revert: Regression in creating auth-bound keys

Bug: 73773914

Bug: 67752510

Change-Id: Ib215d63efe442916f90065015a57614b097cd74d
2018-02-23 01:31:34 +00:00
Mikhail Naganov
eff2bf016b Merge "r_submix: Add some tests" 2018-02-21 21:48:44 +00:00
Brian Young
0dcaf0aebe Merge "Restore "Add "Unlocked device required" parameter to keys"" 2018-02-16 01:18:53 +00:00
Mikhail Naganov
80179932c9 r_submix: Add some tests
Add simple tests to verify remote submix behavior regarding
blocking writes. Currently one of the tests fails (does not finish),
this needs to be fixed.

Also fixed some minor issues in remote submix module code.

Bug: 73175392
Test: r_submix_tests
Change-Id: Ic88d0c385c0102e35b4f751f9c5cd8a6488949c8
2018-02-15 17:09:47 -08:00
TreeHugger Robot
58f255a32b Merge "Fix a memory leak" 2018-02-16 00:08:28 +00:00
Brian C. Young
a684cb6c2c Restore "Add "Unlocked device required" parameter to keys"
Add a keymaster parameter for keys that should be inaccessible when
the device screen is locked. "Locked" here is a state where the device
can be used or accessed without any further trust factor such as a
PIN, password, fingerprint, or trusted face or voice.

This parameter is added to the Java keystore interface for key
creation and import, as well as enums specified by and for the native
keystore process.

This reverts commit 680068e9f2.

Test: CTS tests in I8a5affd1eaed176756175158e3057e44934fffed

Bug: 67752510

Change-Id: I9f3ea694f676801dc3dd348301544a603574edc7
2018-02-15 11:22:40 -08:00
George Burgess IV
4028ac9ae6 Fix a memory leak
If status < 0, we'd silently leak dev.

Bug: None
Test: Ran the analyzer; memory leak warnings are gone.
Change-Id: I76a78feea4c92aa167de908f5571481864d61d73
2018-02-13 00:33:26 +00:00
Eino-Ville Talvala
8a6fed0d28 Camera: Revise MOTION_TRACKING capability
Simplify the API for the P release.

Test: Revised Camera CTS passes
Bug: 63629224
Change-Id: Ib8379f928dbdb6c66850d7648ac814fe710bb104
2018-02-05 16:29:09 -08:00
John Muir
001e6f4650 audio: Update default audio implementation.
Allow the default audio implementation to use the sample rate and
format provided by the application, but default to 16-bit stereo
for both input and output.

Also, default to 10ms output buffer and 20ms input buffer.

Bug: 70692394
Test: Audio device and output stream created successfully with
      the default frame_count.
      Audio device reports 20ms for input buffer size.
      Audio input stream created successfully with defaults.
      Setup device with audio_policy_configuration_stub.xml;
          no failures for GTS tests: GtsGmscoreHostTestCases
          -t 'com.google.android.gts.audio.AudioHostTest'
Change-Id: If496fc89f72f26266a7ed9b59acf88d1ca76e704
2018-01-30 12:05:24 -08:00
Jorim Jaggi
3fb6ccbd35 Merge "Revert "Add "Unlocked device required" parameter to keys"" 2018-01-30 15:36:28 +00:00
Brian Young
680068e9f2 Revert "Add "Unlocked device required" parameter to keys"
This reverts commit dc9505de44.

Reason for revert: Build breakages on elfin, gce_x86_phone.

Bug: 72679761
Bug: 67752510
Change-Id: I53d396632b7a23141b755e028342accf6625ca0b
2018-01-30 15:31:29 +00:00
TreeHugger Robot
9ef9cf40e2 Merge "Add "Unlocked device required" parameter to keys" 2018-01-29 23:16:02 +00:00
Hongwei Wang
066828ebd4 Merge "Removes vehicle.default target" 2018-01-26 21:29:13 +00:00
Dmitry Shmidt
362d2c54cf Merge "camera 3_4: Fix compilation errors" am: 7904e9c2d7 am: 8a08d159fd
am: b0d95c4bb8  -s ours

Change-Id: I3fc0bd56305642281b92a0c7c9791ec4e9d33bea
2018-01-26 01:46:22 +00:00