Commit Graph

752659 Commits

Author SHA1 Message Date
Rob Carr
f28bd4314c Merge "Fix dialog exit animation" into tm-dev am: f76ef62d1a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17124623

Change-Id: I69a4213212fdc705a949cadb9d863f9a205fd2ff
2022-03-10 18:36:30 +00:00
Gabriel Biren
8671dda9db Merge "Rename getMaxNumScanSsids to getMaxSsidsPerScan in WifiNl80211Manager." into tm-dev am: 3b623d4e8a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17145726

Change-Id: Iad04e691ce2204fc988216fe935263d1d5b23ca5
2022-03-10 18:35:56 +00:00
Taran Singh
cbdd5e3354 Merge "Introduce new IMS method for Stylus events and dispatch" into tm-dev am: 6e3f7a9847
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17084324

Change-Id: I3066c757d3b28fa600b2fa341253d3e2ce2ce457
2022-03-10 18:35:00 +00:00
Miranda Kephart
e08a2920e7 Merge "Fix share button color in dark mode for clipboard edit" into tm-dev am: 17feaf8632
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17142032

Change-Id: I8f822cc416f35b2abf3ff6788a7914315af047cb
2022-03-10 18:34:26 +00:00
Lorenzo Colitti
75618ca578 Merge "Split out the ethernet API surface and use framework-connectivity-t" into tm-dev am: 99193716f4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17148770

Change-Id: Ib95188d6339d259a06067105ca2ffd5fab08299e
2022-03-10 18:30:23 +00:00
Pedro Loureiro
f313582f41 [conflict] Merge "Parse maxSdkVersion for APK in apexes" into tm-dev am: 85f1c315d9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17048625

Change-Id: I3d444655764c1a216447d27a48e80a73c4c80ef9
2022-03-10 18:11:02 +00:00
TreeHugger Robot
26ee85dbfa Merge "Refine CUJ_NOTIFICATION_SHADE_EXPAND_COLLAPSE" into tm-dev am: c91767f365
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17152507

Change-Id: Id0b089ff49ad349cb7285536855034b114a59c6c
2022-03-10 17:59:09 +00:00
TreeHugger Robot
63c664a1f1 Merge "Add hotword detection metrics." into tm-dev am: 6376279741
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17106443

Change-Id: I0083adcbfddc34d569cd876582aa73344ff91611
2022-03-10 17:58:30 +00:00
Ricky Wai
1c59bb5fe9 Merge "Apply app ops restriction and filter to restricted switch preference" into tm-dev am: 477ed8b675
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17135813

Change-Id: Ifc09e4d9dd7b1bd82054fa75ed5f01db3c8a759c
2022-03-10 17:56:46 +00:00
Christian Göllner
e65c416db6 Merge "[Motion] Split-shade expansion on LS: move keyguard views" into tm-dev am: c00f6054af
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17104569

Change-Id: Ib626caabef0ffd2b8f199c290f3578e5c2210bd5
2022-03-10 17:55:23 +00:00
Galia Peycheva
b7e3f35a56 Merge "Add shouldDockBigOverlays API" into tm-dev am: f6270e22f7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17123406

Change-Id: Icd0b54c9eb5c754c8cf418d99145b762cedfd37b
2022-03-10 17:54:47 +00:00
Oli Lan
472f579cce Merge "Fix AvatarPhotoControllerTest." into tm-dev am: 6e7043af48
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17135846

Change-Id: I2733b82db0b12907e3ed14b1f52fd0acd6960ec7
2022-03-10 17:50:41 +00:00
Suprabh Shukla
1a5e78172b Merge "Clarifying flag documentation for system alarms" into tm-dev am: 8bed7fca4a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17145511

Change-Id: I0c4e0b98addc96ed27e8f8897b0dacf9f9fd635e
2022-03-10 17:50:02 +00:00
TreeHugger Robot
164ca72e0b Merge "Introduce a flag to enable shell caption" into tm-dev am: 771ed53fc2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17045911

Change-Id: I30c54f7177777ba7e898261b41079d1a5a33d6d2
2022-03-10 17:49:22 +00:00
Christian Göllner
484b673493 Merge "Fix left margin too big on split shade" into tm-dev am: 8507e74ef6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17135604

Change-Id: I6f70b9d07e6ef8a3ec454e8c886601e3dc8a944f
2022-03-10 17:48:57 +00:00
SongFerng Wang
5bf39d79ee Merge "[LE] Connect and disconnect both LE headsets" am: ececa85c9e am: 0567e66c2c am: 254ef629f5 am: de247f70ba
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2010675

Change-Id: I117e867c8a5a8d70123ac0b8799af2a074c9751b
2022-03-10 17:48:34 +00:00
Taran Singh
90b0d74d60 Merge "Use local coordinates in CAI#EditorBoundsInfo" into tm-dev am: a28f53b00d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17049973

Change-Id: I322ddee4e6310cd2c075f4356c013fa7b0c96710
2022-03-10 17:48:11 +00:00
TreeHugger Robot
fc26a80472 Merge "Remove filtering old pipeline filtering inNotificationInterruptStateProviderImpl" into tm-dev am: c0d069bef4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17114927

Change-Id: I7b003049ca6014f3eda128f898bdfede9a4143a1
2022-03-10 17:47:32 +00:00
Winson Chiu
736296f4f4 Merge "Remove ComputerTracker and fix consistency in PackageManagerService" into tm-dev am: 35fed17b0e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16943855

Change-Id: I45d7af9f6b9776ab94b7cae2bb5f4ae173f71317
2022-03-10 17:47:14 +00:00
Tom Hsu
fb05bf2343 Merge "[Panlingual] Turn off switch flag for BETA1" into tm-dev am: 8ff9100be6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17148316

Change-Id: I461aca892f23568e7f2d97cbb913166176d4068b
2022-03-10 17:46:49 +00:00
Louis Chang
61c3b55138 Merge "Stop supporting System UID to embed a separate task" into tm-dev am: dac2c8c645
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16983288

Change-Id: I57c5ce995ad0385cce0b0386ac4f32497b6b2478
2022-03-10 17:46:27 +00:00
Sarup Dalwani
f28b2dd992 Merge "Renaming isCredentialSharedWithParent to isCredentialSharableWithParent" into tm-dev am: bf3f189a34
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17106010

Change-Id: I7f2fec84f4218e917960b4f6506f050f6afdb585
2022-03-10 17:45:58 +00:00
Xiao Ma
bda118aaeb Merge "Remove restriction that limits updateConfiguration API to Auto" am: 0979ff10d8 am: e76c420a0e am: faa6057a72 am: 29037c039c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2015635

Change-Id: If13adeb20c2ca329db474620f1c8ce74b91b96ed
2022-03-10 17:44:45 +00:00
TreeHugger Robot
6cc9ef49ba [automerger skipped] Merge "Group window relayout requests" into sc-v2-dev am: 0716400df2 am: a9cbae4ae8 -s ours am: e430da04f4 -s ours
am skip reason: Merged-In Ib08f7ba66048eb023ee2d5e9c09461381c390f0d with SHA-1 593266739f is already in history

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

Change-Id: Ic803884b09f4de99848c232500f4374f0283e45a
2022-03-10 17:44:16 +00:00
TreeHugger Robot
4162759b5b Merge "Add SafetyNet logging." into tm-dev am: 17ec425256
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17128572

Change-Id: I0c94128946dc6a5b74a69fe42ea77f2be6df9d9e
2022-03-10 17:44:04 +00:00
Charles Chen
46a75a747b Merge "Revert "Revert "Promote startActivityAsUser to SystemApi""" into tm-dev am: 2828207a1a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17076607

Change-Id: I24537c0f1bcf8f2c3d0327fb663ef7e32a7c7a66
2022-03-10 17:43:36 +00:00
Lucas Dupin
f2bd4eebf3 Merge "Enable Looper tracing" into tm-dev am: c48098c1f1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17144187

Change-Id: I342e2ef54718a7d7b1933cf68b6a6ac655c65210
2022-03-10 17:42:37 +00:00
TreeHugger Robot
ab01d4d42d [automerger skipped] Merge "Revert "[DO NOT MERGE] Keyguard was hiding occluding activities"" into sc-v2-dev am: e197b35dbd am: ee83f6df6e -s ours am: 95a2cf1c8f -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ife28424a2781ddb7a46a72ed99cb1df64155b62a
2022-03-10 17:42:18 +00:00
TreeHugger Robot
34f6f40b2b Merge changes from topic "presubmit-am-cd23d9b2a39243fd926bc7a009462de9" into sc-v2-dev-plus-aosp am: 0e7b89f740 am: 3bd83b4772
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17145222

Change-Id: Id33659c77757e504ba4004c08f18dbcaa590fab1
2022-03-10 17:42:04 +00:00
Matt Pietal
ee929cab86 [automerger skipped] [automerge] Revert "[DO NOT MERGE] Keyguard was hiding occluding activities" 2p: d7fe18428f am: ab82171642 -s ours am: 1b09eaeee5 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ibe90e6f01d4e677c41ac3ab68fa5834550b278dc
2022-03-10 17:42:02 +00:00
TreeHugger Robot
13868acde7 Merge "Fix compat issue with apps directly calling LoadedApk.makeApplication()." into tm-dev am: 3403fc7f1e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17144652

Change-Id: I3effdd62bef9866687995511ca94f1c61143cb9b
2022-03-10 17:41:36 +00:00
Tony Huang
a03c5fddb7 Merge "Fix NPE when quick switch on shell transition" into tm-dev am: 607535b8d1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17129806

Change-Id: I567a791443080173f40a44d44662902c8611b637
2022-03-10 17:41:19 +00:00
Evan Rosky
107e1775cd Merge "Only fire extra pause for pip-ing apps" into tm-dev am: 39c67bdd49
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17127806

Change-Id: I84444d1c152b3b6f8051780f813af28860fdd6fc
2022-03-10 17:40:44 +00:00
TreeHugger Robot
d4f7e2b3dd Merge "Cleanup TaskFragment reference on remove" into tm-dev am: 707ac92563
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17131164

Change-Id: I5883c2ed9058c17ede35ac98331f03d0a4d693a6
2022-03-10 17:40:18 +00:00
Hans Boehm
0c419d1a22 Merge "Correct off-by-one error in SetThreadName" am: bb1686a6ac am: 8da7bd5d2a am: d497310b93 am: 14de9cb2c5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2019395

Change-Id: I66611f03692a0a843b09a6d5c01016b1ae8a0bb9
2022-03-10 17:40:02 +00:00
Eric Biggers
76357ef56b [automerger skipped] Merge changes Ib5bcfb6a,I46c2a472,If0c75774,Iab7ba8d3 am: b56960bc76 am: d75803d52b am: 85ea70c3c3 -s ours am: 2313e36e88 -s ours
am skip reason: Merged-In Ib5bcfb6a0279150fec33f2c3edd0431b450c90f4 with SHA-1 f4f345dbee is already in history

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

Change-Id: Ic28b9caa4a691e4654e5c9d3a4a0c95e6eb6d828
2022-03-10 17:39:31 +00:00
Eric Biggers
466be223d8 [automerger skipped] Stop trying to update FDE password from LockSettingsService am: d63d0e12cc am: 426b3da0d1 am: 6d66f9a556 -s ours am: 3b4edfa936 -s ours
am skip reason: Merged-In I46c2a472177836f0c9084e4c3b4ed2e6c0ab61d5 with SHA-1 031a23fa87 is already in history

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

Change-Id: Id0580c4ef7425c62eb4d04dba8619daa0705ed3d
2022-03-10 17:39:30 +00:00
Eric Biggers
316d1095e1 [automerger skipped] Remove clearEncryptionPassword() from LockPatternUtils am: 0a9389d296 am: a8daebb9d0 am: c1341a7fb3 -s ours am: 5a5f49e70c -s ours
am skip reason: Merged-In If0c75774555d3503f21857e66cce527c5edfa586 with SHA-1 50cfdac9ba is already in history

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

Change-Id: I68b1eb9589de6bc17562ccab08f22363fe5fdd8f
2022-03-10 17:39:28 +00:00
Eric Biggers
22b72d22dc [automerger skipped] Stop trying to get/set fields in FDE footer am: 77d147be49 am: a051497d86 am: c76db81ef9 -s ours am: 25ad9bf9ff -s ours
am skip reason: Merged-In Iab7ba8d36890daa0645b2cedf33e4bd177a86b63 with SHA-1 661fdb3d9f is already in history

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

Change-Id: I45f93cf20b979ac94f5736cd5f172a8704407135
2022-03-10 17:39:21 +00:00
William McVicker
5df46f5dba [automerger skipped] Merge "Fix the same active time tasks disappeared on RunngintTasks" am: e55bd1600f am: a5125067a0 am: bd8bd00b6b -s ours am: 62aab36a7c -s ours
am skip reason: Merged-In Iee39e438224f3ef22bc0a9254be88eec842c61a6 with SHA-1 a163d1bfd5 is already in history

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

Change-Id: I4e66bbd67a9d1a10a4103c6b50f7a2b2c877bd31
2022-03-10 17:38:52 +00:00
Patrick Huang
ac67417cf7 Merge "Change lockscreen text from "Emergency call" to "Emergency"" into tm-dev am: edf4b8bbfe
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17125426

Change-Id: Ifb1031aac8a51ac1439ab975aefbc8529bd994f4
2022-03-10 17:38:39 +00:00
Yixiao Luo
446640ded4 Merge "TIAF: Change on API Review: DTV to VOD" into tm-dev am: 883d3e645d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17075670

Change-Id: I826d0dcd0a65661808ad7581fd23a3744f8b2dc6
2022-03-10 17:38:09 +00:00
Chris Li
b38a21ee74 Merge "Offset animation layer for TaskFragment open/close" into tm-dev am: 268ff30768
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17124807

Change-Id: Idba87780127c09cc7414263a8c289ffe5a43a3fe
2022-03-10 17:37:48 +00:00
Aaron Liu
a59129f3c3 Merge "Home Controls: Update colors after setting icon" into tm-dev am: a6b90ed0b1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17138621

Change-Id: I6600bafd2dcb8fd14f70d02ba783084add831aad
2022-03-10 17:37:26 +00:00
Aaron Liu
b8f633e6dc Merge "Bouncer: Change color of emergency button text" into tm-dev am: 7bdff4f214
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17141302

Change-Id: I99341df77d6e1f2331dfa73b6b89b8f072abe6b8
2022-03-10 17:36:53 +00:00
Hui Wu
875ca05e42 Merge "CloudSearch API: adds two keys for app intents in ExtraInfo" into tm-dev am: 8fe47c1cc3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17141161

Change-Id: I609557b2be1026a89dab15896310a6325402cf3d
2022-03-10 17:36:01 +00:00
Rob Carr
f76ef62d1a Merge "Fix dialog exit animation" into tm-dev 2022-03-10 16:01:29 +00:00
Gabriel Biren
3b623d4e8a Merge "Rename getMaxNumScanSsids to getMaxSsidsPerScan in WifiNl80211Manager." into tm-dev 2022-03-10 15:47:30 +00:00
Taran Singh
6e3f7a9847 Merge "Introduce new IMS method for Stylus events and dispatch" into tm-dev 2022-03-10 15:24:29 +00:00
Miranda Kephart
17feaf8632 Merge "Fix share button color in dark mode for clipboard edit" into tm-dev 2022-03-10 15:02:05 +00:00