Commit Graph

745187 Commits

Author SHA1 Message Date
Sally Qi
8b60c74500 Merge "Add fence support in ImageWriter class." 2022-02-07 20:19:20 +00:00
Winson Chung
3e6933f15a Merge "Add some protologs for recents" 2022-02-07 19:48:45 +00:00
Bryce Lee
134508f166 Merge "Define margins for complication overlay." 2022-02-07 19:48:12 +00:00
Michael Wright
128ef9317f Merge changes I600ec645,Idfcc220d
* changes:
  Remove self-assignment from AutofillManagerService
  Use Arrays.hashCode in EventIndex hashCode()
2022-02-07 19:18:43 +00:00
Changyeon Jo
370b27ad3b Merge "Camera: Add automotive metadata section" 2022-02-07 19:02:58 +00:00
TreeHugger Robot
8a34ad1393 Merge "Add tests for BinaryTransparencyService." 2022-02-07 19:01:24 +00:00
Kevin Han
42cef990a7 Merge "Add pkg visibility checks to all hibernation APIs" 2022-02-07 18:57:37 +00:00
Michael Wright
b9764480f4 Merge "Fix formatting string in PolicyVersionUpgrade" 2022-02-07 18:47:07 +00:00
Eran Messeri
d6111dd183 [automerger skipped] Merge "KeyStore: Verbose error reporting" am: 9d805c35d0 am: a8f0e5a77c am: 732aae380e am: 0021be9833 -s ours
am skip reason: Merged-In I776d9e9cc01a9dc3542a63000ee0709847760963 with SHA-1 5da05ee3ed is already in history

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

Change-Id: Ib9877805f104bd67670ea2ff97e4501cdea25840
2022-02-07 18:38:57 +00:00
James Mattis
0eca7b6335 Merge "Marking eth network management APIs @SystemApi" 2022-02-07 18:38:01 +00:00
Eran Messeri
0021be9833 Merge "KeyStore: Verbose error reporting" am: 9d805c35d0 am: a8f0e5a77c am: 732aae380e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1972219

Change-Id: I09544cb6be09dd257848cb1c95577dd5950e4b7d
2022-02-07 18:26:13 +00:00
Eran Messeri
732aae380e Merge "KeyStore: Verbose error reporting" am: 9d805c35d0 am: a8f0e5a77c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1972219

Change-Id: Ie569aa5b363835c342d6ab5f22eb2978dfd111a8
2022-02-07 18:11:07 +00:00
Winson Chung
2dfd206130 Merge "Cache accessibility info in NavBarHelper to reduce binder calls" 2022-02-07 17:52:29 +00:00
Eran Messeri
a8f0e5a77c Merge "KeyStore: Verbose error reporting" am: 9d805c35d0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1972219

Change-Id: If990bbb1146e842bf08f971135145f36e661c979
2022-02-07 17:50:35 +00:00
Automerger Merge Worker
5c5e7b91aa Merge "Merge "Remove asapperstein from OWNERS." am: 06a35d9039 am: fa7a88e8fb am: 9997a8e895 am: d9666b1551" 2022-02-07 17:37:06 +00:00
Alan Viverette
7c9b826042 Merge "Nullability annotations for view and widget" 2022-02-07 17:36:41 +00:00
Treehugger Robot
885dd4472b Merge "Remove asapperstein from OWNERS." am: 06a35d9039 am: fa7a88e8fb am: 9997a8e895 am: d9666b1551
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1973059

Change-Id: I9e47a1284eaf625f6c5b405e1740bebe59a784f6
2022-02-07 17:36:36 +00:00
John Reck
abb11a360f Merge "Add some top-level OWNERs" am: 8abc52aad7 am: e3c2aae661 am: d603c2cbf7 am: 5877567a36
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1973083

Change-Id: I4e233933208b6b2ee37b6417fd135ea7231860db
2022-02-07 17:34:56 +00:00
Felipe Leme
969f745873 Merge "Changes Activity to use Dumpable for "legacy" cases." 2022-02-07 17:32:52 +00:00
Aaron Liu
307580b2a1 Merge "Home Controls: Fix column computation." 2022-02-07 17:32:21 +00:00
Eran Messeri
9d805c35d0 Merge "KeyStore: Verbose error reporting" 2022-02-07 17:26:08 +00:00
Antoan Angelov
262c678df7 Merge "Copy the device manager role holder to the other profile during provisioning" 2022-02-07 17:25:03 +00:00
Treehugger Robot
d9666b1551 Merge "Remove asapperstein from OWNERS." am: 06a35d9039 am: fa7a88e8fb am: 9997a8e895
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1973059

Change-Id: I2551415ff2e70cccf437377d4f4d1e691b40f235
2022-02-07 17:21:44 +00:00
John Reck
5877567a36 Merge "Add some top-level OWNERs" am: 8abc52aad7 am: e3c2aae661 am: d603c2cbf7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1973083

Change-Id: I67d7ac0ad32f826d0513e5ff4cefcc0798accb41
2022-02-07 17:21:24 +00:00
Winson Chung
0644eeefd7 Merge "Remove unnecessary call to flush trust manager" 2022-02-07 17:20:43 +00:00
Winson Chung
19de4ae15e Remove unnecessary call to flush trust manager
- This causes jank when going to overview in 3 button

Fixes: 217291304
Test: Manual
Change-Id: I4e412934e277e52ff31fef72905448bf97f59cc6
2022-02-07 17:20:34 +00:00
Adrian Roos
ad5bd08354 Merge "Fix IMS window visibility" 2022-02-07 17:14:39 +00:00
Treehugger Robot
9997a8e895 Merge "Remove asapperstein from OWNERS." am: 06a35d9039 am: fa7a88e8fb
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1973059

Change-Id: I8ef42c647324ee150af0a85603b2cbb7ad7510ea
2022-02-07 17:05:36 +00:00
Dave Mankoff
ce52ece919 Merge "Remove Dependency#get from qs.external." 2022-02-07 17:05:27 +00:00
John Reck
d603c2cbf7 Merge "Add some top-level OWNERs" am: 8abc52aad7 am: e3c2aae661
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1973083

Change-Id: Ic74e9bef2ab9e438ff5d8c60451aabeec770c69b
2022-02-07 17:05:26 +00:00
Christine Franks
0ba7aa9321 Merge "Add API to hide cursor for virtual mice" 2022-02-07 17:03:56 +00:00
TreeHugger Robot
17f188175e Merge "Add null check for mNavigationBarFrame" 2022-02-07 17:00:10 +00:00
Treehugger Robot
fa7a88e8fb Merge "Remove asapperstein from OWNERS." am: 06a35d9039
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1973059

Change-Id: I8e5b07160e17198de9a9aadcd9e8a960ef11ecf1
2022-02-07 16:59:33 +00:00
Treehugger Robot
06a35d9039 Merge "Remove asapperstein from OWNERS." 2022-02-07 16:56:01 +00:00
John Reck
e3c2aae661 Merge "Add some top-level OWNERs" am: 8abc52aad7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1973083

Change-Id: I3158a39a027f4f267741bdee0f730c49b57e8147
2022-02-07 16:53:55 +00:00
TreeHugger Robot
8acbe89683 Merge "Replaces com.android.server.Dumpable by android.util.Dumpable." 2022-02-07 16:47:23 +00:00
Songchun Fan
afa640c6e0 Merge "[PackageSetting] deep copy PackageUserState" 2022-02-07 16:47:03 +00:00
John Reck
ab43db35ba Merge "Adjust where TransactionCommittedListener lives" 2022-02-07 16:42:09 +00:00
John Reck
8abc52aad7 Merge "Add some top-level OWNERs" 2022-02-07 16:40:39 +00:00
Roderick Sheeter
5909e453a0 Merge "Remove legacy check for reversed ZWJ emoji sequences." 2022-02-07 16:40:06 +00:00
Michael Wright
4353b0b03f Merge "Use correct contains method in PermissionManagerService." 2022-02-07 16:06:38 +00:00
Michael Wright
dda94e8f13 Merge "Avoid catching AssertionError for actual failures." 2022-02-07 16:05:56 +00:00
Michael Wright
48caf9d6a1 Merge "Fix possible NPE in DPMS." 2022-02-07 16:05:45 +00:00
Pratyush More
d478d792e0 Merge "Fix per-app locale updates for apps with shared processes." 2022-02-07 15:47:33 +00:00
Michał Brzeziński
e6094a9e9a Merge "Marking test as @Flaky" 2022-02-07 15:43:03 +00:00
TreeHugger Robot
e63128a312 Merge "Remove doubled-code" 2022-02-07 15:35:32 +00:00
Evan Laird
a95d481545 Merge "Add the user switcher chip to the status bar" 2022-02-07 15:27:11 +00:00
Derek Sollenberger
a04c237023 Merge "Remove isOpaque from RuntimeShader" 2022-02-07 15:12:30 +00:00
Chavi Weingarten
f696a43966 Merge "Shorten mTag in VRI" 2022-02-07 14:58:27 +00:00
TreeHugger Robot
5dc8ee52ed Merge "Don't trigger lift-to-wake on wireless charger" 2022-02-07 14:02:34 +00:00