Steve Elliott
174eb3ef2e
Merge "Add RemoteInput auth bypass flow" into sc-dev
2021-02-09 03:37:50 +00:00
TreeHugger Robot
162e6767d5
Merge "Use new GX overlay for new AOD/lockscreen transitions." into sc-dev
2021-02-09 03:09:47 +00:00
Michael Wright
3d712cce6c
Merge "Fix flaky VibratorServiceTest" into sc-dev
2021-02-09 03:04:42 +00:00
Rob Carr
8ea6b33cbb
Merge "SyncRtSurfaceTransactionApplier: Use BLASTSync" into sc-dev
2021-02-09 03:01:13 +00:00
Treehugger Robot
47f990f6dd
[automerger skipped] Merge "Specify version for aidl_interface explicitly" am: 5968a3906e am: 8add53a34a am: bd0e762d11 -s ours
...
am skip reason: Change-Id I99a5000109b171a74ac4f604b88e86a87b48ec5f with SHA-1 969b9219b9 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1560410
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I6a388163b2a82ed4c669680f12827b579029658d
2021-02-09 03:00:08 +00:00
TreeHugger Robot
f650c52876
Merge "[DO NOT MERGE] Improvements and fixes for BLE scanning within CDM" into sc-dev
2021-02-09 02:25:06 +00:00
Darryl Johnson
871f21e70c
Merge "Revert "Defer triggering notifyLidSwitchChanged() until the system is ready."" into sc-dev
2021-02-09 02:16:46 +00:00
Treehugger Robot
bd0e762d11
Merge "Specify version for aidl_interface explicitly" am: 5968a3906e am: 8add53a34a
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1560410
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Idd7b735da71f7beebc7976ae0a3bd33b98b0020c
2021-02-09 02:16:11 +00:00
Josh Tsuji
dd79a62ac0
Use new GX overlay for new AOD/lockscreen transitions.
...
This will enable the transitions in dogfood!
Bug: 169693662
Test: atest SystemUITests
Test: enable/disable overlay and wake/sleep device a lot
Change-Id: I343400700c5ba25f2575e81cc22994932b230023
2021-02-08 20:35:14 -05:00
Lajos Molnar
084f3be4b1
Merge "media: Add 8K UHD CamcorderProfile qualities" into sc-dev
2021-02-09 01:33:20 +00:00
Prabir Pradhan
8d57685bd5
Merge "Send onTaskDisplayChanged callback for local listeners" into sc-dev
2021-02-09 01:32:41 +00:00
Kevin Chyn
c402fe9434
Merge "Clean up biometric AIDL binderDied handling" into sc-dev
2021-02-09 01:28:31 +00:00
TreeHugger Robot
4f5f93cbd7
[automerger skipped] Merge "Fix the the proto definition for app startup and fully drawn events." into rvc-qpr-dev am: d41c119656 -s ours am: 398301fd88 -s ours
...
am skip reason: Change-Id I36ec354d273dceace5245d7634c68ac63dc5a8cd with SHA-1 15b86108a6 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13462742
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iead27807ad729ba27260a2c3157187ecc717335e
2021-02-09 01:24:58 +00:00
Brian Stack
9a0f8106c0
Merge "Implement SessionHandle.hashCode()" am: 033681de6b am: 1042b48447 am: c2870a248a
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1564877
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I6ad9a365e5cca1015c5f625f58bb1bd1d78815ee
2021-02-09 01:24:15 +00:00
Treehugger Robot
8add53a34a
Merge "Specify version for aidl_interface explicitly" am: 5968a3906e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1560410
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4076bf928aa7f335b16aace695099b4aac1b5cff
2021-02-09 01:22:40 +00:00
TreeHugger Robot
398301fd88
[automerger skipped] Merge "Fix the the proto definition for app startup and fully drawn events." into rvc-qpr-dev am: d41c119656 -s ours
...
am skip reason: Change-Id I36ec354d273dceace5245d7634c68ac63dc5a8cd with SHA-1 5d230a2d49 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13462742
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9ff7e078ff624bd119ee3923da13b852e304d84a
2021-02-09 01:21:55 +00:00
TreeHugger Robot
317c0ae14c
Merge "Make Font class being able to create from native instance" into sc-dev
2021-02-09 01:14:05 +00:00
Rob Carr
c534edd535
Merge "Port SurfaceControlViewHost to BLAST" into sc-dev
2021-02-09 01:10:51 +00:00
Eugene Susla
24de1ca1be
[DO NOT MERGE] Improvements and fixes for BLE scanning within CDM
...
Test: manual
Bug: 168052577
Change-Id: I16ec39d1139ab6ab0c2c84364493268e8f395d43
(cherry picked from commit 10a1973972 )
2021-02-08 16:51:49 -08:00
Eugene Susla
2d29d34fe0
Merge "[DO NOT MERGE] Scan and notify apps when their companion devices are nearby" into sc-dev
2021-02-09 00:47:08 +00:00
Yi Jiang
abffec262d
Merge "Gets suggested screen rotations from RotationResolverService." into sc-dev
2021-02-09 00:39:40 +00:00
TreeHugger Robot
d41c119656
Merge "Fix the the proto definition for app startup and fully drawn events." into rvc-qpr-dev
2021-02-09 00:38:05 +00:00
Brian Stack
c2870a248a
Merge "Implement SessionHandle.hashCode()" am: 033681de6b am: 1042b48447
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1564877
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I736db34d257026030a4eb69ef446f1218db825b2
2021-02-09 00:17:54 +00:00
Treehugger Robot
5968a3906e
Merge "Specify version for aidl_interface explicitly"
2021-02-09 00:16:15 +00:00
Steve Elliott
a7d7205e6e
Add RemoteInput auth bypass flow
...
This change adds a way for a RemoteInputView activation to be allowed
even when the device is locked. If this is done, then authentication
will be deferred until the RemoteInput is sent. At that time, if
authentication is still necessary, the bouncer will be shown.
Authentication can be bypassed asynchronously while the RemoteInputView
is active via the AuthBypassPredicate passed to
NotificationRemoteInputManager#activateRemoteInput. If this predicate
returns true at the time that the RemoteInput is sent, then the send
will succeed, but the device will remain locked. If it returns false,
then the bouncer will be shown, at which point the user can choose to
unlock the device and send again, or dismiss the bouncer (and nothing
else will happen).
Test: manual
Bug: 170647553
Change-Id: Ie3b2089cefc6cfc2f5b6d218a61a51b1785ecf92
2021-02-08 19:15:41 -05:00
Kweku Adams
076669f905
Merge "Add concurrency restriction at the USER level" into sc-dev
2021-02-08 23:53:04 +00:00
Sudheer Shanka
5ac0513b61
Merge "Allow apps receiving media button events to start FGS from BG." into sc-dev
2021-02-08 23:51:51 +00:00
Brian Stack
1042b48447
Merge "Implement SessionHandle.hashCode()" am: 033681de6b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1564877
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Idbb8d51ea12469756df0e6cdd60d3a187d51d20a
2021-02-08 23:42:04 +00:00
Sally Yuen
3b85351cf4
Merge "Update Reduce Bright Colors strings" into sc-dev
2021-02-08 23:33:22 +00:00
Winson Chiu
081b3e4382
Merge "Test scheduleWriteSettings inside DomainVerificationService" into sc-dev
2021-02-08 23:29:06 +00:00
Calin Juravle
6b232cc058
Fix the the proto definition for app startup and fully drawn events.
...
ActivityMetricsLoggers build the proto with the compilation reason first
and then the compilation filter. Instead of changing the logging code,
we prefer to change the proto field order: this will facilitate the
speed up the resolution without the need to purge data or wait for
further release builds.
It is ok, because both fields are in fact int32 proto values so the ABI
does not change.
Test: m
Bug: 178108751
(cherry picked from commit cf676e8028c2611461dc3e009dd9fe771f44bdb2)
Merged-In: I36ec354d273dceace5245d7634c68ac63dc5a8cd
Change-Id: I03c701efe2181ae7796547267902f884007593eb
2021-02-08 23:24:20 +00:00
Brian Stack
033681de6b
Merge "Implement SessionHandle.hashCode()"
2021-02-08 23:09:27 +00:00
Eugene Susla
6ce1f4109f
[DO NOT MERGE] Scan and notify apps when their companion devices are nearby
...
Test: manual
Bug: 168052577
Change-Id: Ib2187fb76e604878b1d4dd9c0cd6cea610b2a04d
(cherry picked from commit 017c2c4145 )
2021-02-08 22:50:57 +00:00
Prabir Pradhan
4e796f8a21
Send onTaskDisplayChanged callback for local listeners
...
Bug: 179715787
Test: manual: Ensure a TaskStackListener registered from system_server
gets the onTaskDisplayChanged callback; verified by logging.
Change-Id: I18d6f691c774108deb9634c648fd8d923227a6e8
2021-02-08 22:50:09 +00:00
Junyu Lai
ceb8ce05d0
Merge "[VCN07] Bypass VCN for non-internet app accessible cellular services" am: 95f5889aff am: ad80cba04d am: 07c1f36651
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1549817
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I915ba6692ebae6ae09429d515ef612fdd48590f8
2021-02-08 22:37:06 +00:00
Benedict Wong
90d273afe1
Merge changes I414dce58,I165716a0,I101d8949 am: 02fe346e84 am: 890114ac08 am: fd162457b9
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1539844
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I03b020217da7bbf229195c4af55172d5de6ddc5f
2021-02-08 22:36:30 +00:00
Hongwei Wang
f3e5e9cdee
Merge "Revert "Add an invisible layer to trap focus"" into sc-dev
2021-02-08 22:36:14 +00:00
TreeHugger Robot
cfce53fc55
Merge "Remove flaky from default excluded tests" into sc-dev
2021-02-08 22:33:02 +00:00
Junyu Lai
07c1f36651
Merge "[VCN07] Bypass VCN for non-internet app accessible cellular services" am: 95f5889aff am: ad80cba04d
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1549817
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4ad38ac5450b06da70f9fd329d79014e352e1656
2021-02-08 22:23:16 +00:00
Richard Gaywood
098c3d746c
Merge "Stop passing in statsFile fds as they will be leaked when returned to the caller." into sc-dev
2021-02-08 22:21:00 +00:00
Junyu Lai
ad80cba04d
Merge "[VCN07] Bypass VCN for non-internet app accessible cellular services" am: 95f5889aff
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1549817
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I304db5e46d8e76d7248b9dd1f42b43200635b2be
2021-02-08 22:09:54 +00:00
Benedict Wong
fd162457b9
Merge changes I414dce58,I165716a0,I101d8949 am: 02fe346e84 am: 890114ac08
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1539844
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I50e6823a87f02341cd9886d1817e10006c16346a
2021-02-08 22:09:16 +00:00
TreeHugger Robot
989bc8cd01
Merge changes from topic "display-mode-rename" into sc-dev
...
* changes:
Tracking changes to renaming DisplayConfig to DisplayMode
Extend the comment for setFrameRate(..., shouldBeSeamless)
2021-02-08 21:56:15 +00:00
TreeHugger Robot
e859f1c0e4
Merge "Fix chronometer theme" into sc-dev
2021-02-08 21:53:56 +00:00
TreeHugger Robot
ea1c8b3a76
Merge "Revert "Revert "Revert "Turn on the feature flag for Android S S..."" into sc-dev
2021-02-08 21:45:00 +00:00
Jakub Pawlowski
25d2513d12
Merge "Add Volume Control UUID" am: c50447ad57 am: de206f8ada am: a42efdda60
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1549914
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I30ba05c835a01d0edf0ec7e9e3fbc75fccd12e92
2021-02-08 21:40:56 +00:00
Roshan Pius
c935fed6d2
Merge "ConnectivityService: Plumb attribution tag for location permission checks" am: 482b2dda4f am: 74371a2953 am: 94404471df
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1534625
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I72340de13e04640935403d282a1d9f5afe0536e6
2021-02-08 21:40:29 +00:00
Junyu Lai
95f5889aff
Merge "[VCN07] Bypass VCN for non-internet app accessible cellular services"
2021-02-08 21:40:09 +00:00
Mitch Phillips
a78fe42a02
Merge "[MTE] Parse MTE sysprop in system_server" am: 4d7b7a71d6 am: b00646e96c am: e399fb29d4
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1575891
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I675a403921d5d52eb1d65d2ff74af35517a7cf1f
2021-02-08 21:39:56 +00:00
Jeff Sharkey
8636af69ca
Merge "Add OWNERS for CPU-related files" am: 1cf122b5a7 am: 808b6d8956 am: 0192f22a73
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1580527
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I276ceb5deb6b2e689c867b27cb8f7395cd42d4f2
2021-02-08 21:38:20 +00:00