Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
703,429 Commits 3 Branches 0 Tags
bdd312f9e6c13eff488de5d3b718ce00a1dbd9c5
Commit Graph

703429 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
bdd312f9e6 Merge "Mark an ActivityThreadTest as flaky" into sc-v2-dev am: a98c28bdb9 am: f32b97fc0b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15350531

Change-Id: Id4b84f8ba9ce890414cda8eed6fe94ed77d17e37
 2021-07-21 23:18:18 +00:00
Lucas Dupin
1a33cb9671 Merge "Enable overlays that are pending creation" into sc-dev am: 715ab39149 am: acb5d60b2b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15350330

Change-Id: I43a99ca99126368a88d84e1d9c353c12d33a4dfd
 2021-07-21 23:17:22 +00:00
Lee Shombert
1171265b9d Merge changes I68868b7f,I092d1385 
* changes:
  Do not cache wildcard users (UserManager)
  Do not cache wildcard users (PackageManager)
 2021-07-21 23:07:00 +00:00
TreeHugger Robot
f32b97fc0b Merge "Mark an ActivityThreadTest as flaky" into sc-v2-dev am: a98c28bdb9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15350531

Change-Id: I0bac75c1add0bd2d2929477e20cd59a2e214a7b9
 2021-07-21 23:01:41 +00:00
Lucas Dupin
acb5d60b2b Merge "Enable overlays that are pending creation" into sc-dev am: 715ab39149 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15350330

Change-Id: I4ab039963542d4e165713bc482753d7be92b5794
 2021-07-21 23:01:28 +00:00
TreeHugger Robot
25fab004b0 Merge "Remove @UnsupportedAppUsage from InputMethodManager#mServedInputConnectionWrapper" 2021-07-21 22:59:15 +00:00
Lucas Dupin
715ab39149 Merge "Enable overlays that are pending creation" into sc-dev 2021-07-21 22:50:54 +00:00
TreeHugger Robot
a98c28bdb9 Merge "Mark an ActivityThreadTest as flaky" into sc-v2-dev 2021-07-21 22:42:35 +00:00
TreeHugger Robot
9322860dc4 [automerger skipped] Merge "fix merge conflicts - SysUI co-ex updates" into sc-v2-dev-plus-aosp am: ab666a6ac8 -s ours 
am skip reason: Merged-In Ied977fec9009265dac89b7e24c1075ceb2905bfd with SHA-1 f2e7959539 is already in history

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

Change-Id: Ic717b9d24fbb0b6fc1c6e88e6a784aba3ddf8a4a
 2021-07-21 21:57:04 +00:00
TreeHugger Robot
ab666a6ac8 Merge "fix merge conflicts - SysUI co-ex updates" into sc-v2-dev-plus-aosp 2021-07-21 21:51:22 +00:00
Evan Rosky
7aee15e0d8 Merge "make non-organized tasks visible when their activity is made visible" into sc-v2-dev am: b6e3779d99 am: 88d3837841 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15341562

Change-Id: Idc48f8ba05614bc34fa12885ad5ab3e72ffd47ec
 2021-07-21 21:26:00 +00:00
Evan Rosky
88d3837841 Merge "make non-organized tasks visible when their activity is made visible" into sc-v2-dev am: b6e3779d99 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15341562

Change-Id: I809797bd49556f1c7c223ad4497c3bc47d03d289
 2021-07-21 21:20:47 +00:00
Evan Rosky
b6e3779d99 Merge "make non-organized tasks visible when their activity is made visible" into sc-v2-dev 2021-07-21 21:17:29 +00:00
Matt Pietal
898f2c796d Merge "Dismiss SIM PIN screen when eSIM disabled" into sc-dev am: 03b95c36a3 am: fd6205c148 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15348037

Change-Id: Ie8d6f22e42ca1b90537fee304d30326f2f4a4935
 2021-07-21 21:06:26 +00:00
TreeHugger Robot
1da9f01e17 Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into sc-dev am: d83f286818 am: aa95ba6456 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15347870

Change-Id: I56e344892f90d4bdaef2e83a2bc94f2004880612
 2021-07-21 21:05:54 +00:00
Matt Pietal
d8c83e0bb8 Merge "Dismiss SIM PIN screen when eSIM disabled" into sc-dev am: 03b95c36a3 am: 7d0b0475a7 am: c5f9ba4d02 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15348037

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

Change-Id: I2407e43baf8131881a96d7d3a324d45533e5b421
 2021-07-21 21:00:32 +00:00
Matt Pietal
c5f9ba4d02 Merge "Dismiss SIM PIN screen when eSIM disabled" into sc-dev am: 03b95c36a3 am: 7d0b0475a7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15348037

Change-Id: I4a970e1554a6a9f7355ab9104fdeda2c336a1d8d
 2021-07-21 20:56:12 +00:00
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
Andrii Kulian
0b6ea59fe0 Mark an ActivityThreadTest as flaky 
Bug: 194242735
Test: Build
Change-Id: I2452db8523438de4d06c938c3c3fa1d8a9aa0f4e
 2021-07-21 13:53:55 -07:00
Matt Pietal
7d0b0475a7 Merge "Dismiss SIM PIN screen when eSIM disabled" into sc-dev am: 03b95c36a3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15348037

Change-Id: I52c48394ddd4f985db705c42d2149e39e73959e2
 2021-07-21 20:51:52 +00:00
Matt Pietal
fd6205c148 Merge "Dismiss SIM PIN screen when eSIM disabled" into sc-dev am: 03b95c36a3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15348037

Change-Id: I9bd80af963b95d49aa1d42e00cc7b319729b6741
 2021-07-21 20:51:48 +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
aa95ba6456 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: I2eca9c1c05ae0aa687796c5e14200e8225cdea9e
 2021-07-21 20:51:21 +00:00
Matt Pietal
03b95c36a3 Merge "Dismiss SIM PIN screen when eSIM disabled" into sc-dev 2021-07-21 20:47:33 +00:00
Bryce Lee
8a67185b09 Merge "Introduce CommunalModule." 2021-07-21 20:42:07 +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
d9bd79f44b Merge "Revert "Deferring visibility updates while applying WCT"" into sc-v2-dev am: 100b9f73e5 am: f0187aa354 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15347902

Change-Id: I894c4523ed8a12784c5b72612f306f213ab24a83
 2021-07-21 20:40:41 +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
Michael Ludwig
bc85a32cdd Merge "Skip applying expanding clip ops in native canvas" 2021-07-21 20:18:57 +00:00
Beverly
d89ca23cd5 fix merge conflicts - SysUI co-ex updates 
- Attempt face auth again on udfps start if we're not already
running face auth
- Use udfps touch, as an intent for device entry - so if udfps fails,
but face auth succeeds, enter the device (even if face auth is
non-bypass)

Test: manual
Bug: 193089985
Fixes: 194010665
Change-Id: Ied977fec9009265dac89b7e24c1075ceb2905bfd
Merged-In: Ied977fec9009265dac89b7e24c1075ceb2905bfd
(cherry picked from commit f2e7959539)
 2021-07-21 20:16:36 +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
Lucas Dupin
7eecfccb6f Enable overlays that are pending creation 
They don't exist yet, but enabling them won't make OverlayManager fail,
creation will be exectured on the same transaction.

Test: manual
Fixes: 194155751
Change-Id: I388f382592dfd1aa4db5bfa047b9cfcb4d489e78
 2021-07-21 13:06:23 -07:00
Fabian Kozynski
1957b48a26 [automerger skipped] Merge "Hide RSSI next to single carrier name" into sc-v2-dev am: 8a5c787b96 am: 1667dd3619 -s ours 
am skip reason: Merged-In I8b80bb14b8f60872d44d5a92ddfa7c5903420874 with SHA-1 64172cbc5d is already in history

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

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

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

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

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

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

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

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

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

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

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

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

Change-Id: I9ca04ed82627f22bc312021ab732eed50f6feb48
 2021-07-21 19:25:21 +00:00
Beverly Tai
3fef6df3d3 [automerger skipped] resolve merge conflicts of 1023c783d8 to sc-v2-dev-plus-aosp am: b4523a71c6 -s ours 
am skip reason: Merged-In I621ea06984f17954e9be138e9e5669aeb3cfb3fe with SHA-1 06e6eeb04f is already in history

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

Change-Id: I4cb39be10d43b32b1d114a7c26b4719dbebd1912
 2021-07-21 19:25:09 +00:00
TreeHugger Robot
afc5c55592 Merge "Remove @UnsupportedAppUsage from IInputConnectionWrapper#mInputConnection" 2021-07-21 19:24:24 +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