Commit Graph

2693 Commits

Author SHA1 Message Date
Denis Hsu
87433cd1a0 Catch egl errors when drawIntoSurfaces
Cts test case: testAbandonRepeatingRequestSurface is
used to test the GPU for the ability of detecting the
interrupt release of surface. It may have a dequeue buffer
action in eglMakeCurrent, so it would return error
"EGL_BAD_NATIVE_WINDOW" after surfaceflinger has been
disconnected. In this case, the test can be passed
only when we catch the errors thrown from GPU when calling
eglMakeCurrent, or the test would be interrupted by
the error exception.

Bug: 72750260
Test: manual, ran the cts test case
android.hardware.camera2.cts.RobustnessTest#testAbandonRepeatingRequestSurface
Change-Id: I79bacdd3c0382a79786f8eb689eb4f89c830ddcc
2018-11-22 12:05:43 +08:00
Treehugger Robot
b25190cf62 Merge "Fix for android.hardware.radio.Utils.createIntSet" 2018-10-23 22:18:55 +00:00
Nathan Harold
f5cf9f24ed Merge "Move some members to the "Q blacklist"." 2018-10-23 21:53:51 +00:00
Jan Kowal
d09a4081d6 Fix for android.hardware.radio.Utils.createIntSet
Previous solution was assymetric: writeInt vs readTypedObject.

Also, specify the initial capacity to avoid unnecessary reallocations.

Bug: 117113131
Test: atest BroadcastRadioTests
Change-Id: Ib33b97d482422b1acac8e9420a0c974bcd59355b
2018-10-23 13:33:51 -07:00
Mathew Inwood
45d2c252b1 Move some members to the "Q blacklist".
Based on some analysis, these fields/methods are likely false positives.
Set maxTargetSdk=P so that any apps using them are required to migrate off
them in future. See the bug for more details.

Exempted-From-Owner-Approval: Automatic changes to the codebase
affecting only @UnsupportedAppUsage annotations, themselves added
without requiring owners approval earlier.

Bug: 115609023
Test: m
Merged-In: I719b5c94e5b1f4fa562dd5d655953422958ad37e
Change-Id: I719b5c94e5b1f4fa562dd5d655953422958ad37e
(cherry picked from commit 8c854f86a4)
2018-10-22 17:28:24 -07:00
Shuzhen Wang
9481340777 Merge "Camera: Trivial doc update"
am: e9f1e8c123

Change-Id: Id1a9c504a460b9f82496fbfcabb49e1c7f583dba
2018-10-11 14:21:35 -07:00
Shuzhen Wang
2b11fddb22 Camera: Trivial doc update
Change-Id: I63198c6d2cb348380e718974dd356d48137ae376
2018-10-11 09:17:34 -07:00
Daichi Hirono
f98d5cb38b Merge "Stop invoke initAppOps in Camera default constructor."
am: 0890a2b51e

Change-Id: I6ed52f595757c3ca7308969105f05e6bd55dee65
2018-09-10 20:00:30 -07:00
Treehugger Robot
0890a2b51e Merge "Stop invoke initAppOps in Camera default constructor." 2018-09-11 01:32:53 +00:00
Ryan Prichard
66e6f61bb1 Merge changes from topic "b113052379-cp-from-pi-dev-p2"
am: c9fc995e0e

Change-Id: Ia83844fa93a02234178042be85cc99eaeaca221f
2018-09-06 14:37:27 -07:00
Eino-Ville Talvala
e0641b2619 Camera: Documentation updates for calibration and distortion correction
am: 96024af857

Change-Id: Ie07f7074a0347f63cd8c6f2bb715efbdba8b717f
2018-09-06 14:30:42 -07:00
Ryan Prichard
c9fc995e0e Merge changes from topic "b113052379-cp-from-pi-dev-p2"
* changes:
  Camera: Documentation update to remove physicalIds
  Camera: Documentation updates for calibration and distortion correction
2018-09-06 20:35:24 +00:00
Daichi Hirono
2dba5c8417 Stop invoke initAppOps in Camera default constructor.
Camera default constructor does not create the underlying native camera
object. Thus calling _enableShutterSound after the default constuctor
causes application crash.

Bug: 80498247
Test: Manually modify the code to return MODE_IGNORED for
      AppOpsService#checkAudioOperation() and to return false for
      CameraManager#supportsCamera2ApiLocked. Then start voice call in
      Hangouts.

Change-Id: Id738c4d46a8e3625bc3b1142b11acac9cfb0b603
Merged-In: Id738c4d46a8e3625bc3b1142b11acac9cfb0b603
(cherry picked from commit cb63c640cd)
2018-09-05 01:51:59 +00:00
Ryan Prichard
3cd4b66ceb Merge changes from topic "b113052379-cp-from-pi-dev-p1"
* changes:
  Camera: hardware level related doc update
  Camera: codegen doc update
2018-09-04 20:20:17 +00:00
Chih-hung Hsieh
f106a9a2c7 Merge "Use multiple emails in per-file syntax."
am: 1d3571cb88

Change-Id: Iaf7f8d314afe7d03cd119a861f94da10a9666a84
2018-08-31 00:41:58 -07:00
Eino-Ville Talvala
96024af857 Camera: Documentation updates for calibration and distortion correction
- Add more notes on coordinate axes
- Add more text on metadata when distortion correction is active
- Note that poseTranslation needs to be negated in many use cases
- Fix coordinate system references for OIS reporting, add more information
- Note that pixel centers at half-integers for the camera API metadata
  such as lens intrinsics

Bug: 79371566
Bug: 74434422
Bug: 109742048
Bug: 109834325
Bug: 109817371
Bug: 112107924
Bug: 113052379
Test: Manual reading of added text
Change-Id: I450e80b79ef66ce8d82a4dee835db6abd1e598a3
Merged-In: I450e80b79ef66ce8d82a4dee835db6abd1e598a3
(cherry picked from commit 08bd163e2d)
2018-08-30 16:42:19 -07:00
Shuzhen Wang
44397643f4 Camera: Documentation update to remove physicalIds
Public API doesn't see android.logicalcam.physicalIds. Remove it
from public doc.

Bug: 112655222
Bug: 113052379
Test: make offline-sdk-docs
Change-Id: Idf6958fb7c117912e33ece4fbaed04cb8e5e14c0
Merged-In: Idf6958fb7c117912e33ece4fbaed04cb8e5e14c0
(cherry picked from commit de23d28d07)
2018-08-30 16:42:19 -07:00
Yin-Chia Yeh
a8cfb0ae93 Camera: hardware level related doc update
Codegen doc update + CameraDevice manual update about EXTERNAL
hardware level.

Test: check offline-sdk-docs output
Bug: 77861412
Bug: 113052379
Change-Id: I70c87a176cf873cf8bec2037f973a94fe99aef2e
Merged-In: I70c87a176cf873cf8bec2037f973a94fe99aef2e
(cherry picked from commit c565700b94)
2018-08-30 16:42:18 -07:00
Yin-Chia Yeh
c925656a1e Camera: codegen doc update
Test: N/A. Doc update
Bug: 109666939
Bug: 113052379
Change-Id: I2bd176a7f5ada755c8a79201d142a98131e2e82c
Merged-In: I2bd176a7f5ada755c8a79201d142a98131e2e82c
(cherry picked from commit 6c73e409fc)
2018-08-30 16:42:18 -07:00
Chih-Hung Hsieh
e5657128e2 Use multiple emails in per-file syntax.
Test: build/make/tools/checkowners.py -c -v OWNERS
Change-Id: I16349f12fa566ec0772b4744aa33e65b614d054b
2018-08-23 16:00:42 -07:00
Mathew Inwood
37d1e21614 Merge "Remove @UnsupportedAppUsage annotations from generated code."
am: 30ea09ab75

Change-Id: Iecef5e97eb464ab9b609dac79f7b0367aa497837
2018-08-22 06:04:03 -07:00
Mathew Inwood
29ec6e6264 Remove @UnsupportedAppUsage annotations from generated code.
Revert back to using the greylist file for this code, since the annotations
would be lost next time the code is regenerated.

Bug: 110868826
Test: m

Merged-In: Ib245a2f1457ced34d5b1a3248161fa4a211ba5e9
Change-Id: Ib245a2f1457ced34d5b1a3248161fa4a211ba5e9
2018-08-21 17:27:35 +01:00
Mathew Inwood
eaff9b8d78 Merge "Add @UnsupportedAppUsage annotations" am: 196eb1d929
am: 83271288ec

Change-Id: I4d68830f98dece9b77a4ad4cd3769172f00eb0cc
2018-08-09 09:13:59 -07:00
Mathew Inwood
5132cc1c85 Add @UnsupportedAppUsage annotations
For packages:
  android.hardware.usb
  android.hardware.soundtrigger
  android.hardware.radio
  android.hardware.location
  android.hardware.input
  android.hardware.hdmi
  android.hardware.fingerprint
  android.hardware.display
  android.hardware.cas.V1_0
  android.hardware.camera2.utils
  android.hardware.camera2.params
  android.hardware.camera2.marshal.impl
  android.hardware.camera2.marshal
  android.hardware.camera2.legacy
  android.hardware.camera2.impl
  android.hardware.camera2.dispatch
  android.hardware.camera2
  android.hardware

This is an automatically generated CL. See go/UnsupportedAppUsage
for more details.

Exempted-From-Owner-Approval: Mechanical changes to the codebase
which have been approved by Android API council and announced on
android-eng@

Bug: 110868826
Test: m
Change-Id: I7bfe07144a4d581985aa9d4b525b7ca975a2127d
Merged-In: I046df307d1065a9692e4e7259c59a93ee8f458ef
2018-08-08 15:50:55 +01:00
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