Commit Graph

3152 Commits

Author SHA1 Message Date
TreeHugger Robot
c7c173389a Merge "Camera: Always return 'null' for unsupported formats" into qt-dev 2019-05-17 21:35:23 +00:00
TreeHugger Robot
34bc57f738 Merge "Camera: Handle out-of-order frameNumber for ZSL requests" into qt-dev 2019-05-17 21:20:44 +00:00
Emilian Peev
0105dfbe78 Camera: Fix some documentation typos
Bug: 132419505
Test: Successful build
Change-Id: Ifb610998422264f565a16eae005e7096a6a2f611
2019-05-15 12:00:13 -07:00
Emilian Peev
0fde6be448 Camera: Always return 'null' for unsupported formats
According to the API documentation, output size queries must
return 'null' in case the respective format is not supported.

Bug: 132594990
Test: Camera CTS
Change-Id: I832efe73dae8753baa635b359a68062f2ef63476
2019-05-15 11:12:19 -07:00
Shuzhen Wang
b45449b9bc Camera: Handle out-of-order frameNumber for ZSL requests
Allow the frame number of ZSL capture to be out of order compared to
reprocessing or normal captures.

Test: Camera CTS, 3P camera app sanity test.
Bug: 120604717
Change-Id: I6bc81dc522329153c0ea27c3409d7237470d1850
2019-05-10 12:35:45 -07:00
Christine Franks
c5f0d146db Validate vendor display color modes
Bug: 128607042
Test: atest FrameworksServicesTests:ColorDisplayServiceTest

Change-Id: I78dca7eeb9d4855007b5616b444b2b715860bed1
2019-05-06 12:26:08 -07:00
TreeHugger Robot
76d9f44133 Merge changes from topic "step_event_permission" into qt-dev
* changes:
  Update Step Detector and Step Counter docstring
  Add support for retrieving targetSdkVersion
2019-05-02 22:56:56 +00:00
TreeHugger Robot
6c7014dd52 Merge "Camera: Consider mPhysicalCameraId in OutputConfiguration comparison" into qt-dev 2019-05-02 21:10:59 +00:00
Shuzhen Wang
46c390a1c6 Camera: Consider mPhysicalCameraId in OutputConfiguration comparison
Test: Camera CTS
Bug: 131714581
Change-Id: Ifbd44a0cd16116311e0eef9c194dd90c9210952c
2019-05-02 11:08:22 -07:00
Brian Stack
fef1a81593 Update Step Detector and Step Counter docstring
Explicitly states that the Step Detector and Step Counter require the
android.permission.ACTIVITY_RECOGNITION permission in order to be
used.

Bug: 130640415
Test: Builds
Change-Id: I3c6bb00128343dff8dbb97c71e9fe2a912662ff0
2019-05-01 19:18:27 +00:00
Ian
fd4021c26a Add tracepoints for potential performance issues
Bug: 124521164
Test: Builds
Change-Id: Ie70f2aae6c5b2e70d9f6029281a761c872451337
2019-04-30 00:01:11 +00:00
Shuzhen Wang
062c22ba60 Camera: Relax BURST_CAPTURE FPS requirements
Allow resolutions larger than 24 megapixels to have fps lower than
10fps.

Test: Build
Bug: 129693371
Change-Id: Ie0403d80bf4c441e268d266eb30dacc2ea8184b9
2019-04-22 08:58:16 -07:00
TreeHugger Robot
c901e419e3 Merge "Camera: Clarify multi-camera RAW and FOV behaviors" into qt-dev 2019-04-17 23:23:29 +00:00
Shuzhen Wang
0fdc9358c6 Camera: Clarify multi-camera RAW and FOV behaviors
- RAW capability can exist for multi-camera even if physical cameras are
of different sizes/capabilities.
- FOV for all processes streams must be the same regardless of logical
or physical streams.

Test: Build and read docs
Bug: 118906351
Bug: 126220135
Change-Id: I14ab4844630a048e66a42ec3a776c87830565e49
2019-04-16 17:13:44 -07:00
Amy Zhang
64b51f91ff Merge "Resolve CEC related API requests from API Council" into qt-dev 2019-04-15 17:46:49 +00:00
Kevin Chyn
9b92030ad5 Merge "Authenticate with the correct user from KeyguardUpdateMonitor" into qt-dev 2019-04-12 21:10:23 +00:00
Kevin Chyn
8d2694a351 Authenticate with the correct user from KeyguardUpdateMonitor
Fixes: 130242795

Test: manual
Change-Id: I5c5e400de9d204d89abbe07bc6b3265dbc4ea973
2019-04-12 11:48:12 -07:00
Eino-Ville Talvala
9943f8db84 Merge "Camera: Document LEGACY not being allowed on new devices" into qt-dev 2019-04-12 18:11:06 +00:00
Amy
d23043a255 Resolve CEC related API requests from API Council
Test: manual
Bug: 128427908
Change-Id: I1c8cd3ed843c91ecb94076160fd1bd93295c619b
2019-04-12 00:55:29 +00:00
TreeHugger Robot
3fe3dc7f5f Merge "Update documentation for fingerprint -> biometric" into qt-dev 2019-04-11 21:25:52 +00:00
Eino-Ville Talvala
2a303a492b Camera: Document LEGACY not being allowed on new devices
Bug: 130315905
Test: Builds, docs look ok.
Change-Id: I9e1bd8561819f84419cac4d048085700b4694473
2019-04-11 00:42:36 +00:00
Kevin Chyn
76d5454a86 Merge "Handle cancellation properly for setDeviceCredentialAllowed(true)" into qt-dev 2019-04-10 08:34:34 +00:00
Kevin Chyn
5a90a653f5 Handle cancellation properly for setDeviceCredentialAllowed(true)
Keep the current auth session until ConfirmDeviceCredential succeeds
or fails. ConfirmDeviceCredential's BP and LSKF screens can be canceled
now.

Bug: 123378871
Bug: 128747871

Test: With modified BiometricPromptDemo, ConfirmDeviceCredential's
      BiometricPrompt and LSKF screens can be canceled

Change-Id: Icaf3f0c55b07fd138a2ee9d214941ea83408f0ee
2019-04-09 22:04:05 -07:00
Rob Carr
f8f5f0290e Merge "Careful with screenshots containing secure layers!" into qt-dev 2019-04-09 00:45:22 +00:00
Robert Carr
66b5664f2d Careful with screenshots containing secure layers!
For purposes of	the screen rotation animation the system server	is allowed
to capture secure (not protected) layers and trusted not to persist screenshots
which may contain secure layers. However when displaying the screen rotation animation,
the layer the screenshot is placed on will itself not be secure, so if we record
the animation the recording will contain persisted versions of the secure content. Make sure
we use the new API from SurfaceFlinger to set FLAG_SECURE if our screenshot contains secure
content.

Bug: 69703445
Test: Transaction_test#SetFlagsSecureEuidSystem
Change-Id: I1b016fb1ad56eccd712442a71cc134e5fa3b1ac6
2019-04-08 15:22:46 -07:00
Christine Franks
66783a8440 Add display white balance enabled methods to CDS
There needs to be a single source of truth about whether DWB is
enabled or disabled.

Bug: 123930917
Test: atest FrameworksServicesTests:DisplayWhiteBalanceTintControllerTest

Change-Id: If634b46c2d0da123901bd5833e2114d958957540
(cherry picked from commit ff6770d669)
2019-04-05 21:36:56 +00:00
Kevin Chyn
9374c9f839 Update documentation for fingerprint -> biometric
Fixes: 129909360

Test: Builds
Change-Id: I8e419e4c2b5ca2c1f0fc9d988100ceb41f193a42
2019-04-05 00:49:59 +00:00
Shuzhen Wang
64ed101290 Camera: Clarify camera1 API behavior for getNumberOfCameras
Expose at most 1 camera ID per facing for all logical-physical camera ID
groups.

Test: Build and read docs
Bug: 113705942
Change-Id: I86a06562eafd600d351d8db2582a613b3323404c
2019-04-04 15:55:37 +00:00
Yin-Chia Yeh
796820aa92 Merge "Camera: add QCIF resolution exception" into pi-dev
am: 5b09928b22

Change-Id: I20e60ef6d84c969b1651e449f5a076183d38a7c9
2019-04-04 00:14:38 -07:00
Kevin Chyn
9af1448d50 Merge "Make get/set feature async between settings and service" 2019-04-03 23:46:14 +00:00
TreeHugger Robot
c2bb94fc29 Merge "Add package name when loadModules and attach." 2019-04-03 19:36:20 +00:00
Michael Wright
89df2a72f7 Merge "Expose input region monitoring to system components." 2019-04-03 16:04:03 +00:00
Michael Wright
c7995239ef Expose input region monitoring to system components.
This is to allow SysUI to detect system-wide gestures.

Test: manual
Bug: 123748692
Change-Id: Ic1e2cd6afea219d0e20b29e7150c9a42b75c7a67
2019-04-03 13:46:30 +01:00
Kevin Chyn
e62749a2c2 Make get/set feature async between settings and service
Fixes: 127382095

Test: None
Change-Id: Ib5495bf5a39bc3a2939aad5c721e32375dd9dde3
2019-04-02 19:59:14 -07:00
TreeHugger Robot
fd283c35f0 Merge "Camera: Relax logical camera stream combination requirement" 2019-04-03 00:06:53 +00:00
Yin-Chia Yeh
428256d258 Camera: add QCIF resolution exception
Also fix a typo.

Test: checkbuild
Bug: 120158047
Bug: 122461651
Change-Id: I61eab3f526e307b04a71c8382e9fa76aee7871e1
2019-04-01 12:40:51 -07:00
TreeHugger Robot
afebeabb48 Merge "Camera: Pass physical camera device id during errors" 2019-04-01 17:00:39 +00:00
Shuzhen Wang
de95aafac6 Camera: legecy: disconnect JPEG surface at exit
Test: Camera CTS on Pixel 1 with HAL1 enabled on nyc-mr2
Bug: 128600230
Change-Id: Ide5acf3117c178029c187ed4ad9d270878c220be
2019-03-27 14:05:39 -07:00
TreeHugger Robot
6897a4e51c Merge "Respond to taps and lifts when AOD is off" 2019-03-26 17:34:21 +00:00
Shuzhen Wang
2da73f420f Camera: Relax logical camera stream combination requirement
Depending on hardware capability, a logical camera may not support
concurrent physical streams. Relax the requirement for stream
combination accordingly.

Also fix missing MANDATORY_STREAM_COMBINATIONS issue for hidden physical
camera.

Test: Updated camera CTS, ITS
Bug: 119325664
Change-Id: Iddbef330d7e091d55ac44124a03fca5a932ae13a
2019-03-26 10:15:48 -07:00
Lucas Dupin
62206ccb11 Respond to taps and lifts when AOD is off
Gesture registration happens in the doze machine, meaning
that there's a dependency between slpi gestures and the
doze service.

Fixes: 118930173
Test: manual
Change-Id: Ic8fd0ed1d2192720a8f0313544d491a498a5cb05
2019-03-25 16:27:51 -07:00
Emilian Peev
d0e96e3a38 Camera: Pass physical camera device id during errors
Failing capture requests associated with physical cameras
must return information about the specific device.

Bug: 128835627
Test: Camera CTS
Change-Id: Icfac9bc442fbe78d9398ce1c1b5faba40022c558
2019-03-25 19:21:06 +00:00
Christine Franks
e17d742ce5 Synchronize NightDisplayListener
Bug: 124232236
Test: manual
Change-Id: Ie0db4e53d20781f21f4fe49670706721e56c9ca7
2019-03-21 12:55:34 -07:00
Andrei Onea
e30e3928f9 Add @UnsupportedAppUsage annotations
For packages:
  android.companion
  android.filterfw
  android.hardware.camera2.utils
  android.inputmethodservice
  android.net.nsd
  android.os
  android.preference
  android.security.keymaster
  android.service.dreams
  android.telecom
  android.telephony.ims.compat.feature
  android.telephony
  android.util
  android.view.accessibility
  android.media.effect

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: I9c2f8347952f3cc65759472b0e1a2717b285e44e
2019-03-21 14:04:57 +00:00
jiabin
1f4b4dd742 Add package name when loadModules and attach.
Adding package name when loading modules and attaching can help check
the permission of capturing hotword.

Test: test with logging.
Bug: 74078996
Bug: 122721589
Change-Id: I283d2e15283542384822d547bc1f322384172896
2019-03-20 18:05:14 -07:00
TreeHugger Robot
7ae743134f Merge "Fix color sampling API per review comments." 2019-03-19 11:12:45 +00:00
TreeHugger Robot
e147bba371 Merge "Update acquisition strings" 2019-03-19 02:50:43 +00:00
Kevin Chyn
650c3faaa1 Merge "Update BiometricPrompt documentation" 2019-03-19 00:53:31 +00:00
Kevin Chyn
7e7b509f17 Update acquisition strings
Fixes: 128629012
Fixes: 128452700
Bug: 111548033

Test: Builds
Change-Id: If5ea688cbd6603d05c9f6883e8038ce3a7bc6a6c
2019-03-18 17:40:32 -07:00
TreeHugger Robot
01e63ea5fd Merge "Camera: Update "RecommendedStreamConfigurationMap" annotations" 2019-03-18 23:42:53 +00:00