Hongwei Wang
|
7fefa591d3
|
Merge "Handle PiP shadow radius in WMShell" into tm-dev am: b2a5b198cd
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17456722
Change-Id: I2a503e280734138e2dcf3ec77f5fb526e4120644
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-03-30 22:25:39 +00:00 |
|
Evan Rosky
|
6132152d6c
|
Merge "Add alternative to deprecated API" into tm-dev am: 353fe11e5d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17491115
Change-Id: I61ebc9d7ca40a7d8fcbb2e95304f9990d0af1ffb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-03-30 22:24:37 +00:00 |
|
Hongwei Wang
|
b2a5b198cd
|
Merge "Handle PiP shadow radius in WMShell" into tm-dev
|
2022-03-30 22:23:51 +00:00 |
|
Suprabh Shukla
|
f2f8f42fc7
|
Merge "Gating USE_EXACT_ALARM by target sdk T" into tm-dev am: d03d400d8f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17391457
Change-Id: Ibfe58f16cb636aabded4f7061e51af35e0c67001
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-03-30 22:23:29 +00:00 |
|
Evan Rosky
|
353fe11e5d
|
Merge "Add alternative to deprecated API" into tm-dev
|
2022-03-30 22:23:05 +00:00 |
|
Suprabh Shukla
|
d03d400d8f
|
Merge "Gating USE_EXACT_ALARM by target sdk T" into tm-dev
|
2022-03-30 22:08:03 +00:00 |
|
TreeHugger Robot
|
36a763e18d
|
[automerger skipped] Merge "RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps." into qt-dev am: 6923c0d102 am: 0fdbb79d9c -s ours am: 49903f64b5 -s ours am: 263e7f5af1 -s ours am: ce83bd7860 -s ours am: 2f5a38fcab -s ours am: b9573bc095 -s ours am: f542c6c0b0 -s ours am: ad9a2371d8 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17400663
Change-Id: Ie2bc0d56c7dcc26a89a0e85282b5df863104f483
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-03-30 21:45:03 +00:00 |
|
Oli Lan
|
217d7377a3
|
[automerger skipped] RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps. am: a7621e0ce0 am: 9b7e9a00b8 -s ours am: 8ad62a15f7 -s ours am: 42ce04bda8 -s ours am: fc3dc6e083 -s ours am: 90f9e26f77 -s ours am: 03b2b4d180 -s ours am: 68222b7aed -s ours am: 53d1ea3573 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17400663
Change-Id: I710d09157ebf923120f1cd9908af2b12fd715294
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-03-30 21:45:01 +00:00 |
|
Xiaowen Lei
|
a7a3e12297
|
Merge "Add tests to ensure swiping down (up) over dream (bouncer) doesn't change the expansion." into tm-dev am: ec2a6c87d0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17413196
Change-Id: I6fab566b9cd5c98dd9bae089b72f9617b264819e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-03-30 21:44:20 +00:00 |
|
TreeHugger Robot
|
ad9a2371d8
|
[automerger skipped] Merge "RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps." into qt-dev am: 6923c0d102 am: 0fdbb79d9c -s ours am: 49903f64b5 -s ours am: 263e7f5af1 -s ours am: ce83bd7860 -s ours am: 2f5a38fcab -s ours am: b9573bc095 -s ours am: f542c6c0b0 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17400663
Change-Id: Id420c943a61fba6edd8994b384530d9fb17f6c22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-03-30 21:29:35 +00:00 |
|
Oli Lan
|
53d1ea3573
|
[automerger skipped] RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps. am: a7621e0ce0 am: 9b7e9a00b8 -s ours am: 8ad62a15f7 -s ours am: 42ce04bda8 -s ours am: fc3dc6e083 -s ours am: 90f9e26f77 -s ours am: 03b2b4d180 -s ours am: 68222b7aed -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17400663
Change-Id: Iaf963e287c3c7a34081cf243734499471c5fcada
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-03-30 21:28:59 +00:00 |
|
Xiaowen Lei
|
ec2a6c87d0
|
Merge "Add tests to ensure swiping down (up) over dream (bouncer) doesn't change the expansion." into tm-dev
|
2022-03-30 21:20:00 +00:00 |
|
TreeHugger Robot
|
f542c6c0b0
|
[automerger skipped] Merge "RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps." into qt-dev am: 6923c0d102 am: 0fdbb79d9c -s ours am: 49903f64b5 -s ours am: 263e7f5af1 -s ours am: ce83bd7860 -s ours am: 2f5a38fcab -s ours am: b9573bc095 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17400663
Change-Id: I4ac380cf8513e036bd3f8875413223531c93ee89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-03-30 21:13:58 +00:00 |
|
Oli Lan
|
68222b7aed
|
[automerger skipped] RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps. am: a7621e0ce0 am: 9b7e9a00b8 -s ours am: 8ad62a15f7 -s ours am: 42ce04bda8 -s ours am: fc3dc6e083 -s ours am: 90f9e26f77 -s ours am: 03b2b4d180 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17400663
Change-Id: Ib129610248e21efc69a5a5cdf91ef1394dae084a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-03-30 21:13:39 +00:00 |
|
Josh Tsuji
|
38adf67f5c
|
Merge changes from topics "presubmit-am-21467bac639546abb87776fa53a3459a", "presubmit-am-91ee056e41174db39dd02eabfb9e3eac" into tm-dev am: 4ef511ba81
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17409723
Change-Id: I0dfbf9bee94ad25636f2fb5521f022d53130e2b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-03-30 21:07:40 +00:00 |
|
TreeHugger Robot
|
875afb9244
|
[automerger skipped] Merge "RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps." into qt-dev am: 6923c0d102 am: 0fdbb79d9c -s ours am: 49903f64b5 -s ours am: 263e7f5af1 -s ours am: ce83bd7860 -s ours am: b96ca97ae8 -s ours am: 93cbb241b0 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17400663
Change-Id: I6405a1c123f36d23d32a7b32a63dc72a5b861691
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-03-30 21:07:23 +00:00 |
|
Oli Lan
|
c32f8da855
|
[automerger skipped] RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps. am: a7621e0ce0 am: 9b7e9a00b8 -s ours am: 8ad62a15f7 -s ours am: 42ce04bda8 -s ours am: fc3dc6e083 -s ours am: 3825806427 -s ours am: fc7f22bf8d -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17400663
Change-Id: Idf3a0740cdb3005ee384e849ad9441c0d9288bba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-03-30 21:07:16 +00:00 |
|
Treehugger Robot
|
1ecc22cf90
|
Merge "Update owners of framework-jarjar-rules.txt" am: cf13ba50cd am: 8ca2b1f53d am: 7c67f2f583 am: 8cbadb631b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2049725
Change-Id: I3f9b7a96a8c80db096593583d36e5aa5dd36c1b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-03-30 21:06:27 +00:00 |
|
Josh Tsuji
|
4ef511ba81
|
Merge changes from topics "presubmit-am-21467bac639546abb87776fa53a3459a", "presubmit-am-91ee056e41174db39dd02eabfb9e3eac" into tm-dev
* changes:
Re-enable remote occlude/unocclude animations.
Add unocclude animation.
|
2022-03-30 21:01:59 +00:00 |
|
TreeHugger Robot
|
93cbb241b0
|
[automerger skipped] Merge "RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps." into qt-dev am: 6923c0d102 am: 0fdbb79d9c -s ours am: 49903f64b5 -s ours am: 263e7f5af1 -s ours am: ce83bd7860 -s ours am: b96ca97ae8 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17400663
Change-Id: Ib2c8e57a75e67daf16e474a2ac5ce0c74d70501b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-03-30 20:52:50 +00:00 |
|
TreeHugger Robot
|
b9573bc095
|
[automerger skipped] Merge "RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps." into qt-dev am: 6923c0d102 am: 0fdbb79d9c -s ours am: 49903f64b5 -s ours am: 263e7f5af1 -s ours am: ce83bd7860 -s ours am: 2f5a38fcab -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17400663
Change-Id: I7c745490d1c259c67244b740fc5941d08bf2faca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-03-30 20:52:36 +00:00 |
|
Oli Lan
|
03b2b4d180
|
[automerger skipped] RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps. am: a7621e0ce0 am: 9b7e9a00b8 -s ours am: 8ad62a15f7 -s ours am: 42ce04bda8 -s ours am: fc3dc6e083 -s ours am: 90f9e26f77 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17400663
Change-Id: I8c2ddb167b04561a822608aa3adc4458f7b546a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-03-30 20:52:29 +00:00 |
|
Oli Lan
|
fc7f22bf8d
|
[automerger skipped] RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps. am: a7621e0ce0 am: 9b7e9a00b8 -s ours am: 8ad62a15f7 -s ours am: 42ce04bda8 -s ours am: fc3dc6e083 -s ours am: 3825806427 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17400663
Change-Id: I67b30fb333a7f2b4254422f45971edcbfef56f9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-03-30 20:52:29 +00:00 |
|
Treehugger Robot
|
8cbadb631b
|
Merge "Update owners of framework-jarjar-rules.txt" am: cf13ba50cd am: 8ca2b1f53d am: 7c67f2f583
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2049725
Change-Id: I7e1c84f94cee23a31661a3318c2a7d2d0f82172d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-03-30 20:43:17 +00:00 |
|
TreeHugger Robot
|
2f5a38fcab
|
[automerger skipped] Merge "RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps." into qt-dev am: 6923c0d102 am: 0fdbb79d9c -s ours am: 49903f64b5 -s ours am: 263e7f5af1 -s ours am: ce83bd7860 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17400663
Change-Id: I308b372b6946e7368535bbd5fb43a3988f5e24fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-03-30 20:36:54 +00:00 |
|
Oli Lan
|
90f9e26f77
|
[automerger skipped] RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps. am: a7621e0ce0 am: 9b7e9a00b8 -s ours am: 8ad62a15f7 -s ours am: 42ce04bda8 -s ours am: fc3dc6e083 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17400663
Change-Id: I48ef33ccadeaa8156f3995af9ec044a0f3d28af3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-03-30 20:36:43 +00:00 |
|
TreeHugger Robot
|
b96ca97ae8
|
[automerger skipped] Merge "RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps." into qt-dev am: 6923c0d102 am: 0fdbb79d9c -s ours am: 49903f64b5 -s ours am: 263e7f5af1 -s ours am: ce83bd7860 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17400663
Change-Id: I27ef8bd1bfcca2b2f1c45dc300dec3e377ec204b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-03-30 20:35:49 +00:00 |
|
Oli Lan
|
3825806427
|
[automerger skipped] RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps. am: a7621e0ce0 am: 9b7e9a00b8 -s ours am: 8ad62a15f7 -s ours am: 42ce04bda8 -s ours am: fc3dc6e083 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17400663
Change-Id: I0ba1cbedde385659893d4a8d94ac2cd96875395f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-03-30 20:35:35 +00:00 |
|
Treehugger Robot
|
7c67f2f583
|
Merge "Update owners of framework-jarjar-rules.txt" am: cf13ba50cd am: 8ca2b1f53d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2049725
Change-Id: I623886bb6c1504550851cf03cf7278c5a4e0ab4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-03-30 20:20:56 +00:00 |
|
Chavi Weingarten
|
06a23504d3
|
Merge "Add ScopedLocalRef for javaObjectForIBinder" into tm-dev am: 29ffb6bab2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17507947
Change-Id: Ie44deaaaba0256fcdc8ca9700c595b7b839be7ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-03-30 20:19:47 +00:00 |
|
Rob Carr
|
2673d4ed0f
|
Merge "DisplayContent: Don't force-update parent if layering didn't change" into tm-dev am: 724c3547ec
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17436026
Change-Id: Ib26431b20a2bc860c2b18f224f1e38e3e1b83a3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-03-30 20:19:31 +00:00 |
|
Treehugger Robot
|
3055991937
|
[automerger skipped] Merge "Update handover rule java doc" am: a535dfe28a am: 40555ca1fa am: f214f95f6b -s ours am: 8b299f4240 -s ours
am skip reason: Merged-In I784ac4b58ea64baf90ec7faf7a25dda5cd1c31cc with SHA-1 4fcecfd6f5 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2050104
Change-Id: I58ae630803e680a382158230657df409c42e0a96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-03-30 20:19:21 +00:00 |
|
TreeHugger Robot
|
ce83bd7860
|
[automerger skipped] Merge "RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps." into qt-dev am: 6923c0d102 am: 0fdbb79d9c -s ours am: 49903f64b5 -s ours am: 263e7f5af1 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17400663
Change-Id: I1dfc5c3ca4833559ce1e69dacec1cca1dcf88f1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-03-30 20:18:59 +00:00 |
|
Oli Lan
|
fc3dc6e083
|
[automerger skipped] RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps. am: a7621e0ce0 am: 9b7e9a00b8 -s ours am: 8ad62a15f7 -s ours am: 42ce04bda8 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17400663
Change-Id: I48e8e94d01e2389d60e88b3613e420eae1029a6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-03-30 20:18:52 +00:00 |
|
Evan Rosky
|
f0dfb84bcd
|
Add alternative to deprecated API
Bug: 217742181
Test: N/A, just comment change
Change-Id: Icf995b30ff12fc65d6b7455bb18e92882ad9f58f
|
2022-03-30 20:15:45 +00:00 |
|
Chavi Weingarten
|
29ffb6bab2
|
Merge "Add ScopedLocalRef for javaObjectForIBinder" into tm-dev
|
2022-03-30 20:12:36 +00:00 |
|
Rob Carr
|
724c3547ec
|
Merge "DisplayContent: Don't force-update parent if layering didn't change" into tm-dev
|
2022-03-30 19:59:00 +00:00 |
|
Treehugger Robot
|
8b299f4240
|
[automerger skipped] Merge "Update handover rule java doc" am: a535dfe28a am: 40555ca1fa am: f214f95f6b -s ours
am skip reason: Merged-In I784ac4b58ea64baf90ec7faf7a25dda5cd1c31cc with SHA-1 4fcecfd6f5 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2050104
Change-Id: I7196e6bd812d516a5595dd24bba08de09b44fe7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-03-30 19:55:59 +00:00 |
|
Treehugger Robot
|
8ca2b1f53d
|
Merge "Update owners of framework-jarjar-rules.txt" am: cf13ba50cd
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2049725
Change-Id: I762ee23d69ec3aef16f049a560c59e61d73f7bcc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-03-30 19:55:40 +00:00 |
|
TreeHugger Robot
|
263e7f5af1
|
[automerger skipped] Merge "RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps." into qt-dev am: 6923c0d102 am: 0fdbb79d9c -s ours am: 49903f64b5 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17400663
Change-Id: If7590cdc14f8e54fab61a60ae2554af8d1203d6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-03-30 19:55:26 +00:00 |
|
Oli Lan
|
42ce04bda8
|
[automerger skipped] RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps. am: a7621e0ce0 am: 9b7e9a00b8 -s ours am: 8ad62a15f7 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17400663
Change-Id: I3e326c5956805fa28de724b38deaf1f76c9c3afe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-03-30 19:55:13 +00:00 |
|
Treehugger Robot
|
f214f95f6b
|
Merge "Update handover rule java doc" am: a535dfe28a am: 40555ca1fa
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2050104
Change-Id: I606672038d2eb96ae364680f711746f3486a2cd2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-03-30 19:31:40 +00:00 |
|
Jing Ji
|
f192311258
|
Merge "Decouple the thresholds of the background restrictions" into tm-dev am: 19e584cf33
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17419863
Change-Id: I7665f7610f0f055a84c821626dc92d1bb27fe0e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-03-30 19:30:33 +00:00 |
|
TreeHugger Robot
|
49903f64b5
|
[automerger skipped] Merge "RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps." into qt-dev am: 6923c0d102 am: 0fdbb79d9c -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17400663
Change-Id: I1a456fa7eec0d7e30b075709e758aa73681fddc3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-03-30 19:29:45 +00:00 |
|
Oli Lan
|
8ad62a15f7
|
[automerger skipped] RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps. am: a7621e0ce0 am: 9b7e9a00b8 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17400663
Change-Id: I1dc9ab48fc62f35935bb959acafb66725f1cdd19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-03-30 19:29:27 +00:00 |
|
Treehugger Robot
|
cf13ba50cd
|
Merge "Update owners of framework-jarjar-rules.txt"
|
2022-03-30 19:26:45 +00:00 |
|
Jing Ji
|
19e584cf33
|
Merge "Decouple the thresholds of the background restrictions" into tm-dev
|
2022-03-30 19:18:16 +00:00 |
|
Treehugger Robot
|
ce2b3c1d08
|
Merge "Added Java bindings to async trace functions with track argument" am: 004bb42f93 am: 83b26d260d am: b5c308d7b2 am: 1e7f831d5b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2048185
Change-Id: Ic67af83c71fc55374f9609ab58f65f8f34769bd3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-03-30 19:12:17 +00:00 |
|
Tim Murray
|
541aae4a0c
|
Merge "Update OWNERS for tracing, including the Java APIs." am: 45f3622eb3 am: a8888da2a2 am: 8f7679aeea am: ef1b9a9562
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2049990
Change-Id: I750c597c9bc81666c5d9f9bcc63128501c5bfcc4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-03-30 19:11:59 +00:00 |
|
Tim Murray
|
3b7874f480
|
Merge "update OWNERS for trace APIs" am: 1eb344eda8 am: f1f3525430 am: 319d6c5584 am: a10664d522
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2048186
Change-Id: I48c7fef84cbc0221274dc350e9d9a2034efc0c22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-03-30 19:11:39 +00:00 |
|