Commit Graph

3596 Commits

Author SHA1 Message Date
Chavi Weingarten
fa155b6db6 Merge "Added displayPosition in LogicalDisplay" 2020-03-23 22:34:48 +00:00
chaviw
5e655dc7a1 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-03-23 11:53:00 -07:00
TreeHugger Robot
c8cbf7365d Merge "Camera: Move bokeh mode to extendedSceneMode tag" into rvc-dev am: 2ecb17aa03 am: be22d5997d am: e89e76057f am: 53973d8684
Change-Id: I2d610d565b10cb5ef466e82fde0d441ec6d16eee
2020-03-21 05:42:49 +00:00
TreeHugger Robot
e89e76057f Merge "Camera: Move bokeh mode to extendedSceneMode tag" into rvc-dev am: 2ecb17aa03 am: be22d5997d
Change-Id: I48a1edda2e95733090b492402603db7501ad27e2
2020-03-21 05:02:03 +00: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
f6e171adcf Merge changes from topic "enrollment-app-permission" into rvc-dev am: aceabbf758 am: 55730e498c am: 9e3fe192b4 am: 4332def7be
Change-Id: Idd3b1e037b5e9f2d301861dbb769ceeb47351fc3
2020-03-21 01:42:45 +00:00
Nicholas Ambur
55730e498c Merge changes from topic "enrollment-app-permission" into rvc-dev am: aceabbf758
Change-Id: I5c2236bd27ffe708b7b590b96901f166aad1362d
2020-03-21 00:41:07 +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
Ilya Matyukhin
d1c630d805 [DO NOT MERGE] Enable biometrics.fingerprint@2.2 am: 7f91123ea4
Change-Id: Ibf44c7ca3fb7c0264970fdc2bf72f23b2ae98754
2020-03-20 17:52:05 +00: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
Peter Li
b09d02b33d Merge "Move the logic of transferTouchFocusToImeWindow to IMMS." into rvc-dev am: 3e6f5a87f9 am: 71610e5037 am: 72ccbac062 am: f744e41b54
Change-Id: Ib996f8c54010c7320f16bb5f4e3b62c7f6cc44b0
2020-03-20 07:35:08 +00:00
Peter Li
72ccbac062 Merge "Move the logic of transferTouchFocusToImeWindow to IMMS." into rvc-dev am: 3e6f5a87f9 am: 71610e5037
Change-Id: I0f5a5b3af3653f120988059ac49675545c4ad181
2020-03-20 07:11:42 +00:00
Peter Li
ff710f1fde Merge "Move the logic of transferTouchFocusToImeWindow to IMMS." into rvc-dev am: 3e6f5a87f9
Change-Id: Id88cd4f6456e378b7edb6dd20ce502ef1aac18fe
2020-03-20 07:00:10 +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
80053979f9 Merge "MediaCodec: address API review #2" into rvc-dev am: de9e6f71d0 am: dd460fc52d am: 47f83f23d5 am: 0c0a0a5522
Change-Id: I51d3199d1e732cf674324be9867109e5b6847c8e
2020-03-19 22:24:56 +00:00
Wonsik Kim
dd460fc52d Merge "MediaCodec: address API review #2" into rvc-dev am: de9e6f71d0
Change-Id: I504d2cd042533108a1c77fd69d20e3521e6802b6
2020-03-19 21:51:25 +00:00
Wonsik Kim
de9e6f71d0 Merge "MediaCodec: address API review #2" into rvc-dev 2020-03-19 21:46:28 +00:00
Eino-Ville Talvala
2fb97b7bc6 RESTRICT AUTOMERGE: Camera: Hide keys for the rotate-and-crop controls am: 9f9bb3b734
Change-Id: I3d938223c6a82bf6d56ccbb3d1583f28b8173a08
2020-03-19 20:47:21 +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
c55678f4a6 Merge "Add caching for getDisplayInfo" into rvc-dev am: 4753576dbf am: dbcc3942c9 am: d5f9e4834b am: f9ce7cc4d5
Change-Id: Ia4ebfdfadc8dd4400e5efb18c1bd34265cf8587e
2020-03-19 19:27:17 +00:00
TreeHugger Robot
d5f9e4834b Merge "Add caching for getDisplayInfo" into rvc-dev am: 4753576dbf am: dbcc3942c9
Change-Id: I225e08d761e02d966f9e7091beaa02944ff3620f
2020-03-19 18:48:49 +00:00
TreeHugger Robot
db3176f0ce Merge "Add caching for getDisplayInfo" into rvc-dev am: 4753576dbf
Change-Id: I14ee048b55c4bcbeb06e089883fc4aa06a364134
2020-03-19 18:37:56 +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
TreeHugger Robot
8d60e670d8 Merge "Remove unused import in HDMI Control Listener AIDL" 2020-03-19 12:46:02 +00:00
Automerger Merge Worker
1fc968b1c3 Merge "Merge "Mandatory concurrent stream combinations should be generated by metadata-generate." into rvc-dev am: af0910c0eb am: 83ea23513b" into rvc-d1-dev-plus-aosp am: 515cea6fed am: 8f80c2ea89
Change-Id: If30330a847067eb09f443cf48e12490740cd22f6
2020-03-19 01:41:03 +00:00
Jayant Chowdhary
3675c84e4f Merge "Mandatory concurrent stream combinations should be generated by metadata-generate." into rvc-dev am: af0910c0eb am: 83ea23513b
Change-Id: Ifb2a86c905711d5272bd0caff51ee20a71a13ed4
2020-03-19 01:12:33 +00:00
Jayant Chowdhary
9e1a5df4ba Merge "Mandatory concurrent stream combinations should be generated by metadata-generate." into rvc-dev am: af0910c0eb
Change-Id: I151c7f8f96741cb8c4392f42f1824b91a884eb0d
2020-03-19 00:56:52 +00: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
Jayant Chowdhary
48dec2e76e Mandatory concurrent stream combinations should be generated by metadata-generate.
Bug: 151462833

Test: builds

Change-Id: I2255ad38a06f7eba3eb591e9147ab694178e4989
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>
2020-03-18 12:47:04 -07:00
TreeHugger Robot
6a52009ffe Merge "Camera: clarify offline processing spec" into rvc-dev am: 9b7197fb11 am: 3ddf2b819a am: 68f9787642 am: 512e64b199
Change-Id: I6e9d68b9ecc6995406f800654cb8cab7b3ad73e3
2020-03-18 19:18:49 +00:00
TreeHugger Robot
68f9787642 Merge "Camera: clarify offline processing spec" into rvc-dev am: 9b7197fb11 am: 3ddf2b819a
Change-Id: I53e4d19de7b548223477d1a437c8e47f584784f8
2020-03-18 19:02:36 +00:00
TreeHugger Robot
1b8e2148dc Merge "Camera: clarify offline processing spec" into rvc-dev am: 9b7197fb11
Change-Id: I109793056edbfbf40b7b315952c3fb2b3e48cbf8
2020-03-18 18:40:36 +00:00
TreeHugger Robot
9b7197fb11 Merge "Camera: clarify offline processing spec" into rvc-dev 2020-03-18 18:25:36 +00:00
Marvin Ramin
757a9d3f37 Remove unused import in HDMI Control Listener AIDL
Noticed this unused import while working on some other HDMI Control
related changes.

Test: make -j

Change-Id: Ie27c5b79195e380d15601f9a9b7e26dfb653d5b5
2020-03-18 14:25:15 +01:00
Automerger Merge Worker
0a8c0683ee Merge "Clarify timestamp definition for SensorEvent" into rvc-dev am: e39527ff51 am: c6817e3d83 am: 17daa587a5 am: 0cc1eeaa75
Change-Id: I5c8d2ca438e5f1909280f020945da61db80b6f2f
2020-03-17 18:25:05 +00:00
Automerger Merge Worker
c6817e3d83 Merge "Clarify timestamp definition for SensorEvent" into rvc-dev am: e39527ff51
Change-Id: I4ff6a7a05e8453e006488da7dacbde90ae52fd32
2020-03-17 17:43:30 +00:00
TreeHugger Robot
e39527ff51 Merge "Clarify timestamp definition for SensorEvent" into rvc-dev 2020-03-17 17:29:38 +00:00
Yin-Chia Yeh
0e847e45ae Camera: clarify offline processing spec
Test: build
Bug: 149346795
Change-Id: Iefd35ad4e79ce43c3d7eb308d39a1d3f89022be6
2020-03-17 09:42:36 -07:00
Anthony Stange
d2c1159c5c Clarify timestamp definition for SensorEvent
Bug: 149914062
Test: presubmits
Change-Id: Ib686100496ce80febba6258bbab57f95ddb3386c
2020-03-16 17:31:03 -04:00
Automerger Merge Worker
c4a2829f64 Merge "USB: Add OWNERS for USB functionality" am: cc13533098 am: 9613717da2 am: 46d3b43dd6 am: 0d06562fb7 am: b4d2e7823b
Change-Id: Ic25832ab3386003c6b5166a4b02847d200eb360d
2020-03-16 05:46:53 +00:00
Automerger Merge Worker
46d3b43dd6 Merge "USB: Add OWNERS for USB functionality" am: cc13533098 am: 9613717da2
Change-Id: I8df10c3a282703e95947649cb8cf39a0d4471f77
2020-03-16 05:06:33 +00:00
Automerger Merge Worker
2aedb9dc00 Merge "camera2: rename getConcurrentStreamingCameraIds() -> getConcurrentCameraIds()" into rvc-dev am: 6241aceae8 am: 2a84b5265d am: 6b6991c093 am: 460ff1fb2f
Change-Id: Ic7e77e0a067a6d98dbc847f87b4b3b53bddfde07
2020-03-14 02:35:58 +00:00
Jayant Chowdhary
6241aceae8 Merge "camera2: rename getConcurrentStreamingCameraIds() -> getConcurrentCameraIds()" into rvc-dev 2020-03-14 01:44:50 +00:00
Automerger Merge Worker
f569300fc4 Merge "Pass operationId to LSS, add HAT to KeyStore" into rvc-dev am: 6b7b2300c4 am: 02e3f9ebc9 am: 8cb942f45d am: 95ec6c02cf
Change-Id: I7a76715835071790b182b1542651fec572d7d81c
2020-03-14 00:55:55 +00:00