Commit Graph

2695 Commits

Author SHA1 Message Date
Aurimas Liutikas
dc309f26f8 Fix broken links in @see tags in framework docs.
doclava was accidentally suppressing all these broken links
in @see tags. This CL fixes issues so we can start enfocing
checks for broken @see links.

Test: make docs
Bug: 80589960
Change-Id: I9c56841d9af111cb72e9a309bbe1bdcd31c80553
2018-06-05 14:44:30 -07:00
Aurimas Liutikas
62786b4431 Merge "Fix broken links in @see tags in framework docs." 2018-06-01 17:16:09 +00:00
Aurimas Liutikas
7f6953369a Fix broken links in @see tags in framework docs.
doclava was accidentally suppressing all these broken links
in @see tags. This CL fixes issues so we can start enfocing
checks for broken @see links.

Test: make docs
Exempt-From-Owner-Approval: Fixing @see javadoc link issues that are currently completely broken
Change-Id: I767e9fb9842494e5eccef2a7bdeee3877c488b5d
2018-06-01 17:15:55 +00:00
Yin-Chia Yeh
47eade3d32 Merge "Camera: add new detailed error callback" into pi-dev am: d4c5d1e448
am: e384ef8768

Change-Id: I51f4468eb6ac33a861459be2850554a7e0117a4a
2018-05-31 17:23:42 -07:00
Shuzhen Wang
f61a9e4417 Merge "Camera: Document getNumberOfCameras behavior for logical camera" into pi-dev am: fe8c263011
am: 7696265ef6

Change-Id: I5e5ab8aaf98e55a2ebd512b41b8caa25c8232024
2018-05-31 17:17:39 -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
Shuzhen Wang
865c73c0ac Merge "Camera: Clarify multi-camera id selection logic" into pi-dev am: 568ccfe0b6
am: 5116500c9d

Change-Id: I3fcea94d5f0cbccef69e45a6ccd98f1f60ed989b
2018-05-25 08:52:47 -07:00
TreeHugger Robot
568ccfe0b6 Merge "Camera: Clarify multi-camera id selection logic" into pi-dev 2018-05-25 15:27:43 +00:00
Justin Yun
eecd170c62 Merge "Merge "Camera: Use fallback key if the requested key returns null" into pi-dev am: 062c050d01" into pi-dev-plus-aosp
am: c7a55ad418

Change-Id: I862b506697883856e6ae88a0d6c9cc90e056758f
2018-05-24 16:14:07 -07: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
a1ef95f6e6 Merge "Fix shutter sound cannot enable." into pi-dev am: 065df1d75b
am: b64d756f08

Change-Id: Ib9bd7eeeb5b5b50e83eaf51554c9e19b12f880f6
2018-05-09 14:03:54 -07:00
Jiabin Huang
065df1d75b Merge "Fix shutter sound cannot enable." into pi-dev 2018-05-09 20:43:14 +00:00
android-build-team Robot
e798fc28f6 Merge "Camera: Specify session parameter build requirements" into pi-dev am: 9856d151f2
am: 4ee5e1d632

Change-Id: Iabd040574e5b9d768e7f19be55127046527b1e3d
2018-05-09 01:29:56 -07: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
a0e250e0d2 Merge "Add OP_PLAY_AUDIO to control shutter sound." into pi-dev am: da8e229b9c
am: 870d327b80

Change-Id: Ie9d04bfb3869b9103919d3c90d0b86ae13769e79
2018-05-01 17:19:50 -07: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
Kevin Chyn
09842ff5e9 Merge "refactored Log statements to Slog" into pi-dev am: 14de2930ba
am: 0a6d44f62e

Change-Id: I5b79fe9988db43586de268312f1898e27e2fb762
2018-05-01 16:48:42 -07: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
Gene Karshenboym
92a7ecf0ef Merge "Implement RadioMetadata.toString." into pi-dev am: 1ae7fd5f44
am: 7cacc1fb80

Change-Id: I58d09dee7557a89432144805e875af45f3562fd7
2018-04-30 16:57:19 -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
ea11c848af Merge "camera2/legacy: Fix expected errors on eglSwapBuffers" into pi-dev am: a973d530df
am: 437e39316b

Change-Id: I4d2f040413063135397f71fc684ba0375b86358a
2018-04-27 11:41:09 -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
9c37eae3b0 Merge "Don't check program selector's type for equality." into pi-dev am: a2015451a7
am: 74a2955d35

Change-Id: I2bcfc30020e0ee9bdee8e38dc124c9ea49df5ceb
2018-04-20 07:11:25 -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
a65c11d041 Merge "Don't delay the FINGERPRINT_ERROR_CANCELED message" into pi-dev am: 54926ba6a9
am: 8566a544c6

Change-Id: I881dcdd4a1da08173e74f5b831c716decf21c752
2018-04-17 19:19:24 -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
89a6da9211 Merge "Camera: Fix a description for MONOCHROME camera capability" into pi-dev am: 8be1197c5d
am: 3995b3ff9c

Change-Id: I66a8d3f31cdaa0a96a4eb991f1f6ab7fb2e8a32c
2018-04-16 17:46:43 -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
578cb32925 Merge "Fix AM band range." into pi-dev am: 9d86920cb4
am: 61522dee25

Change-Id: Ic2b4d1c804424da2438c5e8fb58626ad456d745c
2018-04-12 20:43:55 -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
Dan Gittik
8e7231bccf Merge "Added system-wide minimum brightness curve." into pi-dev am: 082147cfe1
am: 746256b546

Change-Id: I457cfa2b9c4eec3606e2520446644a07ec2a8397
2018-04-10 04:52:34 -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
57f3ccd838 Merge "Rename BiometricDialog to BiometricPrompt." into pi-dev am: 5ab3cf8bec
am: f2f7495f49

Change-Id: If1aa1ab2da564d84a9d56b2ac4ee1386297afed4
2018-04-05 15:07:41 -07: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
Yin-Chia Yeh
da7a3d5372 Merge "Camera: sort getCameraIdList output" into pi-dev am: 3275d9a004
am: 8d018c52a5

Change-Id: I62b5cd77286e678b748b769c90f02eb79e466da6
2018-04-03 10:46:12 -07:00
TreeHugger Robot
3275d9a004 Merge "Camera: sort getCameraIdList output" into pi-dev 2018-04-03 17:13:39 +00:00
Emilian Peev
b28b41df14 Merge "Camera: Update external camera orientation guidelines" into pi-dev am: 7451945364
am: 905fd392ac

Change-Id: If290b4f36d5eceb43dba1d1efcb0e9913a670600
2018-04-03 06:30:05 -07:00
TreeHugger Robot
7451945364 Merge "Camera: Update external camera orientation guidelines" into pi-dev 2018-04-03 12:57:19 +00:00
Yin-Chia Yeh
64ff4c1e51 Merge "Camera: fix errorFlag logic" into pi-dev am: 4ccefebb78
am: fbb5c56f81

Change-Id: Id6b26fb903b31db38e0ec51d4fe2eeeefd9268c3
2018-04-02 23:00:43 -07:00
TreeHugger Robot
4ccefebb78 Merge "Camera: fix errorFlag logic" into pi-dev 2018-04-02 23:04:42 +00:00
Kevin Chyn
a4dd7ff8bc Merge "Fingerprint user canceled message should not be delayed" into pi-dev am: 374f6a26f9
am: 2ef863e93b

Change-Id: Ia5fa53875b5bcfa988097e9322d487fe78bd8465
2018-03-31 07:05:27 +00:00