Commit Graph

2661 Commits

Author SHA1 Message Date
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
Vishwath Mohan
cf87df1531 Refactor FingerprintDialog to BiometricDialog
This CL changes FingerprintDialog into the more generic
BiometricDialog, which OEMs will be able to extend as necessary to
provide support for alternate biometric modalities.

Bug: 74831038
Test: m -j50 FingerprintDialog (from the associated CL on this topic)
      The app works and authenticates successfully.
Test: make update-api -j56

Change-Id: Ic398ef0a0b448be68dbe3330b30779f93f567243
2018-03-27 13:15:01 -07:00
TreeHugger Robot
3801d3a7d9 Merge "Camera2: Add distortion correction support" into pi-dev 2018-03-27 19:26:44 +00:00
TreeHugger Robot
b57843059a Merge "Tweak FingerprintDialog" into pi-dev 2018-03-27 18:43:17 +00:00
Jerry Zhang
e52c2b98e9 Merge "Write descriptors for Mtp in UsbService" into pi-dev am: df101a4596
am: 03f2788598

Change-Id: If6a24ce29d891159a60e4690eb82ef83b2f82885
2018-03-27 03:57:23 +00:00
Jerry Zhang
df101a4596 Merge "Write descriptors for Mtp in UsbService" into pi-dev 2018-03-27 02:49:02 +00:00
Shuzhen Wang
51248bf607 Camera: Add MONOCHROME camera capability
Test: Camera CTS
Bug: 74597035
Bug: 64691172
Change-Id: I0315faada2e69acfe3617fabe3e52563701e8ee7
2018-03-26 16:11:48 -07:00
Kevin Chyn
dba919af3a Tweak FingerprintDialog
FingerprintDialog optional fields should not take up space when null
FingerprintDialog error messages should be delayed until dialog is dismissed

Fixes: 75281164

Test: manual test with FingerprintDialog apk

Change-Id: Iaa95fc8c95b7c9f5fc5d8563ea37fc1f6497fabd
2018-03-26 14:45:23 -07:00
Emilian Peev
261aef584d Merge changes from topic "executor_api" into pi-dev am: 8cb2aba54d
am: d0d4291fef

Change-Id: I00bb1fbfbeeee77454f156fd1853380c33be7dab
2018-03-26 14:05:56 +00:00
Emilian Peev
3b0166dbf1 Camera: Async camera manager calls should use executors am: 9129aa25c1
am: f977ff992c

Change-Id: Ib2819df3ac27e4580bafa9420136c6678318d9b4
2018-03-26 14:02:38 +00:00
Emilian Peev
f977ff992c Camera: Async camera manager calls should use executors
am: 9129aa25c1

Change-Id: Idd12695a8cdd15522d167499deb7b119d5b7db45
2018-03-26 13:46:48 +00:00
TreeHugger Robot
8cb2aba54d Merge changes from topic "executor_api" into pi-dev
* changes:
  Camera: Accept user-supplied executors in capture sessions
  Camera: Async camera manager calls should use executors
2018-03-26 13:31:30 +00:00
Emilian Peev
6dfdd8ccd4 Merge changes from topic "bug73953366_bug74605221" into pi-dev am: 7ed5fb3e1d
am: a87c6da04b

Change-Id: I4ef17c30e731fe96628d39fa8bcf6b8eb7c49ae8
2018-03-23 18:40:44 +00:00
Emilian Peev
d3c4753f34 Camera: Camera shouldn't throw 'RejectedExecutionException' am: b9a5194e9e
am: ca5ffee316

Change-Id: I1f659f2b7a5e2af801b2508e8d8bfd36b9194e05
2018-03-23 18:36:51 +00:00
Emilian Peev
669ca91e00 Revert "Revert "Camera: SessionConfiguration should use Executors"" am: 77ca866b53
am: f18ec57381

Change-Id: Iad789b80b193b535a517c991894cc29046e517b1
2018-03-23 18:33:45 +00:00
Emilian Peev
ca5ffee316 Camera: Camera shouldn't throw 'RejectedExecutionException'
am: b9a5194e9e

Change-Id: Ic4dd87d89f91822fce82c5ca27632f69716279e5
2018-03-23 18:15:35 +00:00
Emilian Peev
f18ec57381 Revert "Revert "Camera: SessionConfiguration should use Executors""
am: 77ca866b53

Change-Id: I226e1ba33047695b74ce5de9054c4760e61bf773
2018-03-23 18:11:10 +00:00