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 |
|
Sarup Dalwani
|
bf3f189a34
|
Merge "Renaming isCredentialSharedWithParent to isCredentialSharableWithParent" into tm-dev
|
2022-03-10 05:59:57 +00:00 |
|
Xiao Ma
|
29037c039c
|
Merge "Remove restriction that limits updateConfiguration API to Auto" am: 0979ff10d8 am: e76c420a0e am: faa6057a72
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2015635
Change-Id: I14f6d9bdc65623872e10fc33ce71d74db495c23b
|
2022-03-10 04:50:57 +00:00 |
|
TreeHugger Robot
|
e430da04f4
|
[automerger skipped] Merge "Group window relayout requests" into sc-v2-dev am: 0716400df2 am: a9cbae4ae8 -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: If278731bf2efa90e0e21223a852642ca67c3b32d
|
2022-03-10 04:50:01 +00:00 |
|
Xiao Ma
|
faa6057a72
|
Merge "Remove restriction that limits updateConfiguration API to Auto" am: 0979ff10d8 am: e76c420a0e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2015635
Change-Id: Ie6b0f928cc35eb55f8a6c18b24499b5805fc5862
|
2022-03-10 04:40:35 +00:00 |
|
TreeHugger Robot
|
a9cbae4ae8
|
Merge "Group window relayout requests" into sc-v2-dev am: 0716400df2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16763426
Change-Id: Id68eabc9cbc9fa7bcd7e29c6fb1ae54ed1e500ca
|
2022-03-10 04:28:55 +00:00 |
|
Xiao Ma
|
e76c420a0e
|
Merge "Remove restriction that limits updateConfiguration API to Auto" am: 0979ff10d8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2015635
Change-Id: I4683bf88ce8d4f8d21a5a41cc30a1a2d55fb2789
|
2022-03-10 04:18:11 +00:00 |
|
TreeHugger Robot
|
0716400df2
|
Merge "Group window relayout requests" into sc-v2-dev
|
2022-03-10 04:03:07 +00:00 |
|
TreeHugger Robot
|
17ec425256
|
Merge "Add SafetyNet logging." into tm-dev
|
2022-03-10 03:51:09 +00:00 |
|
Xiao Ma
|
0979ff10d8
|
Merge "Remove restriction that limits updateConfiguration API to Auto"
|
2022-03-10 03:40:54 +00:00 |
|
Charles Chen
|
2828207a1a
|
Merge "Revert "Revert "Promote startActivityAsUser to SystemApi""" into tm-dev
|
2022-03-10 03:38:07 +00:00 |
|
Lucas Dupin
|
c48098c1f1
|
Merge "Enable Looper tracing" into tm-dev
|
2022-03-10 03:21:45 +00:00 |
|
TreeHugger Robot
|
95a2cf1c8f
|
[automerger skipped] Merge "Revert "[DO NOT MERGE] Keyguard was hiding occluding activities"" into sc-v2-dev am: e197b35dbd am: ee83f6df6e -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17145222
Change-Id: I39843ebc2ee6861ef7117155bfa59f4d0dbe1f1a
|
2022-03-10 03:01:19 +00:00 |
|
TreeHugger Robot
|
3bd83b4772
|
Merge changes from topic "presubmit-am-cd23d9b2a39243fd926bc7a009462de9" into sc-v2-dev-plus-aosp am: 0e7b89f740
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17145222
Change-Id: Id5c761757a08f14c180751de352d5282b6272ce0
|
2022-03-10 03:00:56 +00:00 |
|
Matt Pietal
|
1b09eaeee5
|
[automerger skipped] [automerge] Revert "[DO NOT MERGE] Keyguard was hiding occluding activities" 2p: d7fe18428f am: ab82171642 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17145222
Change-Id: Id47f6b2a53476607472366e20aee4a0abfa3a4e8
|
2022-03-10 03:00:33 +00:00 |
|
TreeHugger Robot
|
ee83f6df6e
|
Merge "Revert "[DO NOT MERGE] Keyguard was hiding occluding activities"" into sc-v2-dev am: e197b35dbd
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17145222
Change-Id: I277b768a02fd9738d61f93282e719f1185fb998a
|
2022-03-10 03:00:22 +00:00 |
|
TreeHugger Robot
|
3403fc7f1e
|
Merge "Fix compat issue with apps directly calling LoadedApk.makeApplication()." into tm-dev
|
2022-03-10 02:35:16 +00:00 |
|
TreeHugger Robot
|
e197b35dbd
|
Merge "Revert "[DO NOT MERGE] Keyguard was hiding occluding activities"" into sc-v2-dev
|
2022-03-10 02:34:58 +00:00 |
|
TreeHugger Robot
|
0e7b89f740
|
Merge changes from topic "presubmit-am-cd23d9b2a39243fd926bc7a009462de9" into sc-v2-dev-plus-aosp
* changes:
[automerge] Revert "[DO NOT MERGE] Keyguard was hiding occluding activities" 2p: d7fe18428f
Revert "[DO NOT MERGE] Keyguard was hiding occluding activities"
|
2022-03-10 02:34:58 +00:00 |
|
Tony Huang
|
607535b8d1
|
Merge "Fix NPE when quick switch on shell transition" into tm-dev
|
2022-03-10 02:31:07 +00:00 |
|
Evan Rosky
|
39c67bdd49
|
Merge "Only fire extra pause for pip-ing apps" into tm-dev
|
2022-03-10 02:25:25 +00:00 |
|
TreeHugger Robot
|
707ac92563
|
Merge "Cleanup TaskFragment reference on remove" into tm-dev
|
2022-03-10 01:53:10 +00:00 |
|
Hans Boehm
|
14de9cb2c5
|
Merge "Correct off-by-one error in SetThreadName" am: bb1686a6ac am: 8da7bd5d2a am: d497310b93
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2019395
Change-Id: Ibb0049e0a53d7d2c16345221d205b9c5c97d1cef
|
2022-03-10 01:42:14 +00:00 |
|
Eric Biggers
|
2313e36e88
|
[automerger skipped] Merge changes Ib5bcfb6a,I46c2a472,If0c75774,Iab7ba8d3 am: b56960bc76 am: d75803d52b am: 85ea70c3c3 -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: I98291fed8dc2fc01e02457662794291970ead100
|
2022-03-10 01:41:45 +00:00 |
|
Eric Biggers
|
3b4edfa936
|
[automerger skipped] Stop trying to update FDE password from LockSettingsService am: d63d0e12cc am: 426b3da0d1 am: 6d66f9a556 -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: Ie4dde1959f3832241ab1e25fe627725d84758d18
|
2022-03-10 01:41:32 +00:00 |
|
Eric Biggers
|
5a5f49e70c
|
[automerger skipped] Remove clearEncryptionPassword() from LockPatternUtils am: 0a9389d296 am: a8daebb9d0 am: c1341a7fb3 -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: Ic302ae899ec07b438cf2dd7766e86ef27e9807b7
|
2022-03-10 01:41:04 +00:00 |
|