Commit Graph

2677 Commits

Author SHA1 Message Date
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
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
Bryan Mawhinney
b41dac3d5c Merge "Add a SystemApi to control display saturation." into pi-dev am: 49c27f2267
am: ce30233913

Change-Id: I03c24bb2b6c1e43eab7543a87e1dffb38a33ddeb
2018-03-29 22:38:01 +00:00
Tomasz Wasilczyk
3519cf02f6 Merge "Fix empty program list filter handling." into pi-dev am: 7a33063b39
am: 925804d844

Change-Id: Iaeb5767ea570fdee58a4f937dda029ae5416ec51
2018-03-29 22:31:52 +00: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
Tomasz Wasilczyk
9f42043ba1 Merge "Indicate whether BandConfig initialization is required or not." into pi-dev am: 64faa5b60f
am: 1ee1809190

Change-Id: I9713bb3982d0c44544b24a5fa89fee1b7d5483e8
2018-03-29 18:25:09 +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
Shuzhen Wang
2410c6f431 Merge "Camera: Add MONOCHROME camera capability" into pi-dev am: 889b21d181
am: aa306f2788

Change-Id: Ic76dac7d28f89bb070321430710c9871c3167857
2018-03-29 00:21:24 +00:00
TreeHugger Robot
889b21d181 Merge "Camera: Add MONOCHROME camera capability" into pi-dev 2018-03-28 21:01:31 +00:00
Vishwath Mohan
6787c4c56a Merge "Refactor FingerprintDialog to BiometricDialog" into pi-dev am: 86ed912f5a
am: 77b5ccb59b

Change-Id: I6de587d85c7ece9a20613ab935fca6f886dbc1c3
2018-03-28 19:19:40 +00:00
Vishwath Mohan
86ed912f5a Merge "Refactor FingerprintDialog to BiometricDialog" into pi-dev 2018-03-28 18:46:34 +00:00
Yin-Chia Yeh
f8aa7bc152 Camera: sort getCameraIdList output
Since API1 camera ID (int) can now be used as array index
of getCameraIdList output.

Test: mix internal/external camera and try CtsVerifier tests
Bug: 72261912
Change-Id: I7cc28f47d100424ebe1ce6f7b61f60c233688538
2018-03-28 12:59:49 +01:00
Emilian Peev
3abc7511b8 Camera: Update external camera orientation guidelines
The external camera orientation and facing should not be
used for the jpeg orientation calculation.

Bug: 72261912
Test: Android compiles without errors
Change-Id: I552c09ae8dada2122396128011f7b82a9889e126
2018-03-28 11:22:26 +01:00
Eino-Ville Talvala
a262051294 Merge "Merge "Camera2: Add distortion correction support" into pi-dev am: 3801d3a7d9" into pi-dev-plus-aosp
am: a2b839170f

Change-Id: I89e9c5044a8cc5b6a107aa6e1b7843d624a11726
2018-03-27 21:38:15 +00:00
Kevin Chyn
6b8ba697b1 Merge "Tweak FingerprintDialog" into pi-dev am: b57843059a
am: 4dd84f9c92

Change-Id: Iffc554493e09da5202d27f66cf32956dae03fc59
2018-03-27 20:30:02 +00:00