Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
560,727 Commits 3 Branches 0 Tags
786e3d090680fe815744dfb0f313a64dda67240a
Commit Graph

3773 Commits

Author SHA1 Message Date
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
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
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
Treehugger Robot
204bb0fdae Merge "Add trackingBug to code used by tests." am: 8cce5a4923 am: f9bda93ccb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1479879

Change-Id: I96d0ee8dcaf69a21b75fbfba85402d11c86c57f0
 2020-10-30 01:55:38 +00:00
Mathew Inwood
421ad3d1a1 Add trackingBug to code used by tests. 
INJECT_INPUT_EVENT_MODE_WAIT_FOR_FINISH appears to be used by espresso.

Bug: 171972397
Merged-In: Ic9df340620bf6c4e2cdd0dff077548f5807fa8e3
Change-Id: I4515f3029e86b63d2b05aa737243318ad20549ea
 2020-10-29 16:43:31 +00:00
Anton Hansson
24b4d166dd Merge "Remove @TestApi from @SystemApi symbols" am: d2d4637685 am: cbe282347e am: 14897c256d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1466264

Change-Id: I859503688ea3254d5bd1b55e80cf1962286e948f
 2020-10-20 20:31:58 +00:00
Anton Hansson
14897c256d Merge "Remove @TestApi from @SystemApi symbols" am: d2d4637685 am: cbe282347e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1466264

Change-Id: I86daec690141893837ec58ab1d75aecc88557ff9
 2020-10-20 19:45:04 +00:00
Anton Hansson
d2d4637685 Merge "Remove @TestApi from @SystemApi symbols" 2020-10-20 13:45:13 +00:00
Treehugger Robot
8570351c5a Merge "Fix documentation of heart beat sensor" am: 3bef7fe58b am: a3d54aaa88 am: 4807d99163 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1465663

Change-Id: I9197744b37e3f2a082624e28a59a0a7e36536d87
 2020-10-20 00:06:15 +00:00
Treehugger Robot
4807d99163 Merge "Fix documentation of heart beat sensor" am: 3bef7fe58b am: a3d54aaa88 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1465663

Change-Id: I7ccbaa984ded806aee599066dc13eacc31244ead
 2020-10-19 23:45:44 +00:00
Treehugger Robot
b0c41a1b0c Merge "Merge redfin/bramble support." 2020-10-19 23:20:09 +00:00
Treehugger Robot
a3d54aaa88 Merge "Fix documentation of heart beat sensor" am: 3bef7fe58b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1465663

Change-Id: Ib6ec0365c09e32ea0bce3cb00c20d1d3d8345916
 2020-10-19 23:16:43 +00:00
Arthur Ishiguro
63b75dd100 Fix documentation of heart beat sensor 
Bug: 158617116
Test: None
Change-Id: Ic6b2c631e0deced70790860ed2080eb5a8089091
 2020-10-19 12:35:12 -07:00
Anton Hansson
dd7d52f963 Remove @TestApi from @SystemApi symbols 
I ran these commands:
    cd frameworks/base
    grep -rl '@TestApi' --include '*.java' | xargs perl -i -p0e \
        's/\@SystemApi[\s\n]+(\@\w+[\s\n]+)?\@TestApi/\@SystemApi\1/gs'
    grep -rl '@TestApi' --include '*.java' | xargs perl -i -p0e \
        's/\@TestApi[\s\n]+(\@\w+[\s\n]+)?\@SystemApi/\1\@SystemApi/gs'

Bug: 171179806
Test: m checkapi
Change-Id: I772790b783b0a8730b8bf680c9e569a886b8d789
Merged-In: I772790b783b0a8730b8bf680c9e569a886b8d789
 2020-10-19 16:41:01 +01:00
Xin Li
986e6eeddf Merge ab/6749736 in stage. 
Bug: 167233921
Merged-In: Iecef31f7bf10ad97b7e0075cf302ae94e248474a
Change-Id: I9e9c873bc2e05a0cfe3af0bf74725500f3f108db
 2020-10-10 20:38:57 -07:00
TreeHugger Robot
bf304b8b4c Merge "Camera: Track native metadata allocations" into rvc-qpr-dev am: 2ac809e71d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12775153

Change-Id: I9fad1d424ed9c6c5b8350abc73f0a77b822c80b1
 2020-10-08 01:29:23 +00:00
Emilian Peev
0f1fd8c236 Camera: Track native metadata allocations 
Native camera metadata buffers can increase both in size
and count over prolonged periods of camera usage.
Register and track the native buffer allocation in the Java
VM to improve GC.

Bug: 168100424
Bug: 170243539
Test: Camera CTS
Change-Id: I7a10c2f360307a6c1afeecde24dc42184106b872
 2020-10-07 18:16:35 +00:00
TreeHugger Robot
ae2e299142 Merge "Camera: Clarify SCALER_CROP_REGION usage" into rvc-dev am: 601e34fdd7 am: bf6e731010 am: f5c645e8a2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12586676

Change-Id: Iad9a7e2ebc41345877c6f230c13f9ae818861826
 2020-09-29 17:32:54 +00:00
TreeHugger Robot
55582b0c4a Merge "Camera: Clarify SCALER_CROP_REGION usage" into rvc-dev am: 601e34fdd7 am: 794e42e566 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12586676

Change-Id: Ibf40686e0076d97fe22a970a4695a86fb3cf150a
 2020-09-29 17:32:36 +00:00
TreeHugger Robot
f5c645e8a2 Merge "Camera: Clarify SCALER_CROP_REGION usage" into rvc-dev am: 601e34fdd7 am: bf6e731010 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12586676

Change-Id: I8a0f378dd8a8ff5709783edaba56a89e5253398d
 2020-09-29 17:10:38 +00:00
TreeHugger Robot
bf6e731010 Merge "Camera: Clarify SCALER_CROP_REGION usage" into rvc-dev am: 601e34fdd7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12586676

Change-Id: I75a21c0eb76f5245776c1c3fb02711839118078e
 2020-09-29 17:09:37 +00:00
TreeHugger Robot
794e42e566 Merge "Camera: Clarify SCALER_CROP_REGION usage" into rvc-dev am: 601e34fdd7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12586676

Change-Id: I0ba79c5a129932dd805bb3dbda49f58702631d3d
 2020-09-29 17:09:26 +00:00
Jayant Chowdhary
606a55e65f Merge changes I6de585de,Id0f9b5a9 am: c681633836 am: e563c30208 am: beb9c4fe58 am: db33922c54 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1438913

Change-Id: I1d17ce9ff6d4f2532c9f0bb11d23205408fbd425
 2020-09-29 01:05:38 +00:00
Jayant Chowdhary
db33922c54 Merge changes I6de585de,Id0f9b5a9 am: c681633836 am: e563c30208 am: beb9c4fe58 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1438913

Change-Id: Ia65bd1446439b3816e2941fa12de39f7f8015025
 2020-09-29 00:09:26 +00:00
Jayant Chowdhary
beb9c4fe58 Merge changes I6de585de,Id0f9b5a9 am: c681633836 am: e563c30208 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1438913

Change-Id: I328035ef7ef359993219baa263529960b38b5560
 2020-09-28 23:48:29 +00:00
Jayant Chowdhary
47a455af03 camera2: Remove partial result nodes for error frames. 
When there's an capture error reported for a frame, remove its nodes in
mPartialResults map node, since they'll not be used by clients of
FrameTracker. This should also reduce slow memory pressure build up
because of mPartialResult growth as and when there are error frames
which have some partial results as well.

Bug: 167944895

Test: GCA on Pixel2, constant mode changes don't show steady state increase in
      mPartialResults map size (Basic validity)

Change-Id: I6de585deb24039321310ddbd5dccd9119b25b23d
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>
(cherry picked from commit 91e64e2d3a)
 2020-09-25 19:23:34 +00:00
Jayant Chowdhary
9fa99145a9 camera2: Improve code readability for FrameNumberTracker. 
Bug: 168713666

Test: builds
Test: GCA (basic validity)

Change-Id: Id0f9b5a9a6363f40daa9384ee5f01b47d36ad139
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>
(cherry picked from commit 91f7bc0b3b)
 2020-09-25 19:14:19 +00:00
Treehugger Robot
cec2a6d20f Merge "Fix setType() return value for high angle sensor" am: 5a2d80de45 am: 89d18e94e4 am: 1e97e64bf2 am: a57b4b75c5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1436893

Change-Id: I4a6974cab2f97b5c9f2a550c99857788592f3db1
 2020-09-25 05:24:31 +00:00
Treehugger Robot
a57b4b75c5 Merge "Fix setType() return value for high angle sensor" am: 5a2d80de45 am: 89d18e94e4 am: 1e97e64bf2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1436893

Change-Id: If7aabccc5c08ec1d6e640a0b3361abaf96346f59
 2020-09-24 21:52:53 +00:00
Treehugger Robot
1e97e64bf2 Merge "Fix setType() return value for high angle sensor" am: 5a2d80de45 am: 89d18e94e4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1436893

Change-Id: I5d4a833884e9c732b9f96cd0ca6f72a889b89254
 2020-09-24 21:24:53 +00:00
Wang Han
fcf671890f Fix setType() return value for high angle sensor 
Change-Id: I712fd77f8079fc17c45dcbc1c2fdf1be72d338f2
 2020-09-24 13:16:18 +00:00
Shuzhen Wang
477c23ed89 Camera: Clarify SCALER_CROP_REGION usage 
1. Document same SCALER_CROP_REGION may map to different aspect
ratio/output size for different sessions.
2. Remove the text in ZOOM_RATIO about using SCALER_CROP to change
aspect ratio.

Test: Build and read docs
Bug: 168493526
Change-Id: I405fe52d0e0a14e6a1cfbec169d33f20715fa4fb
 2020-09-16 11:53:38 -07:00
Jeff Sharkey
487d394296 Merge changes from topic "sep11" am: c0b288133a am: 69e6f07347 am: 741c0a78cc am: da7478b570 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1426195

Change-Id: I79488866c538bf9e76d0a6429e30262978f6fdab
 2020-09-15 00:13:08 +00:00