Bill Yi
|
eac1406765
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 4151d4742e -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13447188
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0d213679214f6c645e708c1a6d2ca055ef489059
|
2021-02-04 01:17:13 +00:00 |
|
Anton Hansson
|
907ebe67d0
|
[automerger skipped] Merge "Remove unused API defaults" into mainline-prod am: ac30bb5247 -s ours
am skip reason: Change-Id I312de1cc3d4ac493d3570d3b6ad6e94e6cb4e4db with SHA-1 b08d5c4109 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13436474
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I97da6fb7b0882843e13f4be3c02956c98fa5e789
|
2021-02-04 01:16:55 +00:00 |
|
Anton Hansson
|
eddb59803a
|
[automerger skipped] Merge changes from topic "presubmit-am-a914d38dbf2a4fd283cd25bda2526870" into mainline-prod am: 1467d174df -s ours
am skip reason: Change-Id I2dcf7f0f24948422e0ffd4880846313a75d467d2 with SHA-1 09e4eb17ba is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13436473
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4e280b7c7de2f0d14c8968252ad2dea6d2fa25f3
|
2021-02-04 01:16:35 +00:00 |
|
Muhammad Qureshi
|
6f77e64608
|
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix potential out of bounds writes in LogEvent." into rvc-dev am: 0992a32def am: b7c4df2e3f -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13321771
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0c831d75a33f09e74b7ffa587b798fb206e516cf
|
2021-02-04 01:16:12 +00:00 |
|
Muhammad Qureshi
|
4671aff56f
|
[automerger skipped] [RESTRICT AUTOMERGE] Fix potential out of bounds writes in LogEvent. am: 53251a491f -s ours am: 109e3a5bc7 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13321771
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I03234e229e1be9609cfa62932c25b3e4ea87d65d
|
2021-02-04 01:16:01 +00:00 |
|
TreeHugger Robot
|
2edb9deba8
|
[automerger skipped] Merge "Only update native InputApplicationHandle once" into rvc-dev am: 274863f9d5 am: 6315368369 -s ours
am skip reason: Change-Id Ief84bbe6e6fa4da5309912059904932ccf775b75 with SHA-1 3213c9657b is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13210344
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I00c81bc51c5c22d1e052db8d7af4617fffe5b239
|
2021-02-04 01:14:20 +00:00 |
|
David Su
|
11a138682d
|
[automerger skipped] Merge "framework-wifi-util-lib - set min_sdk_level to 30" into mainline-prod am: 510ed38ebe -s ours
am skip reason: Change-Id I1129f690b06e7da8b3b8bbd60ab82253d52e75f8 with SHA-1 fd626dbc84 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13433568
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5fc084b0394ab6a70630df4a6908cd1d65df2924
|
2021-02-04 01:13:44 +00:00 |
|
Automerger Merge Worker
|
19ef085a29
|
Merge "[automerger skipped] Merge "Only allow BROWSABLE && DEFAULT Intents to be always opened" into pi-dev am: 47fb5ee20c -s ours am: 589f538708 -s ours am: 06985dae13 -s ours am: a297374f96 -s ours am: 9a3c3898f9 -s ours" into sc-dev
|
2021-02-04 01:13:39 +00:00 |
|
TreeHugger Robot
|
b7a972abf0
|
[automerger skipped] Merge "Only allow BROWSABLE && DEFAULT Intents to be always opened" into pi-dev am: 47fb5ee20c -s ours am: 589f538708 -s ours am: 06985dae13 -s ours am: a297374f96 -s ours am: 9a3c3898f9 -s ours
am skip reason: Change-Id Ib957258735893bf2779bed19bd400c6726ee6478 with SHA-1 a154d7a648 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13307947
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I066a5162d21224da57e5f7e188caa08e79a619b7
|
2021-02-04 01:13:15 +00:00 |
|
Automerger Merge Worker
|
9ec1bb63e3
|
Merge "Merge "Adding SimPhonebookContract" am: 110420fcae" into stage-aosp-master am: f306fb9957 am: 407c766a8b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1521063
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0a79292e10c3e63cccf4e8cc1f077ddce78fb858
|
2021-02-04 01:13:06 +00:00 |
|
Automerger Merge Worker
|
e46b83026e
|
Merge "[automerger skipped] Merge "Only allow BROWSABLE && DEFAULT Intents to be always opened" into qt-dev am: d7c5e63be3 -s ours am: 5d2fa81de2 -s ours am: 72745aaf00 -s ours am: 3efa9f7d5f -s ours" into sc-dev
|
2021-02-04 01:13:01 +00:00 |
|
TreeHugger Robot
|
54086aadf1
|
[automerger skipped] Merge "Only allow BROWSABLE && DEFAULT Intents to be always opened" into qt-dev am: d7c5e63be3 -s ours am: 5d2fa81de2 -s ours am: 72745aaf00 -s ours am: 3efa9f7d5f -s ours
am skip reason: Change-Id Ib957258735893bf2779bed19bd400c6726ee6478 with SHA-1 a154d7a648 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13307474
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I91e82ce95c1ebbe5aa0addfd1650c943d31f864d
|
2021-02-04 01:12:45 +00:00 |
|
Treehugger Robot
|
a7592f99b0
|
Merge "Adding SimPhonebookContract" am: 110420fcae am: 0e6db34869 am: 60be88bbd4
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1521063
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I36eeb81bffb9791076c872411c682bd2986ed02c
|
2021-02-04 01:12:40 +00:00 |
|
Automerger Merge Worker
|
e514636ebb
|
Merge "[automerger skipped] Merge "Only allow BROWSABLE && DEFAULT Intents to be always opened" into qt-qpr1-dev am: 35f36d2d4c -s ours am: 4a241c28a7 -s ours am: aa11921d25 -s ours" into sc-dev
|
2021-02-04 01:12:36 +00:00 |
|
Rubin Xu
|
281fa6e0e2
|
[automerger skipped] Merge "Add DPM.hasKeyPair()" am: 46915d9a14 am: 5c04261dac am: a73c1787f3 -s ours
am skip reason: Change-Id I15ca6190db1ef4dbf0caabe9d46008d92f758df5 with SHA-1 b73e15249b is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1549394
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If68b9e0e52e4bb99e969da9e000d8aad67efcb3b
|
2021-02-04 01:12:25 +00:00 |
|
TreeHugger Robot
|
28447be3a7
|
[automerger skipped] Merge "Only allow BROWSABLE && DEFAULT Intents to be always opened" into qt-qpr1-dev am: 35f36d2d4c -s ours am: 4a241c28a7 -s ours am: aa11921d25 -s ours
am skip reason: Change-Id Ib957258735893bf2779bed19bd400c6726ee6478 with SHA-1 a154d7a648 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13307475
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2210f13f9dd031a55d2c98a5b3f2d56fcdb7a9f9
|
2021-02-04 01:12:19 +00:00 |
|
Automerger Merge Worker
|
8108474517
|
Merge "[automerger skipped] DO NOT MERGE: Associate notif cancels with notif posts am: 24a1d2c990 am: bc878b6a4d am: 5eea1f904c -s ours" into sc-dev
|
2021-02-04 01:12:16 +00:00 |
|
TreeHugger Robot
|
d2a7f0ec81
|
[automerger skipped] Merge "Only allow BROWSABLE && DEFAULT Intents to be always opened" into oc-mr1-dev am: f4a729180c -s ours am: df0b2e9939 am: a4e5fdf10a am: 06885a559e -s ours am: 290cbce8e1 -s ours am: f5682c0332 -s ours
am skip reason: Change-Id Ib957258735893bf2779bed19bd400c6726ee6478 with SHA-1 a154d7a648 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13307593
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib892b55975b2be2d9614aa7f9be179203c1f8ee5
|
2021-02-04 01:12:02 +00:00 |
|
Evan Laird
|
e41f002e1e
|
[automerger skipped] DO NOT MERGE: Associate notif cancels with notif posts am: 24a1d2c990 am: bc878b6a4d am: 5eea1f904c -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13473406
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4bc05be324923a2ecb92f7dfc82b0ab6c6a5b1b8
|
2021-02-04 01:11:55 +00:00 |
|
Automerger Merge Worker
|
ec2ec1c69f
|
Merge "[automerger skipped] Merge "Only allow BROWSABLE && DEFAULT Intents to be always opened" into rvc-dev am: 3c4f0c4946 am: a7026c2eca -s ours" into sc-dev
|
2021-02-04 01:11:55 +00:00 |
|
Treehugger Robot
|
3ae343dfd8
|
Merge "OWNERS for InlineSuggestion* in view/inputmethod" am: 2745c788a0 am: a42ad625ac am: a13d5a3cba
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1562186
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3a018097be211007dc599da7eaee41250f4b58b9
|
2021-02-04 01:11:37 +00:00 |
|
TreeHugger Robot
|
1c4e7831dc
|
[automerger skipped] Merge "Only allow BROWSABLE && DEFAULT Intents to be always opened" into rvc-dev am: 3c4f0c4946 am: a7026c2eca -s ours
am skip reason: Change-Id Ib957258735893bf2779bed19bd400c6726ee6478 with SHA-1 a154d7a648 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13307948
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8c34446e8e6410b51db233a8795b9d8fe48f107f
|
2021-02-04 01:11:32 +00:00 |
|
Anton Hansson
|
0b5a20abac
|
Merge "Update OWNERS to ref existing file" am: c3d4d00270 am: 09e7ab4ddb am: 8ced652a53
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1570720
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib7e16769818fa388a14a441d589f7aac74022d4d
|
2021-02-04 01:11:14 +00:00 |
|
TreeHugger Robot
|
d4354fb775
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 9b6399bea6 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13414039
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I303fa011bf0b874104ebd33c927f36f8e838f5f6
|
2021-02-04 01:10:20 +00:00 |
|
Chris Ye
|
a539c9da30
|
Merge "Remove @UnsupportedAppUsage annotation from InputDevice constroctor" into sc-dev
|
2021-02-04 01:10:10 +00:00 |
|
Automerger Merge Worker
|
407c766a8b
|
Merge "Merge "Adding SimPhonebookContract" am: 110420fcae" into stage-aosp-master am: f306fb9957
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1521063
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I111571106bafdec70611968c932030e200624058
|
2021-02-04 01:10:06 +00:00 |
|
Treehugger Robot
|
60be88bbd4
|
Merge "Adding SimPhonebookContract" am: 110420fcae am: 0e6db34869
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1521063
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I03c972947b7cf8a4b57d326db196b8fe3f122d4c
|
2021-02-04 01:09:50 +00:00 |
|
Automerger Merge Worker
|
f306fb9957
|
Merge "Merge "Adding SimPhonebookContract" am: 110420fcae" into stage-aosp-master
|
2021-02-04 01:02:05 +00:00 |
|
Kevin Chyn
|
1c312ceb12
|
Merge "Fix SensorRect location" into sc-dev
|
2021-02-04 00:59:36 +00:00 |
|
Treehugger Robot
|
0e6db34869
|
Merge "Adding SimPhonebookContract" am: 110420fcae
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1521063
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3d3041404cacf8bd5a269253808efd898d538fe3
|
2021-02-04 00:58:32 +00:00 |
|
Rubin Xu
|
a73c1787f3
|
Merge "Add DPM.hasKeyPair()" am: 46915d9a14 am: 5c04261dac
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1549394
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I58f9d4a93709ffe0013e0fadd27d991a75c77605
|
2021-02-04 00:53:50 +00:00 |
|
Evan Laird
|
5eea1f904c
|
DO NOT MERGE: Associate notif cancels with notif posts am: 24a1d2c990 am: bc878b6a4d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13473406
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic5a5bab3e6788c7483b148aceaa4087cec09ad37
|
2021-02-04 00:53:16 +00:00 |
|
Treehugger Robot
|
9cfa8e79e0
|
Merge "Adding SimPhonebookContract" am: 110420fcae
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1521063
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I608d52e517edf7874c79538e8a99e3455cd27e9a
|
2021-02-04 00:47:40 +00:00 |
|
Treehugger Robot
|
a13d5a3cba
|
Merge "OWNERS for InlineSuggestion* in view/inputmethod" am: 2745c788a0 am: a42ad625ac
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1562186
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2c009ee37657466cc94974af0331d922aa413279
|
2021-02-04 00:40:33 +00:00 |
|
Rubin Xu
|
5c04261dac
|
Merge "Add DPM.hasKeyPair()" am: 46915d9a14
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1549394
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I738273da4664a6248f219688d9d90b76a6f04c11
|
2021-02-04 00:40:07 +00:00 |
|
Anton Hansson
|
8ced652a53
|
Merge "Update OWNERS to ref existing file" am: c3d4d00270 am: 09e7ab4ddb
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1570720
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9d56847ec40e60c040a17296d3cc5f18fd3d106e
|
2021-02-04 00:40:04 +00:00 |
|
Treehugger Robot
|
110420fcae
|
Merge "Adding SimPhonebookContract"
|
2021-02-04 00:33:51 +00:00 |
|
Adam Bookatz
|
52534776ec
|
Merge "Measured screen energy into BatteryStatsHelper" into sc-dev
|
2021-02-04 00:33:10 +00:00 |
|
Evan Laird
|
bc878b6a4d
|
DO NOT MERGE: Associate notif cancels with notif posts am: 24a1d2c990
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13473406
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia1e59e74decf4453eb0489bbc7139032b9e0387c
|
2021-02-04 00:24:25 +00:00 |
|
Matt Casey
|
5e05f48109
|
Merge changes I16e9e3d7,I546ae4a7 into sc-dev
* changes:
Add Save button to long screenshot
Honor crop bounds for long screenshot bitmap export
|
2021-02-04 00:23:32 +00:00 |
|
TreeHugger Robot
|
7ba56c57ee
|
Merge "Prevent interacting with secondary handle if not initialized" into sc-dev
|
2021-02-04 00:16:00 +00:00 |
|
Treehugger Robot
|
a42ad625ac
|
Merge "OWNERS for InlineSuggestion* in view/inputmethod" am: 2745c788a0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1562186
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5055a233152ec44c8bc98561d8736d205c4e5b14
|
2021-02-03 23:38:17 +00:00 |
|
Anton Hansson
|
09e7ab4ddb
|
Merge "Update OWNERS to ref existing file" am: c3d4d00270
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1570720
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ibd30278360b8ad629c5b297b126d882119bb1d33
|
2021-02-03 23:24:00 +00:00 |
|
Treehugger Robot
|
de291dabb4
|
Merge "Keystore 2.0: isKeystore2Enabled returned wrong value." am: 51bf93a35a am: f8a276f313 am: da743b68a4
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1572822
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I91ccdfa9250800092160c1fb79e168213af87c43
|
2021-02-03 23:23:20 +00:00 |
|
Treehugger Robot
|
0a817569eb
|
Merge "AdvertiseData: fix nullable collection" am: 0f12a22aa6 am: acb38137cd am: 5a1c256180
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1563681
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I6cad0419179b893a4b936ec03bc2f3ab9a92e5c5
|
2021-02-03 23:22:56 +00:00 |
|
Songchun Fan
|
933f1de97a
|
Merge "Fix system_server's main thread name." am: 7fa0e63bc3 am: a184cbd7fb am: a3ba5784d3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1569742
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I362576dac4741ce88761d2ffe808ed5e5c469039
|
2021-02-03 23:22:26 +00:00 |
|
Treehugger Robot
|
da743b68a4
|
Merge "Keystore 2.0: isKeystore2Enabled returned wrong value." am: 51bf93a35a am: f8a276f313
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1572822
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I6fbbcbf584778a03d9844623a18966f4a775d1e5
|
2021-02-03 23:13:26 +00:00 |
|
Treehugger Robot
|
5a1c256180
|
Merge "AdvertiseData: fix nullable collection" am: 0f12a22aa6 am: acb38137cd
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1563681
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I80de479b73c6e8acb62c314ab25e2e93f5ed0669
|
2021-02-03 23:13:08 +00:00 |
|
Treehugger Robot
|
f8a276f313
|
Merge "Keystore 2.0: isKeystore2Enabled returned wrong value." am: 51bf93a35a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1572822
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id8742a4f74a0e5339af6d35f03a2d6173a700680
|
2021-02-03 23:00:35 +00:00 |
|
Songchun Fan
|
a3ba5784d3
|
Merge "Fix system_server's main thread name." am: 7fa0e63bc3 am: a184cbd7fb
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1569742
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I6747d8a5e2341338d3e0f71692876bf183609b3a
|
2021-02-03 22:57:02 +00:00 |
|