Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
519,022 Commits 3 Branches 0 Tags
c19fd3c4cba0f02a1ef8a897a4aa6e00a6e3df93
Commit Graph

519022 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Beth Thibodeau
ff4a188dc1 Merge "Filter media controls by user" into rvc-dev am: c781b2e4b0 am: b2f71ffe1a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12037671

Change-Id: Ibdba8dfdcbbd6fc7018250ffc50ea52156d458f9
 2020-07-01 04:32:58 +00:00
Beth Thibodeau
bd9761b1a5 Merge "Filter media controls by user" into rvc-dev am: c781b2e4b0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12037671

Change-Id: Idab53c09c43de600d369b78d63a6a618f4f8afc0
 2020-07-01 04:18:14 +00:00
Beth Thibodeau
b2f71ffe1a Merge "Filter media controls by user" into rvc-dev am: c781b2e4b0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12037671

Change-Id: Ieb29b4fb3b89f62e07c30c7a9e6bf981f424b9b4
 2020-07-01 04:18:08 +00:00
Beth Thibodeau
c781b2e4b0 Merge "Filter media controls by user" into rvc-dev 2020-07-01 04:05:38 +00:00
markchien
8b8e72a00d Fix tethering jarjar rule for LocalLog 
LocalLog is in android.util* instead of android.net*.
No crash happened because the methods used by tethering are
@UnsupportedAppUsage.

Bug: 160113128
Test: atest TetheringTests
Change-Id: I5f070b96f96aaabf7ec8da52a3d3444ed940fb56
 2020-07-01 03:40:50 +00:00
Bill Yi
ce6c218029 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import
Change-Id: Id1fad62bd6424b1ead334a4069e5941eee73f6ab
 2020-06-30 19:00:59 -07:00
Josh Tsuji
ffc87ece03 Merge "Ignore additional pointers in dispatchTouchEvent." into rvc-dev am: fe71adaa65 am: 3804d96d6b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12049282

Change-Id: I7ad411db75cf14bfa13eb4fa0e8a610d20afe4f2
 2020-07-01 01:55:12 +00:00
Josh Tsuji
d9a55fb91b Merge "Ignore additional pointers in dispatchTouchEvent." into rvc-dev am: fe71adaa65 am: 2087199828 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12049282

Change-Id: I42361b54dddbaf2168bf68aa488199fefc325ef4
 2020-07-01 01:54:53 +00:00
Chalard Jean
3740bfadad Revert "Test IPv6ProvisioningLossParcelable in the NetworkAttrib..." 
Revert "Add new network quirk parcelable in the NetworkAttributes."

Revert submission 1323251-ipv6_prov_loss_quirk_parcelable

Reason for revert: Breaks CtsStrictJavaPackagesTestCases
Reverted Changes:
I18e05c09f:Add new network quirk parcelable in the NetworkAtt...
I8dbff2377:Test IPv6ProvisioningLossParcelable in the Network...

Change-Id: Ie906919b344131cd768fbed787248d3caac2f74d
 2020-07-01 01:46:26 +00:00
Josh Tsuji
3804d96d6b Merge "Ignore additional pointers in dispatchTouchEvent." into rvc-dev am: fe71adaa65 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12049282

Change-Id: I38166fa0e820d8dcc76ac25b4c58687e02a2fddc
 2020-07-01 01:43:17 +00:00
Josh Tsuji
2087199828 Merge "Ignore additional pointers in dispatchTouchEvent." into rvc-dev am: fe71adaa65 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12049282

Change-Id: I557a0d06c0a3a95353c107ba1b8b6dba997de5f5
 2020-07-01 01:42:37 +00:00
Louis Chang
851bd1f9d9 Merge "Move the pinned task to front when dismissed split-screen" into rvc-dev am: 92d8d6c384 am: c10b144bc2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12034169

Change-Id: I4e7f2a35d2668e4f6eab4fd7865f02cd89d778d2
 2020-07-01 01:37:16 +00:00
Louis Chang
1cbf002f46 Merge "Move the pinned task to front when dismissed split-screen" into rvc-dev am: 92d8d6c384 am: 9b2e5941ad 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12034169

Change-Id: I37010a19e5477c8af16b82a08011de345308832a
 2020-07-01 01:36:42 +00:00
Automerger Merge Worker
f3a171760f Merge "Merge "Avoid reentrant callback when setting up listeners" into rvc-dev am: 118966e45c am: 40f1fc932c" into rvc-d1-dev-plus-aosp 2020-07-01 01:36:30 +00:00
Lucas Dupin
5b39556430 Merge "Avoid reentrant callback when setting up listeners" into rvc-dev am: 118966e45c am: 268a071817 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12039762

Change-Id: I80aab0ba2149abfa4155ff159bd5b01ab5e8545d
 2020-07-01 01:36:24 +00:00
Lucas Dupin
9d620c9e16 Merge "Avoid reentrant callback when setting up listeners" into rvc-dev am: 118966e45c am: 40f1fc932c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12039762

Change-Id: I17ec9b30c65660b4dfd600eee26add542eee640e
 2020-07-01 01:36:21 +00:00
Bill Yi
757c02c0dd Import translations. DO NOT MERGE 
Auto-generated-cl: translation import
Change-Id: I34c1b0f23d6d0d4814b01978cdd70213419c8347
 2020-06-30 18:33:15 -07:00
Josh Tsuji
fe71adaa65 Merge "Ignore additional pointers in dispatchTouchEvent." into rvc-dev 2020-07-01 01:30:28 +00:00
Louis Chang
c10b144bc2 Merge "Move the pinned task to front when dismissed split-screen" into rvc-dev am: 92d8d6c384 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12034169

Change-Id: I50ce392e73bf2d4970280c332b5a8819282407e6
 2020-07-01 01:19:09 +00:00
Louis Chang
9b2e5941ad Merge "Move the pinned task to front when dismissed split-screen" into rvc-dev am: 92d8d6c384 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12034169

Change-Id: Ibdb0d8bb8b2588bae8e5856a8bfdfd82b9a5e2d3
 2020-07-01 01:18:51 +00:00
Lucas Dupin
268a071817 Merge "Avoid reentrant callback when setting up listeners" into rvc-dev am: 118966e45c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12039762

Change-Id: I9283b3e0660abcf484e850e841353cab31abcb36
 2020-07-01 01:18:18 +00:00
Lucas Dupin
40f1fc932c Merge "Avoid reentrant callback when setting up listeners" into rvc-dev am: 118966e45c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12039762

Change-Id: I1c8a46fab70d6d91f7a8cd398be39fa2ae375dbb
 2020-07-01 01:18:09 +00:00
android-build-team Robot
43412f0b24 Snap for 6643631 from 7387faf8c2 to rvc-release 
Change-Id: I9d364f21aad07e325e2a2a36443612cacf51333a
 2020-07-01 01:10:06 +00:00
Louis Chang
92d8d6c384 Merge "Move the pinned task to front when dismissed split-screen" into rvc-dev 2020-07-01 01:08:38 +00:00
Lucas Dupin
118966e45c Merge "Avoid reentrant callback when setting up listeners" into rvc-dev 2020-07-01 01:02:14 +00:00
Evan Laird
ae87ab87f0 Align QS clock to status bar 
QS clock wasn't accounting for status_bar_top_padding, and also was not
taking into account the margins on the layout when calculating the
minimum inset.

Test: manual
Fixes: 156017028
Change-Id: Ic27691657b062668a69df238677889f937c15122
 2020-06-30 23:42:57 +00:00
Glenn Kasten
a0ab0de818 Include what you use: <cutils/bitops.h> for popcount 
Test: builds OK
Change-Id: I4ebd459a124b6480bb0ce1ccb49b76c727ced0bd
 2020-06-30 16:26:28 -07:00
Beth Thibodeau
f285b1483d Filter media controls by user 
Adds a new step MediaDataFilter in the pipeline, after MediaDataCombineLatest,
which will only pass on media control loaded / removed events if they are for
the current user

If the user is switched, removes all existing controls for the old user and
then adds back any old controls for the new user

Fixes: 159958740
Test: atest com.android.systemui.media
Test: manual, switch users and observe controls updated correctly
Change-Id: Ia07180432df1ce031c42a6225d52160f83ef677e
 2020-06-30 19:21:06 -04:00
Selim Cinek
3c20d895c3 Fixed an issue where the media would reappear animated 
View.isShown doesn't take into account if a view is
faded away so we assumed that we should animate
the transition. We're now excluding those views.
This was reproducible when unlocking from the
bouncer with media present.

Fixes: 160217095
Test: add media, swipe up, unlock with pin or fingerprint
Change-Id: I3b3e65ebefc4f1f11b357cf9a4e5c00dbd4b6723
 2020-06-30 16:16:02 -07:00
Mady Mellor
266afba3a9 Make sure PendingIntent cancel listener is unregistered 
Test: manual
Fixes: 160177818
Fixes: 149918957
Change-Id: I429fc3bcd409cf57276617bd8c9aab26194d3af9
 2020-06-30 16:11:38 -07:00
Daniel Bright
6779079090 Merge "Call on urls changed callback when callback added" am: 62e4a9516d am: 0c8c709bd5 am: bd7c802dd7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1352923

Change-Id: I75a060de7a5af002dfd5febed456b2bd26785602
 2020-06-30 22:55:01 +00:00
Lucas Dupin
fb4c7ebaa9 Avoid reentrant callback when setting up listeners 
When registering new media players for timeouts, we should schedule
their timeouts but not trigger the listeners yet. Otherwise we would
end up on states where listeners would be ask to update players that
were not initialized yet.

One exception is when a playing is migrating from "resumable" to active.
We'll then delay the state to the next Looper loop.

Test: atest MediaTimeoutListenerTest
Test: manually expire players
Bug: 160036959
Change-Id: I9302dee6190e08c0e845b6f28dfcc249b636d90d
 2020-06-30 15:40:28 -07:00
Daniel Bright
bd7c802dd7 Merge "Call on urls changed callback when callback added" am: 62e4a9516d am: 0c8c709bd5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1352923

Change-Id: I2bda1a15d0fd774f3022b30a1ef07c166814f4de
 2020-06-30 22:39:44 +00:00
Daniel Bright
0c8c709bd5 Merge "Call on urls changed callback when callback added" am: 62e4a9516d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1352923

Change-Id: Iccdba540dcb69751f1b6ff43b9c36e3b8617e911
 2020-06-30 22:27:29 +00:00
Daniel Bright
62e4a9516d Merge "Call on urls changed callback when callback added" 2020-06-30 22:11:43 +00:00
Chen Xu
086309d139 [automerger skipped] Merge "allow CBR to write SMS database" am: b50908074c am: d6c6e3ea1f -s ours am: 058f730a63 -s ours 
am skip reason: Change-Id I5535cefb32e89694094299f3b89321f735983ef1 with SHA-1 1eff8d2232 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1353206

Change-Id: Ib98f46a7ef3af017123ee40a39195069d2f3c00b
 2020-06-30 22:06:21 +00:00
Chen Xu
058f730a63 [automerger skipped] Merge "allow CBR to write SMS database" am: b50908074c am: d6c6e3ea1f -s ours 
am skip reason: Change-Id I5535cefb32e89694094299f3b89321f735983ef1 with SHA-1 1eff8d2232 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1353206

Change-Id: Idb64a3163a2ec7ec26112542806cc5b83c951c67
 2020-06-30 21:53:37 +00:00
Chen Xu
d6c6e3ea1f Merge "allow CBR to write SMS database" am: b50908074c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1353206

Change-Id: Id9aa98b6ecf7904aad50f276e4b58d55d8820ab2
 2020-06-30 21:41:59 +00:00
Selim Cinek
f6544d2bbf Merge "Fixed that texts of players would often remain empty" into rvc-dev am: 7387faf8c2 am: 62a641a82e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12038727

Change-Id: Ie2f17565ab983ede54d3f5284fb94015aaa54a2c
 2020-06-30 21:34:28 +00:00
Hongwei Wang
58808772e2 Merge "Launch to fullscreen when re-open from lockscreen and in PiP" into rvc-dev am: c99594ee88 am: 4212e337d7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12047260

Change-Id: I24cd93f1ded6e39b45ecda1abccfcb9bcf6a218d
 2020-06-30 21:34:12 +00:00
Selim Cinek
acc27ef777 Merge "Fixed that texts of players would often remain empty" into rvc-dev am: 7387faf8c2 am: e9f3fa5328 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12038727

Change-Id: I7199f6167469e52677ef7e31e5c535f76ecf0412
 2020-06-30 21:32:01 +00:00
Hongwei Wang
c3b05a8a96 Merge "Launch to fullscreen when re-open from lockscreen and in PiP" into rvc-dev am: c99594ee88 am: 46750d6aa3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12047260

Change-Id: I23b31fed0140aab34a52036dfee5d832dd60f456
 2020-06-30 21:31:42 +00:00
Aurimas Liutikas
87e64b5698 Merge "Clean up old references to android.support in Activity and Fragment" into rvc-dev-plus-aosp am: 47029fe43d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12039663

Change-Id: I801d2fd7dc734f20b1a1f46daf555a6811540c8e
 2020-06-30 21:31:05 +00:00
Chen Xu
b50908074c Merge "allow CBR to write SMS database" 2020-06-30 21:27:02 +00:00
Selim Cinek
e9f3fa5328 Merge "Fixed that texts of players would often remain empty" into rvc-dev am: 7387faf8c2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12038727

Change-Id: I8ccaf55bb57b0ec52ae68f28e6946bf373c29f46
 2020-06-30 21:21:00 +00:00
Selim Cinek
62a641a82e Merge "Fixed that texts of players would often remain empty" into rvc-dev am: 7387faf8c2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12038727

Change-Id: Ice0c8ed8e0f2e4f5d5ee9ee91fa487b771b595a5
 2020-06-30 21:20:44 +00:00
Hongwei Wang
46750d6aa3 Merge "Launch to fullscreen when re-open from lockscreen and in PiP" into rvc-dev am: c99594ee88 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12047260

Change-Id: I303e9d6c6ba461e305703b23a62b206fd34ee475
 2020-06-30 21:20:43 +00:00
Hongwei Wang
4212e337d7 Merge "Launch to fullscreen when re-open from lockscreen and in PiP" into rvc-dev am: c99594ee88 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12047260

Change-Id: Id50a679ff3818cdd2f65eac977d86c1dfb6bbddf
 2020-06-30 21:19:57 +00:00
Aurimas Liutikas
47029fe43d Merge "Clean up old references to android.support in Activity and Fragment" into rvc-dev-plus-aosp 2020-06-30 21:16:33 +00:00
Selim Cinek
7387faf8c2 Merge "Fixed that texts of players would often remain empty" into rvc-dev 2020-06-30 21:09:34 +00:00