Ben Lin
ca10fdaa31
Merge "Revert "PiP: Potentially hide menu immediately after it appears."" into rvc-dev am: d4445e0c86
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12065341
Change-Id: If78efe2ec7264bc5e7e4f2bd9db4ad016cceed14
2020-07-07 19:25:27 +00:00
Ben Lin
52abac27f1
Merge "Revert "PiP: Potentially hide menu immediately after it appears."" into rvc-dev am: d4445e0c86
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12065341
Change-Id: If0f27e8d83ee1879b7cfeef526d6fc37d4b07dee
2020-07-07 19:24:46 +00:00
Ben Lin
d4445e0c86
Merge "Revert "PiP: Potentially hide menu immediately after it appears."" into rvc-dev
2020-07-07 19:13:45 +00:00
Nikita Dubrovsky
2654b6e238
Remove flaky test for cursor drag from presubmit
...
These tests run fine in isolation (verified both on a physical Pixel 3
and on a Cuttlefish emulator via acloud), but are flaky in presubmits.
Bug: 159764993
Test: Presubmit
Change-Id: Ia27e05543e2647c42e06a684a3ae5c11c074a5fb
Merged-In: Ia27e05543e2647c42e06a684a3ae5c11c074a5fb
(cherry picked from commit 9d296cdd98 )
2020-07-07 18:42:42 +00:00
Michael Wright
3a09650f68
Move PointerController from sp to shared_ptr
...
Bug: 160010896
Test: atest PointerController_test, manual usage
Change-Id: I4e665d00c56b44c9c1a4ea8cb27ffd10ade3315b
Merged-In: I4e665d00c56b44c9c1a4ea8cb27ffd10ade3315b
(cherry picked from commit 0cde5911bc )
2020-07-07 18:39:47 +00:00
Treehugger Robot
95ff73851c
Merge "Update JavaDoc reference to AndroidX Test" am: 9ec2ad9dc6 am: d632eacf92 am: 961ad9339b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1356342
Change-Id: I6895f9fe17792b993cdf0c4f36433a8ffb55dc56
2020-07-07 18:30:28 +00:00
Fabian Kozynski
edf7483fdf
Fix customizer state
...
QSFragment uses QSCustomizer#isCustomizing to determine what to show.
isCustomizing() = mCustomizing || mOpening.
Before this CL, if the customizer was hidden before it was fully opened,
it would thing it was still opening and QS would not be updated
correctly.
Test: manual
Fixes: 160509272
Change-Id: Iec9c896621502a1825f717f733b24bde2fe22509
2020-07-07 14:28:43 -04:00
Treehugger Robot
961ad9339b
Merge "Update JavaDoc reference to AndroidX Test" am: 9ec2ad9dc6 am: d632eacf92
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1356342
Change-Id: If0f8632fc8630f283a060dbc573607b602012286
2020-07-07 18:16:26 +00:00
Treehugger Robot
d632eacf92
Merge "Update JavaDoc reference to AndroidX Test" am: 9ec2ad9dc6
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1356342
Change-Id: I6ef0210d49559fe4e9e835b6f1e56ac7d6d1c5b7
2020-07-07 18:05:49 +00:00
Treehugger Robot
9ec2ad9dc6
Merge "Update JavaDoc reference to AndroidX Test"
2020-07-07 17:54:58 +00:00
Michael Wright
6853fe6d78
Move PointerController enums to enum classes.
...
Bug: 160010896
Test: atest PointerController_test, compile
Change-Id: I6c7bfc91023ce6cd2dc8f82b0d72731f871ad3ea
Merged-In: I6c7bfc91023ce6cd2dc8f82b0d72731f871ad3ea
2020-07-07 10:43:01 -07:00
Lucas Dupin
bdee377f87
Don't delay frame scheduling
...
Doing so will lead to state inconsistencies. setExpansionAffectsAlpha
won't enque opacity requrests because mUpdatePending won't be true yet,
causing sudden opacity changes.
The much longer mAnimationDelay will already take care of waiting for
a while before starting the scrim animation.
Test: manual, with fp sensor
Fixes: 158955776
Change-Id: I9f7342f01de36576ba0108edfecbfc97448c8756
(cherry picked from commit d38fed16c8 )
2020-07-07 17:40:44 +00:00
Automerger Merge Worker
e1997bc7e0
Merge changes from topic "am-eedfd1b48b8148d8b87aa8f7e122daed" into rvc-d1-dev-plus-aosp
...
* changes:
Merge "DO NOT MERGE: Keep old callback thread" into rvc-dev am: 4f5495ea9c am: 95acfb402b
DO NOT MERGE: Keep old callback thread am: 7b6e6089af am: 1f4c5e6b4e
2020-07-07 17:32:17 +00:00
TreeHugger Robot
1505ed8ba3
Merge "DO NOT MERGE: Keep old callback thread" into rvc-dev am: 4f5495ea9c am: 95acfb402b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12087996
Change-Id: I42a313cddaf228fa4789928ee1997ddbbe19bb7e
2020-07-07 17:32:08 +00:00
Soonil Nagarkar
a6f7798974
DO NOT MERGE: Keep old callback thread am: 7b6e6089af am: 1f4c5e6b4e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12087996
Change-Id: I60e9eae0a72f9c49afaa7c78508c1568f536fa4e
2020-07-07 17:32:04 +00:00
TreeHugger Robot
b5c5183a44
Merge "DO NOT MERGE: Keep old callback thread" into rvc-dev am: 4f5495ea9c am: 793df6dbee
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12087996
Change-Id: I4a151b426b0f22ba701540b85691f2f64612f6a3
2020-07-07 17:32:01 +00:00
Soonil Nagarkar
34c95b841e
DO NOT MERGE: Keep old callback thread am: 7b6e6089af am: 0bb84094c4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12087996
Change-Id: I35cc5ba5f099e58291d4c71cdd46445390f99b55
2020-07-07 17:31:49 +00:00
Victor Chang
cdf1423650
Copy some libcore.icu classes to android.text.format
...
Bug: 160606356
Test: N/A
Change-Id: I408ed56e240d2379fb49a52a19f134d83a2b601f
2020-07-07 18:30:55 +01:00
TreeHugger Robot
793df6dbee
Merge "DO NOT MERGE: Keep old callback thread" into rvc-dev am: 4f5495ea9c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12087996
Change-Id: I319bcaf6ae79cf71f67183ce3bbf85e6f5367026
2020-07-07 17:19:50 +00:00
TreeHugger Robot
95acfb402b
Merge "DO NOT MERGE: Keep old callback thread" into rvc-dev am: 4f5495ea9c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12087996
Change-Id: Id6423facb858c82f37d5048470e4f95ba5211466
2020-07-07 17:19:48 +00:00
Soonil Nagarkar
0bb84094c4
DO NOT MERGE: Keep old callback thread am: 7b6e6089af
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12087996
Change-Id: I25c8ba26bf84a2e8ceca8517a937fbed1378d83a
2020-07-07 17:19:46 +00:00
Soonil Nagarkar
1f4c5e6b4e
DO NOT MERGE: Keep old callback thread am: 7b6e6089af
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12087996
Change-Id: Ida1f71a7ed2e56cbb09ea5099d34dc2f870932fa
2020-07-07 17:19:35 +00:00
Michael Wright
a0bc6b1d09
Move PointerController from sp to shared_ptr
...
Bug: 160010896
Test: atest PointerController_test, manual usage
Change-Id: I4e665d00c56b44c9c1a4ea8cb27ffd10ade3315b
Merged-In: I4e665d00c56b44c9c1a4ea8cb27ffd10ade3315b
2020-07-07 10:11:58 -07:00
TreeHugger Robot
4f5495ea9c
Merge "DO NOT MERGE: Keep old callback thread" into rvc-dev
2020-07-07 17:02:49 +00:00
Andras Kloczl
7194677e4e
Fix quick settings user switcher avatar shape issue.
...
In older OS versions user photos weren't cropped to round shape, so a
legacy user avatar had a rectangular shape in the QS user switcher.
I've added on the fly shaping (similar to how it works in the Settings
app) to QS user avatars.
Test: manual test
Bug: 159473281
Change-Id: Iea48f01aa2f94a2ca5adb3e46eea7c3947092447
2020-07-07 16:42:20 +01:00
Tobias Thierer
19838ea5ae
services/backup/OWNERS: Add more people.
...
Fixes: 159055442
Test: Treehugger
Change-Id: Ib2d49b3d347aef0141e6b703054e1f1840c380f2
2020-07-07 12:25:53 +01:00
Nicolas Geoffray
11f4874360
Merge "Remove old code that isn't relevant anymore." am: 22e3e74e4b am: 0642fc19f3 am: dd85ce6a50
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1354663
Change-Id: Icb0c64d11ad38f1a554acbaf9dca7931bfe55db8
2020-07-07 09:24:23 +00:00
Nicolas Geoffray
dd85ce6a50
Merge "Remove old code that isn't relevant anymore." am: 22e3e74e4b am: 0642fc19f3
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1354663
Change-Id: Ic39e4a46f50fd3ab18dba5c859ec39c9458191a0
2020-07-07 09:03:34 +00:00
Nicolas Geoffray
0642fc19f3
Merge "Remove old code that isn't relevant anymore." am: 22e3e74e4b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1354663
Change-Id: I2f2bf48cb9cc5264d62a9cd78dc28e0f392ad1fb
2020-07-07 08:48:35 +00:00
Nicolas Geoffray
22e3e74e4b
Merge "Remove old code that isn't relevant anymore."
2020-07-07 08:32:51 +00:00
Riddle Hsu
5fb4b24606
[automerger skipped] Merge "Fix boot timeout and reduce boot time" into rvc-dev am: 2d695313c9 am: 60c730b6d9 -s ours
...
am skip reason: Change-Id I2f979055e89ae5e40af05e469741bb89e2e24ce6 with SHA-1 29bfa72754 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12085171
Change-Id: I2a3f8997de9d9087a72914c0e82955829c24fe0f
2020-07-07 08:06:40 +00:00
Riddle Hsu
2924162a55
Merge "Fix boot timeout and reduce boot time" into rvc-dev am: 2d695313c9 am: 7cab6acae9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12085171
Change-Id: I6f5f218ade24bb60879c04a0eb812e73133b00ca
2020-07-07 08:06:22 +00:00
Riddle Hsu
60c730b6d9
Merge "Fix boot timeout and reduce boot time" into rvc-dev am: 2d695313c9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12085171
Change-Id: I4c24f27c4c182ecc0add98ff64bce4a84df130de
2020-07-07 07:58:43 +00:00
Riddle Hsu
7cab6acae9
Merge "Fix boot timeout and reduce boot time" into rvc-dev am: 2d695313c9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12085171
Change-Id: If8bc707a1a70dbbea14b36d25f0dc781f3b26a3f
2020-07-07 07:58:38 +00:00
Riddle Hsu
2d695313c9
Merge "Fix boot timeout and reduce boot time" into rvc-dev
2020-07-07 07:26:18 +00:00
Automerger Merge Worker
ad807e8fc0
Merge "Merge "Adding null check for split bounds before notifying" into rvc-dev am: 736647f28c am: c8c43b2560" into rvc-d1-dev-plus-aosp
2020-07-07 04:03:22 +00:00
Winson Chung
4e72a8f066
Merge "Adding null check for split bounds before notifying" into rvc-dev am: 736647f28c am: c8c43b2560
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12090432
Change-Id: I56ab09b71eed748b886217fe2c2c450ceddd5249
2020-07-07 04:03:11 +00:00
Winson Chung
f4a792497f
Merge "Adding null check for split bounds before notifying" into rvc-dev am: 736647f28c am: 732f43e51e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12090432
Change-Id: I8a5d2ffa53ade9c8e5153385844bef89a1373d60
2020-07-07 04:03:00 +00:00
Winson Chung
732f43e51e
Merge "Adding null check for split bounds before notifying" into rvc-dev am: 736647f28c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12090432
Change-Id: I56f840abe9fe8aa6f00546e09a80391dcc7213d6
2020-07-07 03:46:01 +00:00
Winson Chung
c8c43b2560
Merge "Adding null check for split bounds before notifying" into rvc-dev am: 736647f28c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12090432
Change-Id: I5b65c109335f499dc9b124ef1aca1a6f9cbd1128
2020-07-07 03:45:40 +00:00
Winson Chung
736647f28c
Merge "Adding null check for split bounds before notifying" into rvc-dev
2020-07-07 03:32:08 +00:00
Jeff Chang
6b197afb78
Merge "Fix stack reference is not updated when task organizer is dead." into rvc-dev am: 70511db961 am: fb24883149
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12068938
Change-Id: I4830d75e5883597d735cc4a7468b5d41a6cc08d2
2020-07-07 01:56:38 +00:00
Jeff Chang
851aec7f75
Merge "Fix stack reference is not updated when task organizer is dead." into rvc-dev am: 70511db961 am: df66826e9a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12068938
Change-Id: I02c123b1f137138e9094f74ec0ae4b255b499bdf
2020-07-07 01:56:21 +00:00
Wale Ogunwale
8c91334a16
Revert "Fix "Allow/Deny" popup window no respond when enable pointer location"
...
Bug: 160590776
Bug: 158717144
This reverts commit 10b6c531e2 .
Reason for revert: b/160590776 test failures.
Change-Id: I89191d0d487715d87bcd0a833e96ff50a951b476
2020-07-07 01:45:56 +00:00
Jeff Chang
df66826e9a
Merge "Fix stack reference is not updated when task organizer is dead." into rvc-dev am: 70511db961
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12068938
Change-Id: I979a0811d0b41b3fd9585fa25887324e264120b6
2020-07-07 01:45:07 +00:00
Jeff Chang
fb24883149
Merge "Fix stack reference is not updated when task organizer is dead." into rvc-dev am: 70511db961
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12068938
Change-Id: I395de6a9dc0d8b9e505ee10b63759e64032ddff7
2020-07-07 01:45:05 +00:00
Jeff Chang
70511db961
Merge "Fix stack reference is not updated when task organizer is dead." into rvc-dev
2020-07-07 01:31:44 +00:00
Steven Moreland
f42e63d8ae
HIDL Java: DeadObjectException
...
Allow HIDL to throw DeadObjectException (which extends RemoteException)
like AIDL in order to distinguish this error.
There is a slight risk of API breakage here because someone could be
guarding against DeadObjectException already for AIDL code and ignoring
all HIDL exceptions within that scope. In this case, HIDL code which
previously did not trigger the DeadObjectException could trigger that
code path. However, mixing AIDL and HIDL like this would already be
considered extremely unsafe.
Fixes: 160169016
Test: hidl_test_java
Change-Id: I259070bbba5cabb52cf7cf5a11cb5d5c21abeff8
2020-07-07 01:29:47 +00:00
android-build-team Robot
ff7a6dc660
Snap for 6657150 from 66929380ab to rvc-release
...
Change-Id: I09d2c2d1119f0118e8a699226ccc6faba8763788
2020-07-07 01:09:49 +00:00
Soonil Nagarkar
7b6e6089af
DO NOT MERGE: Keep old callback thread
...
Discrepency between documented and delivered thread in prior versions
got confused. Switching back to the main thread for delivery when not
specified.
Bug: 160565229
Test: presubmit only
Change-Id: I6deaf08e2045771c120aa2eb35c64b392208bd58
2020-07-06 16:31:35 -07:00