Louis Chang
|
77778bca60
|
[automerger skipped] Detects all activities for whether showing work challenge am: 69b3a3cd04 am: d5c18447be -s ours am: 82fa6e3769 -s ours
am skip reason: Merged-In I5e09b09be547d04fdfd709cb9cd4bcd4a94bbf21 with SHA-1 27a2a5f986 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14182408
Change-Id: I96a578deb99e890188fbb3a6b17fbfc5f305e1d6
|
2021-04-27 22:33:56 +00:00 |
|
Chris Tate
|
79ba5701cd
|
[automerger skipped] Merge "DO NOT MERGE - Disallow deletion of channels with FGS notifications" into pi-dev am: 1735cdeea4 -s ours am: 76a15c06f4 -s ours am: e0a844da8b -s ours am: eff05e86d3 -s ours
am skip reason: Merged-In I1c2bb78d86f194585d273661cecf3419f51965df with SHA-1 88380a00d5 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13743878
Change-Id: I3b466bc93fc658fd5bd162716e0e9149f254e700
|
2021-04-27 22:33:52 +00:00 |
|
Beth Thibodeau
|
1c8a052b5a
|
Merge "Increase maximum allowed size for status bar icons" into pi-dev am: d17b979843 am: e219886035 am: b0d6e6cd57 am: b32d4d538b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14054747
Change-Id: I9799b5e33dfdd2fb90e66a4bc3fbc9eac11a4557
|
2021-04-27 22:33:47 +00:00 |
|
Chris Tate
|
4246471a5a
|
[automerger skipped] Merge "DO NOT MERGE - Disallow deletion of channels with FGS notifications" into oc-mr1-dev am: 6cc887c00d -s ours am: 2bec84a794 -s ours am: 9cd02f1d7f am: 22feb668e8 -s ours am: 91fbccc817
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13779450
Change-Id: Ia1478dc08a058aa3abdc34f5cd4b03be842a17ed
|
2021-04-27 22:33:37 +00:00 |
|
Patrick Baumann
|
1c42aaffab
|
[automerger skipped] Merge "Adds caller check to getAllPackages()" into pi-dev am: 7905a07048 am: 9069025b9d am: 21756abd75 -s ours am: c6ce643435 -s ours am: 69517e0c04 -s ours am: 0b91f5faf0 -s ours
am skip reason: Merged-In I77460ae19a4d41151577646441f11e2eddbb741a with SHA-1 9b694ef4d4 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13618271
Change-Id: Ic794b8b2ea80bdd5be0b8a87431d7f7b9b929ab1
|
2021-04-27 22:33:37 +00:00 |
|
Chris Tate
|
83afdde7d6
|
[automerger skipped] Merge "DO NOT MERGE - Disallow deletion of channels with FGS notifications" into pi-dev am: 1735cdeea4 -s ours am: 76a15c06f4 -s ours am: e0a844da8b -s ours am: eff05e86d3 -s ours
am skip reason: Merged-In I1c2bb78d86f194585d273661cecf3419f51965df with SHA-1 88380a00d5 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13743878
Change-Id: I8515841cb1103f34f3cfd88699f0c81975f6811a
|
2021-04-27 22:33:18 +00:00 |
|
Chris Tate
|
3201b6ee34
|
[automerger skipped] Merge "DO NOT MERGE - Disallow deletion of channels with FGS notifications" into qt-dev am: 7b0067c950 am: 05dd5f18e3 -s ours am: 0dbc306379 -s ours
am skip reason: Merged-In I1c2bb78d86f194585d273661cecf3419f51965df with SHA-1 8cb7e0a881 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13728411
Change-Id: I06f7d74e63da08fc07090cd6fb960cc0f1ffb5b2
|
2021-04-27 22:33:12 +00:00 |
|
Christopher Tate
|
45c4c9f1ec
|
[automerger skipped] DO NOT MERGE - Disallow deletion of channels with FGS notifications am: 88380a00d5 am: 3c507386ca -s ours am: 11f4032b5e -s ours
am skip reason: Merged-In I1c2bb78d86f194585d273661cecf3419f51965df with SHA-1 8cb7e0a881 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13728411
Change-Id: Ied527f94280f1eea4893d993a1120ea1a554abbf
|
2021-04-27 22:33:04 +00:00 |
|
Winson Chiu
|
525629a399
|
[automerger skipped] Revert "Only allow BROWSABLE && DEFAULT Intents to be always opened" am: ffe45e4497 am: 52e9d8f472 am: 6929314484 am: 721ef1bccb am: bc0aa4c4a3 am: 921a2e786a am: 356ed6ad81 -s ours
am skip reason: Merged-In I00b78d596ee05c5a4a228771bbf8082af2b0ab8a with SHA-1 1ad90d5a2d is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13728024
Change-Id: Ifc53ba0cc69d22ddaa4dcf70bd42096becf0e065
|
2021-04-27 22:33:00 +00:00 |
|
Chris Tate
|
cb05a19982
|
[automerger skipped] Merge "DO NOT MERGE - Disallow deletion of channels with FGS notifications" into qt-dev am: 7b0067c950 am: 05dd5f18e3 -s ours am: 0dbc306379 -s ours
am skip reason: Merged-In I1c2bb78d86f194585d273661cecf3419f51965df with SHA-1 8cb7e0a881 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13728411
Change-Id: Ibed52169298ff5f1886cd6861835d46513b14e9c
|
2021-04-27 22:32:52 +00:00 |
|
Christopher Tate
|
80fa91b134
|
[automerger skipped] DO NOT MERGE - Disallow deletion of channels with FGS notifications am: 88380a00d5 am: 3c507386ca -s ours am: 11f4032b5e -s ours
am skip reason: Merged-In I1c2bb78d86f194585d273661cecf3419f51965df with SHA-1 8cb7e0a881 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13728411
Change-Id: Ic61ea6e91daf56b0bbdb565d52c868b3b5bc621e
|
2021-04-27 22:32:50 +00:00 |
|
TreeHugger Robot
|
f6b6e5af7b
|
Merge changes from topic "notif-backport" into qt-dev am: a0f134bd11 am: e9ffefbf4d am: 2ebc9c19e3 am: 756ec63839 am: 67726a992a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13453266
Change-Id: I78aef3fb0809655dd8d8b3a03373784ede67f066
|
2021-04-27 22:32:24 +00:00 |
|
Beth Thibodeau
|
3fe3d51c13
|
Increase maximum allowed size for status bar icons am: 8875da5207 am: cc35c516df am: 39ecfe9aed am: 8d4ac0f225 am: c7930c4045
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14033398
Change-Id: Ife20825e55d9427bb8b04a05c3a07fd190ec5941
|
2021-04-27 22:32:17 +00:00 |
|
Evan Laird
|
d1759ba5a4
|
[automerger skipped] DO NOT MERGE: Fix interaction tracking logic am: 0e2acaf0a5 -s ours am: 915b162667 -s ours am: b0417f5a31 am: 06a4abef68 am: 3722f47090 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13453266
Change-Id: Ib5fc1b54e0801fb086b723113e6f119087369dba
|
2021-04-27 22:32:13 +00:00 |
|
Beth Thibodeau
|
c2d3f9f067
|
Increase maximum allowed size for status bar icons am: 92106a58df am: fcd571f060 am: eded1d8a7c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14053514
Change-Id: I4c92fa021e03a7a0101fd27f0cd70aa97240db8f
|
2021-04-27 22:32:10 +00:00 |
|
Beth Thibodeau
|
bde5259f51
|
Increase maximum allowed size for status bar icons am: 8875da5207 am: cc35c516df am: 39ecfe9aed am: 8d4ac0f225 am: c7930c4045
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14033398
Change-Id: I589bf46c53fdb035b388905a89bf985ca3f1792e
|
2021-04-27 22:32:05 +00:00 |
|
Beth Thibodeau
|
60a212dca2
|
Increase maximum allowed size for status bar icons am: 92106a58df am: fcd571f060 am: eded1d8a7c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14053514
Change-Id: I2636f4284434916e9e47069a9e911ccffeb6172d
|
2021-04-27 22:31:59 +00:00 |
|
yawanng
|
0abf7eb3eb
|
[automerger skipped] Adds caller check to getAllPackages() am: 264dea63b0 -s ours am: 2f4ff31a2e -s ours am: e57bd828a9 -s ours am: 4c38925244 -s ours
am skip reason: Merged-In I77460ae19a4d41151577646441f11e2eddbb741a with SHA-1 9b694ef4d4 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13856278
Change-Id: I97723d60b107b64cd2ce77481a0ef73df747274b
|
2021-04-27 22:31:56 +00:00 |
|
Patrick Baumann
|
7733b7b06c
|
[automerger skipped] Revert "Adds caller check to getAllPackages()" am: 8d900812b7 -s ours am: 2db12a46a9 -s ours am: d1c3879708 -s ours am: 3a5b3f8a88 -s ours
am skip reason: Merged-In I77460ae19a4d41151577646441f11e2eddbb741a with SHA-1 9b694ef4d4 is already in history. Merged-In was found from reverted change.
Reverted change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13618271
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13856274
Change-Id: Ie2d217f1bdc282faa86da143bfd21b4f98cdf934
|
2021-04-27 22:31:53 +00:00 |
|
yawanng
|
5202c57904
|
[automerger skipped] Adds caller check to getAllPackages() am: 264dea63b0 -s ours am: 2f4ff31a2e -s ours am: e57bd828a9 -s ours am: 4c38925244 -s ours
am skip reason: Merged-In I77460ae19a4d41151577646441f11e2eddbb741a with SHA-1 9b694ef4d4 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13856278
Change-Id: I2aeca1a1f106ccffb2fbba0c9de7533231572e95
|
2021-04-27 22:31:53 +00:00 |
|
Patrick Baumann
|
65f396f465
|
[automerger skipped] Revert "Adds caller check to getAllPackages()" am: 8d900812b7 -s ours am: 2db12a46a9 -s ours am: d1c3879708 -s ours am: 3a5b3f8a88 -s ours
am skip reason: Merged-In I77460ae19a4d41151577646441f11e2eddbb741a with SHA-1 9b694ef4d4 is already in history. Merged-In was found from reverted change.
Reverted change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13618271
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13856274
Change-Id: Iae26679cf00302f6e7c4afc084975986ef80bcee
|
2021-04-27 22:31:52 +00:00 |
|
TreeHugger Robot
|
a32c50e74a
|
[automerger skipped] Merge "Revoke storage on SDK downgrade or new full storage request" into qt-dev am: d035f1b963 am: dcbef79eb9 -s ours am: 130459160f -s ours
am skip reason: Merged-In Ia6bd5658b77a26ab15fea013ec875050457473e0 with SHA-1 b29834bc15 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13546393
Change-Id: I589d2b33d03bdbf0454a2dd4383cdf28de8822dc
|
2021-04-27 22:31:29 +00:00 |
|
TreeHugger Robot
|
21dad0f35e
|
[automerger skipped] Merge "Revoke storage on SDK downgrade or new full storage request" into qt-dev am: d035f1b963 am: dcbef79eb9 -s ours am: 130459160f -s ours
am skip reason: Merged-In Ia6bd5658b77a26ab15fea013ec875050457473e0 with SHA-1 09080dc177 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13546393
Change-Id: I99e95830e883c36d6827d816eba27a237db7b38f
|
2021-04-27 22:31:27 +00:00 |
|
TreeHugger Robot
|
7163f75477
|
Merge "Limit maximum allowed size for a status bar icon" into oc-mr1-dev am: 7e6da1776d am: a9aaed5d47 am: cdbee965a7 am: 71f344b36a am: 45d5be1254
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13430253
Change-Id: Ib121ed1d159a01cad0cdc1aef7daaa687459052b
|
2021-04-27 22:31:13 +00:00 |
|
Beth Thibodeau
|
fbea633c38
|
Merge "Limit maximum allowed size for a status bar icon" into qt-dev am: 81a7a760c8 am: 6540ebaf5c am: 2bb50aba75
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13430605
Change-Id: I106b990bc09e29266af8086c2e9375dd8086a9ce
|
2021-04-27 22:31:01 +00:00 |
|
TreeHugger Robot
|
c3b709e513
|
Merge "Limit maximum allowed size for a status bar icon" into oc-mr1-dev am: 7e6da1776d am: a9aaed5d47 am: cdbee965a7 am: 71f344b36a am: 45d5be1254
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13430253
Change-Id: Icf48ba6ba0be039ab0ac5effc671c12575511108
|
2021-04-27 22:31:00 +00:00 |
|
Beth Thibodeau
|
aedb986770
|
[automerger skipped] Merge "Limit maximum allowed size for a status bar icon" into pi-dev am: ed7118d8bf am: 04043de40c am: c7731486df -s ours am: bc6f5f8bf8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13430565
Change-Id: I21d633b479ae443c0e2866fe5c231ad5d17368db
|
2021-04-27 22:30:49 +00:00 |
|
Beth Thibodeau
|
ca77f64eb7
|
Merge "Limit maximum allowed size for a status bar icon" into qt-dev am: 81a7a760c8 am: 6540ebaf5c am: 2bb50aba75
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13430605
Change-Id: I76493811a68e7d78d57eb32134ed34e6c31a10d5
|
2021-04-27 22:30:37 +00:00 |
|
Beth Thibodeau
|
f0aac434b9
|
[automerger skipped] Merge "Limit maximum allowed size for a status bar icon" into pi-dev am: ed7118d8bf am: 04043de40c am: c7731486df -s ours am: bc6f5f8bf8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13430565
Change-Id: Id950e2e59e9522d1ecd0b756da1c4899c830cfec
|
2021-04-27 22:29:26 +00:00 |
|
Benedict Wong
|
e7f06d9eb9
|
Update set|getRetryIntervalsMs to Millis
Bug: 184612525
Test: atest FrameworksVcnTests
Change-Id: I696854960ca9488ae2c8a0c569c57a8563998ac8
|
2021-04-27 22:28:43 +00:00 |
|
Julia Reynolds
|
2a061f2e25
|
[automerger skipped] Merge "Restrict alarm broadcast" into oc-mr1-dev am: 3b0fc6bd38 am: d749dc3510 am: fd89965284 am: 90ef2704fa -s ours
am skip reason: Merged-In I4f8e56729d90f8f5288d08881129b1c45d5790e7 with SHA-1 4056976f1e is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14103469
Change-Id: I1a85b8c3024307a9d780eb1c404a9baa17a4f696
|
2021-04-27 22:27:00 +00:00 |
|
Louis Chang
|
6adacfab63
|
[automerger skipped] Detects all activities for whether showing work challenge am: 6820d70823 -s ours am: 1c750cd367 -s ours am: b64eddc2c9 -s ours am: aecf7c267d -s ours
am skip reason: Merged-In I5e09b09be547d04fdfd709cb9cd4bcd4a94bbf21 with SHA-1 69b3a3cd04 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14186075
Change-Id: I4559f227416180c37564a99318a1945f4c768382
|
2021-04-27 22:26:12 +00:00 |
|
Louis Chang
|
dcb100da76
|
[automerger skipped] Detects all activities for whether showing work challenge am: fe5e1432cf -s ours am: 850810d0fd -s ours am: 62c71ab0fd -s ours
am skip reason: Merged-In I5e09b09be547d04fdfd709cb9cd4bcd4a94bbf21 with SHA-1 69b3a3cd04 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14188081
Change-Id: Ia8578dced1d3716449255ba7df4f98c7e74bee5b
|
2021-04-27 22:25:28 +00:00 |
|
Louis Chang
|
82fa6e3769
|
[automerger skipped] Detects all activities for whether showing work challenge am: 69b3a3cd04 am: d5c18447be -s ours
am skip reason: Merged-In I5e09b09be547d04fdfd709cb9cd4bcd4a94bbf21 with SHA-1 27a2a5f986 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14182408
Change-Id: If523fdd2f55df58fb2beed1c95c6fd46248d5a45
|
2021-04-27 22:24:45 +00:00 |
|
Beth Thibodeau
|
b32d4d538b
|
Merge "Increase maximum allowed size for status bar icons" into pi-dev am: d17b979843 am: e219886035 am: b0d6e6cd57
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14054747
Change-Id: I8e76d41d7afd0a92808e5e5a62013ea15dddcb0f
|
2021-04-27 22:23:44 +00:00 |
|
Chris Tate
|
91fbccc817
|
[automerger skipped] Merge "DO NOT MERGE - Disallow deletion of channels with FGS notifications" into oc-mr1-dev am: 6cc887c00d -s ours am: 2bec84a794 -s ours am: 9cd02f1d7f am: 22feb668e8 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13779450
Change-Id: I9c77d745a97304c67aa80741298b3d539eaa85f1
|
2021-04-27 22:22:30 +00:00 |
|
Chris Tate
|
eff05e86d3
|
[automerger skipped] Merge "DO NOT MERGE - Disallow deletion of channels with FGS notifications" into pi-dev am: 1735cdeea4 -s ours am: 76a15c06f4 -s ours am: e0a844da8b -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13743878
Change-Id: I81ae3d27ab83ef0f8197275b956c7e35de3338d5
|
2021-04-27 22:20:53 +00:00 |
|
Benedict Wong
|
44629199de
|
Set safe mode alarm when validation reports NOT_VALID
Bug: 186257328
Test: atest FrameworksVcnTests
Change-Id: I80f37d42e4d61026b3521a4133257cd472c22f1a
|
2021-04-27 22:20:15 +00:00 |
|
Chris Tate
|
0dbc306379
|
[automerger skipped] Merge "DO NOT MERGE - Disallow deletion of channels with FGS notifications" into qt-dev am: 7b0067c950 am: 05dd5f18e3 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13728411
Change-Id: Ia646150ba7ecb4342542dc3601789b056fb91710
|
2021-04-27 22:20:04 +00:00 |
|
Christopher Tate
|
11f4032b5e
|
[automerger skipped] DO NOT MERGE - Disallow deletion of channels with FGS notifications am: 88380a00d5 am: 3c507386ca -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13728411
Change-Id: I8dea7a8e26803efd6cdbf87ffedaf32f6f2420c1
|
2021-04-27 22:19:44 +00:00 |
|
Beth Thibodeau
|
c7930c4045
|
Increase maximum allowed size for status bar icons am: 8875da5207 am: cc35c516df am: 39ecfe9aed am: 8d4ac0f225
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14033398
Change-Id: I090f9210434eff0345d0dc6643ff87c24432bf07
|
2021-04-27 22:19:05 +00:00 |
|
Beth Thibodeau
|
eded1d8a7c
|
Increase maximum allowed size for status bar icons am: 92106a58df am: fcd571f060
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14053514
Change-Id: I494cd6ff1ea1291e8b4cd5883e6e573114816dcc
|
2021-04-27 22:18:34 +00:00 |
|
yawanng
|
4c38925244
|
[automerger skipped] Adds caller check to getAllPackages() am: 264dea63b0 -s ours am: 2f4ff31a2e -s ours am: e57bd828a9 -s ours
am skip reason: Merged-In I77460ae19a4d41151577646441f11e2eddbb741a with SHA-1 9b694ef4d4 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13856278
Change-Id: If73b6306d49d489850b0d17359f4df743d7829b4
|
2021-04-27 22:18:19 +00:00 |
|
Patrick Baumann
|
3a5b3f8a88
|
[automerger skipped] Revert "Adds caller check to getAllPackages()" am: 8d900812b7 -s ours am: 2db12a46a9 -s ours am: d1c3879708 -s ours
am skip reason: Merged-In I77460ae19a4d41151577646441f11e2eddbb741a with SHA-1 9b694ef4d4 is already in history. Merged-In was found from reverted change.
Reverted change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13618271
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13856274
Change-Id: Ib547c7fae128b15521d20ffafcba070c9076783c
|
2021-04-27 22:18:01 +00:00 |
|
TreeHugger Robot
|
f0c47216f6
|
[automerger skipped] Merge "Adds caller check to getAllPackages()" into oc-mr1-dev am: 835ab4eb82 -s ours am: 38fb80f008 -s ours am: 263adb234a -s ours am: 463477087d -s ours am: 8e2813e52b -s ours am: 5a47e40fd5 -s ours
am skip reason: Merged-In I77460ae19a4d41151577646441f11e2eddbb741a with SHA-1 9b694ef4d4 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13618218
Change-Id: Ia409558f3049dddf18e85d6d3e3c1f2e7e024021
|
2021-04-27 22:16:49 +00:00 |
|
Pavel Grafov
|
37169d9adb
|
Merge "Drive-by fix for wtfIfInLock + two violations" into sc-dev
|
2021-04-27 22:16:45 +00:00 |
|
Patrick Baumann
|
6f9648f5ee
|
[automerger skipped] Merge "Adds caller check to getAllPackages()" into qt-dev am: 9ecea7a435 -s ours am: e32deee19a -s ours am: 93b289562b -s ours am: b74f1c344c -s ours
am skip reason: Merged-In I77460ae19a4d41151577646441f11e2eddbb741a with SHA-1 9b694ef4d4 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13618269
Change-Id: I33dbe5cf808b74d8b7144293f8cdb6bfbf3cd868
|
2021-04-27 22:16:16 +00:00 |
|
TreeHugger Robot
|
e93212d0a2
|
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Use userId instead of USER_CURRENT in shouldLockKeyguard." into qt-dev am: e086a17e7d am: 67352cf086 -s ours am: 48cb3da792 am: ae509461ef -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13473565
Change-Id: Ia4d5cfcaec12b493607fee85dff945f757aa816c
|
2021-04-27 22:15:32 +00:00 |
|
Jonathan Scott
|
112d4342dd
|
[automerger skipped] [RESTRICT AUTOMERGE] Use userId instead of USER_CURRENT in shouldLockKeyguard. am: bb4eded379 am: 5af044fcf2 -s ours am: 05bc9eb65d am: 94ea2ea32a -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13473565
Change-Id: Id64d19b0534191333ca4c2172efd4b4d60f32da5
|
2021-04-27 22:15:23 +00:00 |
|
TreeHugger Robot
|
1781e82338
|
[automerger skipped] Merge "Adds caller check to getAllPackages()" into oc-mr1-dev am: 835ab4eb82 -s ours am: 38fb80f008 -s ours am: 263adb234a -s ours am: 463477087d -s ours am: 8e2813e52b -s ours am: c3c87660aa -s ours
am skip reason: Merged-In I77460ae19a4d41151577646441f11e2eddbb741a with SHA-1 9b694ef4d4 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13618218
Change-Id: I9592a65c13480f314d37beb87907478cfa59b247
|
2021-04-27 22:15:13 +00:00 |
|