Commit Graph

761289 Commits

Author SHA1 Message Date
Wenhao Wang
ca078a5985 [automerger skipped] Merge "DO NOT MERGE Suppress notifications when device enter lockdown" into sc-qpr1-dev am: 06439d0860 -s ours am: 6fb87bd8a5 -s ours am: 4b21d21a5d -s ours am: c4bdfdfad4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If196783584f4a1ca70735e312cf2945f301ae6e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 18:19:08 +00:00
Wenhao Wang
0e31f637e4 [automerger skipped] DO NOT MERGE Suppress notifications when device enter lockdown am: 1f789841fe -s ours am: 3506ab2cc7 -s ours am: 05d1dd3df1 -s ours am: 29ed1ef7d9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I89a34522b5a7c0cea5f6c8ec5725264621174d65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 18:19:05 +00:00
Presubmit Automerger Backend
19ff0e019f [automerger skipped] [automerge] DO NOT MERGE Suppress notifications when device enter lockdown 2p: b1099290b8 am: 018f1c6ce6 -s ours am: ba093891a1 -s ours am: 5c3e5e005b -s ours am: c80b644e21 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ifcd4ad6f6d09850e7668111239bb75b0ddca8f57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 18:18:52 +00:00
Wenhao Wang
c1a15f5060 [automerger skipped] Merge "DO NOT MERGE Suppress notifications when device enter lockdown" into sc-v2-dev am: 7c4f648b0f -s ours am: e32e565af6 -s ours am: 478bcd4056 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I206f6589a6c1a2442c58c7169a6cb758248afce0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 18:18:11 +00:00
Wenhao Wang
d3f23e3be1 [automerger skipped] DO NOT MERGE Suppress notifications when device enter lockdown am: 62845d9af7 -s ours am: 675f29e0ef -s ours am: c8a6b68c55 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0844b90062e3b3572c8a81de9ea0c045849e57fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 18:18:08 +00:00
James O'Leary
23205797b5 Merge changes from topic "variants_landing" into tm-dev am: ee74679e85 am: 7833347e3c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17943620

Change-Id: Ie2618b91b800a3c896cda3460051b2e233a7a28b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 18:15:07 +00:00
James O'Leary
edfd766cdd Adjust variants specs to match latest UX spec. am: 6a82afbb82 am: 36c98108fd
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17937868

Change-Id: I63bd2706f3ea8451a227d8b0c4bc27d815ff51c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 18:15:02 +00:00
Lucas Silva
fe5f6112cf Merge "Dismiss dream when activities are started while dreaming." into tm-dev am: 964c0704c5 am: 70429b136e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17988655

Change-Id: Ia5b9d5b8f870e670aec27e58cb5c8ec000af112c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 18:13:03 +00:00
Wenhao Wang
9d15d7513c [automerger skipped] Merge "DO NOT MERGE Suppress notifications when device enter lockdown" into sc-qpr1-dev am: 06439d0860 -s ours am: 6fb87bd8a5 -s ours am: 4b21d21a5d -s ours am: e3dbcdf8f5 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2f0edb9ef2527faf0176221045803d8c4b942879
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 18:10:17 +00:00
Wenhao Wang
f4a509bc50 [automerger skipped] DO NOT MERGE Suppress notifications when device enter lockdown am: 1f789841fe -s ours am: 3506ab2cc7 -s ours am: 05d1dd3df1 -s ours am: 50bd5562f4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4a72ed4b37c9d7dd76119da20540bba923b8a2b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 18:10:16 +00:00
Presubmit Automerger Backend
a58921187b [automerger skipped] [automerge] DO NOT MERGE Suppress notifications when device enter lockdown 2p: b1099290b8 am: 018f1c6ce6 -s ours am: ba093891a1 -s ours am: 5c3e5e005b -s ours am: f3b00e7aab -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9f7f7d340b9c66728a75c5e61b06016c54a13584
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 18:10:04 +00:00
Wenhao Wang
ceb99f104d [automerger skipped] Merge "DO NOT MERGE Suppress notifications when device enter lockdown" into sc-v2-dev am: 7c4f648b0f -s ours am: e32e565af6 -s ours am: c21029ec10 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9399cfdbca243d75cedf60f7be7392377f5b8fa3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 18:09:47 +00:00
Wenhao Wang
1992264c87 [automerger skipped] DO NOT MERGE Suppress notifications when device enter lockdown am: 62845d9af7 -s ours am: 675f29e0ef -s ours am: 89d1aa90f5 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9ef31c8a18d9aca65296487c0acd43a6e230fb4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 18:09:41 +00:00
James O'Leary
9418b10a4e Merge changes from topic "variants_landing" into tm-dev am: ee74679e85 am: 6019dc9d65
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17943620

Change-Id: I8823b58fcb46a94c7c0dda84e88f0458f8c68f67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 18:09:28 +00:00
James O'Leary
6e9e897efd Adjust variants specs to match latest UX spec. am: 6a82afbb82 am: 4eb17f838f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17937868

Change-Id: Ibf3f2dc4b2775148bf5e47ec195c2e96f2036e40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 18:09:24 +00:00
Wenhao Wang
b9e9e360b3 [automerger skipped] Merge changes from topic "lockdown-mode-qt-dev-rvc-dev-sc-dev" into tm-dev am: 5ada3e16cf -s ours am: f45ee07187 -s ours
am skip reason: Merged-In I7e83544863eeadf8272b6ff8a9bb8136d6466203 with SHA-1 02771b7fc3 is already in history

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

Change-Id: I63f84cd74db9e702d3aa7d0fa2941a2cad193db1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 18:05:29 +00:00
Presubmit Automerger Backend
fb7bfc7dcc [automerger skipped] [automerged blank] DO NOT MERGE Suppress notifications when device enter lockdown 2p: b1099290b8 2p: d6a8e6d013 am: 16969bde0c -s ours am: 671fc7e308 -s ours
am skip reason: Merged-In I7e83544863eeadf8272b6ff8a9bb8136d6466203 with SHA-1 02771b7fc3 is already in history

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

Change-Id: I65dc4393687e723a11593d89684ec46298734295
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 18:05:27 +00:00
Steve Elliott
8158f29746 Merge "Use correct groupKey API for notif groups" into tm-dev am: 502a44e15a am: d9d810520c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17989540

Change-Id: I2e91c28b993baf74a3054b55addd5fd87c32227b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 18:05:17 +00:00
Josh Tsuji
4064146a07 Merge changes Iee97d469,Ica1b552a into tm-dev am: 50f19f212e am: 9d9bf2b9e5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17892807

Change-Id: Iba1886bb194fc78bacf89c4679c4eda22d0e27bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 18:05:06 +00:00
Automerger Merge Worker
86b5ac00f6 Merge changes from topic "am-f399541741b14cbaa7a92199ac7b346e" into tm-d1-dev-plus-aosp
* changes:
  [automerger skipped] Merge changes from topic "lockdown-mode-qt-dev-rvc-dev-sc-dev" into tm-dev am: 5ada3e16cf -s ours am: 6444c1b35b -s ours
  [automerger skipped] [automerged blank] DO NOT MERGE Suppress notifications when device enter lockdown 2p: b1099290b8 2p: d6a8e6d013 am: 16969bde0c -s ours am: d4ec726e2f -s ours
2022-04-29 18:04:59 +00:00
Wenhao Wang
9f8e498a1b [automerger skipped] Merge changes from topic "lockdown-mode-qt-dev-rvc-dev-sc-dev" into tm-dev am: 5ada3e16cf -s ours am: 6444c1b35b -s ours
am skip reason: Merged-In I7e83544863eeadf8272b6ff8a9bb8136d6466203 with SHA-1 02771b7fc3 is already in history

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

Change-Id: Idc513aee14686d7ad2282847a7e23fd6d0375704
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 18:04:54 +00:00
Presubmit Automerger Backend
83820f020e [automerger skipped] [automerged blank] DO NOT MERGE Suppress notifications when device enter lockdown 2p: b1099290b8 2p: d6a8e6d013 am: 16969bde0c -s ours am: d4ec726e2f -s ours
am skip reason: Merged-In I7e83544863eeadf8272b6ff8a9bb8136d6466203 with SHA-1 02771b7fc3 is already in history

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

Change-Id: Icece52072a771a62594e5e71aa0fc11a725f4811
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 18:04:52 +00:00
Kiwon Park
db52e4d1e0 Merge "Log TelephonyAnomalyDetected event from AnomalyReporter" into tm-dev am: c49ba33ac0 am: b437f30bff
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17802633

Change-Id: I02606536bf4aed3781e78a1e52cf4c4b0268b444
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 18:04:50 +00:00
Steve Elliott
3ba7dafbfc Merge "Use correct groupKey API for notif groups" into tm-dev am: 502a44e15a am: 8fd3d60c4e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17989540

Change-Id: I441b2ac06553517f063382e9c53e7e506db1fa2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 18:04:42 +00:00
Josh Tsuji
aec5cef87a Merge changes Iee97d469,Ica1b552a into tm-dev am: 50f19f212e am: b646165870
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17892807

Change-Id: I20bfb5a631c23213074e97d07d5c53a612dcfb34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 18:04:29 +00:00
Kiwon Park
08bcc4ffef Merge "Log TelephonyAnomalyDetected event from AnomalyReporter" into tm-dev am: c49ba33ac0 am: a149c039e9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17802633

Change-Id: I3eadce9555c16444eb2f981c488e754daeafafac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 18:04:14 +00:00
Nikita Dubrovsky
a614bbcbe3 Merge "Remove manual pregrants for AttentionService (handled via roles)" into tm-dev am: 0f9f5f9379 am: 994e94ac6a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17190244

Change-Id: Ibea354c985ad424948b7eb422f65f28098672ae8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 18:04:05 +00:00
Alex Spradlin
11b3fe96ae Log TelephonyAnomalyDetected event from AnomalyReporter am: 01018818a3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18090522

Change-Id: I9c2f107f6f62163b87c2c6eddc663795a38b18ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 18:03:52 +00:00
Automerger Merge Worker
c3fd47cbb9 Merge "Merge "Remove manual pregrants for AttentionService (handled via roles)" into tm-dev am: 0f9f5f9379 am: 86c58531ca" into tm-d1-dev-plus-aosp 2022-04-29 18:03:44 +00:00
Nikita Dubrovsky
fc3e039bd8 Merge "Remove manual pregrants for AttentionService (handled via roles)" into tm-dev am: 0f9f5f9379 am: 86c58531ca
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17190244

Change-Id: I3727d20fda0d54699887460735274849eb05a5c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 18:03:35 +00:00
Salud Lemus
37f75647ed Merge "Update canSilentlyInstallPackage DPMS API for financed device owner" into tm-dev am: 7977353cd2 am: fc76e8e403
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17949573

Change-Id: I9136a93f11788257808cd53adde9a2f63f082bdf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 18:03:19 +00:00
Prabal Singh
ed07d55624 Merge "Edit workPolicyUtil constructor" into tm-dev am: c39095ff0f am: 95daa85be9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17989404

Change-Id: Iaeaa87cee421980cce117af02de0ea33b073adf1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 18:03:06 +00:00
Salud Lemus
3375c9ecac Merge "Update canSilentlyInstallPackage DPMS API for financed device owner" into tm-dev am: 7977353cd2 am: d0884b26b6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17949573

Change-Id: Ia38e53aac7e4f487078d93a19c20704688742a40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 18:02:53 +00:00
Yu-Han Yang
0cb4e45290 Merge "Hold the reference of TelephonyCallback" into tm-dev am: 76de9f1eab am: 6078a922d4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17946240

Change-Id: Ic213d26977351c91d2f0435afb06211c090e5ccd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 18:02:40 +00:00
TreeHugger Robot
03d4c8d93a Merge "Fix IME layering issue by non-focusable IME target overlay" into tm-dev am: 23765fcbb6 am: b1a5a40a50
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17751851

Change-Id: I10ef0f6c181d3e5b16bc84c7ad96d78f16d6f919
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 18:02:27 +00:00
Lyn Han
49961a6575 Merge "Fix notification shelf issues" into tm-dev am: 11bfc9677d am: a4d58a84f1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17896364

Change-Id: I48054c17f562e169261332fdd26ac6e4e50547d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 18:02:08 +00:00
TreeHugger Robot
8a9023e22b Merge "Fixes UMS.getPreCreatedUserLU() to ignore partial pre-created users." into tm-dev am: 26e995aaf0 am: 874b98648a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17917999

Change-Id: I86a97193c4e618d372b3a1fbd17870c7e58186d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 18:01:59 +00:00
Automerger Merge Worker
8b3bb2d2bb Merge "Merge "[SettingsProvider] enforce permission on openFile" into tm-dev am: 0cb62fa9c7 am: 3309354b1e" into tm-d1-dev-plus-aosp 2022-04-29 18:01:47 +00:00
Songchun Fan
3f1c4b1281 Merge "[SettingsProvider] enforce permission on openFile" into tm-dev am: 0cb62fa9c7 am: 3309354b1e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17970005

Change-Id: I8b4a73ca850a537689c046f0ef82f81b207403bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 18:01:43 +00:00
Prabal Singh
b704811f53 Merge "Edit workPolicyUtil constructor" into tm-dev am: c39095ff0f am: 1535b14d2f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17989404

Change-Id: Iee54aeb902d76e369c855c6854147eeb5cc8273d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 18:01:38 +00:00
Lucas Dupin
91b35ce3db Merge "Do not ignore forceReload requests" into tm-dev am: 8ed3ef0fab am: 750fca80f6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17988792

Change-Id: I805267378dd49155a51d4ab05430b362c391b1f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 18:01:27 +00:00
TreeHugger Robot
ad03a5d4df Merge "Fix unexpected IME switcher dialog hidden" into tm-dev am: 441515483d am: 5a7f08620b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17252923

Change-Id: I43b27933b4887b6b864f89ae8baca1def3fcee94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 18:01:09 +00:00
Lucas Silva
70429b136e Merge "Dismiss dream when activities are started while dreaming." into tm-dev am: 964c0704c5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17988655

Change-Id: Ie8f79a2616567e5a8e1022033414291ee35d7464
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 16:54:51 +00:00
Wenhao Wang
e3dbcdf8f5 [automerger skipped] Merge "DO NOT MERGE Suppress notifications when device enter lockdown" into sc-qpr1-dev am: 06439d0860 -s ours am: 6fb87bd8a5 -s ours am: 4b21d21a5d -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic1a10b468a9469801ac4ee769e620eb73f68f602
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 16:54:27 +00:00
Wenhao Wang
50bd5562f4 [automerger skipped] DO NOT MERGE Suppress notifications when device enter lockdown am: 1f789841fe -s ours am: 3506ab2cc7 -s ours am: 05d1dd3df1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Idb5a518381c6b1595579f74af04418b478edb7b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 16:54:25 +00:00
Presubmit Automerger Backend
f3b00e7aab [automerger skipped] [automerge] DO NOT MERGE Suppress notifications when device enter lockdown 2p: b1099290b8 am: 018f1c6ce6 -s ours am: ba093891a1 -s ours am: 5c3e5e005b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I28288e63d373dcdc33d573228da5b1dd1d9694dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 16:52:03 +00:00
Wenhao Wang
c21029ec10 [automerger skipped] Merge "DO NOT MERGE Suppress notifications when device enter lockdown" into sc-v2-dev am: 7c4f648b0f -s ours am: e32e565af6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5132adaae806ebd5c8775c37514a0361e313bf50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 16:50:30 +00:00
Wenhao Wang
89d1aa90f5 [automerger skipped] DO NOT MERGE Suppress notifications when device enter lockdown am: 62845d9af7 -s ours am: 675f29e0ef -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1750e07c9ecec3211ee7a8e2bf30946382f8d3b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 16:50:28 +00:00
James O'Leary
6019dc9d65 Merge changes from topic "variants_landing" into tm-dev am: ee74679e85
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17943620

Change-Id: I45e97a4655fa984a3d49e5f73ccbab80109b0b30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 16:50:15 +00:00
James O'Leary
4eb17f838f Adjust variants specs to match latest UX spec. am: 6a82afbb82
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17937868

Change-Id: Ie551b59925dcb728ab97a306228a976b878e0bd1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 16:50:09 +00:00