Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
660,966 Commits 3 Branches 0 Tags
e9dfa211d6468310c0ca30207f58dbcd597ceca6
Commit Graph

660966 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
e9dfa211d6 Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into sc-dev am: d83f286818 am: b8fc6c7296 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15347870

Change-Id: Ie5d70551ab2b287f539f6167a6365dc01c263cfa
 2021-07-21 20:55:59 +00:00
TreeHugger Robot
b8fc6c7296 Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into sc-dev am: d83f286818 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15347870

Change-Id: I26c5b5320f48e22f05297de506d13dc6170c5c52
 2021-07-21 20:51:23 +00:00
TreeHugger Robot
d83f286818 Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into sc-dev 2021-07-21 20:41:11 +00:00
Daniel Chapin
f0187aa354 Merge "Revert "Deferring visibility updates while applying WCT"" into sc-v2-dev am: 100b9f73e5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15347902

Change-Id: I9913fbeec08501c35bcdaacb58df6f84c9dd8089
 2021-07-21 20:27:44 +00:00
Daniel Chapin
100b9f73e5 Merge "Revert "Deferring visibility updates while applying WCT"" into sc-v2-dev 2021-07-21 20:13:54 +00:00
Fabian Kozynski
1667dd3619 Merge "Hide RSSI next to single carrier name" into sc-v2-dev am: 8a5c787b96 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15337859

Change-Id: I1c458bc75189e5ba51399e62325edcdd626a966f
 2021-07-21 19:20:28 +00:00
Joshua Mccloskey
aaa88ae5d6 Merge "Remove all biometrics if user is removed." into sc-dev am: 755ca98ad4 am: 03483236d5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15343273

Change-Id: I4b40a5bfeca3f9c59fdc1b2ce8d119d5aeba9b2f
 2021-07-21 19:20:06 +00:00
Evan Rosky
795aea9658 Merge "Fix some shell transitions bugs breaking splashscreen cts" into sc-v2-dev am: 317e669870 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15340839

Change-Id: Ida7bb38d0da0bd5b059e7c85cd99aaa03ff2efb1
 2021-07-21 19:19:37 +00:00
Fiona Campbell
88bbda9c26 Merge "Add displayId to DPC logs" into sc-dev am: 1d509e2e21 am: fc031a9ada 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15299315

Change-Id: I50cc0e889fe1ae4dcfe58ee2e257e05c4746ba8b
 2021-07-21 19:19:05 +00:00
Ilya Matyukhin
622f14c389 Merge "Fix enrollment preview surface leak" into sc-dev am: 2151a28c7c am: f02dae3491 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15246716

Change-Id: I3fb96607d1977cf08a14bb71a24b364c62cb2662
 2021-07-21 19:18:50 +00:00
Yuncheol Heo
44399f20c8 Merge "Apply setAlwaysOnTop when recycling Task." into sc-v2-dev am: ee4ae77c5f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15305884

Change-Id: I3e31cb5daf9253d83954fcabbca93de04e921045
 2021-07-21 19:18:26 +00:00
Silin Huang
379ac00e3e Recreate the Wallet client before query the wallet cards with a time am: afe1913257 am: c37bf4e5f6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15315891

Change-Id: Id55dbaaa99cd9bac0eb69e4cbb937af4b42306bc
 2021-07-21 19:18:05 +00:00
Chris Li
56640cd192 Merge "Do not preload recents activity if it will be visible" into sc-v2-dev am: 5b7911b8a3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15319290

Change-Id: I322c1ce27cd3cce21114f33267250ebe803ca0cc
 2021-07-21 19:17:56 +00:00
Beverly Tai
f05867f696 Merge "Rely on the dozeAmount changes for mIsDozing" into sc-dev am: 814655b18c am: c4fe720f11 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15348030

Change-Id: Ic51cc10472f469b4ce7489831990efda1f37f0ce
 2021-07-21 19:17:41 +00:00
Evan Severson
534ebbeec9 Merge "Don't block intent if op is restricted due to toggles" into sc-dev am: 2b11e7f25c am: b88fa4135b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15245178

Change-Id: I6b983abe3ab13c386524b073832afe271390ad71
 2021-07-21 19:17:26 +00:00
Sunny Goyal
854a50690d Merge "Accounting for image scaling when calculating color extraction" into sc-v2-dev am: f7f941743d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15342468

Change-Id: Ic92d485b2fca34e2594405c092436e48deafbfd3
 2021-07-21 19:16:56 +00:00
Josh Tsuji
d3c9519ece Merge "Fix issue where screen off is disabled after expanding then collapsing the shade." into sc-dev am: 3d89666385 am: cc8ebcaf9d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15340719

Change-Id: I40b814898be63ca57b767b4b1eb60bc519eac644
 2021-07-21 19:15:51 +00:00
Fabian Kozynski
8a5c787b96 Merge "Hide RSSI next to single carrier name" into sc-v2-dev 2021-07-21 19:12:01 +00:00
Joshua Mccloskey
03483236d5 Merge "Remove all biometrics if user is removed." into sc-dev am: 755ca98ad4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15343273

Change-Id: I103a114eb5e38195323940ef0f558e892fb25655
 2021-07-21 18:17:22 +00:00
Joshua Mccloskey
755ca98ad4 Merge "Remove all biometrics if user is removed." into sc-dev 2021-07-21 18:14:01 +00:00
Evan Rosky
317e669870 Merge "Fix some shell transitions bugs breaking splashscreen cts" into sc-v2-dev 2021-07-21 18:01:08 +00:00
Fiona Campbell
fc031a9ada Merge "Add displayId to DPC logs" into sc-dev am: 1d509e2e21 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15299315

Change-Id: I26ef1c7c8ffad1cfb81d96cd43be4029d3e89bfd
 2021-07-21 17:56:33 +00:00
Fabian Kozynski
66820d753e Hide RSSI next to single carrier name 
If there's exactly one SIM, do not show the RSSI next to the name in
QSBH. Instead, show it with the other icons. If there's more than one
SIM, show each RSSI next to the carrier name, and not with the other
icons (not even in QQS).

Test: atest com.android.systemui.qs
Test: manual single sim
Bug: 187654917
Bug: 194178072
Change-Id: I8b80bb14b8f60872d44d5a92ddfa7c5903420874
Merged-In: I8b80bb14b8f60872d44d5a92ddfa7c5903420874
 2021-07-21 17:53:52 +00:00
Fiona Campbell
1d509e2e21 Merge "Add displayId to DPC logs" into sc-dev 2021-07-21 17:51:27 +00:00
Ilya Matyukhin
f02dae3491 Merge "Fix enrollment preview surface leak" into sc-dev am: 2151a28c7c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15246716

Change-Id: Ia6c92a226d1fe7db3cf82c799145a7d773145352
 2021-07-21 17:51:11 +00:00
Yuncheol Heo
ee4ae77c5f Merge "Apply setAlwaysOnTop when recycling Task." into sc-v2-dev 2021-07-21 17:43:02 +00:00
Ilya Matyukhin
2151a28c7c Merge "Fix enrollment preview surface leak" into sc-dev 2021-07-21 17:41:34 +00:00
Silin Huang
c37bf4e5f6 Recreate the Wallet client before query the wallet cards with a time am: afe1913257 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15315891

Change-Id: Ifd6c3888440ba96c26f7a20c7f567b8f0a353aee
 2021-07-21 17:35:50 +00:00
Silin Huang
afe1913257 Recreate the Wallet client before query the wallet cards with a time 
window.

The previous approach won't working because we can't catch the
IOException in the tile; so we need to avoid using a staled QAW client, and the re-create call is
relatively cheap.
The re-creation will happen at most once per 10-minute time window.

Test: atest
Fixes: 188789272
Change-Id: I2c4dd25d4eb7a983c7ca7870fdba147ff8452a3d
 2021-07-21 17:32:26 +00:00
Chris Li
5b7911b8a3 Merge "Do not preload recents activity if it will be visible" into sc-v2-dev 2021-07-21 17:29:07 +00:00
Beverly Tai
c4fe720f11 Merge "Rely on the dozeAmount changes for mIsDozing" into sc-dev am: 814655b18c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15348030

Change-Id: I5b1e144f8d5c50b5eab2f99f54a4916b3256dd4e
 2021-07-21 17:26:52 +00:00
Evan Severson
b88fa4135b Merge "Don't block intent if op is restricted due to toggles" into sc-dev am: 2b11e7f25c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15245178

Change-Id: I6e6fea3721aed83e38d3b70f570036c1b3c72c03
 2021-07-21 17:26:21 +00:00
Beverly Tai
814655b18c Merge "Rely on the dozeAmount changes for mIsDozing" into sc-dev 2021-07-21 17:22:19 +00:00
Evan Severson
2b11e7f25c Merge "Don't block intent if op is restricted due to toggles" into sc-dev 2021-07-21 17:10:21 +00:00
Sunny Goyal
f7f941743d Merge "Accounting for image scaling when calculating color extraction" into sc-v2-dev 2021-07-21 16:53:51 +00:00
Daniel Chapin
5c4fcb2bf2 Revert "Deferring visibility updates while applying WCT" 
This reverts commit be3d9a3bde.

Reason for revert: Droidfood Weekly blocking bug: 194040982

Change-Id: If36f29b9275196d6042f0d110ad3cd6346c08931
 2021-07-21 16:23:00 +00:00
Josh Tsuji
cc8ebcaf9d Merge "Fix issue where screen off is disabled after expanding then collapsing the shade." into sc-dev am: 3d89666385 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15340719

Change-Id: Ie254711aef1847de3ba08a26ae167dee8f0392f7
 2021-07-21 16:00:48 +00:00
Josh Tsuji
3d89666385 Merge "Fix issue where screen off is disabled after expanding then collapsing the shade." into sc-dev 2021-07-21 15:40:24 +00:00
Evan Severson
7b6d643171 Don't block intent if op is restricted due to toggles 
Test: Create sdk 22 and 30 test apps and use the MEDIASTORE intents
Bug: 192635623
Change-Id: I250a5e398e72919ec8217e87b76273082e781f63
 2021-07-21 08:37:00 -07:00
Beverly Tai
b4523a71c6 resolve merge conflicts of 1023c783d8 to sc-v2-dev-plus-aosp 
Change-Id: I1063f845f110714754f5738de95538e3ae98e66a
Fixes: 194282466
Merged-In: I621ea06984f17954e9be138e9e5669aeb3cfb3fe
 2021-07-21 15:24:17 +00:00
Beverly
346acd4920 Rely on the dozeAmount changes for mIsDozing 
The large clock view can be attached while the
doze transition is happening, so we don't want to
mistakently set mIsDozing=false from StatusBarStateController#isDozing
when we should be relying on the update from onDozeAmountChanged.

Test: manual
Fixes: 194277812
Change-Id: I202b9d845194f9d97d8ac1d6d1ff7e3f78491fd7
 2021-07-21 10:51:28 -04:00
Dave Mankoff
25b172abfd Guard DISABLE_PLUGIN with PLUGIN permission. 
Fixes a p0 security bug. We already have the plugin permission
defined in our manifest. Ensure that senders of the DISABLE_PLUGIN
broadcast have that permission.

Fixes: 193444889
Test: manual
Change-Id: Iebaba435c17c5644c5357c0683858447f5ffb897
 2021-07-21 14:41:48 +00:00
Beverly Tai
218182d11f Merge "Don't forward touches to udfps if notification panel is expanding" into sc-dev am: f7b36eedf5 am: c2810b436a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15340335

Change-Id: I7db0b1c060cc43a071ea1ec613efe94944df5a7d
 2021-07-21 14:25:28 +00:00
Beverly Tai
0e116ac6bb Merge "Don't forward touches to udfps if notification panel is expanding" into sc-dev am: f7b36eedf5 am: db88fa5c71 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15340335

Change-Id: I10bb5475caad73feadcca07abb47209b79a60570
 2021-07-21 14:17:19 +00:00
Beverly Tai
1023c783d8 Merge "Update orientation on rotation changes" into sc-dev am: b8a20acc47 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15340330

Change-Id: I88cf0a350a7bdcac3661874c9b75da5a7f8d9a35
 2021-07-21 14:08:45 +00:00
Beverly Tai
c2810b436a Merge "Don't forward touches to udfps if notification panel is expanding" into sc-dev am: f7b36eedf5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15340335

Change-Id: I35812bb6ba722816320d3e8083563083e5e2c169
 2021-07-21 14:08:28 +00:00
Beverly Tai
db88fa5c71 Merge "Don't forward touches to udfps if notification panel is expanding" into sc-dev am: f7b36eedf5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15340335

Change-Id: Ie8f21500e8c50cd8746f17dc03440c258031e09f
 2021-07-21 14:06:43 +00:00
Beverly Tai
b8a20acc47 Merge "Update orientation on rotation changes" into sc-dev 2021-07-21 13:57:35 +00:00
Beverly Tai
f7b36eedf5 Merge "Don't forward touches to udfps if notification panel is expanding" into sc-dev 2021-07-21 13:57:08 +00:00
TreeHugger Robot
054dbac3e8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 39bd3b0f40 -s ours am: 4d7a460996 -s ours am: 429650a265 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I102321f33aec3a1b4f792656d1551cfdaecac5a7
 2021-07-21 13:50:49 +00:00