Commit Graph

4144 Commits

Author SHA1 Message Date
TreeHugger Robot
270499876f Merge "camera2: Mark onCameraOpened/Closed callbacks @SystemApi." 2020-12-10 18:36:31 +00:00
TreeHugger Robot
2c70cd586b Merge changes I944dc1cd,I97c962d5
* changes:
  Track CEC version of CEC devices
  Add HdmiDeviceInfo#mHdmiCecVersion
2020-12-10 12:23:49 +00:00
TreeHugger Robot
ea748be0c9 Merge "Add change id for FLAG_SLIPPERY" 2020-12-10 11:34:06 +00:00
Jeff Sharkey
507b4cba66 Merge "Add OWNERS to HDMI control directories" am: fd2f7c893a am: b76f77b9b0 am: 577ee1b6d5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519668

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icff446e33de2eed8829c605aaedf88d2aeee096e
2020-12-09 20:19:20 +00:00
Jeff Sharkey
577ee1b6d5 Merge "Add OWNERS to HDMI control directories" am: fd2f7c893a am: b76f77b9b0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519668

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I02dfb322253ba59376fe0f63feae055f01eabe3f
2020-12-09 18:48:31 +00:00
Jeff Sharkey
b76f77b9b0 Merge "Add OWNERS to HDMI control directories" am: fd2f7c893a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519668

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8d8dd902baec65abec93557d00a22ad3fcd66347
2020-12-09 18:02:00 +00:00
Marvin Ramin
3b69e14e9a Add OWNERS to HDMI control directories
Test: n/a
Change-Id: I8e77822bb0a87c8b397be28d60528a35b0eda7b2
2020-12-09 09:47:16 +00:00
Marvin Ramin
6f69264f75 Add HdmiDeviceInfo#mHdmiCecVersion
Store CEC version for each device. Defaults to HDMI CEC 1.4b.

Bug: 174732339
Test: make; atest HdmiDeviceInfoTest

Change-Id: I97c962d58b16ddfab9010a1738670a107e12481f
2020-12-09 09:44:05 +01:00
TreeHugger Robot
b1e041d5b5 Merge "Support multi-channel FF vibration effect for input device." 2020-12-08 23:33:24 +00:00
Jayant Chowdhary
f3b7a85fe8 camera2: Mark onCameraOpened/Closed callbacks @SystemApi.
This is so that regular apps don't get to know when camera devices
are opened / closed (as oppsed to being available / unavailable), in addition to not knowing the
package names of the processes that open / close the devices.

Bug: 147710835
Bug: 170870941

Test: builds
Test: atest CameraManagerTest#testCameraManagerListenerCallbacks

Change-Id: I5cad3cb5dd70775d74c5be20d7adf434fd37bfa7
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>
2020-12-08 11:45:02 -08:00
Jeff Sharkey
0ab7007631 resolve merge conflicts of 358f0d4fc8 to master
Bug: 174932174
Test: I solemnly swear I tested this conflict resolution.
Exempt-From-Owner-Approval: refactoring with team leads buy-in
Change-Id: I9262a08ffc1ccede8e519d0eed90ed2bfcf0232c
2020-12-08 11:01:05 -07:00
Jeff Sharkey
358f0d4fc8 Merge changes from topic "dec5" am: c2793cf12b am: 9af6ac78b0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519384

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2776a545a24f007ccb4b9ee14705978571265ef3
2020-12-08 16:43:19 +00:00
Jeff Sharkey
24d251403b Improve OWNERS coverage across frameworks/base/. am: fab0ab3c9c am: c7c4a74a78
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519383

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5120a3701af3564f363900b20bca75f3ad2a854c
2020-12-08 16:43:17 +00:00
Jeff Sharkey
9af6ac78b0 Merge changes from topic "dec5" am: c2793cf12b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519384

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifdc390f5ae046c515a30158f3f55b831be147547
2020-12-08 16:05:11 +00:00
Jeff Sharkey
c7c4a74a78 Improve OWNERS coverage across frameworks/base/. am: fab0ab3c9c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519383

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0211462ecbcd9ad66f66af87e31cf12e1582fc65
2020-12-08 16:01:16 +00:00
Jeff Sharkey
52b9862f87 Improve OWNERS coverage across frameworks/base/.
As general background, OWNERS files expedite code reviews by helping
code authors quickly find relevant reviewers, and they also ensure
that stakeholders are involved in code changes in their areas.

Some teams under frameworks/base/ have been using OWNERS files
successfully for many years, and we're ready to expand them to cover
more areas.  Here's the historical coverage statistics for the last
two years of changes before these new OWNERS changes land:

-- 56% of changes are fully covered by OWNERS
-- 17% of changes are partially covered by OWNERS
-- 25% of changes have no OWNERS coverage

Working closely with team leads, we've now identified clear OWNERS on
a per-package basis, and we're using "include" directives whenever
possible to to simplify future maintenance.  With this extensive
effort, we've now improved our coverage as follows:

-- 98% of changes are fully covered by OWNERS
-- 1% of changes are partially covered by OWNERS
-- 1% of changes have no OWNERS coverage

This specific change is automatically generated by a script that
identifies relevant "include" directives.

Bug: 174932174
Test: manual
Exempt-From-Owner-Approval: refactoring with team leads buy-in
Merged-In: I3480ddf2fe7ba3dfb922b459d4da01fa17a2c813
Change-Id: I3480ddf2fe7ba3dfb922b459d4da01fa17a2c813
2020-12-08 08:36:28 -07:00
Jeff Sharkey
fab0ab3c9c Improve OWNERS coverage across frameworks/base/.
As general background, OWNERS files expedite code reviews by helping
code authors quickly find relevant reviewers, and they also ensure
that stakeholders are involved in code changes in their areas.

Some teams under frameworks/base/ have been using OWNERS files
successfully for many years, and we're ready to expand them to cover
more areas.  Here's the historical coverage statistics for the last
two years of changes before these new OWNERS changes land:

-- 56% of changes are fully covered by OWNERS
-- 17% of changes are partially covered by OWNERS
-- 25% of changes have no OWNERS coverage

Working closely with team leads, we've now identified clear OWNERS on
a per-package basis, and we're using "include" directives whenever
possible to to simplify future maintenance.  With this extensive
effort, we've now improved our coverage as follows:

-- 98% of changes are fully covered by OWNERS
-- 1% of changes are partially covered by OWNERS
-- 1% of changes have no OWNERS coverage

This specific change is automatically generated by a script from
detailed ownership information confirmed by team leads.

Bug: 174932174
Test: manual
Exempt-From-Owner-Approval: refactoring with team leads buy-in
Merged-In: I9789c97c1de8e5d962b48c29c57d82fe83729eba
Change-Id: I9789c97c1de8e5d962b48c29c57d82fe83729eba
2020-12-08 08:36:27 -07:00
TreeHugger Robot
e7b9355f40 Merge "Camera: Regenerate javadocs due to format change" 2020-12-07 18:52:13 +00:00
Shuzhen Wang
596f4790e1 Camera: Regenerate javadocs due to format change
The new docs make sure <ul></ul> tags outside of <p></p> enclosures

Test: Build and read docs
Change-Id: I3c62509148e5658e2f66d384618a527bbd35ef44
2020-12-04 15:44:33 -08:00
Jeff Sharkey
db4ae71beb Merge changes from topic "nov30"
* changes:
  Hand-migration to TypedXml interface.
  Mechanically apply TypedXml refaster template.
  Mechanical refactoring to new typed XML classes.
  Additional hand-migration to TypedXml interface.
  "Resolve" both human-readable and binary XML.
2020-12-04 21:32:44 +00:00
Siarhei Vishniakou
5006597d68 Add change id for FLAG_SLIPPERY
We need to figure out whether any apps are using FLAG_SLIPPERY. Ideally,
we should lock this down and only allow it for system uses. Add a change
id for this logging here.

Bug: 157929241
Test: adb shell dumpsys platform_compat
Change-Id: I7a12828e768a145054d31fbf07f130a2f06735de
2020-12-04 08:35:07 -10:00
Kevin Chyn
10a7843d33 Merge "Add sensorId to biometric sensor proto dumpsys" 2020-12-03 19:20:29 +00:00
TreeHugger Robot
5e697c4ea6 Merge "Camera: Document behavior when cropRegion and zoomRation conflict" into rvc-qpr-dev am: cf91d4b9b9 am: a3b333b619
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13145508

Change-Id: I3d4b7164e45f375f97806769b4bcac879088d4db
2020-12-03 18:00:02 +00:00
TreeHugger Robot
0d3d16b4d1 Merge "Rename send_standby_on_sleep in constants and methods" 2020-12-03 16:58:40 +00:00
TreeHugger Robot
a3b333b619 Merge "Camera: Document behavior when cropRegion and zoomRation conflict" into rvc-qpr-dev am: cf91d4b9b9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13145508

Change-Id: Iacdbb68dfd551718cf513e887211c82297d8f651
2020-12-03 16:56:28 +00:00
TreeHugger Robot
cf91d4b9b9 Merge "Camera: Document behavior when cropRegion and zoomRation conflict" into rvc-qpr-dev 2020-12-03 16:46:12 +00:00
Nathalie Le Clair
4dc6b1793a Rename send_standby_on_sleep in constants and methods
Updated the name to better represent the usage of this setting.
The values of the constants remain the same to ensure compatibility.

Bug: 169145038
Test: atest HdmiCecLocalDevicePlaybackTest
Change-Id: Ieba3d94d5db52d39f717b525a8b8ed6e6587b132
2020-12-03 15:47:38 +01:00
TreeHugger Robot
895fc96bc7 Merge "usb: Remove IntDef flag when it isn't a flag" 2020-12-03 11:03:08 +00:00
raychi
920381237f usb: Remove IntDef flag when it isn't a flag
Some Int Def annotations were marked with `flag=true` by mistake.
This commit will remove the definition so that the flag
will be marked as false by default.

Bug: 174239412
Test: full build pass
Change-Id: I32328d76699e396c53dfc62768b2cd24ab48cabd
2020-12-03 06:38:28 +00:00
Kevin Chyn
1c0d722a91 Add sensorId to biometric sensor proto dumpsys
Test: atest CtsBiometricsTestCases
Change-Id: I418fcfb9948be9693889a69cdbd0df4efe919793
2020-12-02 17:27:46 -08:00
TreeHugger Robot
94a8347051 Merge "Add TestApi for setRefreshRateSwitchingType" 2020-12-02 21:07:04 +00:00
Jeff Sharkey
a2c132d9c6 Hand-migration to TypedXml interface.
Previous changes have applied mechanical refactorings, but this change
hand-migrates the remaining logic which was too complex to identify.

This change should have no behavior change; famous last words.

Bug: 171832118
Test: manual
Exempt-From-Owner-Approval: trivial refactoring
Change-Id: I85cd830eb6bfde18fca6e73ee7adfdc385a890de
2020-12-02 13:55:35 -07:00
Xin Li
d31ee38811 Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855
Bug: 172690556
Merged-In: I78222391b83a4add8e964340ec08bb8a1306e1c6
Change-Id: I28bbf40820674675ccf765c912aa8140d3f74ab2
2020-12-02 00:38:58 -08:00
TreeHugger Robot
bce2821854 Merge changes from topic "r3_flicker_high_brightness" into rvc-qpr-dev am: 11bee77de6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12936277

Change-Id: I10794b1337fca712f2c751ce01b87ea86977cfdf
2020-12-02 01:47:20 +00:00
Treehugger Robot
30ab518467 Merge "HDMICEC: Override hashCode in HdmiDeviceInfo" am: 1d59ab8486 am: 76f22955a6 am: 8bee663c01
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1460262

Change-Id: Ic457b69bdd32bc932aa1266c556ffe7ccdb5c21e
2020-12-02 01:44:41 +00:00
Treehugger Robot
8bee663c01 Merge "HDMICEC: Override hashCode in HdmiDeviceInfo" am: 1d59ab8486 am: 76f22955a6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1460262

Change-Id: I45b89565e6375c9231de0e36698fd025ab317d13
2020-12-02 01:35:34 +00:00
TreeHugger Robot
11bee77de6 Merge changes from topic "r3_flicker_high_brightness" into rvc-qpr-dev
* changes:
  Allow DeviceConfig to change display settings for high zone
  Set fixed fps when ambient or display brightness is high
  Add FakeSettingsProviderRule class
2020-12-02 01:05:39 +00:00
Eino-Ville Talvala
686d7aa0d8 Fix up some camera API javadocs am: 66a993beeb am: 804134ab87 am: bfa0ffbb9f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13061797

Change-Id: Ia7c1e4c1ba0a926681148cf6c5e10e769c5bb4a9
2020-12-01 22:53:16 +00:00
Eino-Ville Talvala
bfa0ffbb9f Fix up some camera API javadocs am: 66a993beeb am: 804134ab87
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13061797

Change-Id: I26aa22702b35761b2ec43e11369514aef80ce663
2020-12-01 22:37:40 +00:00
Eino-Ville Talvala
804134ab87 Fix up some camera API javadocs am: 66a993beeb
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13061797

Change-Id: Iaa8732c416f259b2bcf12733bd7afd1f707e0639
2020-12-01 22:24:13 +00:00
Shuzhen Wang
dc921d86ad Camera: Document behavior when cropRegion and zoomRation conflict
In case cropRegion == windowboxing and zoomRatio != 1.0f, specify the
camera framework behavior of overriding cropRegion.

Test: Build
Bug: 172873869
Change-Id: Ic7713260cdd5f51e422be330534dd1e5648ba2fc
2020-12-01 09:35:00 -08:00
Marin Shalamanov
019f990cd1 Add TestApi for setRefreshRateSwitchingType
This CLs adds a test API to replicted the behaviour of the
MATCH_CONTENT_FRAME_RATE user setting. This is intended to
be used from CTS.

Bug: 157504046
Bug: 171952409
Test: atest MatchContentFrameRateTest
Change-Id: I90d9a0d019cdb908b3b13328a78fe370676ad064
2020-12-01 16:15:41 +01:00
Michael Wright
cf55c21064 Allow DeviceConfig to change display settings for high zone
Allow DeviceConfig to change the high zone behavior including
refresh rate and brightness thresholds.

Bug: 166581675
Test: atest DisplayModeDirectorTest
Test: adb shell device_config put display_manager refresh_rate_in_high_zone "90"
Test: adb shell device_config put display_manager fixed_refresh_rate_high_display_brightness_thresholds "200"
Test: adb shell device_config put display_manager fixed_refresh_rate_high_ambient_brightness_thresholds "8000"
Change-Id: I2ac8d95f976748d03f6dc2e60725e9ef1213ed6f
Merged-In: I2ac8d95f976748d03f6dc2e60725e9ef1213ed6f
2020-12-01 19:31:52 +08:00
Jeff Sharkey
8f43151721 Mechanically apply TypedXml refaster template.
This is a purely mechanical CL that applies the output of the
recently added refaster templates to help guide towards more
efficient TypedXml methods.  There is no behavior change.

Bug: 171832118
Test: manual
Exempt-From-Owner-Approval: trivial refactoring
Change-Id: Ic95dd3de77c60482ad36b31706e6b701929f40b3
2020-11-30 20:45:40 -07:00
Jeff Sharkey
236c03b5c3 Mechanical refactoring to new typed XML classes.
Related changes are introducing new TypedXmlSerializer and
TypedXmlPullParser interfaces which offer efficient access to
primitive attributes.

Bug: 171832118
Test: manual
Exempt-From-Owner-Approval: trivial refactoring
Change-Id: Ibd93f353ff3cb1f0b7073ebbeae17fe5194b046b
2020-11-30 20:45:25 -07:00
TreeHugger Robot
a01f750588 Merge changes from topic "r3_flicker_master"
* changes:
  Allow DeviceConfig to change display settings for high zone
  Set fixed fps when ambient or display brightness is high
2020-12-01 03:32:49 +00:00
Michael Wright
579350903c Allow DeviceConfig to change display settings for high zone
Allow DeviceConfig to change the high zone behavior including
refresh rate and brightness thresholds.

Bug: 166581675
Test: atest DisplayModeDirectorTest
Test: adb shell device_config put display_manager refresh_rate_in_high_zone "90"
Test: adb shell device_config put display_manager fixed_refresh_rate_high_display_brightness_thresholds "200"
Test: adb shell device_config put display_manager fixed_refresh_rate_high_ambient_brightness_thresholds "8000"
Change-Id: I2ac8d95f976748d03f6dc2e60725e9ef1213ed6f
2020-11-30 18:39:21 +08:00
Chris Ye
28f00f879e Support multi-channel FF vibration effect for input device.
Support multi-channel FF vibration effect with CombinedVibration effect
API.

Bug: 161629089
Test: atest InputDeviceVibratorTest
Change-Id: Ie1bd82a324501704cfc673c7cea8af6aae974407
2020-11-27 18:41:24 +00:00
Lais Andrade
e320282bba Extract input device vibrators code from VibratorService
This code will also be migrated to VibratorManagerService, to give
preference to input devices over the devices vibrators when the user
setting enables it.

This need to remain a server-side code so permissions/setting will be
applied to system vibrations even when they are redirected to input
devices (including vibration scaling).

Bug: 167946816
Bug: 131311651
Test: atest FrameworksServiceTests:VibratorServiceTest
      atest FrameworksServiceTests:InputDeviceVibratorsTest
Change-Id: I6c61c3f20e4d82d44af136917d3755d9f6edd31f
2020-11-25 14:35:35 +00:00
Ady Abraham
d90ac7139c Merge "Handle DISPLAY_EVENT_FRAME_RATE_OVERRIDE" 2020-11-23 23:20:48 +00:00