Commit graph

5031 commits

Author SHA1 Message Date
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
android-build-team Robot
6ba564ff36 Snap for 4615953 from eff2bf016b to pi-release
Change-Id: I3767c1407c77d090eec52d9a0ec48184aca5afcb
2018-02-22 08:25:25 +00:00
Mikhail Naganov
eff2bf016b Merge "r_submix: Add some tests" 2018-02-21 21:48:44 +00:00
android-build-team Robot
e2fad51de6 Snap for 4610834 from 0dcaf0aebe to pi-release
Change-Id: Ic1abe962339d7ecb20847304c29236651397dc91
2018-02-18 08:20:48 +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
android-build-team Robot
5393d7f299 Snap for 4600820 from 8a6fed0d28 to pi-release
Change-Id: Iefe442ef7f7bb04dbae08695fe46545493bafdde
2018-02-13 08:40:06 +00: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
android-build-team Robot
66c1e53d2d Snap for 4577102 from 001e6f4650 to pi-release
Change-Id: I08c828c5efb378ebde0290ca964d670db201ced0
2018-01-31 17:24:38 +00:00
android-build-team Robot
f4d0f3e6a8 Merge cherrypicks of [3535875, 3534641, 3534642, 3536651, 3536652, 3536653, 3535904, 3535498, 3536654, 3535876, 3534643, 3535905] into pi-release
Change-Id: I4ff0509dde4196c6d0331d7fc2108302cf0be3f1
2018-01-30 21:11:07 +00:00
Brian Young
9d18fd1f52 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
(cherry picked from commit 680068e9f2)
2018-01-30 21:10:28 +00: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
android-build-team Robot
a2181d4007 Snap for 4574286 from 9ef9cf40e2 to pi-release
Change-Id: If9debef5179acb7fdbb43a8c246b9b190f89e4ad
2018-01-30 08:20:33 +00:00
TreeHugger Robot
9ef9cf40e2 Merge "Add "Unlocked device required" parameter to keys" 2018-01-29 23:16:02 +00:00
gitbuildkicker
5c2772af14 merge in pi-release history after reset to master 2018-01-29 14:54:44 -08:00
gitbuildkicker
724c4c335a merge in pi-release history after reset to master 2018-01-29 11:54:30 -08:00
android-build-team Robot
b432fe49dc Snap for 4571561 from 066828ebd4 to pi-release
Change-Id: I94319f7d5374b4c21ddaa5f4cffe7c027d5d1191
2018-01-28 08:27:41 +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
Hongwei Wang
82e4dc70f4 Removes vehicle.default target
Bug: 72179784
Test: None

Change-Id: Ia96ef01c98565deb8920d1df2eee31149a2a9338
2018-01-25 15:58:11 -08:00
Dmitry Shmidt
b0d95c4bb8 Merge "camera 3_4: Fix compilation errors" am: 7904e9c2d7
am: 8a08d159fd

Change-Id: Id6d08971d1625c0f57143a1d2f33228735d3915b
2018-01-25 22:56:14 +00:00
Dmitry Shmidt
8a08d159fd Merge "camera 3_4: Fix compilation errors"
am: 7904e9c2d7

Change-Id: I5c05336b1899ca7f92ccd548daa5e578c0d4bd89
2018-01-25 22:21:29 +00:00
Treehugger Robot
7904e9c2d7 Merge "camera 3_4: Fix compilation errors" 2018-01-25 20:22:26 +00:00
Dmitry Shmidt
de9c47bdb9 camera 3_4: Fix compilation errors
Compile Error:
hardware/libhardware/modules/camera/3_4/camera.cpp:502:9: error: non-constant-expression cannot be narrowed from type 'std::__1::vector<camera3_stream_buffer, std::__1::allocator<camera3_stream_buffer> >::size_type' (aka 'unsigned long') to 'uint32_t' (aka 'unsigned int') in initializer list [-Wc++11-narrowing]
        request->output_buffers.size(),
        ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Compile Error:
hardware/libhardware/modules/camera/3_4/v4l2_gralloc.cpp:168:15: error: use of undeclared identifier 'EINVAL'
      return -EINVAL;

Test: Add to device.mk
        USE_CAMERA_V4L2_HAL := true
        PRODUCT_PACKAGES += camera.v4l2
      mma

Change-Id: Ia6bbd6bac06540214d2c6167a8826f3f4c946e57
Merged-In: Ia6bbd6bac06540214d2c6167a8826f3f4c946e57
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2018-01-25 09:42:16 -08:00
Brian C. Young
dc9505de44 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.

Test: go/asym-write-test-plan

Bug: 67752510

Change-Id: Ic1ec3bde05f8a28e20b9443b7f0078749921f297
2018-01-25 08:43:13 -08:00
Shuzhen Wang
bc04a28238 Merge "camera3: Add physical camera id field in capture result" 2018-01-25 15:52:45 +00:00
android-build-team Robot
94b05b7853 Snap for 4565898 from 437ce43787 to pi-release
Change-Id: I4719fe1be24dc99893db42c3192874c2779a0861
2018-01-25 09:05:49 +00:00
Courtney Goeltzenleuchter
437ce43787 Add support for HDR metadata (SMPTE2086)
Add HWC interface to pass in SMPTE2086 & CTA 861.3 metadata.
Test: TBD CTS test
Bug: 29940137

Change-Id: Ib99787752441b8a883864cc8adc8431478a15ba7
2018-01-24 19:24:13 -08:00
Shuzhen Wang
1d4c09e83e camera3: Add physical camera id field in capture result
- Add an array of physical camera ids and metadata when physical
cameras are requested within a logical multi-camera.
- Physical camera ids and metadata are only necessary for the final
capture_results, not the partial result.
- Physical camera ids and metadata must not be populated if no physical
camera is requested.

Test: Compile
Bug: 64691172
Change-Id: I78b20fe3d0c6462abf95b8fe7e3b4c66b3acefdf
2018-01-24 18:14:13 -08:00
TreeHugger Robot
6accb1de92 Merge "camera 3_4: Fix compilation errors" 2018-01-24 23:10:34 +00:00
Dmitry Shmidt
9df082e933 camera 3_4: Fix compilation errors
Compile Error:
hardware/libhardware/modules/camera/3_4/camera.cpp:502:9: error: non-constant-expression cannot be narrowed from type 'std::__1::vector<camera3_stream_buffer, std::__1::allocator<camera3_stream_buffer> >::size_type' (aka 'unsigned long') to 'uint32_t' (aka 'unsigned int') in initializer list [-Wc++11-narrowing]
        request->output_buffers.size(),
        ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Test: Add to device.mk
        USE_CAMERA_V4L2_HAL := true
        PRODUCT_PACKAGES += camera.v4l2
      mma

Change-Id: Ia6bbd6bac06540214d2c6167a8826f3f4c946e57
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2018-01-24 12:34:00 -08:00
TreeHugger Robot
a6e13b1c1d Merge "[HWC] Add setLayerFloatColor API." 2018-01-24 18:19:19 +00:00
Peiyong Lin
fd05d13edc [HWC] Add setLayerFloatColor API.
This patch adds the struct of float color, and setLayerFloatColor API so that
SurfaceFlinger can set the layer color with more bits on each channel.
Currently the display calibration tool require 10-bits support.

BUG: 69970838
Test: make locally and applied on device
Change-Id: I8bab335cc4fbc41a3eb18306a8831d1e9a9a219a
2018-01-24 18:12:41 +00:00
android-build-team Robot
5ea69c1edb Snap for 4562879 from 52a0dad79c to pi-release
Change-Id: I31bf0688e21e8641af2474e656aca35138263c52
2018-01-24 08:24:38 +00:00
Kevin Rocard
52a0dad79c Merge "Revert "Audio V4: Split system and vendor Audio.h"" 2018-01-24 06:26:16 +00:00
Kevin Rocard
c6ec9486d8 Revert "Audio V4: Split system and vendor Audio.h"
This reverts commit fc9e212f01.

Reason for revert: Breaks multiple devices

Change-Id: I816671fd92246f85c97d00819858a74e36e2929d
2018-01-24 06:04:27 +00:00
TreeHugger Robot
a03b72961d Merge "Camera3: Add new MOTION_TRACKING template enums" 2018-01-24 04:36:33 +00:00
Kevin Rocard
904511aaa2 Merge "Audio V4: Split system and vendor Audio.h" 2018-01-24 04:04:47 +00:00
gitbuildkicker
c123662706 merge in pi-release history after reset to master 2018-01-23 14:19:55 -08:00
gitbuildkicker
3d3b3ab6ab merge in pi-release history after reset to master 2018-01-23 12:12:29 -08:00
android-build-team Robot
e50f7cdad7 Snap for 4560043 from 8662c46d71 to pi-release
Change-Id: I4a67c3edcedc33b6eca68ad90137724abeff2542
2018-01-23 08:28:58 +00:00
Eino-Ville Talvala
cc1aa87b19 Camera3: Add new MOTION_TRACKING template enums
Bug: 70565622
Bug: 63629224
Test: Builds, CTS passes
Change-Id: I927776d042b74013cf24c342b107a5aee1ad26a2
2018-01-23 00:23:32 -08:00
gitbuildkicker
ac9088b160 merge in pi-release history after reset to master 2018-01-22 22:26:19 -08:00
Shuzhen Wang
8662c46d71 Merge "camera3: Extend camera capture request for multiple cameras" 2018-01-23 00:36:16 +00:00
gitbuildkicker
e23ba5214f merge in pi-release history after reset to master 2018-01-22 16:02:54 -08:00