TreeHugger Robot
|
a6300e66a9
|
Merge "Optimize checking if package defines companion services in CDM" into tm-dev am: ba88e17064 am: 3120705ca2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17056084
Change-Id: Ifc14585853ec53283ab537a37e197f8afc905744
|
2022-03-02 22:34:15 +00:00 |
|
Automerger Merge Worker
|
645ef67bff
|
Merge "Merge "Add flipper switch for shell transitions" into tm-dev am: ed73b44d5b"
|
2022-03-02 22:32:30 +00:00 |
|
TreeHugger Robot
|
b10482e2a4
|
Merge "Add flipper switch for shell transitions" into tm-dev am: ed73b44d5b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16998517
Change-Id: Ibc8bb6d2922fbb7dca4c8c0c6ecdf1a042b17da7
|
2022-03-02 22:31:52 +00:00 |
|
TreeHugger Robot
|
c8bb444e21
|
Merge "Add flipper switch for shell transitions" into tm-dev am: ed73b44d5b am: 880f835d88
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16998517
Change-Id: Ie9391d08eac62ccf166062424c9148333a92d50f
|
2022-03-02 22:31:33 +00:00 |
|
TreeHugger Robot
|
3120705ca2
|
Merge "Optimize checking if package defines companion services in CDM" into tm-dev am: ba88e17064
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17056084
Change-Id: I5adc01d44cb950b602222cb570e838b3ced89f85
|
2022-03-02 22:12:12 +00:00 |
|
TreeHugger Robot
|
880f835d88
|
Merge "Add flipper switch for shell transitions" into tm-dev am: ed73b44d5b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16998517
Change-Id: I65d5fe7b9e539fd95cabba16f5e860f92a6c12a9
|
2022-03-02 22:09:46 +00:00 |
|
TreeHugger Robot
|
ba88e17064
|
Merge "Optimize checking if package defines companion services in CDM" into tm-dev
|
2022-03-02 22:07:25 +00:00 |
|
TreeHugger Robot
|
ed73b44d5b
|
Merge "Add flipper switch for shell transitions" into tm-dev
|
2022-03-02 22:05:36 +00:00 |
|
TreeHugger Robot
|
093450266a
|
Merge "Add null checking to fix NullPointerException while creating mock tag"
|
2022-03-02 21:48:23 +00:00 |
|
Josh Tsuji
|
0cccc4cf51
|
[automerger skipped] Merge "Don't re-hide the keyguard if it isn't showing." into sc-v2-dev am: 0d8f1067a4 am: 1706cecb25 -s ours am: 5123bbc2d2 -s ours am: 4e829dcb4f -s ours
am skip reason: Merged-In I00655c2e85c46bd0c52b77094757e155b1a6f9c9 with SHA-1 22ae995c20 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17005881
Change-Id: I882963a668292059223b7f1daa01b2bc5f2bbebc
|
2022-03-02 21:47:31 +00:00 |
|
Josh Tsuji
|
5c40d10e0a
|
[automerger skipped] Merge changes from topic "presubmit-am-6bd2dc4c86ff420f9becf1b089e962a7" into sc-v2-dev-plus-aosp am: 49ededb26d -s ours am: 73665f7eb6 -s ours am: ee8b3b414c -s ours
am skip reason: Merged-In I00655c2e85c46bd0c52b77094757e155b1a6f9c9 with SHA-1 22ae995c20 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17005881
Change-Id: I32ba546fabd6416372870aa0a5669c3d34aa90a5
|
2022-03-02 21:47:09 +00:00 |
|
Presubmit Automerger Backend
|
fe60ba1375
|
[automerger skipped] [automerge] Don't re-hide the keyguard if it isn't showing. 2p: c3a2eeaed3 am: 346f9c19bf -s ours am: a098ec58d3 -s ours am: c6f5dfc7bd -s ours
am skip reason: Merged-In I00655c2e85c46bd0c52b77094757e155b1a6f9c9 with SHA-1 22ae995c20 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17005881
Change-Id: I1064ba1d88f322fc382fc992e9aafd54fd6206e3
|
2022-03-02 21:46:51 +00:00 |
|
Dave Mankoff
|
5d73c0b183
|
Merge "Add docs for CoreStartable." into tm-dev am: e677aafd35 am: 99d93febd2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17002612
Change-Id: I5039bdb7d5af6b4f8b00dbac1b773bbb0e59a17a
|
2022-03-02 21:46:06 +00:00 |
|
Rob Carr
|
68d4d0bab0
|
Merge "ViewRootImpl: Don't pause HWUI so much" into tm-dev am: c406f6afa7 am: d5ceb56093
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16981759
Change-Id: I7c5a17aa9a23394f134447c4e4ea248985c2bae2
|
2022-03-02 21:45:31 +00:00 |
|
Bryce Lee
|
059a318bf3
|
Merge "Remove ComplicationHostViewComponent." into tm-dev am: 3906378004 am: 33e44772fc
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16993407
Change-Id: I414d9a42e140fb97f531a967b0f35eadced1d70b
|
2022-03-02 21:44:15 +00:00 |
|
TreeHugger Robot
|
0a835c2592
|
[automerger skipped] Merge "Filter notification APIs by user" into rvc-dev am: b4ed0a3467 -s ours am: 9aeec3e862 -s ours am: 8165fee91d -s ours am: a5cdfa690b -s ours am: f167945b56 -s ours am: a53e794051 -s ours am: a934ff0cd7 -s ours am: 29ced7d574 -s ours
am skip reason: Merged-In I2eba0a592fa33ed25e1ac3919f1b2631e5db4258 with SHA-1 24076b8571 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16873394
Change-Id: I719848e42c6bf41ade008d179493057b63161356
|
2022-03-02 21:43:14 +00:00 |
|
Julia Reynolds
|
8be7a80a4b
|
[automerger skipped] Filter notification APIs by user am: 3456555b7c -s ours am: 4372e063b7 -s ours am: a905b405bf -s ours am: 0ae8eee99e -s ours am: a02879a15e -s ours am: 2176716195 -s ours am: 8ede3ae04d -s ours am: 9871e68421 -s ours
am skip reason: Merged-In I2eba0a592fa33ed25e1ac3919f1b2631e5db4258 with SHA-1 24076b8571 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16873394
Change-Id: Ic6b7511eb866e92a5993edfffbd0d482f033cdef
|
2022-03-02 21:42:47 +00:00 |
|
TreeHugger Robot
|
f9064344c8
|
[automerger skipped] Merge "Filter notification APIs by user" into rvc-qpr-dev am: 0ffd60007c -s ours am: 2dfb7bbbed -s ours am: 0e8c0d8b0e -s ours am: 14a350285e -s ours am: 08b798aeaa -s ours am: a79b20a844 -s ours am: fe1e78ae51 -s ours
am skip reason: Merged-In I2eba0a592fa33ed25e1ac3919f1b2631e5db4258 with SHA-1 40ca868ca5 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16873353
Change-Id: Ifabd5e0795cd39d296dd935bbe97152d149488fa
|
2022-03-02 21:42:10 +00:00 |
|
Julia Reynolds
|
48cc79198a
|
[automerger skipped] Filter notification APIs by user am: 24076b8571 -s ours am: ed4b77dbcf -s ours am: fca61e4b86 -s ours am: 2b395251c1 -s ours am: 9272235ee3 -s ours am: 3783ae02eb -s ours am: 6a613d2f5d -s ours
am skip reason: Merged-In I2eba0a592fa33ed25e1ac3919f1b2631e5db4258 with SHA-1 40ca868ca5 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16873353
Change-Id: I7560fd8b5378291740abd26851a4f47c2cbb4e8c
|
2022-03-02 21:41:50 +00:00 |
|
TreeHugger Robot
|
648a48928b
|
[automerger skipped] Merge "Filter notification APIs by user" into sc-dev am: 1db370eac3 -s ours am: e127a68093 -s ours am: 308ed847d4 -s ours am: bde1eae8b5 -s ours am: 69e896244b -s ours am: 56ee2fd1b1 -s ours
am skip reason: Merged-In I2eba0a592fa33ed25e1ac3919f1b2631e5db4258 with SHA-1 40ca868ca5 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16873352
Change-Id: I0989ffff6a95fa67cffec43699d4575fab261e0f
|
2022-03-02 21:40:51 +00:00 |
|
Josh Tsuji
|
4e829dcb4f
|
[automerger skipped] Merge "Don't re-hide the keyguard if it isn't showing." into sc-v2-dev am: 0d8f1067a4 am: 1706cecb25 -s ours am: 5123bbc2d2 -s ours
am skip reason: Merged-In I00655c2e85c46bd0c52b77094757e155b1a6f9c9 with SHA-1 22ae995c20 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17005881
Change-Id: Ic9fd6c44ab0843fcc8eb13efcaa01dacad852d20
|
2022-03-02 21:39:01 +00:00 |
|
Mark Punzalan
|
0a54860ff3
|
Merge "Don't cache created Translators in TranslationManager." into tm-dev am: a88f5b74f2 am: f118a417dc
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16991523
Change-Id: I4c82c0fcfe22f9340f6f5f56ccc91c19ba284455
|
2022-03-02 21:39:00 +00:00 |
|
Josh Tsuji
|
ee8b3b414c
|
[automerger skipped] Merge changes from topic "presubmit-am-6bd2dc4c86ff420f9becf1b089e962a7" into sc-v2-dev-plus-aosp am: 49ededb26d -s ours am: 73665f7eb6 -s ours
am skip reason: Merged-In I00655c2e85c46bd0c52b77094757e155b1a6f9c9 with SHA-1 22ae995c20 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17005881
Change-Id: I50b5736b89d01bc42f3236d34fd70bf92e01ce19
|
2022-03-02 21:38:51 +00:00 |
|
Presubmit Automerger Backend
|
c6f5dfc7bd
|
[automerger skipped] [automerge] Don't re-hide the keyguard if it isn't showing. 2p: c3a2eeaed3 am: 346f9c19bf -s ours am: a098ec58d3 -s ours
am skip reason: Merged-In I00655c2e85c46bd0c52b77094757e155b1a6f9c9 with SHA-1 22ae995c20 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17005881
Change-Id: Ib048c0adf4eeda46623ab306e5ab9a1f730cd2c0
|
2022-03-02 21:38:41 +00:00 |
|
Dave Mankoff
|
99d93febd2
|
Merge "Add docs for CoreStartable." into tm-dev am: e677aafd35
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17002612
Change-Id: I0cfafc189014d9b5fe0f1d3f1a3e1560f466de82
|
2022-03-02 21:38:31 +00:00 |
|
Rob Carr
|
d5ceb56093
|
Merge "ViewRootImpl: Don't pause HWUI so much" into tm-dev am: c406f6afa7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16981759
Change-Id: Ifae5153d92f9324d0b5b1b8b31ece15b9696457d
|
2022-03-02 21:38:17 +00:00 |
|
Neha Pattan
|
45b7a51444
|
Merge "Remove *nonpublic_deps which was added pre-Rb announcement." into tm-dev am: 0469e1ae46 am: 4bbaa84743
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17056892
Change-Id: I319c0066a3b6b3a860636793384b1a9f38e6c126
|
2022-03-02 21:38:14 +00:00 |
|
Josh Tsuji
|
5123bbc2d2
|
[automerger skipped] Merge "Don't re-hide the keyguard if it isn't showing." into sc-v2-dev am: 0d8f1067a4 am: 1706cecb25 -s ours
am skip reason: Merged-In I00655c2e85c46bd0c52b77094757e155b1a6f9c9 with SHA-1 22ae995c20 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17005881
Change-Id: Id8685a6bfe8356e1e90d82bddf7155bfc8833d48
|
2022-03-02 21:38:03 +00:00 |
|
Josh Tsuji
|
73665f7eb6
|
[automerger skipped] Merge changes from topic "presubmit-am-6bd2dc4c86ff420f9becf1b089e962a7" into sc-v2-dev-plus-aosp am: 49ededb26d -s ours
am skip reason: Merged-In I00655c2e85c46bd0c52b77094757e155b1a6f9c9 with SHA-1 22ae995c20 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17005881
Change-Id: I4b872ee3ac73c3365be836630357340cdf0d0973
|
2022-03-02 21:37:46 +00:00 |
|
Bryce Lee
|
33e44772fc
|
Merge "Remove ComplicationHostViewComponent." into tm-dev am: 3906378004
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16993407
Change-Id: Id84afd902ac6735c404e21785a840df62f1d938b
|
2022-03-02 21:37:43 +00:00 |
|
Presubmit Automerger Backend
|
a098ec58d3
|
[automerger skipped] [automerge] Don't re-hide the keyguard if it isn't showing. 2p: c3a2eeaed3 am: 346f9c19bf -s ours
am skip reason: Merged-In I00655c2e85c46bd0c52b77094757e155b1a6f9c9 with SHA-1 22ae995c20 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17005881
Change-Id: I34694cdf5daa5faa3ac38ec4198b2eaeb7250128
|
2022-03-02 21:37:36 +00:00 |
|
Josh Tsuji
|
1706cecb25
|
Merge "Don't re-hide the keyguard if it isn't showing." into sc-v2-dev am: 0d8f1067a4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17005881
Change-Id: I0a33a1eaec23cc4af8a5cce549ea7faba4e55a85
|
2022-03-02 21:36:49 +00:00 |
|
Dave Mankoff
|
550fcb892a
|
Merge "Add docs for CoreStartable." into tm-dev am: e677aafd35
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17002612
Change-Id: I7644b0730c532644fbe61059c530476297f7933f
|
2022-03-02 21:28:18 +00:00 |
|
Rob Carr
|
898cb500c5
|
Merge "ViewRootImpl: Don't pause HWUI so much" into tm-dev am: c406f6afa7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16981759
Change-Id: I7eb53bd945a24bc55f54c7abc3ef83028da8ba60
|
2022-03-02 21:27:25 +00:00 |
|
Bryce Lee
|
d73505b0f0
|
Merge "Remove ComplicationHostViewComponent." into tm-dev am: 3906378004
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16993407
Change-Id: I8ad9c0fc8fc7075739ac51f3ec9f6c5a929a0b90
|
2022-03-02 21:26:11 +00:00 |
|
Dave Mankoff
|
e677aafd35
|
Merge "Add docs for CoreStartable." into tm-dev
|
2022-03-02 21:23:32 +00:00 |
|
Rob Carr
|
c406f6afa7
|
Merge "ViewRootImpl: Don't pause HWUI so much" into tm-dev
|
2022-03-02 21:20:46 +00:00 |
|
Josh Tsuji
|
49ededb26d
|
Merge changes from topic "presubmit-am-6bd2dc4c86ff420f9becf1b089e962a7" into sc-v2-dev-plus-aosp
* changes:
[automerge] Don't re-hide the keyguard if it isn't showing. 2p: c3a2eeaed3
Don't re-hide the keyguard if it isn't showing.
|
2022-03-02 21:17:23 +00:00 |
|
Josh Tsuji
|
0d8f1067a4
|
Merge "Don't re-hide the keyguard if it isn't showing." into sc-v2-dev
|
2022-03-02 21:17:23 +00:00 |
|
Bryce Lee
|
3906378004
|
Merge "Remove ComplicationHostViewComponent." into tm-dev
|
2022-03-02 21:12:15 +00:00 |
|
TreeHugger Robot
|
d3b9343e0f
|
[automerger skipped] Merge "Filter notification APIs by user" into rvc-dev am: b4ed0a3467 -s ours am: 9aeec3e862 -s ours am: 8165fee91d -s ours am: a5cdfa690b -s ours am: f167945b56 -s ours am: a53e794051 -s ours am: a934ff0cd7 -s ours
am skip reason: Merged-In I2eba0a592fa33ed25e1ac3919f1b2631e5db4258 with SHA-1 24076b8571 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16873394
Change-Id: I548f9bd6a96c9fff5328195eca07c8d551d6c0dc
|
2022-03-02 21:07:37 +00:00 |
|
Julia Reynolds
|
f77a7bd28b
|
[automerger skipped] Filter notification APIs by user am: 3456555b7c -s ours am: 4372e063b7 -s ours am: a905b405bf -s ours am: 0ae8eee99e -s ours am: a02879a15e -s ours am: 2176716195 -s ours am: 8ede3ae04d -s ours
am skip reason: Merged-In I2eba0a592fa33ed25e1ac3919f1b2631e5db4258 with SHA-1 24076b8571 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16873394
Change-Id: I2e0c0b0b69292205bcb2c1e55119f693e7b0865e
|
2022-03-02 21:07:15 +00:00 |
|
TreeHugger Robot
|
a57174ea3f
|
[automerger skipped] Merge "Filter notification APIs by user" into rvc-qpr-dev am: 0ffd60007c -s ours am: 2dfb7bbbed -s ours am: 0e8c0d8b0e -s ours am: 14a350285e -s ours am: 08b798aeaa -s ours am: a79b20a844 -s ours
am skip reason: Merged-In I2eba0a592fa33ed25e1ac3919f1b2631e5db4258 with SHA-1 40ca868ca5 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16873353
Change-Id: If0fc8c4aef1c2ae8e6410f90ca025a4e9c7ea275
|
2022-03-02 21:06:33 +00:00 |
|
Julia Reynolds
|
988de8bbb5
|
[automerger skipped] Filter notification APIs by user am: 24076b8571 -s ours am: ed4b77dbcf -s ours am: fca61e4b86 -s ours am: 2b395251c1 -s ours am: 9272235ee3 -s ours am: 3783ae02eb -s ours
am skip reason: Merged-In I2eba0a592fa33ed25e1ac3919f1b2631e5db4258 with SHA-1 40ca868ca5 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16873353
Change-Id: I64b08801380bb1d3ca06bcba60dc4cd5a056ca67
|
2022-03-02 21:06:17 +00:00 |
|
TreeHugger Robot
|
a320e78140
|
[automerger skipped] Merge "Filter notification APIs by user" into sc-dev am: 1db370eac3 -s ours am: e127a68093 -s ours am: 308ed847d4 -s ours am: bde1eae8b5 -s ours am: 69e896244b -s ours
am skip reason: Merged-In I2eba0a592fa33ed25e1ac3919f1b2631e5db4258 with SHA-1 40ca868ca5 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16873352
Change-Id: Ib95f111ba09ab5934e49c053033f0b8dbc6b50c1
|
2022-03-02 21:05:34 +00:00 |
|
TreeHugger Robot
|
29ced7d574
|
[automerger skipped] Merge "Filter notification APIs by user" into rvc-dev am: b4ed0a3467 -s ours am: 9aeec3e862 -s ours am: 8165fee91d -s ours am: a5cdfa690b -s ours am: f167945b56 -s ours am: a53e794051 -s ours am: a934ff0cd7 -s ours
am skip reason: Merged-In I2eba0a592fa33ed25e1ac3919f1b2631e5db4258 with SHA-1 24076b8571 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16873394
Change-Id: Ic94a639c3f689e02245ac3f26a2f579f5e06ecb2
|
2022-03-02 21:04:30 +00:00 |
|
Julia Reynolds
|
9871e68421
|
[automerger skipped] Filter notification APIs by user am: 3456555b7c -s ours am: 4372e063b7 -s ours am: a905b405bf -s ours am: 0ae8eee99e -s ours am: a02879a15e -s ours am: 2176716195 -s ours am: 8ede3ae04d -s ours
am skip reason: Merged-In I2eba0a592fa33ed25e1ac3919f1b2631e5db4258 with SHA-1 24076b8571 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16873394
Change-Id: Ic6ba9c9bedc6d10279c844facca9ef66b54415e5
|
2022-03-02 21:04:28 +00:00 |
|
TreeHugger Robot
|
fe1e78ae51
|
[automerger skipped] Merge "Filter notification APIs by user" into rvc-qpr-dev am: 0ffd60007c -s ours am: 2dfb7bbbed -s ours am: 0e8c0d8b0e -s ours am: 14a350285e -s ours am: 08b798aeaa -s ours am: a79b20a844 -s ours
am skip reason: Merged-In I2eba0a592fa33ed25e1ac3919f1b2631e5db4258 with SHA-1 40ca868ca5 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16873353
Change-Id: I18da017f06281258a551e280b1602d3dfec5ebd2
|
2022-03-02 21:04:19 +00:00 |
|
Julia Reynolds
|
6a613d2f5d
|
[automerger skipped] Filter notification APIs by user am: 24076b8571 -s ours am: ed4b77dbcf -s ours am: fca61e4b86 -s ours am: 2b395251c1 -s ours am: 9272235ee3 -s ours am: 3783ae02eb -s ours
am skip reason: Merged-In I2eba0a592fa33ed25e1ac3919f1b2631e5db4258 with SHA-1 40ca868ca5 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16873353
Change-Id: Iebce2bbf0b5c54bc514e82a0752c493dd3bfe74d
|
2022-03-02 21:04:17 +00:00 |
|
Mark Punzalan
|
aa26523c55
|
Merge "Don't cache created Translators in TranslationManager." into tm-dev am: a88f5b74f2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16991523
Change-Id: I304c392af8bcd2ef9205c46c7c09e3612f44f05f
|
2022-03-02 21:04:06 +00:00 |
|