Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
771,693 Commits 3 Branches 0 Tags
d6ea0a772ee4fa9cee91f5860a2d7ed91ef82b80
Commit Graph

771693 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lucas Silva
d6ea0a772e Merge "Accessibility: Set the title of the dream activity to the label of the current dream." into tm-qpr-dev am: 2e6248a7f8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17717225

Change-Id: I026c938fecf0c9e85ed1abf587d2daa98f229913
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-13 13:56:57 +00:00
Julia Reynolds
a2684a44b5 Merge "Check that an app still has access while rebinding" into tm-qpr-dev am: 5e88021747 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17695271

Change-Id: I6b73349f11e78e7bfcef1d89187ad673961b0e05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-13 13:55:49 +00:00
Chris Li
42b9cbe917 [automerger skipped] Merge "Reset embedded TaskFragment override when entering PIP" into tm-dev am: ff5064e713 -s ours am: aa027db6e8 -s ours 
am skip reason: Merged-In I03bd679b77f7ed8a65ba5fc59723b83a4254442c with SHA-1 103a6dc7f7 is already in history

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

Change-Id: I3c83ce1e09fa03ad38a70a55ddd148f23f10baac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-13 13:49:52 +00:00
Julia Reynolds
93d604fe6b Merge "Allow registered call notifications to always appear" into tm-dev am: f8e0fd5fe7 am: 53d093f133 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17642059

Change-Id: I0f6d7aa45b1fd5f7a3f89dbab4f5d4951be0d5ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-13 13:49:24 +00:00
Chris Li
d592a1b261 [automerger skipped] Merge changes from topic "presubmit-am-dec5ac638a7e44c68413c7f552c67cd0" into tm-mainline-prod am: c9519c8b5b -s ours 
am skip reason: Merged-In I03bd679b77f7ed8a65ba5fc59723b83a4254442c with SHA-1 bc357abca6 is already in history

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

Change-Id: I201f8d29d3e584f0309b8b96e0ccce31f4b670c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-13 13:48:44 +00:00
Presubmit Automerger Backend
8165adc3b6 [automerger skipped] [automerge] Reset embedded TaskFragment override when entering PIP 2p: 103a6dc7f7 am: 6ef8cf1f90 -s ours 
am skip reason: Merged-In I03bd679b77f7ed8a65ba5fc59723b83a4254442c with SHA-1 bc357abca6 is already in history

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

Change-Id: Ic40ef46d060e2220df71574623412e745cfa060c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-13 13:48:31 +00:00
Chris Li
aa027db6e8 [automerger skipped] Merge "Reset embedded TaskFragment override when entering PIP" into tm-dev am: ff5064e713 -s ours 
am skip reason: Merged-In I03bd679b77f7ed8a65ba5fc59723b83a4254442c with SHA-1 103a6dc7f7 is already in history

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

Change-Id: If15a7a308bb2edee8d58a987b6b55111613607fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-13 13:47:57 +00:00
Julia Reynolds
6ea66a0405 Merge changes from topic "presubmit-am-cbc3dc3a1fb64fea92fed20dc6a3f23e" into tm-mainline-prod am: 117aa0eb9f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17642059

Change-Id: Ic76db554544b03e6d07f11ec0115192a48030d80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-13 13:47:11 +00:00
Julia Reynolds
53d093f133 Merge "Allow registered call notifications to always appear" into tm-dev am: f8e0fd5fe7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17642059

Change-Id: I80ed6020b0b4a85269c096d0a92ee5e2bfd6a653
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-13 13:46:40 +00:00
Matt Pietal
e1f817a939 Merge "[DO NOT MERGE] Fix intent launch from notification" 2022-04-13 13:36:35 +00:00
Lucas Silva
2e6248a7f8 Merge "Accessibility: Set the title of the dream activity to the label of the current dream." into tm-qpr-dev 2022-04-13 13:27:13 +00:00
Chris Li
c9519c8b5b Merge changes from topic "presubmit-am-dec5ac638a7e44c68413c7f552c67cd0" into tm-mainline-prod 
* changes:
  [automerge] Reset embedded TaskFragment override when entering PIP 2p: 103a6dc7f7
  Reset embedded TaskFragment override when entering PIP
 2022-04-13 13:09:46 +00:00
Chris Li
ff5064e713 Merge "Reset embedded TaskFragment override when entering PIP" into tm-dev 2022-04-13 13:09:46 +00:00
Julia Reynolds
5e88021747 Merge "Check that an app still has access while rebinding" into tm-qpr-dev 2022-04-13 13:08:53 +00:00
Julia Reynolds
f8e0fd5fe7 Merge "Allow registered call notifications to always appear" into tm-dev 2022-04-13 13:06:47 +00:00
Julia Reynolds
117aa0eb9f Merge changes from topic "presubmit-am-cbc3dc3a1fb64fea92fed20dc6a3f23e" into tm-mainline-prod 
* changes:
  [automerge] Allow registered call notifications to always appear 2p: 20a47d5ed0
  Allow registered call notifications to always appear
 2022-04-13 13:06:45 +00:00
Charles Chen
2e5e3ea2e4 Merge "Cache OverContext to prevent deadlock" into tm-dev am: 801e5c0dd4 am: b11f623753 am: ce7b6c6118 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17499147

Change-Id: I6b9a852a8f7bcf8fbfa7bd6eb35c516f95ead272
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-13 12:20:48 +00:00
Oli Lan
69045a3980 Merge "Add logging of user stop and user removal events." into tm-dev am: 087964ad18 am: b59f2079ff am: 7fd4cd8a77 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17104659

Change-Id: I3de2b217dea6b5e1f3d8998e983c1e945c9de6f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-13 12:18:01 +00:00
TreeHugger Robot
f542ed7388 Merge "Only add system language on locale page" into tm-dev am: 66070d7c8a am: 5e1709fd3e am: 864c16d8cb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17739084

Change-Id: I587d9e43507870445b2aebbf53fe0cbc64ae2a55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-13 12:07:39 +00:00
Yan Han
4a70ae05bd Merge "Fix OTT devices not reacting to messages in Standby" am: 4065fa6496 am: acc1ea43a5 am: 002a792474 am: 26d79e363e am: 8311eeff2e am: 5c9129e3b8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2055913

Change-Id: If1997b60885780a5efa9d7d171a6dd46f029416f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-13 12:06:29 +00:00
Treehugger Robot
e391ca05f6 Merge "Add extra logging" am: 47b98a2d38 am: 9479208dd3 am: 09d3410e51 am: 0ec82bc2b1 am: 173ca4b939 am: baf6ff1ba3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2056510

Change-Id: I697292bb4334320ffe669af3cf507ed10522782e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-13 12:05:16 +00:00
Charles Chen
c6dee3233a Merge "Promote WMJetpackUnitTests to presubmit" into tm-dev am: 64d4564747 am: 5f36eaece0 am: a8628d76c5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17635304

Change-Id: I90c55e4c4dc19692b0f43611fe110ed07e771290
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-13 12:03:59 +00:00
TreeHugger Robot
f6c0adaf1d Merge "Re-land "Move rounded corner to provider"" into tm-dev am: cee24a3d7a am: 14c01427ad am: 48600d2fb3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17630309

Change-Id: I5b44ac8c32f8c000a91421f55676b1f022ddde22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-13 12:02:28 +00:00
David Drysdale
92c6a606d0 Merge "Clarify doc comment for setUnlockedDeviceRequired" am: a0976a1207 am: f6354a20d5 am: 9025d607a0 am: 90099ff85c am: 43374ca204 am: d3d4b21422 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2060058

Change-Id: I00f81983092c70c07ee81e69b5fc5623231dc396
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-13 12:00:48 +00:00
Kholoud Mohamed
d0cff40bdf Merge "Move device management resource retrieval calls to bg thread" into tm-dev am: fb0a6a1950 am: 0be35e4e89 am: 7ac0e7abde 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17607256

Change-Id: Idd5391282f0ac6f541fb3049687ae01c14411115
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-13 11:59:09 +00:00
TreeHugger Robot
a738cfcb9e Merge "usb: Fixed the null pointer issue" into tm-dev am: eb1eb03859 am: e7bdd58c84 am: 354f622824 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17665877

Change-Id: Ieec57f7a1e25c81fa38656ee74d6237f53c4f3db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-13 11:57:45 +00:00
Lucas Lin
54a8032ede Merge "Add NET_CAPABILITY_NOT_VPN when requesting test network" am: 6ccd0e0503 am: 46d9f02a15 am: a4c15d442d am: bae41b28d5 am: c9574d7c8e am: 483d191f41 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2062247

Change-Id: I810d04879694f0e6de8a7feb10d2dc4b03848a0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-13 11:55:55 +00:00
TreeHugger Robot
c51e393caa Merge "Apply transaction when starting back nav" into tm-dev am: 9e9a9d36ac am: 3f1712573b am: e90007456c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17570481

Change-Id: Iaf28873e4c6a955773842a56f73f016dc113a3ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-13 11:54:35 +00:00
Eun-Jeong Shin
536a1ff2d0 Merge "Handling exception when per-use prompt cannot be generated" into tm-dev am: 246ecfd412 am: a6c2fa8ec3 am: ba1171f074 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17722828

Change-Id: I3eba8e96c5269220aa35a2a066e00cb230b37d90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-13 11:52:33 +00:00
Edgar Wang
84a3e39d72 Merge "Fine tune Spinner style" into tm-dev am: e5ee7aa25f am: 712caf1717 am: cf3dfbd8d1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17620164

Change-Id: I3a915b1bf177245fa16eb25c2ca05acc3167c26c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-13 11:49:34 +00:00
TreeHugger Robot
ebfd4f098d Merge "AudioService: increase log size of device connection history" into tm-dev am: e33a37a865 am: f3f8e65bbb am: 7bd6c7b5f7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17707137

Change-Id: I61cf1025d347473ae2cace86cc0cf45f84409998
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-13 11:48:44 +00:00
TreeHugger Robot
c2ec5b9a62 Merge "Move codes to gerrit for CollapsingToolbar" into tm-dev am: 2ee49c0f04 am: 90af50b2ba am: 229ad4306f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17665879

Change-Id: Ie11ce3691de0a7d9b30df5c2adfe76e4f19d6a55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-13 11:44:36 +00:00
TreeHugger Robot
8b96195319 Merge "Extend providedInternalInsets to be type specific" into tm-dev am: 36d012ca1c am: 39adc1676d am: 0db73087ba 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17352110

Change-Id: I362875c09055249e1efb90987594bf0ad1ba6aa0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-13 11:43:48 +00:00
TreeHugger Robot
bcf1689115 Merge "GLFunctorDrawable: skip alpha filtering" into tm-dev am: ec839b2eb8 am: c920562aef am: 852ad0573c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17697994

Change-Id: I7754d9d3100a16fc5623d55288fc7620c84982ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-13 11:42:18 +00:00
Automerger Merge Worker
913d9a53c9 Merge "Merge "Add keylayout mapping for Xbox360 compatible controllers." am: e9e88881a2 am: cbd6b9bbab am: 9db4acd342 am: 43f42ced37" into tm-d1-dev am: ddfbfcbadb am: a897b47dd9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2026303

Change-Id: I588f36ec4212ae295152c6c0f60ecc80b75da2b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-13 11:40:51 +00:00
Treehugger Robot
a2231d1ebc Merge "Add keylayout mapping for Xbox360 compatible controllers." am: e9e88881a2 am: cbd6b9bbab am: 9db4acd342 am: 43f42ced37 am: fe42f1f9de am: 061ed74ee7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2026303

Change-Id: I51f7aa34b75a8c25af1e31946da5b69ba3ecf0aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-13 11:39:46 +00:00
Songchun Fan
3e3643922b Merge "Lock for AppsFilter" into tm-dev am: f5e3cd3ec6 am: 0eec79adaa am: a929f722d7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17675239

Change-Id: Ic35724d459bbb78314dbdcd76072fc575ca6b772
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-13 11:39:08 +00:00
TreeHugger Robot
ffe318ca1c Merge "Camera: Improve documentation for 3A regions" into tm-dev am: 7af7fcbeb0 am: d9171cefe2 am: 987378d3a1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17450512

Change-Id: I2916948cae8032d9e9175406070baf894e58022f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-13 11:38:24 +00:00
Songchun Fan
90d60940f4 Merge "[pm] fix platinum test mapping" into tm-dev am: 082d5f3aad am: 7487b7a231 am: 77e9c21d90 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17699365

Change-Id: I1f44d87c9e29f3ab98f07e35ef875afc74295cd3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-13 11:37:40 +00:00
Sudheer Shanka
99618960b4 Merge "Fix the @RequiresPermission annotation." into tm-dev am: 8338395749 am: 0467d2d43b am: c413ce1df0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17698251

Change-Id: Ie635970c9660407389cf782b5de289004a78c300
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-13 11:36:50 +00:00
Automerger Merge Worker
2455066e13 Merge "Merge "Add and update some hotword detection metrics" into tm-dev am: 5e1904c323 am: e9412cf6cd" into tm-qpr-dev am: 2adfd136f7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17701596

Change-Id: Id39e2f3009c3358e3cfdc155d6ca6fb934592cc0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-13 11:35:29 +00:00
Automerger Merge Worker
9c80ab5d76 Merge "Merge "Add and update some hotword detection metrics" into tm-dev am: 5e1904c323 am: e9412cf6cd am: e093f8d940" 2022-04-13 11:34:27 +00:00
TreeHugger Robot
61daf00a4b Merge "Add and update some hotword detection metrics" into tm-dev am: 5e1904c323 am: e9412cf6cd am: e093f8d940 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17701596

Change-Id: I05c274ce9be87d16ff3be0bacdf057adc8c957d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-13 11:34:03 +00:00
Automerger Merge Worker
031e70f266 Merge "Merge "Cache OverContext to prevent deadlock" into tm-dev am: 801e5c0dd4" into tm-mainline-prod am: 6d513cdb61 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17499147

Change-Id: I5269cc2a55400528cc05438fe9ea1eec69611f95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-13 11:33:56 +00:00
Automerger Merge Worker
58c6bfbe8c Merge "Merge "Enable haptic for face coex" into tm-d1-dev am: 0032983c0b am: 709821a418" 2022-04-13 11:33:29 +00:00
TreeHugger Robot
7ab4079f3c Merge "Enable haptic for face coex" into tm-d1-dev am: 0032983c0b am: 709821a418 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17716389

Change-Id: I2b4ff7eff0193c2a0c924c1ea13179e23e3a1c75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-13 11:33:08 +00:00
Oli Lan
10bed37fcb Merge "Add logging of user stop and user removal events." into tm-dev am: 087964ad18 am: bd0fbf384a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17104659

Change-Id: Ia2b065aa05a4f05ce2e9ecff180cfd648bb53ee1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-13 11:32:56 +00:00
Automerger Merge Worker
17c34fa20f Merge "Merge "android_util_Process: fix length checking logic" am: b1fb01e8b5 am: 43567ad451 am: 00c2754219 am: 39eb41b554 am: 16a702d489 am: 2c9b4744de" 2022-04-13 11:32:12 +00:00
Keith Mok
e765ae9a44 Merge "android_util_Process: fix length checking logic" am: b1fb01e8b5 am: 43567ad451 am: 00c2754219 am: 39eb41b554 am: 16a702d489 am: 2c9b4744de 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1959779

Change-Id: I8b1413b6126a2f0db90d7ac5c8ca64be08d240e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-13 11:31:40 +00:00
TreeHugger Robot
db054a58b6 Merge "Only add system language on locale page" into tm-dev am: 66070d7c8a am: 6eebdb9f5f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17739084

Change-Id: I137b65d2edac6fc58a37b162f12e0d6ff04f52d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-13 11:31:16 +00:00