Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
661,750 Commits 3 Branches 0 Tags
c00a066ef89cf23af02acf6adfbccabd85832c51
Commit Graph

661750 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bo Liu
c00a066ef8 Merge "ADPF: Handle preferred interval on unsupported device" into sc-dev am: 047d3ba17a am: 9cb67d342e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15392128

Change-Id: I50074d27d8a9a7597b58c5c849efe31d437cf763
 2021-07-27 20:10:47 +00:00
TreeHugger Robot
8289895352 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 27e6215f16 -s ours am: cfeb86b0d0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6d07a1b54f83c2695c926fac1f5a85eaf24352c0
 2021-07-27 20:10:26 +00:00
Jeff Sharkey
99d6ffed27 Merge "Pass metadata as AttributionSourceSource." into sc-dev am: a57ee36d6c am: ce6a9699b6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15388734

Change-Id: I8055249a8a7e3176b92dddb7adb186df0bf6ba75
 2021-07-27 20:10:11 +00:00
Lyn Han
997779773c Merge "Cancel existing QsClippingAnimation when creating new one" into sc-dev am: ea1871c7d2 am: 878ecdf560 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15390005

Change-Id: I016e1838c360f8c6e680fd09168f74b48947fc37
 2021-07-27 20:09:22 +00:00
Bo Liu
9cb67d342e Merge "ADPF: Handle preferred interval on unsupported device" into sc-dev am: 047d3ba17a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15392128

Change-Id: Ie35c2089b3627d583e37acefa83026c74c6d733a
 2021-07-27 19:44:25 +00:00
TreeHugger Robot
770447c23d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: bb262d6bf8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie96da97bca0c58b67a97aa637f3118586975e943
 2021-07-27 19:43:49 +00:00
TreeHugger Robot
cfeb86b0d0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 27e6215f16 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib5e6e82ebd065f8a326ab3eb775f0f9b2e6ab03b
 2021-07-27 19:43:46 +00:00
Jeff Sharkey
ce6a9699b6 Merge "Pass metadata as AttributionSourceSource." into sc-dev am: a57ee36d6c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15388734

Change-Id: Iabda6bed8f2392201a0fc87eb31f9d01a3ecac1e
 2021-07-27 19:43:33 +00:00
Matt Pietal
d82336e9f6 [DO NOT MERGE] Controls Lockscreen affordance am: 1d4da0b899 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15403233

Change-Id: I875a926212af955b7f403262e7befdbaf612ddfe
 2021-07-27 19:43:15 +00:00
Lyn Han
878ecdf560 Merge "Cancel existing QsClippingAnimation when creating new one" into sc-dev am: ea1871c7d2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15390005

Change-Id: I72a4d3b47933935f561030398ccd20a1d8792217
 2021-07-27 19:43:07 +00:00
Bo Liu
047d3ba17a Merge "ADPF: Handle preferred interval on unsupported device" into sc-dev 2021-07-27 19:35:08 +00:00
TreeHugger Robot
27e6215f16 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-07-27 19:27:45 +00:00
Meng Wang
2dbb9d6eb4 Merge "Lazily load bitmap of SubscriptionInfo" am: 4d8663cb84 am: 9b7bccc2cf am: 8c6278ecbc 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1778879

Change-Id: I9daea5996e5ccb4e834c373b0a00b16bd31dbe83
 2021-07-27 19:21:06 +00:00
Jeff Sharkey
a57ee36d6c Merge "Pass metadata as AttributionSourceSource." into sc-dev 2021-07-27 19:20:50 +00:00
Meng Wang
8c6278ecbc Merge "Lazily load bitmap of SubscriptionInfo" am: 4d8663cb84 am: 9b7bccc2cf 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1778879

Change-Id: I5944721172cd1faa66aebeceb04cc057bc6d0cd4
 2021-07-27 19:16:10 +00:00
Adam He
a8018e499f Merge "Fix inline autofill not working if both afservice and keyboard support it, but keyboard disabled inline support manually." into sc-dev am: e31184cb46 am: 0fe0c2b361 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15362681

Change-Id: I582b1d24b27cb76dc81cc12a79a1f95acc5b8892
 2021-07-27 19:16:05 +00:00
Lyn Han
ea1871c7d2 Merge "Cancel existing QsClippingAnimation when creating new one" into sc-dev 2021-07-27 19:01:35 +00:00
Lyn Han
a39aece07c Cancel existing QsClippingAnimation when creating new one 
Bug: 191436459

[Manual tests for regressions]
Test: open shade from lockscreen, open fullscreen qs
Test: open unlocked shade, open fullscreen qs
Test: directly open fullscreen qs from top of lockscreen
Test: directly open fullscreen qs via two-finger swipe while unlocked

Change-Id: Ibb8f3e35e5fc14e4e029e98fa3dd83a20b470ebf
 2021-07-27 19:01:16 +00:00
TreeHugger Robot
bb262d6bf8 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-07-27 19:00:22 +00:00
Meng Wang
9b7bccc2cf Merge "Lazily load bitmap of SubscriptionInfo" am: 4d8663cb84 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1778879

Change-Id: I6dbb148d3cee85851b63c54c9c193e50223abe68
 2021-07-27 18:53:20 +00:00
Adam He
0fe0c2b361 Merge "Fix inline autofill not working if both afservice and keyboard support it, but keyboard disabled inline support manually." into sc-dev am: e31184cb46 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15362681

Change-Id: If605d300d5b7d4cbf7038566c885d6c274b60d46
 2021-07-27 18:51:02 +00:00
Adam He
e31184cb46 Merge "Fix inline autofill not working if both afservice and keyboard support it, but keyboard disabled inline support manually." into sc-dev 2021-07-27 18:31:08 +00:00
Meng Wang
4d8663cb84 Merge "Lazily load bitmap of SubscriptionInfo" 2021-07-27 18:30:21 +00:00
Matt Pietal
1d4da0b899 [DO NOT MERGE] Controls Lockscreen affordance 
Place a button on the lockscreen similar to the wallet
affordance. Only enable the button if:

1. User has enabled the setting
2. Device control services are enabled
3. The user has favorited at least 1 control

Fixes: 194435266
Test: manual
Change-Id: Idc755656e2d3b7df77bf95d06f076b63349ece9a
(cherry picked from commit 9172eef0cd)
 2021-07-27 18:05:06 +00:00
Lucas Dupin
872dc79d2e Merge "Offload Luma Sampling IPC to background thread" into sc-v2-dev am: 69eef091b4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15388784

Change-Id: Ibd75deff7e7eadff2276419741356fc3b98e5ea8
 2021-07-27 17:33:10 +00:00
Evan Rosky
ffc00be4fb Merge "Add shell-transitions inTransition check to getTouchOcclusionMode" into sc-v2-dev am: 1e4d07fe1f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15348243

Change-Id: I879e388686d2433156d4ed00ce6576a835e84a57
 2021-07-27 17:31:43 +00:00
Lucas Dupin
69eef091b4 Merge "Offload Luma Sampling IPC to background thread" into sc-v2-dev 2021-07-27 17:26:16 +00:00
Evan Rosky
1e4d07fe1f Merge "Add shell-transitions inTransition check to getTouchOcclusionMode" into sc-v2-dev 2021-07-27 17:11:26 +00:00
Julia Reynolds
6213e3cd8e Merge "Add NMS broadcasts to protected list" into sc-dev am: 92145ddf77 am: 44d4056877 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15393660

Change-Id: Idb905a28c2152600bbf91ec3724508a2f4dd78a1
 2021-07-27 16:47:26 +00:00
Julia Reynolds
44d4056877 Merge "Add NMS broadcasts to protected list" into sc-dev am: 92145ddf77 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15393660

Change-Id: Ic1110f3618171322349346d017938c3248b7845a
 2021-07-27 16:35:52 +00:00
Automerger Merge Worker
c20f6b17c8 Merge "Merge "Skip duplicate setBounds requests for task fragments" into sc-v2-dev am: 7d1040f716" into sc-v2-dev-plus-aosp 2021-07-27 16:32:11 +00:00
Jason Chang
80d8c55c1b Merge "Fix tutorial background color not up-to-date occasionally" into sc-dev am: 3ebd024a80 am: 63f15d32dd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15373613

Change-Id: Ied857583e43fb2e0e68e19d158d6b48aa5261dd5
 2021-07-27 16:31:35 +00:00
Andrii Kulian
f4e263606c Merge "Skip duplicate setBounds requests for task fragments" into sc-v2-dev am: 7d1040f716 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15364352

Change-Id: Ic6ffddeac35d9e8737a6689b5b930c3c007b612b
 2021-07-27 16:31:34 +00:00
Chris Li
7f2ac96380 Merge "Hide Keyguard view after remote animation" into sc-v2-dev am: b2aca4718f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15365824

Change-Id: Ief1b1efa9c4d50e5ee193af1a4e2c53e71911727
 2021-07-27 16:30:36 +00:00
Andrii Kulian
7d1040f716 Merge "Skip duplicate setBounds requests for task fragments" into sc-v2-dev 2021-07-27 16:21:25 +00:00
Julia Reynolds
92145ddf77 Merge "Add NMS broadcasts to protected list" into sc-dev 2021-07-27 16:16:53 +00:00
Jason Chang
63f15d32dd Merge "Fix tutorial background color not up-to-date occasionally" into sc-dev am: 3ebd024a80 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15373613

Change-Id: I55abb1baa725c312038fb454f9a3737d88c13fe7
 2021-07-27 16:12:56 +00:00
Chris Li
b2aca4718f Merge "Hide Keyguard view after remote animation" into sc-v2-dev 2021-07-27 16:08:27 +00:00
Jason Chang
3ebd024a80 Merge "Fix tutorial background color not up-to-date occasionally" into sc-dev 2021-07-27 16:00:30 +00:00
Jeff Sharkey
75d4f93a4e Pass metadata as AttributionSourceSource. 
These two PermissionManager methods are using AttributionSource as
metadata only, and aren't interested in the remote caller enforcing
that the claimed UID matches the caller, since they're not actually
being used for permission enforcement.

Thus we pass the metadata using the AttributionSourceState holder
object and reconstruct on the remote side, entirely avoiding the
enforceCallingUid() check.

Bug: 193842956
Test: atest CtsPermission5TestCases
Change-Id: I576b6feb8cc2b0586b4341268866d8027689293f
 2021-07-27 09:45:54 -06:00
Peter Kalauskas
82eef5791f Merge "Move guest creation to background thread" into sc-dev am: 2599b29073 am: c2360bad51 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15373286

Change-Id: I275b09f67cb2bc4bfa61f9c9f342b2cf3ed15396
 2021-07-27 15:45:15 +00:00
Bill Yi
1668f74f1c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 170f2b6287 -s ours am: c78d905228 -s ours am: 97dc391718 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibb88b16c142dfa8f6da006c73b28fed53bd91966
 2021-07-27 15:45:02 +00:00
Peter Kalauskas
c2360bad51 Merge "Move guest creation to background thread" into sc-dev am: 2599b29073 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15373286

Change-Id: I0165115ab9b76b27213de6eb7824fa9e63a6908e
 2021-07-27 15:25:45 +00:00
Bill Yi
97dc391718 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 170f2b6287 -s ours am: c78d905228 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1c0d22767cd2b00fe12f5b3aa18e4dc528d057a7
 2021-07-27 15:25:17 +00:00
Peter Kalauskas
2599b29073 Merge "Move guest creation to background thread" into sc-dev 2021-07-27 15:19:05 +00:00
Jeff DeCew
0e7ef38722 Merge "Use correct stack height when bypass enabled." into sc-dev am: 44cd9995db am: b744663f9d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15392213

Change-Id: Id759a4d31b15fb5dc0bb0990293dfd6fe6874c86
 2021-07-27 15:16:16 +00:00
Sergey Volnov
8bcbf4b1ab Merge "Fix content capture not being usable from hotword detector." into sc-dev am: 78456de866 am: 04f0c39ce3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15379071

Change-Id: I7f6883613700714aab10c453598ba95cb5e73929
 2021-07-27 15:15:33 +00:00
Alex Buynytskyy
f0d0001aa7 Merge "Check for invalid (negative) string pool pos." into sc-dev am: 59bad728e2 am: 9336680fe5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15390628

Change-Id: Iae777af3410b51509ff39c6619084a765909522d
 2021-07-27 15:14:57 +00:00
Bill Yi
c78d905228 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 170f2b6287 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia293b6b9c509b8f7c5716badb3d056065e0aed5e
 2021-07-27 15:09:11 +00:00
Jeff DeCew
b744663f9d Merge "Use correct stack height when bypass enabled." into sc-dev am: 44cd9995db 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15392213

Change-Id: Ief9db8b88ee36471affe960f247635f05c7768bb
 2021-07-27 14:52:47 +00:00