Commit Graph

654187 Commits

Author SHA1 Message Date
TreeHugger Robot
207482d22c Merge "Set correct uid for headless system 0 in DnD PreferencesHelperTest" into sc-dev am: 173286e254
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15081240

Change-Id: Ibf22044006d2f5fda4ab80ecca61ce7a0787792c
2021-06-24 21:31:58 +00:00
Josh Tsuji
b6a39740c4 Merge "Start and end the lift reveal glow slightly farther off screen so it's not slightly visible at the end state." into sc-dev am: 172b1f1f02
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15096487

Change-Id: Ib005f2bcbc75aa062e72a65e361f0da33889b843
2021-06-24 21:31:37 +00:00
TreeHugger Robot
4dfd5b8542 Merge "Add boot flags for metadata query" into sc-dev am: 214898d047
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15097910

Change-Id: Iaa651e45e7e967edcacca31dd6afb6d6fb43a06e
2021-06-24 21:30:56 +00:00
TreeHugger Robot
173286e254 Merge "Set correct uid for headless system 0 in DnD PreferencesHelperTest" into sc-dev 2021-06-24 21:21:51 +00:00
Josh Tsuji
172b1f1f02 Merge "Start and end the lift reveal glow slightly farther off screen so it's not slightly visible at the end state." into sc-dev 2021-06-24 21:17:28 +00:00
TreeHugger Robot
214898d047 Merge "Add boot flags for metadata query" into sc-dev 2021-06-24 21:15:52 +00:00
TreeHugger Robot
080533e142 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 79f41e3ded -s ours am: fcb240344c -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15093140

Change-Id: I2f23b68c297d081e0380fbdcccf5e226854f5413
2021-06-24 20:51:50 +00:00
TreeHugger Robot
d5c97d2e9a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 3f33203d34 -s ours am: ae55c2d272 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15093142

Change-Id: I8e67cd4326750abfa1ad77a7c40d38cf78d8c60f
2021-06-24 20:51:43 +00:00
TreeHugger Robot
fcb240344c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 79f41e3ded -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15093140

Change-Id: I098c6f6b59faba206c8e31176c502bbc3e4a14cc
2021-06-24 20:42:16 +00:00
TreeHugger Robot
ae55c2d272 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 3f33203d34 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15093142

Change-Id: Ic5ea369ac25610e8a75c15a2e4b170e7af4895c4
2021-06-24 20:41:47 +00:00
Huihong Luo
afcc5e759c Merge "Fix a crash caused by transaction" into sc-dev am: 7580a2dd98
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15092219

Change-Id: I8d0431f5d0d94b706b98971c584d09f74233f5e4
2021-06-24 20:32:19 +00:00
Huihong Luo
7580a2dd98 Merge "Fix a crash caused by transaction" into sc-dev 2021-06-24 20:27:48 +00:00
Alison Cichowlas
0c544025e7 Merge "Direct share load cutback - minimal/low-risk version." into sc-dev am: cf49f78265
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15056134

Change-Id: I0d1ac0e6e78c82da4ff23197016a4fa34d24882a
2021-06-24 20:24:28 +00:00
TreeHugger Robot
87367c854c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 394b3b6ee9 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15092214

Change-Id: I3747367b3572e812ff27f9b3516e080033cad6ff
2021-06-24 20:24:23 +00:00
TreeHugger Robot
3f33203d34 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-06-24 20:24:06 +00:00
TreeHugger Robot
a709544f12 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2021-06-24 20:23:56 +00:00
TreeHugger Robot
1efebb423a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 4a78f521f5 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15081929

Change-Id: I7afc4e34a5a9b581f5a43f565ad08425cd8d48ff
2021-06-24 20:23:38 +00:00
TreeHugger Robot
79f41e3ded Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-06-24 20:22:55 +00:00
Alison Cichowlas
cf49f78265 Merge "Direct share load cutback - minimal/low-risk version." into sc-dev 2021-06-24 20:19:45 +00:00
TreeHugger Robot
394b3b6ee9 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-06-24 20:19:07 +00:00
TreeHugger Robot
4a78f521f5 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-06-24 20:07:37 +00:00
TreeHugger Robot
29acd2c00d Merge "Add OBSERVE_NETWORK_POLICY for shell to test CTS" into sc-dev am: e49d295079
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15047819

Change-Id: I13728f7afffac83b95d6b90ca71b089e0febcc7f
2021-06-24 19:53:12 +00:00
Fabian Kozynski
56056f78fb Add boot flags for metadata query
Test: manual, reboot with device locked, observe Focus Mode tile doesn't
have chevron.

Fixes: 190922185

Change-Id: Ic155637875981d065bc14075398a6644b80dc9d2
2021-06-24 15:40:51 -04:00
TreeHugger Robot
e49d295079 Merge "Add OBSERVE_NETWORK_POLICY for shell to test CTS" into sc-dev 2021-06-24 19:39:11 +00:00
Abhijoy Saha
154dabcae6 Set correct uid for headless system 0 in DnD PreferencesHelperTest
This fixes Dnd PreferenceHelper CTS tests for AAOS.

Fixes: 191803082
Test: atest com.android.server.notification.PreferencesHelperTest
Change-Id: I91339e8971fa1cea6abc696e084de1764b3b953a
2021-06-24 19:38:56 +00:00
Josh Tsuji
901730fe40 Start and end the lift reveal glow slightly farther off screen so it's not slightly visible at the end state.
Fixes: 190044198
Test: no more glow
Change-Id: If6ae1c90b9855f920062c0cd7c26f24a28d0635e
2021-06-24 15:17:47 -04:00
Huihong Luo
4df4151bc0 Fix a crash caused by transaction
A native transaction passed from webview is sent back to native side, so java side does not manage the life cycle of the transaction.

Bug: 191414767
Test: Play a video, switch to another app, wait for 10 seconds
Change-Id: I013052c202b445438d6cb6497f5f9a2fc22a2b85
2021-06-24 11:10:06 -07:00
Jay Aliomer
5481b64942 Merge "Fix ripple radius calculation" into sc-dev am: 2903ad550b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15068322

Change-Id: I6a039661dcbcc023c8a258bcef86d6f9909b91d4
2021-06-24 18:09:31 +00:00
Curtis Belmonte
fba4fae34a Merge "Update strings for the face re-enroll notification" into sc-dev am: dc56e9eec7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15085464

Change-Id: I48c2fcdfde66f97ff505186d6d971ace0955ba01
2021-06-24 18:09:13 +00:00
Andrei-Valentin Onea
7637256224 Merge "Fix nullpointer exception in CompatConfig" into sc-dev am: 8bfacdf641
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15094010

Change-Id: I8048d1bd6a94b3a4a34387f74a09d787c8663b0b
2021-06-24 18:08:59 +00:00
TreeHugger Robot
7e244f216d Merge "Add a device config for FGS denied notification." into sc-dev am: e06a55ba9f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14825247

Change-Id: Ic867b97aab21891c33badb6d3b10513688188c59
2021-06-24 18:08:43 +00:00
Stevie Kideckel
6154c0e62e Merge "Add a people tile state for dnd" into sc-dev am: e0dcf62f29
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15080411

Change-Id: Iad7327b3c4cbdba584336dc4e41532a879f2e7ec
2021-06-24 18:08:15 +00:00
TreeHugger Robot
73579f4d19 Merge "Change Owner" into sc-dev am: 5629eccbbc
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15027119

Change-Id: Ia82a7d77d8f86294a1028307baab96356cfb4e73
2021-06-24 18:07:44 +00:00
Jay Aliomer
2903ad550b Merge "Fix ripple radius calculation" into sc-dev 2021-06-24 18:06:50 +00:00
Curtis Belmonte
dc56e9eec7 Merge "Update strings for the face re-enroll notification" into sc-dev 2021-06-24 18:01:45 +00:00
Andrei-Valentin Onea
8bfacdf641 Merge "Fix nullpointer exception in CompatConfig" into sc-dev 2021-06-24 17:56:24 +00:00
TreeHugger Robot
e06a55ba9f Merge "Add a device config for FGS denied notification." into sc-dev 2021-06-24 17:53:45 +00:00
Stevie Kideckel
e0dcf62f29 Merge "Add a people tile state for dnd" into sc-dev 2021-06-24 17:51:26 +00:00
TreeHugger Robot
5629eccbbc Merge "Change Owner" into sc-dev 2021-06-24 17:48:52 +00:00
Evan Chen
08c4c64157 Change Owner
Change Owner from Eugene to the people who are currently working
with CDM.
Better to change the owner file under sc-dev first since there's
no owner file in AOSP.
Source of truth: /core/java/android/companion/OWNERS
Fix: 191984480
Change-Id: I737246128ca25e5efe2bdf59361a83cd6dc54c6b
2021-06-24 17:48:40 +00:00
TreeHugger Robot
b844d72268 Merge "Delay unmuting sensor when device is unlocked" into sc-dev am: dc9a03db06
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14846664

Change-Id: Icfa757398b223c4c761039a20123ac8a66d63ea8
2021-06-24 17:11:35 +00:00
TreeHugger Robot
dc9a03db06 Merge "Delay unmuting sensor when device is unlocked" into sc-dev 2021-06-24 17:06:40 +00:00
Beth Thibodeau
0f58cc4cc7 Merge "Use notification action to stop recording" into sc-dev am: e9408eaf89
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15082881

Change-Id: I6b2be59c1a2e10532e1be2063aaf8b50767dc210
2021-06-24 17:04:37 +00:00
TreeHugger Robot
67ca8fb7ee Merge "profcollectd: Avoid hard-coding Betterbug name" into sc-dev am: 503d4d6ca2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15090021

Change-Id: Ic5f8f914c3c3310b4ff7332d2968c04581ffdb91
2021-06-24 17:03:42 +00:00
Beth Thibodeau
e9408eaf89 Merge "Use notification action to stop recording" into sc-dev 2021-06-24 17:02:18 +00:00
Julia Reynolds
6a6f07c54c Merge "Add flag for remote streams" into sc-dev am: f9343c8baf
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15015503

Change-Id: I99d5bc79336ac77268635828c8b38f78836b4879
2021-06-24 17:01:43 +00:00
TreeHugger Robot
503d4d6ca2 Merge "profcollectd: Avoid hard-coding Betterbug name" into sc-dev 2021-06-24 16:50:45 +00:00
Julia Reynolds
f9343c8baf Merge "Add flag for remote streams" into sc-dev 2021-06-24 16:44:34 +00:00
TreeHugger Robot
b2facb1006 Merge "Save one notifyColorListeners() call" into sc-dev am: 8c9039fca8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15079478

Change-Id: Ic0bc7f8dec58577baf527f5b7658220494956ee3
2021-06-24 16:39:45 +00:00
TreeHugger Robot
8c9039fca8 Merge "Save one notifyColorListeners() call" into sc-dev 2021-06-24 16:25:22 +00:00