Nick Chameyev
fa005d7c08
Merge "Continue folding animation after it cancelled if necessary" into tm-dev am: 54c3d1b82e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17346988
Change-Id: I96e2ec540bc5bd8f7b0a0c2e8fe1c490fd7be33f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-25 10:33:34 +00:00
Kyunglyul Hyun
09c018ab7f
Merge "Set audio route name when LE audio device is connected" am: dd1a3bae15 am: 0ef7fe46ad am: 716f23d92f am: 5c2bad1c59
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2038603
Change-Id: I3488e620379f1104046711cff09f4c4cfed1066c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-25 10:32:56 +00:00
Automerger Merge Worker
91cc2cf4e8
Merge "Merge "[Motion] Split-shade transition on LS: cross-fade status bars" into tm-dev am: 6e322a23e9"
2022-03-25 10:32:38 +00:00
Remi NGUYEN VAN
9580d5b0ed
Merge changes from topic "conn_t_move_master"
...
* changes:
Remove stale aidl-export references
Move ConnectivityT to packages/modules
2022-03-25 10:32:19 +00:00
Christian Göllner
5e4e98ea4f
Merge "[Motion] Split-shade transition on LS: cross-fade status bars" into tm-dev am: 6e322a23e9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17378063
Change-Id: I8707de5d3f0cda941751bbdf7945f4d5e3c1f141
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-25 10:32:16 +00:00
Mark Chien
83bd93aee5
Merge "Rename updateFirewallRule to setUidFirewallRule" into tm-dev am: 157f669633 am: 781091741b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17319303
Change-Id: I85a78f1c7fc37467cbd6ba99f9bf96423cde8cb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-25 10:29:57 +00:00
Rubin Xu
2a0ef6a596
Merge "device policy: ignore unknown permission in setPermissionGrantState" into tm-dev am: 498f7bf260 am: 3fb352c470
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17352004
Change-Id: Ic6413f643bc7011ed0fdcd48435b644ca5de9469
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-25 10:29:28 +00:00
Piotr Wilczyński
a7f03785a2
Merge "More initialisation for external displays Change the FLAG_DEFAULT_DISPLAY to FLAG_SUPPORTS_DEFAULT_DISPLAY When the default display of the default layout is removed, find another display and make it default" into tm-dev am: a3a39631e9 am: a643556a06
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17071392
Change-Id: I89e2022eaa13398f18e5e3f98355ec1cea966093
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-25 10:28:54 +00:00
Nick Chameyev
54c3d1b82e
Merge "Continue folding animation after it cancelled if necessary" into tm-dev
2022-03-25 10:28:40 +00:00
Oli Lan
a7b4c1c79f
Merge "Prevent non-admin users from deleting system apps." into tm-dev am: 224481ec0e am: 311db3a0c5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17352264
Change-Id: I250277938a3b02b7f3c4bbe175e2416f8452b48e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-25 10:28:13 +00:00
Rubin Xu
e01439b00a
Merge changes from topic "presubmit-am-4af7c72a3ef84c01ade42047ba306467" into tm-mainline-prod am: d225bc58f1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17352004
Change-Id: I96914fd8d6e125562e94e36d6111b3a04b7c2e1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-25 10:27:29 +00:00
Kyunglyul Hyun
5c2bad1c59
Merge "Set audio route name when LE audio device is connected" am: dd1a3bae15 am: 0ef7fe46ad am: 716f23d92f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2038603
Change-Id: I1576576cf0146230f680ba954f5d5107df379aa2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-25 10:26:02 +00:00
Christian Göllner
6e322a23e9
Merge "[Motion] Split-shade transition on LS: cross-fade status bars" into tm-dev
2022-03-25 10:25:34 +00:00
Mark Chien
dcc8f22bfc
Merge "Rename updateFirewallRule to setUidFirewallRule" into tm-dev am: 157f669633
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17319303
Change-Id: I9974c23fb749e6c41aa675a00d99e4154af819ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-25 10:19:27 +00:00
Rubin Xu
37bc205ce7
Merge "device policy: ignore unknown permission in setPermissionGrantState" into tm-dev am: 498f7bf260
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17352004
Change-Id: Ie7a9886fa3ecadc516e99afa0069c4e9a2459085
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-25 10:18:53 +00:00
Mark Chien
781091741b
Merge "Rename updateFirewallRule to setUidFirewallRule" into tm-dev am: 157f669633
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17319303
Change-Id: Ieefb3018f66bf6885fa8d19b5cd9701aa0847c8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-25 10:18:48 +00:00
Rubin Xu
3fb352c470
Merge "device policy: ignore unknown permission in setPermissionGrantState" into tm-dev am: 498f7bf260
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17352004
Change-Id: I1ac875b12ebce428ce6509e2ee58a020bf3a4754
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-25 10:18:24 +00:00
Piotr Wilczyński
d42632bd0e
Merge "More initialisation for external displays Change the FLAG_DEFAULT_DISPLAY to FLAG_SUPPORTS_DEFAULT_DISPLAY When the default display of the default layout is removed, find another display and make it default" into tm-dev am: a3a39631e9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17071392
Change-Id: I879bf20261ac7f2993d8995f1e4e78cf3dd550ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-25 10:18:13 +00:00
Piotr Wilczyński
a643556a06
Merge "More initialisation for external displays Change the FLAG_DEFAULT_DISPLAY to FLAG_SUPPORTS_DEFAULT_DISPLAY When the default display of the default layout is removed, find another display and make it default" into tm-dev am: a3a39631e9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17071392
Change-Id: Idca7eff8ab59fc0b6b1e718ab4817ad697fb598b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-25 10:18:02 +00:00
Oli Lan
71c97a4108
Merge "Prevent non-admin users from deleting system apps." into tm-dev am: 224481ec0e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17352264
Change-Id: I08b1e05fd528cc35a05b75a355a7f79510ddad96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-25 10:17:37 +00:00
Oli Lan
311db3a0c5
Merge "Prevent non-admin users from deleting system apps." into tm-dev am: 224481ec0e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17352264
Change-Id: Ie4e4f3ded1bb68f2d4b6650887371502b3e7c86f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-25 10:17:35 +00:00
Mark Chien
157f669633
Merge "Rename updateFirewallRule to setUidFirewallRule" into tm-dev
2022-03-25 10:14:28 +00:00
Rubin Xu
d225bc58f1
Merge changes from topic "presubmit-am-4af7c72a3ef84c01ade42047ba306467" into tm-mainline-prod
...
* changes:
[automerge] device policy: ignore unknown permission in setPermissionGrantState 2p: d71c0ce305
device policy: ignore unknown permission in setPermissionGrantState
2022-03-25 10:12:43 +00:00
Rubin Xu
498f7bf260
Merge "device policy: ignore unknown permission in setPermissionGrantState" into tm-dev
2022-03-25 10:12:43 +00:00
Rubin Xu
7b74ea118c
Merge changes from topic "presubmit-am-4af7c72a3ef84c01ade42047ba306467"
...
* changes:
[automerge] device policy: ignore unknown permission in setPermissionGrantState 2p: d71c0ce305 2p: 04e70d1b0b
[automerge] device policy: ignore unknown permission in setPermissionGrantState 2p: d71c0ce305
device policy: ignore unknown permission in setPermissionGrantState
2022-03-25 10:12:42 +00:00
Piotr Wilczyński
a3a39631e9
Merge "More initialisation for external displays Change the FLAG_DEFAULT_DISPLAY to FLAG_SUPPORTS_DEFAULT_DISPLAY When the default display of the default layout is removed, find another display and make it default" into tm-dev
2022-03-25 10:07:55 +00:00
Kyunglyul Hyun
716f23d92f
Merge "Set audio route name when LE audio device is connected" am: dd1a3bae15 am: 0ef7fe46ad
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2038603
Change-Id: I219e7d25f32e8d469deaa0c68dad16dc89616a14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-25 10:03:27 +00:00
Oli Lan
224481ec0e
Merge "Prevent non-admin users from deleting system apps." into tm-dev
2022-03-25 10:00:41 +00:00
Christian Göllner
37b8d92252
Merge "Requery silent notifs lockscreen setting on change" into tm-dev am: 9711658113 am: 367f743e66
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17386661
Change-Id: Idb75e31de23ceac1bf6cc026121a9117c7225e5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-25 09:49:09 +00:00
Nicolò Mazzucato
ca4c897928
Merge "Tune fold animation on top of apps" into tm-dev am: c1f95fd38b am: 5906babbdb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17375005
Change-Id: I882694d1e22d8c3c5e0ed9df9cfff26f4e5f7d99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-25 09:48:38 +00:00
Christian Göllner
5ce9381242
Merge "LockscreenShadeTransitionController: add more tests for DepthController interactions" into tm-dev am: 36ad1aee13 am: 5d86671a38
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17346987
Change-Id: I7e91683dc6ccb4459222de1a9988b7fcdf465cb0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-25 09:48:07 +00:00
Christian Göllner
36c4a28d9f
Merge "Requery silent notifs lockscreen setting on change" into tm-dev am: 9711658113
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17386661
Change-Id: I9ee033a06d2159cd1268d089567d77a5c2fa417a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-25 09:40:32 +00:00
Christian Göllner
367f743e66
Merge "Requery silent notifs lockscreen setting on change" into tm-dev am: 9711658113
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17386661
Change-Id: I0e5c656a494a36c32969d239148b0f3279c9caae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-25 09:40:26 +00:00
Kyunglyul Hyun
0ef7fe46ad
Merge "Set audio route name when LE audio device is connected" am: dd1a3bae15
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2038603
Change-Id: I399d2bb259d50916c575e59621ddfaf798affc5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-25 09:40:14 +00:00
Christian Göllner
9711658113
Merge "Requery silent notifs lockscreen setting on change" into tm-dev
2022-03-25 09:36:49 +00:00
Nicolò Mazzucato
5906babbdb
Merge "Tune fold animation on top of apps" into tm-dev am: c1f95fd38b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17375005
Change-Id: Id174a58c5c7f65980f0c28879516e0be857797ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-25 09:33:29 +00:00
Christian Göllner
5d86671a38
Merge "LockscreenShadeTransitionController: add more tests for DepthController interactions" into tm-dev am: 36ad1aee13
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17346987
Change-Id: Iaf27ae86643de4875fe97ef76d099d244c2b6cef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-25 09:33:10 +00:00
Nicolò Mazzucato
2de10660ef
Merge "Tune fold animation on top of apps" into tm-dev am: c1f95fd38b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17375005
Change-Id: I040e2fc797c96e6289b1de15d7145dd7fc692433
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-25 09:33:06 +00:00
Christian Göllner
c462f74b47
Merge "LockscreenShadeTransitionController: add more tests for DepthController interactions" into tm-dev am: 36ad1aee13
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17346987
Change-Id: Ib2d2b2483ee256ca0c6a1811e48ce584388a7e73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-25 09:32:17 +00:00
Nicolò Mazzucato
c1f95fd38b
Merge "Tune fold animation on top of apps" into tm-dev
2022-03-25 09:31:11 +00:00
Kyunglyul Hyun
dd1a3bae15
Merge "Set audio route name when LE audio device is connected"
2022-03-25 09:25:22 +00:00
Philip Junker
587c65ace6
Merge "Add support for more keycodes to reference remote control." into tm-dev am: 1ccb6f2a4c am: b3ed93e344
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17124323
Change-Id: Id7dee1dafeef110db87ba122cccafe955c7acb10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-25 09:21:19 +00:00
Cliff Wu
1ce72d42e7
Merge "Update toast strings for blocking camera to match UX guideline" into tm-dev am: 9df4056dcb am: 8e9cfadd09
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17184432
Change-Id: I4d901ac2135c68ee61edf53efe15f5150c24f612
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-25 09:20:37 +00:00
Philip Junker
b15330e95f
Merge changes from topic "cherrypick-ref_rcu_keylayout-vedrcybalt" into tm-mainline-prod am: d65af06856
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17124323
Change-Id: Ide546d193780625649be25bd08ae2dd9b5db32c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-25 09:19:52 +00:00
Christian Göllner
36ad1aee13
Merge "LockscreenShadeTransitionController: add more tests for DepthController interactions" into tm-dev
2022-03-25 09:17:46 +00:00
Philip Junker
fa8021ea10
Merge "Add support for more keycodes to reference remote control." into tm-dev am: 1ccb6f2a4c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17124323
Change-Id: I0f6697dc7f811a979d81cf574f894e3afd52a173
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-25 09:05:05 +00:00
Philip Junker
b3ed93e344
Merge "Add support for more keycodes to reference remote control." into tm-dev am: 1ccb6f2a4c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17124323
Change-Id: I7774ccbc0e01aa169a98f4637feb50527f3673d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-25 09:04:42 +00:00
Cliff Wu
fb4874bc82
Merge "Update toast strings for blocking camera to match UX guideline" into tm-dev am: 9df4056dcb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17184432
Change-Id: Ie417dce5091da2ca466ff646c49b04e2fb74460a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-25 09:04:28 +00:00
Cliff Wu
8e9cfadd09
Merge "Update toast strings for blocking camera to match UX guideline" into tm-dev am: 9df4056dcb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17184432
Change-Id: I4e40ac7cdf52e7460ca9cc6e71264ceb44216c5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-25 09:04:09 +00:00
Philip Junker
d65af06856
Merge changes from topic "cherrypick-ref_rcu_keylayout-vedrcybalt" into tm-mainline-prod
...
* changes:
[automerge] Add support for more keycodes to reference remote control. 2p: b22e51a372
Add support for more keycodes to reference remote control.
2022-03-25 09:02:35 +00:00