Commit Graph

761028 Commits

Author SHA1 Message Date
Nate Myren
73ab925347 Merge "Grant Notifications to Carrier Provisioning App" into tm-dev am: 0a6c6f8d01 am: 256c7daccc
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17697690

Change-Id: Ie7308147883e6494b273d850c5dc9d63dafdad01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 08:41:45 +00:00
Automerger Merge Worker
f584e7b1a3 Merge "Merge "Allow activity in ActivityEmbedding split to get Task windowing mode" into tm-dev am: 8358f51ed3 am: 7c9f75dba7" into tm-d1-dev-plus-aosp 2022-04-28 08:41:39 +00:00
Nate Myren
8bebed739b Merge "Grant Notifications to Carrier Provisioning App" into tm-dev am: 0a6c6f8d01 am: 502742fd3a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17697690

Change-Id: I56b462c1e257768d03692b228fb848e4ab8c5cf2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 08:41:28 +00:00
TreeHugger Robot
df7a00c3b5 Merge "Allow activity in ActivityEmbedding split to get Task windowing mode" into tm-dev am: 8358f51ed3 am: 7c9f75dba7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17905030

Change-Id: I6b5461f71af8eaac44566b5d7dbd4a04470df53a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 08:41:27 +00:00
TreeHugger Robot
d45a52af2a Merge "Allow activity in ActivityEmbedding split to get Task windowing mode" into tm-dev am: 8358f51ed3 am: 3fb063ed49
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17905030

Change-Id: Ica02fb7e27ee07257307adde0893855d4796fffb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 08:41:11 +00:00
Nate Myren
256c7daccc Merge "Grant Notifications to Carrier Provisioning App" into tm-dev am: 0a6c6f8d01
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17697690

Change-Id: I0960c49a46fb06a69534ce35cf2a3e1ae0b7b7e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 07:53:06 +00:00
TreeHugger Robot
7c9f75dba7 Merge "Allow activity in ActivityEmbedding split to get Task windowing mode" into tm-dev am: 8358f51ed3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17905030

Change-Id: Icca25bd2061f7e4042d3912c7fab3fa68b59561b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 07:52:41 +00:00
Nate Myren
502742fd3a Merge "Grant Notifications to Carrier Provisioning App" into tm-dev am: 0a6c6f8d01
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17697690

Change-Id: Ia88ea9a23f69866f8dc0f348d3b24817000006d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 07:52:33 +00:00
TreeHugger Robot
3fb063ed49 Merge "Allow activity in ActivityEmbedding split to get Task windowing mode" into tm-dev am: 8358f51ed3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17905030

Change-Id: I2e83e757d35a2e92f3aa98a0cb96c305e2083119
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 07:51:48 +00:00
Automerger Merge Worker
3e1e5a7b22 Merge "Merge "Make cuj be synchrous among atoms.proto and InteractionJankMonitor" into tm-dev am: 6298c68c71 am: b728130f3a" into tm-d1-dev-plus-aosp 2022-04-28 07:34:35 +00:00
TreeHugger Robot
2760f0539c Merge "Make cuj be synchrous among atoms.proto and InteractionJankMonitor" into tm-dev am: 6298c68c71 am: b728130f3a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17951299

Change-Id: I9f24914ef23ee131da5f55ed01b4d72ae9fe7cd2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 07:34:21 +00:00
TreeHugger Robot
f5534a472d Merge "Make cuj be synchrous among atoms.proto and InteractionJankMonitor" into tm-dev am: 6298c68c71 am: a2a2a8177d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17951299

Change-Id: I6af7748017b1d23d11c2d6535e64fefc734675dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 07:34:19 +00:00
Nate Myren
0a6c6f8d01 Merge "Grant Notifications to Carrier Provisioning App" into tm-dev 2022-04-28 06:58:08 +00:00
TreeHugger Robot
8358f51ed3 Merge "Allow activity in ActivityEmbedding split to get Task windowing mode" into tm-dev 2022-04-28 06:36:38 +00:00
TreeHugger Robot
b728130f3a Merge "Make cuj be synchrous among atoms.proto and InteractionJankMonitor" into tm-dev am: 6298c68c71
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17951299

Change-Id: Ic41dbecaffb2ef266ea4a77e2e885a15a639d405
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 06:22:38 +00:00
TreeHugger Robot
a2a2a8177d Merge "Make cuj be synchrous among atoms.proto and InteractionJankMonitor" into tm-dev am: 6298c68c71
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17951299

Change-Id: I59c67f1689cc4176ac378a291a341d8c0fecff8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 06:20:59 +00:00
TreeHugger Robot
6298c68c71 Merge "Make cuj be synchrous among atoms.proto and InteractionJankMonitor" into tm-dev 2022-04-28 05:47:54 +00:00
Stanley Wang
6592151925 Merge "Fixe the problem of invalid switch preference." into tm-dev am: 3797d0904b am: 21aa6d563b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17956549

Change-Id: Ia1578e14f6e3f3f77e290adea8ce3dc5aba824b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 05:46:20 +00:00
Stanley Wang
a5a72560b3 Merge "Fixe the problem of invalid switch preference." into tm-dev am: 3797d0904b am: 4532f7f99e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17956549

Change-Id: Ie76ad77557c5b05a4b5fb4a068bddcaa4438662c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 05:29:12 +00:00
TreeHugger Robot
2c4fcfd475 Merge "Fixes un-setting activity type when embed activity in split-screen" into tm-dev am: 0fb7a12804 am: 9b9c7f1100
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17800405

Change-Id: I31aaa6a712a52abb5f5e1c25d693b9ca838226d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 05:28:51 +00:00
Stanley Wang
21aa6d563b Merge "Fixe the problem of invalid switch preference." into tm-dev am: 3797d0904b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17956549

Change-Id: I2311be822a8eb17f2fa7673d95b1e33b8d02c3ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 05:27:33 +00:00
Stanley Wang
4532f7f99e Merge "Fixe the problem of invalid switch preference." into tm-dev am: 3797d0904b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17956549

Change-Id: I405a89236d0a94da44035bf2528df3915003e6d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 05:22:00 +00:00
TreeHugger Robot
5e22f8549b Merge "Fixes un-setting activity type when embed activity in split-screen" into tm-dev am: 0fb7a12804 am: 31918e910d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17800405

Change-Id: I518621842f63938ad18733d918f3ec1c501a0e9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 05:21:23 +00:00
TreeHugger Robot
9b9c7f1100 Merge "Fixes un-setting activity type when embed activity in split-screen" into tm-dev am: 0fb7a12804
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17800405

Change-Id: I55bdf31ac3e41dd90fbb2e364ee9c21770e4a8eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 05:21:11 +00:00
Automerger Merge Worker
599c1cafa1 Merge "Merge "Add DeviceConfig namespace for Vendor System Native" into tm-dev am: 5a7dafba62 am: 8f856a17e5" into tm-d1-dev-plus-aosp 2022-04-28 05:21:10 +00:00
Jenhao Chen
c0063f8469 Merge "Add DeviceConfig namespace for Vendor System Native" into tm-dev am: 5a7dafba62 am: 8f856a17e5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17473270

Change-Id: Ie4323d658004f7d5cc1f69f5e53b067c413a401c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 05:21:06 +00:00
Jenhao Chen
c77beccf69 Merge "Add DeviceConfig namespace for Vendor System Native" into tm-dev am: 5a7dafba62 am: 1108d2259a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17473270

Change-Id: Ia04d9ae143a7c95f296cfa1dd311b82a0d685c9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 05:21:05 +00:00
Stanley Wang
3797d0904b Merge "Fixe the problem of invalid switch preference." into tm-dev 2022-04-28 05:20:53 +00:00
TreeHugger Robot
1498d3c0a8 Merge "Make GameSessionTrampolineActivity invisible" into tm-dev am: a74842fe07 am: f12a6b47a8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17831912

Change-Id: I6ffb17d29cb4e77589f51bc5f3e9fe9d63b68e82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 05:20:50 +00:00
Jenhao Chen
8f856a17e5 Merge "Add DeviceConfig namespace for Vendor System Native" into tm-dev am: 5a7dafba62
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17473270

Change-Id: If48835db18a5ac5b17f31598be10750065cb27d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 05:20:48 +00:00
TreeHugger Robot
a6c4bf180b Merge "Make GameSessionTrampolineActivity invisible" into tm-dev am: a74842fe07 am: d7271882d4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17831912

Change-Id: I25b641c20491de62f69a51078405593e4bdf5bb1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 05:20:40 +00:00
TreeHugger Robot
2130b0f07a Merge "Update launch root rule to consider candidate task if needed" into tm-dev am: 5793f436ad am: f52d2409ae
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17856863

Change-Id: I2a87ace700e584d1e765b6ae6aaaf20922b41ba1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 05:20:35 +00:00
TreeHugger Robot
c30dcc48f3 Merge "Update launch root rule to consider candidate task if needed" into tm-dev am: 5793f436ad am: 83fdc94d5a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17856863

Change-Id: I05c6e9fda362979f728d59e55249da986cc3341f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 05:20:28 +00:00
TreeHugger Robot
d7271882d4 Merge "Make GameSessionTrampolineActivity invisible" into tm-dev am: a74842fe07
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17831912

Change-Id: I9cc9cad4ef839f213f5ab8903f5671e974a8cef2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 05:20:23 +00:00
Nate Myren
7512959078 Merge "Sort list of flags, change comment about REVIEW_REQUIRED" into tm-dev am: 13deb7ff04 am: b301dd5f0b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17805782

Change-Id: Ie2014ed376c363b6ee6022ba34350fa1addcf6f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 05:20:19 +00:00
TreeHugger Robot
31918e910d Merge "Fixes un-setting activity type when embed activity in split-screen" into tm-dev am: 0fb7a12804
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17800405

Change-Id: I7f40736a5420c5fc55a8cadc382709f040fc5160
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 05:20:13 +00:00
Jinyoung Jeong
9178ad472a Merge "Add a protected broadcast for FDR" into tm-dev am: 42788d73f9 am: 62ea22e3dc
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17938073

Change-Id: Idd693bd61fb79f02c15feabceeeaee230a03fde9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 05:20:08 +00:00
Jenhao Chen
1108d2259a Merge "Add DeviceConfig namespace for Vendor System Native" into tm-dev am: 5a7dafba62
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17473270

Change-Id: Ia5a17d277e10d04e5acdcfde08645bc153ff9532
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 05:20:04 +00:00
Nate Myren
037ceb021b Merge "Sort list of flags, change comment about REVIEW_REQUIRED" into tm-dev am: 13deb7ff04 am: d14a09fc25
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17805782

Change-Id: I58c8faa658b1d98c952554de898ca616797acf76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 05:20:02 +00:00
Kweku Adams
2538c04087 Merge "Make TARE DeviceConfig-urable." into tm-dev am: bed9d116ab am: 835e471fc2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17947563

Change-Id: I071039932fc84eb91f2b588159c48bc6dfcc0c04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 05:19:40 +00:00
TreeHugger Robot
83fdc94d5a Merge "Update launch root rule to consider candidate task if needed" into tm-dev am: 5793f436ad
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17856863

Change-Id: I911567cf4b950681fcfaa9a02719d2adf87e9a47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 05:19:23 +00:00
TreeHugger Robot
f12a6b47a8 Merge "Make GameSessionTrampolineActivity invisible" into tm-dev am: a74842fe07
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17831912

Change-Id: I52e0fef4f926695a10f71df928d7e10608d4e05a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 05:19:16 +00:00
Jinyoung Jeong
c59bd2ac9d Merge "Add a protected broadcast for FDR" into tm-dev am: 42788d73f9 am: b072a107c1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17938073

Change-Id: I50544dd981a936cc781c05a868c269ed1fd54567
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 05:19:13 +00:00
TreeHugger Robot
f52d2409ae Merge "Update launch root rule to consider candidate task if needed" into tm-dev am: 5793f436ad
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17856863

Change-Id: I56a77ceccdd3d4e2b39dc66f3142c51cd88a76b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 05:18:06 +00:00
TreeHugger Robot
0fb7a12804 Merge "Fixes un-setting activity type when embed activity in split-screen" into tm-dev 2022-04-28 04:50:45 +00:00
Jenhao Chen
5a7dafba62 Merge "Add DeviceConfig namespace for Vendor System Native" into tm-dev 2022-04-28 04:40:02 +00:00
TreeHugger Robot
a74842fe07 Merge "Make GameSessionTrampolineActivity invisible" into tm-dev 2022-04-28 04:32:39 +00:00
TreeHugger Robot
5793f436ad Merge "Update launch root rule to consider candidate task if needed" into tm-dev 2022-04-28 04:14:52 +00:00
Nate Myren
b301dd5f0b Merge "Sort list of flags, change comment about REVIEW_REQUIRED" into tm-dev am: 13deb7ff04
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17805782

Change-Id: I644111597a56ab701e9fdac0201f9165c031f34d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 03:41:18 +00:00
Nate Myren
d14a09fc25 Merge "Sort list of flags, change comment about REVIEW_REQUIRED" into tm-dev am: 13deb7ff04
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17805782

Change-Id: I598c796612979faf4570dd206ac604e3836e2fa7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 03:40:06 +00:00