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

703456 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
cfd82c0521 Merge "Remove @UnsupportedAppUsage from IInputConnectionWrapper#mLock" 2021-07-22 03:17:15 +00:00
Kevin Chyn
d8599dfc71 Merge "7/n: Add mechanism to hold onto already-completed operations" into sc-dev am: 63614e99d1 am: 68ab86bf00 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15337428

Change-Id: I82103813996ba6c34f13c04209586221a0232766
 2021-07-22 02:21:39 +00:00
Automerger Merge Worker
92a320336e Merge "Merge "7/n: Add mechanism to hold onto already-completed operations" into sc-dev am: 63614e99d1 am: 3c00041dbe am: c7830e52e6" 2021-07-22 02:05:38 +00:00
TreeHugger Robot
04b42b5033 Merge "Remove @UnsupportedAppUsage from InputMethodManager#getInputContext()" 2021-07-22 02:05:29 +00:00
Kevin Chyn
6180a57381 Merge "7/n: Add mechanism to hold onto already-completed operations" into sc-dev am: 63614e99d1 am: 3c00041dbe am: c7830e52e6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15337428

Change-Id: I9067ead4666899b176700e46e222c7d2032e0a7a
 2021-07-22 02:05:29 +00:00
TreeHugger Robot
38a58e43a0 Merge "Fixed the padding of quick settings" into sc-v2-dev am: cb2a580046 am: 546f4ccfd4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15346603

Change-Id: I43a8c4bb699f6dc4a6a0a00542d805e184b6f230
 2021-07-22 02:05:15 +00:00
Kevin Chyn
68ab86bf00 Merge "7/n: Add mechanism to hold onto already-completed operations" into sc-dev am: 63614e99d1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15337428

Change-Id: I8d71c02bc00db411a416452e14372cc722f55dfb
 2021-07-22 02:04:21 +00:00
Kevin Chyn
c7830e52e6 Merge "7/n: Add mechanism to hold onto already-completed operations" into sc-dev am: 63614e99d1 am: 3c00041dbe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15337428

Change-Id: Idedcd78768379c4edc2e2699abbc495b694da4ee
 2021-07-22 02:03:57 +00:00
Kevin Chyn
3c00041dbe Merge "7/n: Add mechanism to hold onto already-completed operations" into sc-dev am: 63614e99d1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15337428

Change-Id: Ife28e4a4415f7a4f909b54d815190044dd96efc8
 2021-07-22 01:48:33 +00:00
TreeHugger Robot
546f4ccfd4 Merge "Fixed the padding of quick settings" into sc-v2-dev am: cb2a580046 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15346603

Change-Id: I3f6705ea1ab7bed613451e06ab8fc30f6a942747
 2021-07-22 01:47:54 +00:00
Jackal Guo
1ce663dd30 Merge "Refactor PackageParser (12/n)" 2021-07-22 01:47:08 +00:00
Kevin Chyn
63614e99d1 Merge "7/n: Add mechanism to hold onto already-completed operations" into sc-dev 2021-07-22 01:42:33 +00:00
TreeHugger Robot
cb2a580046 Merge "Fixed the padding of quick settings" into sc-v2-dev 2021-07-22 01:30:30 +00:00
Evan Rosky
38cbfbb824 Merge "Hook up custom activity-level animation callbacks to shell" into sc-v2-dev am: 9ee6f20ddb am: 87eadfefb3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15345293

Change-Id: Ie4030edd14c3214f72a4523947a3a5622cd29032
 2021-07-22 00:06:50 +00:00
TreeHugger Robot
db3ff3a043 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-07-21 23:59:08 +00:00
Evan Rosky
87eadfefb3 Merge "Hook up custom activity-level animation callbacks to shell" into sc-v2-dev am: 9ee6f20ddb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15345293

Change-Id: I4efd2942c446320ed30da3fdc623128a20e91742
 2021-07-21 23:49:52 +00:00
Evan Rosky
9ee6f20ddb Merge "Hook up custom activity-level animation callbacks to shell" into sc-v2-dev 2021-07-21 23:31:02 +00:00
Lucas Dupin
0951556cd8 Merge "Enable overlays that are pending creation" into sc-dev am: 715ab39149 am: dbee7f7242 am: f5f194a4e9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15350330

Change-Id: Ie1fb35bfdf52857e3a8aba19ae1f39c97449ae7e
 2021-07-21 23:19:01 +00:00
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
Lucas Dupin
f5f194a4e9 Merge "Enable overlays that are pending creation" into sc-dev am: 715ab39149 am: dbee7f7242 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15350330

Change-Id: I13e0a4915ba81296df4363aba76d12a625f71b5f
 2021-07-21 23:02:28 +00:00
Lucas Dupin
dbee7f7242 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: I3793c6e9a815563287dfbea5d6a77427b3622f6d
 2021-07-21 23:02:11 +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
Yohei Yukawa
51c9350477 Remove @UnsupportedAppUsage from InputMethodManager#getInputContext() 
We are mostly confident that this @UnsupportedAppUsage was a false
positive.

Fix: 194323038
Test: presubmit
Change-Id: Id83ce2bd5896e953c824f7eaf28b235859123ab0
 2021-07-21 14:50:32 -07: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