Commit Graph

3588 Commits

Author SHA1 Message Date
Yin-Chia Yeh
ab59e9af27 Merge "Camera: add proper null check for mRemoteDevice" into rvc-dev 2020-05-01 18:05:49 +00:00
Eino-Ville Talvala
2a4de9cf21 Merge "Camera: Improve metadata access JNI performance" into rvc-dev 2020-04-30 22:19:13 +00:00
Eino-Ville Talvala
d95058f1cd Camera: Improve metadata access JNI performance
- Don't use reverse-JNI to access metadata ptr, pass it as an arg instead
- Use @FastNative since the calls are short and bounded in time

Performance improvement:
- On a 10-second trace of camera app running on sargo, percentage of
  time used in CameraMetadataNative.get went from 4.36% to 3.77%, a 15%
  reduction in time.

Test: atest CtsCameraTestCases
Bug: 150214459
Change-Id: I28d9428beaa7eada6292e24fe6ca1dbd9c2ff153
2020-04-30 12:59:06 -07:00
Ytai Ben-Tsvi
b6f88a7af7 Handle exceptions on attach
attach() may throw various kinds of runtime exceptions, and since there
is no way to represent them in attach() other than returning null (it
is not supposed to throw), we should catch them here and log them.

Bug: 153332815
Change-Id: Icbb7643c3abf6c6b0edc9d1eb9a74c38c731acdf
2020-04-29 14:54:29 -07:00
TreeHugger Robot
77576fe964 Merge "CEC: Make HDMI CEC volume control configurable" into rvc-dev 2020-04-27 12:26:23 +00:00
Marvin Ramin
da665a67f1 CEC: Make HDMI CEC volume control configurable
Add API (backed by Setting) to enable/disable volume changes via HDMI
CEC for HDMI CEC source devices.
This state is persisted via Settings.

If volume control is disabled, no incoming HDMI CEC commands related to
volume will be processed. If disabled, no HDMI CEC volume control
messages will be sent by the device.

Test: atest com.android.server.hdmi
Bug: 149800547

Merged-In: I83ae9b423122b540b9adb156fb1c6f5964dd6105
Change-Id: I83ae9b423122b540b9adb156fb1c6f5964dd6105
2020-04-27 12:35:56 +02:00
Ytai Ben-Tsvi
458930753d Deliver internal server errors to the client
Due to a binder limitation (b/150808347), any unexpected exception
thrown by a binder service while processing an RPC call, will be
silently discarded and the client will get back a default-initialized
result parcelable (i.e. in most cases, won't know that anything wrong
happened).

We work around this issue by throwing a ServiceSpecificException,
which does get delivered, having a special code to designate an
internal error. Errors resulting from a HAL malfunctions will result
in a HAL reboot, which leads to recovery.

Bug: 154089179
Test: Manual verification of basic error recovery scenarios by
      injecting HAL error codes and crashes.
Change-Id: Ib5dbe08a362e545501c04204bebad5ab95f5d632
2020-04-24 16:39:36 -07:00
TreeHugger Robot
f0de93d7b2 Merge "Use Arrays.hashCode in DeviceProductInfo" into rvc-dev 2020-04-24 14:24:25 +00:00
Marin Shalamanov
90fd0b19f8 Use Arrays.hashCode in DeviceProductInfo
Using arrays in Objects.hash() is error prone. Instead we
call Arrays.hashCode().

Test: m services
Bug: 154302664
Change-Id: Icf00fbaa465ef60951998659ae0333b2faf7042b
2020-04-24 13:02:35 +00:00
TreeHugger Robot
1a17016c70 Merge "Camera: Update physical camera request keys documentation" into rvc-dev 2020-04-23 16:39:11 +00:00
Emilian Peev
b30f4ef874 Camera: Update physical camera request keys documentation
Align physical camera request key documentation with the
camera service implementation. Specifically remove any
repeating request limitations.

Bug: 154673381
Test: Successful doc build
Change-Id: I563542e819ef57a99f762d7cfd653cced2423ebb
2020-04-22 09:11:01 -07:00
Jacky Kao
538ee89f2b Merge "Obtain correct screenshot based on device orientation" into rvc-dev 2020-04-22 00:19:35 +00:00
Jacky Kao
333de4e7c3 Obtain correct screenshot based on device orientation
When taking the screenshot, passing the width and height
of the display, and the rotation according to the current
device orientation.

Bug: 153173726
Test: a11y CTS & unit tests
Test: manual test
Change-Id: I19eea2046da282155719b1dfdf9a3f53ad95e13b
2020-04-22 00:19:12 +00:00
Nicholas Ambur
d3c1f27b0c add KeyphraseEnrollmentInfo to TestApi
KeyphraseEnrollmentInfo is used for testing the system enrollment
application support within GTS.

Bug: 153264697
Test: gts-tradefed run gts-dev -m GtsAssistIntentTestCases \
-t com.google.android.assist.gts.KeyphraseModelManagerTest# \
testAllSystemKeyphrasesAndLocales

Change-Id: I66558cf849f2815f2c917d128f9f9cc0673750ef
Merged-In: I66558cf849f2815f2c917d128f9f9cc0673750ef
2020-04-17 22:12:13 +00:00
Shuzhen Wang
f807a41008 Camera: Hook up zoom ratio in legacy camera2 shim
Map the camera2 CONTROL_ZOOM_RATIO to legacy zoomRatio in Camera.Parameters.

Test: Force Pixel 2 HAL to HAL1, and run testZoomRatioTest
Bug: 149052011
Change-Id: I888c919ae10d3e2882f3df797524a06e2b3be259
2020-04-15 18:01:29 -07:00
TreeHugger Robot
c74baf480d Merge "[RESTRICT AUTOMERGE] Add relative address to DeviceProductInfo." into rvc-dev 2020-04-14 16:30:28 +00:00
Marin Shalamanov
443c4d047a [RESTRICT AUTOMERGE] Add relative address to DeviceProductInfo.
This CL adds a field relativeAddress to DeviceProductInfo which
contains the device address in the display network. For example,
for HDMI connections the field is populated with the physical address.

Bug: 147994746
Test: adb shell dumpsys display
Change-Id: I87d9fd00bd16abc7594dc3f6b6d4e00c8968af07
2020-04-14 16:52:11 +02:00
TreeHugger Robot
72a3d44773 Merge "Camera: Fix condition check for min/max zoom ratios" into rvc-dev 2020-04-11 02:19:12 +00:00
Andrei-Valentin Onea
1775d16adb Merge "Add method to greylist" into rvc-dev 2020-04-09 11:17:11 +00:00
Andrei Onea
a8766420c6 Add method to greylist
Add Landroid/hardware/camera2/CameraMetadata;->getNativeMetadataPtr()J
to greylist so that
CameraManagerTest#testCameraCharacteristicsNdkFromSdk no longer needs
to forego hidden api checks.

Bug: 149594233
Test: atest CameraManagerTest#testCameraCharacteristicsNdkFromSdk
Test: adb install -r -g CtsCameraTestCases.apk && \
      adb  shell am instrument -e class \
	'android.hardware.camera2.cts.CameraManagerTest#testCameraCharacteristicsNdkFromSdk' \
	-w 'android.camera.cts/androidx.test.runner.AndroidJUnitRunner'
Change-Id: Ibd53dd198efc5722e20f153ef5cc9433e5b7539d
2020-04-08 19:56:52 +01:00
Shuzhen Wang
b80734fa09 Camera: Fix condition check for min/max zoom ratios
- minZoomRatio can be larger than 1.0f
- assert both min and max zoom ratios to be greater than 0.
- assert min zoom ratio to be equal or smaller than max zoom ratio.

Test: CTS on Cuttlefish camera
Bug: 153377715
Change-Id: Ia5d3f2ec7a51d4a35f199abe15a90c72cb7f3456
2020-04-06 15:30:50 -07:00
Chavi Weingarten
ae1c541a6f Merge "Added displayPosition in LogicalDisplay" into rvc-dev 2020-04-06 18:29:05 +00:00
Jacky Kao
aa8f5cb671 Merge "Supporting multi-display for takeScreenshot()" into rvc-dev 2020-04-06 09:03:42 +00:00
chaviw
945f7301f0 Added displayPosition in LogicalDisplay
Allow WindowManager to get display position from DisplayManager. This
will allow display animations to work since we need to know the initial
position of the display to correctly handle animations

Test: LogicalDisplayTest
Bug: 149490428

Change-Id: I5de2495982294ffa0437d8e87a43bf1d2fd0d86a
2020-04-03 13:51:03 -07:00
Yin-Chia Yeh
10d59c5f6d Camera: add proper null check for mRemoteDevice
Test: camera CTS
Bug: 139493594
Change-Id: Ifef9e30852056e54c5ed2c1427751a8c92c14469
2020-04-01 10:08:26 -07:00
b0202.jung
925435c18d [wm] VirtualDisplayConfig to mirror the non-default display
The application can request to mirror default display by using MediaProjection.
However, there is no way to mirror the specific display on multi-display enviroment.

Now, the application can set displayIdToMirror through VirtualDisplayConfig class.

Test: atest FrameworksServicesTests:DisplayManagerServiceTest
Bug : 127687569

Change-Id: I1ef94bfa79e103d0a4a05a10fc8705ed3bbcc0c9
2020-04-01 08:50:18 -07:00
Kevin Chyn
f825133d01 Merge "Send "early canceled" to privileged clients" into rvc-dev 2020-03-28 00:05:59 +00:00
Kevin Chyn
0a45b662b0 Send "early canceled" to privileged clients
The navigation bar dismissal animation caused by "activity finish"
should be invoked in some cases immediately when the user
cancels authentication. Add a "early user cancel" message
for ConfirmDeviceCredentialActivity to subscribe to. This
message is sent immediately when the user invokes a back gesture or
cancels authentication.

Bug: 148273355

Test: Set up work profile with separate password and biometric
      Unlock work profile
      Lock screen
      Open work profile app
      Cancel authentication at various states in various ways
      Notice no navigation bar jank

Test: atest com.android.systemui.biometrics

Change-Id: I89c5b5e2782339cae15f936268e6e7b8ad4e5359
2020-03-27 14:44:08 -07:00
Nicholas Ambur
95ee3d7ad5 Merge "remove SoundTrigger public member variables" into rvc-dev 2020-03-27 20:54:22 +00:00
Nicholas Ambur
1e43767f10 remove SoundTrigger public member variables
Bug: 150127026
Test: boot and verify soundtrigger hotword is functional

Change-Id: I04061cdb3eba02aac0f08de96f957e2b74c70a12
2020-03-26 19:44:31 +00:00
Kevin Chyn
127e3957d6 Merge changes I704914b2,I51560dfc,I866e84b2 into rvc-dev
* changes:
  Allow BIOMETRIC_CONVENIENCE to register with BiometricService
  Improve AuthService logging
  Only BIOMETRIC_STRONG HATs should be sent to KeyStore
2020-03-25 22:10:14 +00:00
Jacky Kao
316477c399 Supporting multi-display for takeScreenshot()
Creating a new API, screenshotWithoutSecureLayer(), to get the
graphic buffer of screenshot for all displays including non-default
display and virtual one. We can use it to support multi-display
of takeScreenshot() API.

Bug: 145893483
Test: a11y CTS & unit tests
Test: manual testing to take screenshot of second display which is a
monitor with chrome cast

Change-Id: I474c71f7e01d57b5a318b2a5bfb690a2e01c128c
2020-03-25 13:46:11 +08:00
TreeHugger Robot
ff57d5cba0 Merge "Camera: Add visual samples for android.control.zoomRatio" into rvc-dev 2020-03-24 18:37:39 +00:00
Kevin Chyn
0f598aa9c0 Only BIOMETRIC_STRONG HATs should be sent to KeyStore
Bug: 150014844
Bug: 141025588
Bug: 151967372

Test: Configure a device to have weak biometrics only, then
      run CtsVerifier Weak Biometrics section
Test: com.android.server.biometrics

Change-Id: I866e84b2f88c24faeaf42452d44f651ec220858a
2020-03-23 15:40:09 -07:00
Shuzhen Wang
69cf0fd599 Camera: Add visual samples for android.control.zoomRatio
To better document how android.control.zoomRatio works, add diagrams to
illustrate its relationship with scalerCropRegion.

Test: Build and read docs
Bug: 144780745
Change-Id: I90b93c4d516f6f1e2d427ed3d56e85b6c94befe8
2020-03-23 13:26:03 -07:00
Eino-Ville Talvala
585305da32 Camera: Improve docs for getOutputMinFrameDuration
The current text was misleading, since minimum frame duration of a
stream affects the aggregate minimum frame duration of a session
whether a stream is in use for a given request stream or not.

Test: Docs build
Bug: 147080626
Change-Id: Ic884cd0bb3ea184383944cb78e9713d6044b1959
2020-03-23 12:41:17 -07:00
TreeHugger Robot
2ecb17aa03 Merge "Camera: Move bokeh mode to extendedSceneMode tag" into rvc-dev 2020-03-21 04:25:09 +00:00
Nicholas Ambur
aceabbf758 Merge changes from topic "enrollment-app-permission" into rvc-dev
* changes:
  fix enrollment application permission check
  add KEYPHRASE_ENROLLMENT_APPLICATION permission
2020-03-21 00:39:35 +00:00
Nicholas Ambur
64fb254c63 fix enrollment application permission check
Remove check associated with enrollment application UID, and allow
enrollment applications holding the KEYPHRASE_ENROLLMENT_APPLICATION
privledged permission to enroll.

Bug: 151405284
Test: Confirm enrollment from both enrollment application and active
voiceinteraction service. Confirm enrollment can still occurr after
system user switch.

Change-Id: I8686f705fe5405523004eef5de834282a7382464
2020-03-20 14:55:35 -07:00
Shuzhen Wang
796863a5ec Camera: Move bokeh mode to extendedSceneMode tag
Migrate BOKEH_MODE_STILL_CAPTURE and BOKEH_MODE_CONTINUOUS to be 2 enums
of CONTROL_EXTENDED_SCENE_MODE.

Test: Camera CTS, VTS
Bug: 151759402
Change-Id: I2373f3cb37bbca72cdf403b209f2375c1954fb9a
2020-03-20 12:15:48 -07:00
TreeHugger Robot
f4a69284d0 Merge changes from topic "revert" into rvc-dev
* changes:
  [DO NOT MERGE] Enable biometrics.fingerprint@2.2
  [DO NOT MERGE] Revert "Add support for fingerprint@2.2 and face@1.1"
2020-03-20 17:44:50 +00:00
lpeter
133fce0171 Move the logic of transferTouchFocusToImeWindow to IMMS.
It would better move logic of transferTouchFocusToImeWindow
from WindowManagerService to InputMethodManagerService.

Bug: 149574510
Test: atest CtsAutoFillServiceTestCases
Test: atest CtsInputMethodTestCases
Change-Id: I268b09781e5eb7c77c4912efdc8fd5d6936ada27
2020-03-20 12:16:44 +08:00
Ilya Matyukhin
244aee6368 [DO NOT MERGE] Revert "Add support for fingerprint@2.2 and face@1.1"
This reverts commit ef410e3c1e.

Reason for revert: the implementation is untested in R; moving to S.

Bug: 139317981
Bug: 151331855
Change-Id: If6a2fdb26e1ffbdb2cad7dfc16a7cd579f513d5c
2020-03-19 23:05:13 +00:00
Wonsik Kim
de9e6f71d0 Merge "MediaCodec: address API review #2" into rvc-dev 2020-03-19 21:46:28 +00:00
TreeHugger Robot
0b3db44d5b Merge "RESTRICT AUTOMERGE: Camera: Hide keys for the rotate-and-crop controls" into rvc-dev 2020-03-19 20:37:08 +00:00
TreeHugger Robot
4753576dbf Merge "Add caching for getDisplayInfo" into rvc-dev 2020-03-19 18:18:33 +00:00
Eino-Ville Talvala
9f9bb3b734 RESTRICT AUTOMERGE: Camera: Hide keys for the rotate-and-crop controls
Implementation is not complete yet, so hide the feature for now.

Test: Adjusted camera CTS continues to pass
Bug: 150036107
Change-Id: Ifc49766d3e7ebd5a785424cf9a59e9c0f805aabc
2020-03-19 11:05:56 -07:00
Tim Murray
890ceb5e5b Add caching for getDisplayInfo
Cache DisplayInfo objects on clients to avoid unnecessary binder traffic.

Test: boots, works, 60->90->60 works
Bug: 140788621

Change-Id: I0dec0f6e293f1345fbe0a30c4a6e39305c94276d
2020-03-19 09:27:43 -07:00
Jayant Chowdhary
af0910c0eb Merge "Mandatory concurrent stream combinations should be generated by metadata-generate." into rvc-dev 2020-03-19 00:49:17 +00:00
Wonsik Kim
637afb2db4 MediaCodec: address API review #2
- Remove GraphicBlock and use HardwareBuffer instead.
- retrieveChangedKeys -> getChangedKeys
- More messages for Exceptions

Bug: 149487982
Test: atest CtsMediaTestCases -- --module-arg CtsMediaTestCases:size:small
Change-Id: I4d19a8dfa6b9f43005c3d3d8ecc840d16aebd356
2020-03-18 17:29:21 -07:00