Commit Graph

3168 Commits

Author SHA1 Message Date
Emilian Peev
54d7219b0c Merge "Camera: Always return 'null' for unsupported formats" into qt-dev
am: c7c173389a

Change-Id: I70498dcc38c16912230eb28f2975cd758f12e694
2019-05-17 15:17:49 -07:00
Shuzhen Wang
400c6fc4ee Merge "Camera: Handle out-of-order frameNumber for ZSL requests" into qt-dev
am: 34bc57f738

Change-Id: If601700de8ea43d1bf1538984951b0ec76151f88
2019-05-17 14:55:46 -07:00
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
c9fe56e893 Merge "Camera: Fix some documentation typos" into qt-dev
am: ee0d8180b6

Change-Id: Ib774bda31bd6aee67eaa88f8e840ba5930d6d9b3
2019-05-16 12:23:44 -07: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
29e86faf4e Merge "Validate vendor display color modes" into qt-dev
am: 1da3d01b5e

Change-Id: Iad3419fbbb43177bb137c17c45b34f494d34ff8b
2019-05-08 11:12:24 -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
Brian Stack
2e9b2b31a1 Merge changes from topic "step_event_permission" into qt-dev
am: 76d9f44133

Change-Id: I595aac545678b7059c817c62a73ff88a473bf556
2019-05-03 09:31:38 -07:00
Shuzhen Wang
4f4fa12784 Merge "Camera: Consider mPhysicalCameraId in OutputConfiguration comparison" into qt-dev
am: 6c7014dd52

Change-Id: If661321a74436c850652e728e16cf13e8de83668
2019-05-03 06:37:40 -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 Chang
cb12c60411 Merge "Add tracepoints for potential performance issues" into qt-dev
am: 28cb4d23db

Change-Id: I6de4fb84870d0e67d0b944b8fd7ad5307e6fe46e
2019-04-30 19:42:39 -07: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
578e1637bd Merge "Camera: Relax BURST_CAPTURE FPS requirements" into qt-dev
am: b9177522ff

Change-Id: Ib1da89bbfafa3f5c1231d14aa071f6e22c268da0
2019-04-23 18:59:19 -07: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
Shuzhen Wang
d514575d59 Merge "Camera: Clarify multi-camera RAW and FOV behaviors" into qt-dev
am: c901e419e3

Change-Id: I51a7aa4c7246b6899f933cd3c8e82093f8f1b43a
2019-04-17 17:18:49 -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
7a7ebecb9b Merge "Resolve CEC related API requests from API Council" into qt-dev
am: 64b51f91ff

Change-Id: I8c9f89d3bd8c4124e4d09115684a02156e19e1fb
2019-04-15 11:05:06 -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
1ebd55b1f5 Merge "Authenticate with the correct user from KeyguardUpdateMonitor" into qt-dev
am: 9b92030ad5

Change-Id: Iee77d2830ea0837441c362f8d435511cfac7d5b0
2019-04-12 14:34:33 -07:00
Kevin Chyn
9b92030ad5 Merge "Authenticate with the correct user from KeyguardUpdateMonitor" into qt-dev 2019-04-12 21:10:23 +00:00
Eino-Ville Talvala
6000bb9884 Merge "Camera: Document LEGACY not being allowed on new devices" into qt-dev
am: 9943f8db84

Change-Id: I6732f2a736187d930887055bd1b0c4b8fe95cb51
2019-04-12 12:19:27 -07: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
Kevin Chyn
76fa5f0060 Merge "Update documentation for fingerprint -> biometric" into qt-dev
am: 3fe3dc7f5f

Change-Id: I8539e40e236c2f993028075eeee32b3a8ed619d9
2019-04-11 14:43:32 -07:00
TreeHugger Robot
3fe3dc7f5f Merge "Update documentation for fingerprint -> biometric" into qt-dev 2019-04-11 21:25:52 +00:00
Neil Fuller
a76674f153 resolve merge conflicts of fe9b32e4be to qt-dev-plus-aosp
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Exempt-From-Owner-Approval: Merge conflict resolution for approved change
Change-Id: I39bda8417f709f86b5b389a75ff34df8a28a3d8d
2019-04-11 18:09:18 +00:00
Neil Fuller
b5d1c15ec2 Switch from Byte.toHexString() to HexEncoding
Switch from Byte.toHexString() to HexEncoding equivalents.

Bug: 124232146
Test: build only
Exempt-From-Owner-Approval: Cherry-picking OWNERS approved internal version
Merged-In: Id244e5247eb87c67446cbd65eb5d320f3617b8cd
Change-Id: Id244e5247eb87c67446cbd65eb5d320f3617b8cd
2019-04-11 09:27:45 +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