Julia Reynolds
|
d295decb53
|
[automerger skipped] Merge "Restrict alarm broadcast" into oc-mr1-dev am: 3b0fc6bd38 am: d749dc3510 am: fd89965284 am: 90ef2704fa -s ours am: 2a061f2e25 -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: I486e5614e4d829ec51a8d19719085a7941268c46
|
2021-04-27 22:35:23 +00:00 |
|
Louis Chang
|
99f54b9b9e
|
[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: 6adacfab63 -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: Icdc7ea4bc5bb7466a984a354789bc90a7710fd78
|
2021-04-27 22:35:12 +00:00 |
|
Louis Chang
|
eccd031f5c
|
[automerger skipped] Detects all activities for whether showing work challenge am: fe5e1432cf -s ours am: 850810d0fd -s ours am: 62c71ab0fd -s ours am: dcb100da76 -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: Ieddd367772be39265edb6ebc7d78603c9603ae86
|
2021-04-27 22:35:04 +00:00 |
|
Louis Chang
|
bf62b6bfb1
|
[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: I91455d649bb90c8f6b3c5e056409481cad16ce00
|
2021-04-27 22:34:53 +00:00 |
|
Beth Thibodeau
|
8b9f71550c
|
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: I8fb27d045a7941f142dbe9b3a2dae9aa992b51a2
|
2021-04-27 22:34:43 +00:00 |
|
Chris Tate
|
18252b299b
|
[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: I235d145a0f586bef8436d492a7e8a7fdddabec43
|
2021-04-27 22:34:30 +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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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
|
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
|
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 |
|
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 |
|
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
|
130459160f
|
[automerger skipped] Merge "Revoke storage on SDK downgrade or new full storage request" into qt-dev am: d035f1b963 am: dcbef79eb9 -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: I1683d8965087c7174448e986a3262dd9dd95285f
|
2021-04-27 22:14:02 +00:00 |
|
TreeHugger Robot
|
45d5be1254
|
Merge "Limit maximum allowed size for a status bar icon" into oc-mr1-dev am: 7e6da1776d am: a9aaed5d47 am: cdbee965a7 am: 71f344b36a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13430253
Change-Id: Icdea763e039c4a35fd49e3c70631dbef86abe0cd
|
2021-04-27 22:13:11 +00:00 |
|
Beth Thibodeau
|
2bb50aba75
|
Merge "Limit maximum allowed size for a status bar icon" into qt-dev am: 81a7a760c8 am: 6540ebaf5c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13430605
Change-Id: Ia05cbabaa0151a2e064820032368de8fc2f88f37
|
2021-04-27 22:12:29 +00:00 |
|
Beth Thibodeau
|
bc6f5f8bf8
|
[automerger skipped] Merge "Limit maximum allowed size for a status bar icon" into pi-dev am: ed7118d8bf am: 04043de40c am: c7731486df -s ours
am skip reason: skipped by user ethibodeau
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13430565
Change-Id: I9a0c18bedfa7b328a9983560a123d704bc3b6370
|
2021-04-27 22:11:39 +00:00 |
|
TreeHugger Robot
|
c3c87660aa
|
[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 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: I0a4b1517be61a0e008564643922176775d165b81
|
2021-04-27 21:57:36 +00:00 |
|
Patrick Baumann
|
958e64e376
|
[automerger skipped] Merge "Adds caller check to getAllPackages()" into qt-dev am: 9ecea7a435 -s ours am: e32deee19a -s ours am: 93b289562b -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: If3dc361f6ee5a3bee1287b479326a9e55f380347
|
2021-04-27 21:57:09 +00:00 |
|
TreeHugger Robot
|
3276544168
|
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Use userId instead of USER_CURRENT in shouldLockKeyguard." into qt-dev am: e086a17e7d am: 67352cf086 -s ours am: 48cb3da792
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13473565
Change-Id: I901bb7d2cfc241bae6da3ac5ee000a7af97d90b5
|
2021-04-27 21:56:45 +00:00 |
|
Jonathan Scott
|
71348ece4f
|
[automerger skipped] [RESTRICT AUTOMERGE] Use userId instead of USER_CURRENT in shouldLockKeyguard. am: bb4eded379 am: 5af044fcf2 -s ours am: 05bc9eb65d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13473565
Change-Id: I5d024d49fbf39af1c2bb0e3f49f2c9a59b0476c5
|
2021-04-27 21:56:42 +00:00 |
|
TreeHugger Robot
|
b474d2cb17
|
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Use userId instead of USER_CURRENT in shouldLockKeyguard." into pi-dev am: d48073491f -s ours am: 65f650b6ac am: d2b2ae912b -s ours am: ad4df34c13
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13473997
Change-Id: Ic8a9a843aa34273d206e804ff7eca3cfab828d7c
|
2021-04-27 21:56:28 +00:00 |
|
TreeHugger Robot
|
c7a3cb93cf
|
[automerger skipped] Merge "Add pkg target to snoozing alarm" into oc-mr1-dev am: 119ebe193f -s ours am: c5cd3bcbc1 -s ours am: 6c6d48d228 -s ours am: 61534f62ce -s ours am: 9d21d885df -s ours
am skip reason: Merged-In I6aaf80a11dcae2eca41d4647411126ed41587027 with SHA-1 c73916229d is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13675028
Change-Id: I95e126a93d66c0ea48d1ebe39d3df44a2b97cc70
|
2021-04-27 21:56:15 +00:00 |
|
TreeHugger Robot
|
420fe3b36a
|
[automerger skipped] Merge "Add pkg target to snoozing alarm" into pi-dev am: 691b6ca55b -s ours am: 6b5ceccc48 -s ours am: 69c672fbc9 -s ours am: 1d5cfe1c28 -s ours
am skip reason: Merged-In I6aaf80a11dcae2eca41d4647411126ed41587027 with SHA-1 c73916229d is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13676745
Change-Id: I6f3c7e6278cb71e23afea937a90e859d5c097a34
|
2021-04-27 21:56:01 +00:00 |
|
TreeHugger Robot
|
a5edb15f7f
|
[automerger skipped] Merge "Add pkg target to snoozing alarm" into qt-dev am: 8e75c0526a am: 5079aa86c8 -s ours am: 34e0644a08 -s ours
am skip reason: Merged-In I6aaf80a11dcae2eca41d4647411126ed41587027 with SHA-1 c73916229d is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13676688
Change-Id: Ib1609b8528abf95bb678268256ea636ae8096e64
|
2021-04-27 21:55:46 +00:00 |
|
Patrick Baumann
|
69517e0c04
|
[automerger skipped] Merge "Adds caller check to getAllPackages()" into pi-dev am: 7905a07048 am: 9069025b9d am: 21756abd75 -s ours am: c6ce643435 -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: Ifa78bd2ab529fb536a2023d36ae5d7a49aadc7ae
|
2021-04-27 21:55:31 +00:00 |
|
Winson Chiu
|
921a2e786a
|
Revert "Only allow BROWSABLE && DEFAULT Intents to be always opened" am: ffe45e4497 am: 52e9d8f472 am: 6929314484 am: 721ef1bccb am: bc0aa4c4a3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13728024
Change-Id: Iac370a194645aa939b304eec4033e60d4d8605f8
|
2021-04-27 21:55:15 +00:00 |
|
TreeHugger Robot
|
756ec63839
|
Merge changes from topic "notif-backport" into qt-dev am: a0f134bd11 am: e9ffefbf4d am: 2ebc9c19e3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13453266
Change-Id: I53d77ecb7ec616891caf8dacec0d47e7290762f6
|
2021-04-27 21:54:57 +00:00 |
|
Evan Laird
|
06a4abef68
|
[automerger skipped] DO NOT MERGE: Fix interaction tracking logic am: 0e2acaf0a5 -s ours am: 915b162667 -s ours am: b0417f5a31
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13453266
Change-Id: I2c2f569436efd95ddc4310583b8e1e22dcec7f5b
|
2021-04-27 21:54:50 +00:00 |
|
TreeHugger Robot
|
8e2813e52b
|
[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 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: Id64697d60c6c378fd325d03fc07973823d14dfee
|
2021-04-27 21:43:08 +00:00 |
|
Patrick Baumann
|
93b289562b
|
[automerger skipped] Merge "Adds caller check to getAllPackages()" into qt-dev am: 9ecea7a435 -s ours am: e32deee19a -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: I40014620cc76286454c704245a689057b79e3834
|
2021-04-27 21:42:47 +00:00 |
|
TreeHugger Robot
|
48cb3da792
|
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Use userId instead of USER_CURRENT in shouldLockKeyguard." into qt-dev am: e086a17e7d am: 67352cf086 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13473565
Change-Id: I9ff2e866bcd3f281e99bbf63fb557088dfe1f35a
|
2021-04-27 21:42:28 +00:00 |
|
Jonathan Scott
|
05bc9eb65d
|
[automerger skipped] [RESTRICT AUTOMERGE] Use userId instead of USER_CURRENT in shouldLockKeyguard. am: bb4eded379 am: 5af044fcf2 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13473565
Change-Id: I92e1aa20129d0d706a2b72c42154528928f44b48
|
2021-04-27 21:42:24 +00:00 |
|