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

703481 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Arthur Hung
a6564536e6 Merge "Fix pointer location apply wrong insets in foldable device" into sc-v2-dev am: c923e35a3c am: 76f074094c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15334686

Change-Id: I4e45e2bb2346180a32b8446ad982759f27c7244c
 2021-07-22 03:49:26 +00:00
Ray Essick
0157a16b3f Merge "Describe Video Encoding Floor" into sc-dev am: 11badea7d3 am: b3695ff530 am: 9b32702f42 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15238435

Change-Id: Id1c02636b1dba6154f50dad545c46a6c458b11f2
 2021-07-22 03:49:08 +00:00
Peter Kalauskas
d02cbe3056 Merge "Fix bug that caused task to show behind keyguard" into sc-dev am: b248718705 am: 17b6650d32 am: 75fbd095f1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15349269

Change-Id: I20d5948fa5769e5bffe8500af5d674226078e25f
 2021-07-22 03:48:52 +00:00
Luke Huang
bcd955f98b Merge "Keep the native mdns daemon alive for pre-S application" into sc-dev am: 5978eb6eb4 am: a251e5a9e0 am: 655d9e3e21 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15320524

Change-Id: I4a7028b7c1ec43d30d0adbdd97e5071751c02aa0
 2021-07-22 03:48:14 +00:00
Arthur Hung
76f074094c Merge "Fix pointer location apply wrong insets in foldable device" into sc-v2-dev am: c923e35a3c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15334686

Change-Id: Iae47db3ceb8cb0a09ef4bed77bd2a7a7c5d485af
 2021-07-22 03:48:12 +00:00
Ray Essick
d226b88d42 Merge "Describe Video Encoding Floor" into sc-dev am: 11badea7d3 am: db55a584af 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15238435

Change-Id: I5186a6adfbcae2e17f940adf8b829407446265a8
 2021-07-22 03:32:42 +00:00
Peter Kalauskas
7e4d5754f7 Merge "Fix bug that caused task to show behind keyguard" into sc-dev am: b248718705 am: 20039e9218 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15349269

Change-Id: Iafa371875397565ae9a13c825b32bf11408be407
 2021-07-22 03:32:30 +00:00
Luke Huang
8ec54fe692 Merge "Keep the native mdns daemon alive for pre-S application" into sc-dev am: 5978eb6eb4 am: d60262ad85 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15320524

Change-Id: I7ea55782af71d94e640f6c482b8ad91822beb71c
 2021-07-22 03:32:10 +00:00
Arthur Hung
c923e35a3c Merge "Fix pointer location apply wrong insets in foldable device" into sc-v2-dev 2021-07-22 03:31:54 +00:00
Ray Essick
9b32702f42 Merge "Describe Video Encoding Floor" into sc-dev am: 11badea7d3 am: b3695ff530 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15238435

Change-Id: I7ad312f4a845789b7c79e2ab81f10f97d226c1d3
 2021-07-22 03:31:32 +00:00
Peter Kalauskas
75fbd095f1 Merge "Fix bug that caused task to show behind keyguard" into sc-dev am: b248718705 am: 17b6650d32 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15349269

Change-Id: Ied3b7b7be704f05933ff6152c3c66fa8e43b57d5
 2021-07-22 03:31:23 +00:00
Luke Huang
655d9e3e21 Merge "Keep the native mdns daemon alive for pre-S application" into sc-dev am: 5978eb6eb4 am: a251e5a9e0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15320524

Change-Id: I0215ffa5e4b91a92d13fe672c320892b82b328eb
 2021-07-22 03:31:07 +00:00
TreeHugger Robot
cfd82c0521 Merge "Remove @UnsupportedAppUsage from IInputConnectionWrapper#mLock" 2021-07-22 03:17:15 +00:00
Ray Essick
b3695ff530 Merge "Describe Video Encoding Floor" into sc-dev am: 11badea7d3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15238435

Change-Id: I211c47fc69fb419c5c2469d6ec4f12dd755983de
 2021-07-22 03:15:37 +00:00
Peter Kalauskas
17b6650d32 Merge "Fix bug that caused task to show behind keyguard" into sc-dev am: b248718705 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15349269

Change-Id: I9c04621651ba559562f7b65d0298f28c1c4beb23
 2021-07-22 03:15:24 +00:00
Luke Huang
a251e5a9e0 Merge "Keep the native mdns daemon alive for pre-S application" into sc-dev am: 5978eb6eb4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15320524

Change-Id: I385be9019608d8bef55fd9fbb4d3187c5943c812
 2021-07-22 03:14:59 +00:00
Ray Essick
db55a584af Merge "Describe Video Encoding Floor" into sc-dev am: 11badea7d3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15238435

Change-Id: I257c72906f388a40e46c69dffff8ab5cd344ede9
 2021-07-22 03:14:54 +00:00
Peter Kalauskas
20039e9218 Merge "Fix bug that caused task to show behind keyguard" into sc-dev am: b248718705 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15349269

Change-Id: I14aac4a1933cb0495713aba945d5dac592ab55cd
 2021-07-22 03:14:43 +00:00
Luke Huang
d60262ad85 Merge "Keep the native mdns daemon alive for pre-S application" into sc-dev am: 5978eb6eb4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15320524

Change-Id: I0f0618cc29ce1699b54e9fc7ca4c88c069a532f2
 2021-07-22 03:13:49 +00:00
Ray Essick
11badea7d3 Merge "Describe Video Encoding Floor" into sc-dev 2021-07-22 03:10:53 +00:00
Peter Kalauskas
b248718705 Merge "Fix bug that caused task to show behind keyguard" into sc-dev 2021-07-22 03:06:17 +00:00
Luke Huang
5978eb6eb4 Merge "Keep the native mdns daemon alive for pre-S application" into sc-dev 2021-07-22 03:00:35 +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