Commit Graph

2669 Commits

Author SHA1 Message Date
TreeHugger Robot
3d3c6531e1 Merge "Camera: hardware level related doc update" into pi-dev 2018-07-19 16:12:17 +00:00
Yin-Chia Yeh
c565700b94 Camera: hardware level related doc update
Codegen doc update + CameraDevice manual update about EXTERNAL
hardware level.

Test: check offline-sdk-docs output
Bug: 77861412
Change-Id: I70c87a176cf873cf8bec2037f973a94fe99aef2e
2018-07-13 13:42:43 -07:00
Donghui Han
2fca393cc1 Merge "camera2: Treat face detect mode larger than FULL as FULL" into pi-dev 2018-07-12 17:19:36 +00:00
Arthur Ishiguro
267b960dab [automerger] Resolve inconsistent parcel read in NanoAppFilter am: abe5a73a4a am: 2895b320b4 am: 77e6e34644 am: 49e97ea1dc am: c2cfe453f2 am: cab2fa779e am: bf8733b162
am: e9b67d2b22

Change-Id: Ia3222d7b97b2d1083404d607738fc15d2646999c
2018-07-11 14:40:57 -07:00
Arthur Ishiguro
e9b67d2b22 [automerger] Resolve inconsistent parcel read in NanoAppFilter am: abe5a73a4a am: 2895b320b4 am: 77e6e34644 am: 49e97ea1dc am: c2cfe453f2 am: cab2fa779e
am: bf8733b162

Change-Id: I4fe6469031d7ef6fcc6d9b46da4dbc5845ea62d2
2018-07-11 14:27:45 -07:00
Arthur Ishiguro
bf8733b162 [automerger] Resolve inconsistent parcel read in NanoAppFilter am: abe5a73a4a am: 2895b320b4 am: 77e6e34644 am: 49e97ea1dc am: c2cfe453f2
am: cab2fa779e

Change-Id: Ifdd69396d202951f8b9ed5fe6e5766133955a5e5
2018-07-11 14:13:30 -07:00
Donghui Han
5f967a3941 camera2: Treat face detect mode larger than FULL as FULL
This change treats any face detect mode larger than FULL mode
in the capture result as FULL mode. So in case the face detect
mode is larger than FULL, it is assumed that the FULL mode
STATISTICS_FACE is supported in the capture result.

Bug: 111131913
Test: CTS, GCA
Change-Id: I3a6a29ce8d9d8ab66918baaea3162797e18276d2
2018-07-11 15:47:44 +00:00
Android Build Merger (Role)
cab2fa779e [automerger] Resolve inconsistent parcel read in NanoAppFilter am: abe5a73a4a am: 2895b320b4 am: 77e6e34644 am: 49e97ea1dc am: c2cfe453f2
Change-Id: I6e3461125290f2835ff1f9a996beb92e64172386
2018-07-06 22:55:21 +00:00
Android Build Merger (Role)
c2cfe453f2 [automerger] Resolve inconsistent parcel read in NanoAppFilter am: abe5a73a4a am: 2895b320b4 am: 77e6e34644 am: 49e97ea1dc
Change-Id: I19c512999a0eae233e2cc7c4d31d0c62556e4ffd
2018-07-06 22:55:14 +00:00
Android Build Merger (Role)
77e6e34644 [automerger] Resolve inconsistent parcel read in NanoAppFilter am: abe5a73a4a am: 2895b320b4
Change-Id: I26b97af90ef6ea8b640ff7198b2883297d4fb03e
2018-07-06 22:55:02 +00:00
Android Build Merger (Role)
2895b320b4 [automerger] Resolve inconsistent parcel read in NanoAppFilter am: abe5a73a4a
Change-Id: Ieb925f073b80e4d624552e738d49b0996f0485ae
2018-07-06 22:54:55 +00:00
Arthur Ishiguro
abe5a73a4a Resolve inconsistent parcel read in NanoAppFilter
Bug: 77599679
Test: Compile only
Change-Id: Ib417a5cb4d51744442d2fb14437cabbe5fd1c266
2018-07-06 22:54:52 +00:00
TreeHugger Robot
a749cd584e Merge "Camera: Update surface sharing format restrictions" into pi-dev 2018-06-23 00:11:04 +00:00
Emilian Peev
470c698c5a Camera: Update surface sharing format restrictions
Surface sharing supports all formats except jpeg and
RAW private.

Bug: 110412079
Test: documentation builds without errors.
Change-Id: I72c5d744fed1b62eedd7a83522021ebad17e49b7
2018-06-19 18:27:59 +01:00
Yin-Chia Yeh
6c73e409fc Camera: codegen doc update
Test: N/A. Doc update
Bug: 109666939
Change-Id: I2bd176a7f5ada755c8a79201d142a98131e2e82c
2018-06-18 16:18:34 -07:00
TreeHugger Robot
d4c5d1e448 Merge "Camera: add new detailed error callback" into pi-dev 2018-05-31 21:11:24 +00:00
Yin-Chia Yeh
a07cd32684 Camera: add new detailed error callback
For the legacy shim layer to tell the difference between evction
and disable error.

Test: CTS CameraEvictionTest + IdleUidTest
Bug: 77486868
Change-Id: I5b68f55460287634903c9b8b42188d9dec8744d5
2018-05-31 12:24:55 -07:00
Shuzhen Wang
e7d3cd0a76 Camera: Document getNumberOfCameras behavior for logical camera
For camera1 API, framework only exposes one camera id for every
logical/physical camera id group. Document this behavior accordingly.

Test: Build
Bug: 80075565
Change-Id: I32c2de84d27a603d485014255bf1fad5031aa08e
2018-05-31 12:21:37 -07:00
TreeHugger Robot
568ccfe0b6 Merge "Camera: Clarify multi-camera id selection logic" into pi-dev 2018-05-25 15:27:43 +00:00
Shuzhen Wang
a57c274fc4 Camera: Clarify multi-camera id selection logic
Test: Compile
Bug: 80075565
Change-Id: I12d95b7b0248ab8c3e8fb9e42cac3ed6475e499b
2018-05-23 11:53:09 -07:00
Justin Yun
f01e40c5e1 Camera: Use fallback key if the requested key returns null
If the key returns null, try with the fallback key to get the values.
This is to support old key names for old camera hals.

Bug: 79183654
Test: Launch GCA in P and P+OMR1 walleye devices.

Change-Id: I1d55cc53b159401d4cd47da9a02f174cb6cb9e5e
2018-05-18 21:27:05 +09:00
Jiabin Huang
065df1d75b Merge "Fix shutter sound cannot enable." into pi-dev 2018-05-09 20:43:14 +00:00
jiabin
e059e45b05 Fix shutter sound cannot enable.
Bug: 79307231
Test: run cts and take picture with/withour dnd mode.
Change-Id: I9d4166d07b38ffae735aa63dad075bdb2def9a5a
2018-05-08 13:16:50 -07:00
Emilian Peev
0c227d47cc Camera: Specify session parameter build requirements
Session parameters are subset of the supported capture
request parameters. They are passed as part of the capture
session intitialization and only require the initial session
parameter values. Update the documentation and make clear that
additional outputs, tags etc. should not be passed when building
the session parameter capture request object.

Bug: 79225608
Test: Documentation builds
Change-Id: Id2651ea1d8dc8e3ebd9ebfca84eca2bb67694bf4
2018-05-08 09:28:10 +01:00
android-build-team Robot
da8e229b9c Merge "Add OP_PLAY_AUDIO to control shutter sound." into pi-dev 2018-05-01 23:56:12 +00:00
Joshua Mccloskey
d4390a52e5 refactored Log statements to Slog
Test: it builds
Change-Id: I9fdc5ad6767b02f42b768c1709b22d9f4d2d4e6b
Fixes: 76183279
2018-04-30 17:36:54 -07:00
Tomasz Wasilczyk
dd2e6c502f Implement RadioMetadata.toString.
This is required for metadata debugging.

Bug: 78885613
Test: build, run radio, watch logs
Change-Id: I63393bf555ede396a04f50897490049568b089dd
2018-04-30 10:40:39 -07:00
android-build-team Robot
a973d530df Merge "camera2/legacy: Fix expected errors on eglSwapBuffers" into pi-dev 2018-04-27 18:24:00 +00:00
Lloyd Pique
df34b49fa2 camera2/legacy: Fix expected errors on eglSwapBuffers
SurfaceTextureRenderer::swapBuffers interpreted EGL_BAD_SURFACE as
indicating an abandanoned buffer queue. But the EGL 1.4 lists additional
errors that also indicate extreme failure: EGL_CONTEXT_LOST, and
EGL_BAD_NATIVE_WINDOW.

Discovered while debugging CTS test
android.hardware.camera2.cts.RobustnessTest#testAbandonRepeatingRequestSurface
on ARC++ x86 boards.

Test: cts-tradefed/android.hardware.camera2.cts.RobustnessTest#testAbandonRepeatingRequestSurface
Bug: 64496778
Bug: 36063477
Change-Id: I782f2c923aa5ff2442bbcf3dfb09861e129a2872
(cherry picked from commit 3511f99cf986a9fe7a67a8aee301e05f1be07f62)
2018-04-26 15:31:12 -07:00
jiabin
503e1fdcd1 Add OP_PLAY_AUDIO to control shutter sound.
The camera will play shutter sound through native layer instead of Java
layer. That will cause shutter sound to bypass AppOps check. Add
OP_PLAY_AUDIO checking to avoid shutter sound playing while DnD.

Bug: 78136756
Test: Taking picture in Message with enable/disable DnD.
Change-Id: Iba5e7ab19cf5565ba3f074d2aba194b60e18265f
2018-04-20 11:51:09 -07:00
Tomasz Wasilczyk
a2015451a7 Merge "Don't check program selector's type for equality." into pi-dev 2018-04-20 13:49:39 +00:00
Tomasz Wasilczyk
71791f95c6 Don't check program selector's type for equality.
As the comments of the whole class says, primary ID is the field used
for checking for equality of the selectors. Current implementation also
checks program type, which is a deprecated field that can be inferred
from primary ID.

Test: open car.Media, add AM station to favorites
Bug: 78296701
Change-Id: I0423f831c2fdca2d1d126ed8a3b8fe40f28022ac
2018-04-19 14:23:54 -07:00
Kevin Chyn
54926ba6a9 Merge "Don't delay the FINGERPRINT_ERROR_CANCELED message" into pi-dev 2018-04-18 01:53:39 +00:00
Kevin Chyn
58a0d51472 Don't delay the FINGERPRINT_ERROR_CANCELED message
Test: tested with test APK

Change-Id: Ic975870c6f815b5f7dfa4c7f2d8bf5554fbb1c5b
Fixes: 78185698
2018-04-17 13:50:53 -07:00
Hidenari Koshimae
3a385f81a3 Camera: Fix a description for MONOCHROME camera capability
Test: Compile
Bug: 77902724
Change-Id: Ibb6a1d4b5f80a0c4d0e3f29625b03a827a3ed80c
2018-04-16 12:22:34 -07:00
Tomasz Wasilczyk
dc7687a29b Fix AM band range.
Test: open radio app, it doesn't throw any errors anymore
Bug: 75970985
Change-Id: I1d35fe02abf3c8de20c4426867f855feab3277d5
2018-04-11 16:04:05 -07:00
TreeHugger Robot
082147cfe1 Merge "Added system-wide minimum brightness curve." into pi-dev 2018-04-10 11:28:44 +00:00
Dan Gittik
122df86891 Added system-wide minimum brightness curve.
The minimum brightness curve guarantess that any brightness curve
that dips below it is rejected by the system.
This prevent auto-brightness from setting the screen so dark as to
prevent the user from resetting or disabling it, and maps lux to
the absolute minimum nits that are still readable in that ambient
brightness.

Test: atest BrightnessConfigurationTest.

Fixes: 77176207

Change-Id: Ibd1e83e9b147f3849d6c907f828cbe5950c8367f
2018-04-06 17:04:45 +01:00
Vishwath Mohan
ecf00cedb6 Rename BiometricDialog to BiometricPrompt.
Renamed to BiometricPrompt per API-council feedback.

Bug: 77494933
Test: m -j70
Change-Id: Ifed2b8f3439a7e671e0ce46d3a7db9f24871b16a
2018-04-05 10:41:19 -07:00
TreeHugger Robot
3275d9a004 Merge "Camera: sort getCameraIdList output" into pi-dev 2018-04-03 17:13:39 +00:00
TreeHugger Robot
7451945364 Merge "Camera: Update external camera orientation guidelines" into pi-dev 2018-04-03 12:57:19 +00:00
TreeHugger Robot
4ccefebb78 Merge "Camera: fix errorFlag logic" into pi-dev 2018-04-02 23:04:42 +00:00
TreeHugger Robot
374f6a26f9 Merge "Fingerprint user canceled message should not be delayed" into pi-dev 2018-03-31 01:52:37 +00:00
Kevin Chyn
c50aded51d Fingerprint user canceled message should not be delayed
The user canceled message is different than the other fingerprint errors
since it is caused by the user explicitly tapping on the UI at which
point the dialog will be already dismissing/dismissed. So the error
should be sent immediately to the application.

Test: manual test with FingerprintDialog, modified to show when the
      error messages are received

Change-Id: Ia2a3b0a7ac9c8cfcbd6055045a95fc06aa02c61a
Fixes: 77337939
2018-03-30 15:31:18 -07:00
TreeHugger Robot
49c27f2267 Merge "Add a SystemApi to control display saturation." into pi-dev 2018-03-29 20:55:22 +00:00
Tomasz Wasilczyk
d0c78f9f28 Fix empty program list filter handling.
Also, fix some minor issues about program list fetching.

Test: manual
Bug: 74353024
Change-Id: I77546b806f2d9de9505e64335af47e99079cea3e
2018-03-29 18:38:58 +00:00
Bryan Mawhinney
462e29da9b Add a SystemApi to control display saturation.
Allows an app with the appropriate permission to reduce
(make more gray) the saturation of colors on the display.

Test: manual
Bug: 77189882
Change-Id: I2b7b065d07bd2ca24730b2e8c52d161c22b307ab
2018-03-29 18:41:03 +01:00
Tomasz Wasilczyk
64faa5b60f Merge "Indicate whether BandConfig initialization is required or not." into pi-dev 2018-03-29 17:27:56 +00:00
Tomasz Wasilczyk
27926edc3b Indicate whether BandConfig initialization is required or not.
The broadcastradio HAL 1.x requires waiting for onConfigChanged callback
to indicate the initialization is done, while HAL 2.0 does not have the
config setting (at the tuner session level) at all.

This change makes it possible to cleanly workaround race condition in the
radio app retaining support for both HAL revisions. Future versions of the
RadioManager will provide a method to open a session without taking care
about these nuances.

Bug: 74353024
Test: manual
Change-Id: I5de2d5e5c33626fcf0cfbbaf121d0b13e53d0bae
2018-03-29 07:45:06 -07:00
TreeHugger Robot
889b21d181 Merge "Camera: Add MONOCHROME camera capability" into pi-dev 2018-03-28 21:01:31 +00:00