Commit Graph

3803 Commits

Author SHA1 Message Date
Michael Wright
cd89ac9062 DO NOT MERGE "Allow DeviceConfig to change display settings for high zone" am: 58515946ac
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13345659

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia563c3ff4128d22f1451b304b217de7473fffafd
2021-01-19 04:02:10 +00:00
Michael Wright
58515946ac DO NOT MERGE "Allow DeviceConfig to change display settings for high zone"
Allow DeviceConfig to change the high zone behavior including
refresh rate and brightness thresholds.

Bug: 177636374

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: I1463d6c5daaee46a87a193e98e7f63cad9274b49
2021-01-19 01:07:01 +00:00
raylinhsu
75a0fb1b01 DO NOT MERGE Revert "Set fixed fps when ambient or display brightness is high" am: b4bf83a773
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13330027

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5c71048af659fc9cbcd90a4d56f5c0aa9b1fe998
2021-01-14 19:16:05 +00:00
raylinhsu
b14bed88c5 DO NOT MERGE Revert "Allow DeviceConfig to change display settings for high zone"
This reverts commit cf55c21064.

Bug: 176018998
Test: atest DisplayModeDirectorTest
Change-Id: Ib576e16257d7903b39efa8015c2af3be8c0d0c40
2021-01-13 14:04:08 +08:00
Treehugger Robot
ab0359a7e3 Merge "Add additional biometrics OWNERS" am: 08763cddab am: 56d15d2c25
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1546368

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If33fcc4b7eb88b169c4fc217b427c3d1d84f95e2
2021-01-12 01:15:21 +00:00
Kevin Chyn
835f50b21a Add additional biometrics OWNERS
Test: Builds
Change-Id: Ief8ea06dcc5803298294c639956cdfa97fa8be10
2021-01-11 13:43:29 -08:00
Treehugger Robot
68ba39f6d7 Merge "Add team members to biometric OWNERS" am: 80df223aed am: 2dc1d17689
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1543964

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0cdd444845e2f484e26045c04facbce2e33c95ba
2021-01-08 10:14:06 +00:00
Kevin Chyn
8777a4dda3 Add team members to biometric OWNERS
Test: Presubmit
Change-Id: I0b503756a60fc8dcaaf8bcd1f1fa13628b2b9b75
2021-01-07 17:56:19 -08:00
Nicolas Geoffray
e6db6b21e6 Merge "Remove FastNative annotations on synchronized methods." 2020-12-14 13:41:06 +00:00
Nicolas Geoffray
498aa12949 Remove FastNative annotations on synchronized methods.
FastNative doesn't work on synchronized methods.

Bug: 175016705
Test: 004-JniTest
Change-Id: I1e34c78a8438c67e5a1bedb83eb977389ee9a82d
Merged-In: I1e34c78a8438c67e5a1bedb83eb977389ee9a82d
(cherry picked from commit 7c4c101a7b)
2020-12-13 17:44:59 +00:00
Nicolas Geoffray
0874a6fb49 Remove FastNative annotations on synchronized methods.
FastNative doesn't work on synchronized methods.

Bug: 175016705
Test: 004-JniTest
Change-Id: I1e34c78a8438c67e5a1bedb83eb977389ee9a82d
Merged-In: I1e34c78a8438c67e5a1bedb83eb977389ee9a82d
(cherry picked from commit 7c4c101a7b)
2020-12-11 09:11:44 +00:00
Michael Groover
272b06dce4 Merge "Add OWNERS for sensor privacy" am: 05c699d02e am: f2c250acb9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1520165

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4c6999ee0d59f4424cced74423c174bcfcdeeaa3
2020-12-10 19:48:56 +00:00
Michael Groover
05c699d02e Merge "Add OWNERS for sensor privacy" 2020-12-10 19:24:46 +00:00
Treehugger Robot
d489358491 Merge "HDMICEC: Change hashcode for HdmiPortInfo" am: d8cd3c7d2d am: 8f4bb0a2a5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1483970

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If924ee797a4d75c93840ea2947d754de30a9f58a
2020-12-10 16:33:04 +00:00
Treehugger Robot
d8cd3c7d2d Merge "HDMICEC: Change hashcode for HdmiPortInfo" 2020-12-10 15:59:53 +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
Michael Groover
cfaac0e759 Add OWNERS for sensor privacy
Bug: 175159332
Test: Builds
Change-Id: I430d823ced4065df2a5d1f7a4229eb4d5361e82b
2020-12-08 17:26:23 -08: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
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
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
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
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
Venkatarama NG. Avadhani
d9ddff97c2 HDMICEC: Change hashcode for HdmiPortInfo
Use all the variables in equality to generate hashcode.

Bug: 168713324
Test: atest HdmiPortInfoTest
Change-Id: I1f84087a604f00a4cd7f99c87e2459543bc31542
2020-11-23 14:01:39 +05:30
Venkatarama NG. Avadhani
61e6793d24 HDMICEC: Override hashCode in HdmiDeviceInfo
Adds hashCode override and equals test for the class.

Bug: 168713324
Test: atest HdmiDeviceInfoTest
Change-Id: I77f7a4da113785573718a16895a988de7fff6b0b
2020-11-23 09:49:52 +05:30
Aurimas Liutikas
59d98a07a9 Merge "Remove legacy style metalava suppression" am: e1bb600fc7 am: 66574f225e am: 1c505e8cda
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1421698

Change-Id: Ib1b078a6e6c6e19391277d19c0f8d748eee6300b
2020-11-16 21:40:21 +00:00
Aurimas Liutikas
1c505e8cda Merge "Remove legacy style metalava suppression" am: e1bb600fc7 am: 66574f225e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1421698

Change-Id: Idd656e3803c247b03808259c582599898c064b27
2020-11-16 21:13:46 +00:00
Aurimas Liutikas
e1bb600fc7 Merge "Remove legacy style metalava suppression" 2020-11-16 17:40:07 +00:00
Eino-Ville Talvala
66a993beeb Fix up some camera API javadocs
Test: m offline-sdk-docs
Bug: 173204437
Change-Id: If333d6fd5023d0bc5d778437d1745dcd209ccbd9
Merged-In: If333d6fd5023d0bc5d778437d1745dcd209ccbd9
2020-11-15 23:58:33 +00:00
Aurimas Liutikas
ab35d18a7c Merge "Suppress all hidden abstract methods in constructable classes." am: bdd6c53abb am: c08c4d9b02 am: 65ed2cb534
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1495396

Change-Id: Icb989e4ac7190afbdb3b09552fa0055c2a742ceb
2020-11-13 03:49:22 +00:00
Aurimas Liutikas
65ed2cb534 Merge "Suppress all hidden abstract methods in constructable classes." am: bdd6c53abb am: c08c4d9b02
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1495396

Change-Id: I9f9bfc14b3cb56016da352949922e3084237228e
2020-11-13 03:35:12 +00:00
Aurimas Liutikas
d23189b998 Suppress all hidden abstract methods in constructable classes.
Having a hidden abstract method for a class that can be extended
means that public implementors cannot implement these hidden methods
posing a risk that custom implementations will not have required
abstract methods resulting in an exception.

Bug: 151134792
Test: make update-api
Change-Id: I758d12465fabc671be19bedeeceb16885de23c87
Merged-In: I758d12465fabc671be19bedeeceb16885de23c87
Exempt-From-Owner-Approval: large scale suppression of existing issues,
    no-op in terms of behavior
2020-11-13 02:56:20 +00:00
Aurimas Liutikas
46a165215b Remove legacy style metalava suppression
@SuppressLint("Doclava125") is a legacy way of suppressing
RequiresPermission check. Updating to the new style of suppression
so metalava no longer has to support the legacy mode.

sed -i "s/@SuppressLint(\"Doclava125/@SuppressLint(\"RequiresPermission/" \
core/java/android/app/admin/DevicePolicyManager.java \
core/java/android/hardware/hdmi/HdmiControlManager.java \
core/java/android/hardware/location/ContextHubManager.java \
core/java/android/hardware/usb/UsbDeviceConnection.java \
core/java/android/net/TrafficStats.java \
core/java/android/os/RecoverySystem.java \
core/java/android/os/storage/StorageManager.java \
core/java/android/service/persistentdata/PersistentDataBlockManager.java \
location/java/android/location/LocationManager.java \
media/java/android/media/AudioManager.java \
telecomm/java/android/telecom/TelecomManager.java \
telephony/java/android/telephony/CarrierConfigManager.java \
telephony/java/android/telephony/TelephonyManager.java \
wifi/java/android/net/wifi/RttManager.java \
wifi/java/android/net/wifi/WifiScanner.java

Test: make
Exempt-From-Owner-Approval: No-op change
Merged-In: I6d5df95cfca2950ea86872d2f0afc1ba828841dc
Change-Id: I6d5df95cfca2950ea86872d2f0afc1ba828841dc
2020-11-12 18:30:12 -08:00
Mathew Inwood
5a448e27ed Merge "Add maxTargetSdk restriction to unused APIs." am: f8abe13db4 am: eb80316624
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1468245

Change-Id: I60222cb1879651cf283e385519b5c4d156ab68a1
2020-11-09 15:24:20 +00:00
Mathew Inwood
5d123b6775 Add maxTargetSdk restriction to unused APIs.
These are APIs that have @UnsupportedAppUsage but for which we don't
have any evidence of them currently being used, so should be safe to
remove from the unsupported list.

Bug: 170729553
Test: Treehugger
Merged-In: I626caf7c1fe46c5ab1f39c2895b42a34319f771a
Change-Id: I54e5ecd11e76ca1de3c5893e3a98b0108e735413
2020-11-04 09:45:53 +00:00
Mathew Inwood
5f0edaaaf5 Add maxTargetSdk restriction to unused APIs.
These are APIs that have @UnsupportedAppUsage but for which we don't
have any evidence of them currently being used, so should be safe to
remove from the unsupported list.

Bug: 170729553
Test: Treehugger
Merged-In: I8285daa8530260251ecad6f3f38f98e263629ca7
Change-Id: I626caf7c1fe46c5ab1f39c2895b42a34319f771a
2020-11-02 10:30:09 +00:00
Treehugger Robot
c05066bb3d Merge "Add trackingBug to code used by tests." am: 8cce5a4923 am: f9bda93ccb am: 204bb0fdae
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1479879

Change-Id: I6176f4ed207310a5012262c36f14e9f30fdf2e48
2020-10-30 02:12:02 +00:00