Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
657,699 Commits 3 Branches 0 Tags
c0cdcbfefb08eeea2d2b689888f72043e95508bb
Commit Graph

657699 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
ab78a4fd08 Merge "Do not update RM config with previous sequence" into sc-dev am: 9b1891b428 am: c505abbf84 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15190447

Change-Id: I5b13554e4075807998236d4020f399245c8f2f55
 2021-07-02 21:07:17 +00:00
TreeHugger Robot
d981fe7dba Merge "Route touches via NPVController instead of LockIcon's onClickListener" into sc-dev am: c948e561d9 am: a85530426c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15179992

Change-Id: Ia40b8959aa04ab96b284d182984438a821c257e3
 2021-07-02 21:06:48 +00:00
Automerger Merge Worker
d51d810354 Merge "Merge "Hide silent notifications when AOD animation starts" into sc-dev am: 8d52443260 am: 6c560192ee" into sc-v2-dev-plus-aosp 2021-07-02 21:06:20 +00:00
TreeHugger Robot
e390e0d23d Merge "Do not update RM config with previous sequence" into sc-dev am: 9b1891b428 am: 34502e3deb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15190447

Change-Id: Ia00c1d45ce2f2fb2da57396d119544382c37c9a2
 2021-07-02 21:05:40 +00:00
TreeHugger Robot
97bd9326bd Merge "Route touches via NPVController instead of LockIcon's onClickListener" into sc-dev am: c948e561d9 am: 5c0eb3f687 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15179992

Change-Id: I232cac4a7856625802eacf93e4920427dd9a4b3a
 2021-07-02 21:05:22 +00:00
Ned Burns
412185576b Merge "Hide silent notifications when AOD animation starts" into sc-dev am: 8d52443260 am: c49a4754fb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15186228

Change-Id: I14ee8de52f45905331be8740d45ff31c33852761
 2021-07-02 21:05:02 +00:00
Ned Burns
5afcd4cf5e Merge "Hide silent notifications when AOD animation starts" into sc-dev am: 8d52443260 am: 6c560192ee 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15186228

Change-Id: Ic2eccb0f646f596488d91878d1175bc067984902
 2021-07-02 21:04:07 +00:00
Jay Sullivan
f7e502deab Merge "Fix isAutoRevokeWhitelisted vulnerability" into sc-dev am: c567ac9165 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15102869

Change-Id: Idbfafcdfccd58d1fed810bee495708de63971447
 2021-07-02 20:59:23 +00:00
Jay Sullivan
c567ac9165 Merge "Fix isAutoRevokeWhitelisted vulnerability" into sc-dev 2021-07-02 20:55:11 +00:00
TreeHugger Robot
34502e3deb Merge "Do not update RM config with previous sequence" into sc-dev am: 9b1891b428 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15190447

Change-Id: Ifbe47eb36d32ece3b52cd50d7e8af1bdc568ff04
 2021-07-02 20:47:03 +00:00
TreeHugger Robot
c505abbf84 Merge "Do not update RM config with previous sequence" into sc-dev am: 9b1891b428 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15190447

Change-Id: Id2d6ce9139d214fb172b7fe789b11367ef201fb0
 2021-07-02 20:46:59 +00:00
TreeHugger Robot
a85530426c Merge "Route touches via NPVController instead of LockIcon's onClickListener" into sc-dev am: c948e561d9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15179992

Change-Id: Ic4baca9d23f7f17cab5cac906ead7174da6a239c
 2021-07-02 20:46:43 +00:00
Ned Burns
6c560192ee Merge "Hide silent notifications when AOD animation starts" into sc-dev am: 8d52443260 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15186228

Change-Id: I85fa4ed57aa5877d4a7b2863b5cbe70d5406c815
 2021-07-02 20:46:31 +00:00
TreeHugger Robot
5c0eb3f687 Merge "Route touches via NPVController instead of LockIcon's onClickListener" into sc-dev am: c948e561d9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15179992

Change-Id: I6a41b321370a689fb9d2999be52b49c2fac190ac
 2021-07-02 20:46:20 +00:00
Ned Burns
c49a4754fb Merge "Hide silent notifications when AOD animation starts" into sc-dev am: 8d52443260 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15186228

Change-Id: Idfcd935d5185d0b0db6638451e5d68f10730ff94
 2021-07-02 20:46:03 +00:00
Nate Myren
f0b70130f1 Merge "Create "trusted chain" mechanism for AttributionSource" into sc-dev am: 1e1aef37c8 am: 7703ea8de4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15123738

Change-Id: I137ddff3ac548b4c21d7a4302b9dd77ba4988057
 2021-07-02 20:37:55 +00:00
Nate Myren
648ae204e0 Merge "Create "trusted chain" mechanism for AttributionSource" into sc-dev am: 1e1aef37c8 am: 3b6857a429 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15123738

Change-Id: Iebd9c2f7138f67e7b95c429e26f74356a3c0891e
 2021-07-02 20:37:40 +00:00
TreeHugger Robot
9b1891b428 Merge "Do not update RM config with previous sequence" into sc-dev 2021-07-02 20:34:13 +00:00
Nate Myren
6c7dac39d5 Avoid creating Recognition Callback if preflight fails 
Only create the callback (and call onCancel) if the preflight permission
check succeeds.

Bug: 190848702
Test: manual
Change-Id: Ie7155348213e86dea0a9080a9c4ed53144f91c6f
 2021-07-02 13:32:34 -07:00
TreeHugger Robot
c948e561d9 Merge "Route touches via NPVController instead of LockIcon's onClickListener" into sc-dev 2021-07-02 20:31:43 +00:00
Ned Burns
8d52443260 Merge "Hide silent notifications when AOD animation starts" into sc-dev 2021-07-02 20:31:03 +00:00
Nate Myren
7703ea8de4 Merge "Create "trusted chain" mechanism for AttributionSource" into sc-dev am: 1e1aef37c8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15123738

Change-Id: I4e49fa2e469f07a31f3ed6b1c7b59b7f79a8bec8
 2021-07-02 20:20:42 +00:00
Nate Myren
3b6857a429 Merge "Create "trusted chain" mechanism for AttributionSource" into sc-dev am: 1e1aef37c8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15123738

Change-Id: Iba9e0205c45e47a5d781125335ad06579e167159
 2021-07-02 20:19:44 +00:00
Nate Myren
1e1aef37c8 Merge "Create "trusted chain" mechanism for AttributionSource" into sc-dev 2021-07-02 20:03:33 +00:00
Beth Thibodeau
b12fdd8073 Remove controls from carousel when not in manager 
If the user is in a bad state where controls exist in the carousel but
their keys have been removed from the manager, allow the dismiss button
to remove the player from the carousel directly.

The device isn't expected to get into this state normally but this will
allow users to remove the bad controls without needing to reboot.
Also added dump to MediaCarouselController to help debug future reports.

Bug: 190799184
Test: atest MediaDataManagerTest MediaControlPanelTest
Test: take bugreport, verify MediaCarouselController data is in dumpsys
Test: manual - force bad controls state, verify can still remove
Change-Id: I7af130c90c7b661cc7cc8bbeb3ca1fd5d81c8913
 2021-07-02 15:52:07 -04:00
Josh Tsuji
1bccd514f3 Don't reset to lift reveal - StatusBar will take care of that. 
Fixes: 181923218
Test: steps in b/181923218#comment21
Change-Id: I18694251e18044cc34c537bc7b8f91d12b09dadd
 2021-07-02 12:49:17 -07:00
Miranda Kephart
8c00b885ff Merge "Fix shared transition offsets in landscape" into sc-dev am: 3196d0faea am: 5ad849a924 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15189837

Change-Id: I20f828f4b2d0513524ad6097e1a1c4ce6a16a647
 2021-07-02 19:47:53 +00:00
Miranda Kephart
3aca6c3582 Merge "Fix shared transition offsets in landscape" into sc-dev am: 3196d0faea am: ab48098b67 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15189837

Change-Id: I9c0043c168564e9720596c6084b23db7ea86873f
 2021-07-02 19:47:22 +00:00
Miranda Kephart
ab48098b67 Merge "Fix shared transition offsets in landscape" into sc-dev am: 3196d0faea 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15189837

Change-Id: I2ab058ec256caa7d0e777a481893ca6dcf22c371
 2021-07-02 19:34:05 +00:00
Miranda Kephart
5ad849a924 Merge "Fix shared transition offsets in landscape" into sc-dev am: 3196d0faea 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15189837

Change-Id: Id114e18a0c8a01d71e2538e05e93faeb14a9ec64
 2021-07-02 19:33:15 +00:00
Benedict Wong
a49bbf06f1 Add support for app data accounting for in-kernel dataplanes 
This change ensures that app data accounting works correctly within the
confines of in-kernel dataplanes, as used by platform VPNs and the VCN.

Notably, the VCN MUST NOT specify the IMSI, as that would lead to double
counting of the interface statistics.

Bug: 175853498
Bug: 190620024
Test: atest NetworkStatsTest FrameworksVcnTests
Original-Change: https://android-review.googlesource.com/1749070
Merged-In: I768907cd3dd2028c7040cddd81fc71a5ce69bbdb
Change-Id: I768907cd3dd2028c7040cddd81fc71a5ce69bbdb
 2021-07-02 19:28:45 +00:00
Silin Huang
d886267b18 Add westworld log to quick access wallet UI. 
Bug: 192604191
Test: atest WalletScreenControllerTest
Change-Id: Ia0ae73a5bff55e6d81d330f71a7c15179d2d9793
 2021-07-02 12:25:51 -07:00
Automerger Merge Worker
3a6b85055d Merge "Merge "Add VCN underlying networks" am: 447fbc3788 am: b9c06bc020 am: b1f2cc2814" into sc-v2-dev-plus-aosp 2021-07-02 19:25:10 +00:00
Benedict Wong
1e3eb3b264 Merge "Add VCN underlying networks" am: 447fbc3788 am: b9c06bc020 am: b1f2cc2814 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1750241

Change-Id: I8b9b38052f2b6e5cafbfcedebe55a58dc81221b9
 2021-07-02 19:24:58 +00:00
Kevin Han
329d1b1669 Merge "Actually count explicit broadcasts as usage" into sc-dev am: 9e3ce77cca am: 117e58256b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15179083

Change-Id: Iead9e49bfe592552f11af2ee199cd59c9032806d
 2021-07-02 19:24:55 +00:00
Benedict Wong
a4e2cdd31c Merge "Add support for app data accounting for in-kernel dataplanes" am: 69e2f04207 am: cdb9503af4 am: 9c66126e95 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1749070

Change-Id: Ib0d234e6395f1d78cf2894e68d7cfd692a8dd84d
 2021-07-02 19:24:29 +00:00
Kevin Han
34edb312b1 Merge "Actually count explicit broadcasts as usage" into sc-dev am: 9e3ce77cca am: 0b6c6a09c9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15179083

Change-Id: I1ebf88d9cd4e63a0e8502536c782fce0253ac35c
 2021-07-02 19:23:42 +00:00
Lyn Han
685a868e21 Enable qs open while shade expansion is still running 
Fixes: 190837480
Test: slowly fling shade open, swipe qs open => qs opens, qs does not
show extra tiles during shade open (before second swipe to open qs)

Change-Id: I359935e55e24b4e7faaf5e9d3fdc80fc55d965b8
Merged-In: I359935e55e24b4e7faaf5e9d3fdc80fc55d965b8
 2021-07-02 19:23:32 +00:00
Mark Renouf
634eddb1d9 Merge "Revert "Revert "Fix mPositionInWindow to not use global coords""" into sc-dev am: 2fe11f121d am: cf6f098598 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15172668

Change-Id: Ic181937c677a045be7415c0b3b49893daf8976d9
 2021-07-02 19:23:11 +00:00
Automerger Merge Worker
929490f929 Merge "Merge "Revert "Revert "Fix mPositionInWindow to not use global coords""" into sc-dev am: 2fe11f121d am: f5ff9a0425" into sc-v2-dev-plus-aosp 2021-07-02 19:22:53 +00:00
Mark Renouf
1a5e36cbd9 Merge "Revert "Revert "Fix mPositionInWindow to not use global coords""" into sc-dev am: 2fe11f121d am: f5ff9a0425 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15172668

Change-Id: I10cbae503c672a4c92011d45a435cf6cf416d5e6
 2021-07-02 19:22:34 +00:00
Automerger Merge Worker
ccefa116a7 Merge changes from topic "am-85a87c1cc1724ea49922fbd45e4f7aeb" into sc-v2-dev-plus-aosp 
* changes:
  [automerger skipped] Merge "[DO NOT MERGE] Global actions tip" into sc-dev am: 70c9f8b8b5 am: 0ee139f112 -s ours
  [automerger skipped] [DO NOT MERGE] Global actions tip am: cfd4b956db am: 49475ca475 -s ours
 2021-07-02 19:22:33 +00:00
TreeHugger Robot
94fc11d630 [automerger skipped] Merge "[DO NOT MERGE] Global actions tip" into sc-dev am: 70c9f8b8b5 am: 0ee139f112 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icdbe83a7b951031f50e030bea58be484e36e3bf9
 2021-07-02 19:22:31 +00:00
Matt Pietal
7c956ce6cc [automerger skipped] [DO NOT MERGE] Global actions tip am: cfd4b956db am: 49475ca475 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I920a199be8c956a46ede6a5046b561e49002bb40
 2021-07-02 19:22:22 +00:00
TreeHugger Robot
7df7d45730 [automerger skipped] Merge "[DO NOT MERGE] Global actions tip" into sc-dev am: 70c9f8b8b5 -s ours am: af325d9679 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I69d9e5e6149b7c959f18da3ab0f684fe3cd53aa0
 2021-07-02 19:22:21 +00:00
Mill Chen
1a5631bb83 Merge "Update dynamic height adjusting" into sc-dev am: e665e27525 am: 97a5ed010a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15187824

Change-Id: Id6422b1c7c44602f5c18882fd54203c9e914d5f6
 2021-07-02 19:22:06 +00:00
Mill Chen
e5846e5d12 Merge "Update dynamic height adjusting" into sc-dev am: e665e27525 am: e0e87f2ecf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15187824

Change-Id: I3869a815a907c0b52245bee5f772557f07dc5e3b
 2021-07-02 19:21:38 +00:00
Miranda Kephart
3196d0faea Merge "Fix shared transition offsets in landscape" into sc-dev 2021-07-02 19:21:21 +00:00
Lyn Han
f9a69c6084 Enable qs open while shade expansion is still running 
Fixes: 190837480
Test: slowly fling shade open, swipe qs open => qs opens, qs does not
show extra tiles during shade open (before second swipe to open qs)

Change-Id: I359935e55e24b4e7faaf5e9d3fdc80fc55d965b8
 2021-07-02 19:21:18 +00:00
Benedict Wong
b1f2cc2814 Merge "Add VCN underlying networks" am: 447fbc3788 am: b9c06bc020 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1750241

Change-Id: I93ec50a1004dc79352dd72270828cb199e0e150d
 2021-07-02 19:12:53 +00:00