Commit Graph

569687 Commits

Author SHA1 Message Date
Jing Ji
3d7210ee88 Merge "Update Kotlin sample code for CountDownTimer and Parcelable" am: 598675abef am: a61b23b89e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1673235

Change-Id: Ia82738a244e73ea431280afa3bd5896b68ad6f28
2021-04-19 19:34:11 +00:00
Treehugger Robot
98afac3370 Merge "Hide RCS PUBLISH mapping due to complicated structure" am: f7cde977db am: ce819de5b1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675739

Change-Id: I397d86b1d403451cf0de301ac246b0af3a9f3eba
2021-04-19 19:33:50 +00:00
Treehugger Robot
0f2e5f50de Merge "Clarify SipDelegateImsConfiguration getVersion Documentation" am: ca53d40161 am: f03f48dae6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675738

Change-Id: I73f393eeb5d3c38eae792ab1909d4d4d2cdae356
2021-04-19 19:33:00 +00:00
Jing Ji
a61b23b89e Merge "Update Kotlin sample code for CountDownTimer and Parcelable" am: 598675abef
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1673235

Change-Id: Ia6c7d8965190b905b393d0d51fcaac2f651ef8fb
2021-04-19 19:28:23 +00:00
Treehugger Robot
ce819de5b1 Merge "Hide RCS PUBLISH mapping due to complicated structure" am: f7cde977db
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675739

Change-Id: I7303f9c6d69e3aa6a515273b36bcec8f50289027
2021-04-19 19:25:32 +00:00
Jing Ji
598675abef Merge "Update Kotlin sample code for CountDownTimer and Parcelable" 2021-04-19 19:23:06 +00:00
Treehugger Robot
f03f48dae6 Merge "Clarify SipDelegateImsConfiguration getVersion Documentation" am: ca53d40161
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675738

Change-Id: I9a4462d90bcfc6bc202e72120cfc56693139bbf9
2021-04-19 19:20:57 +00:00
Steven Moreland
a3e142fe3b Merge "reflect libbinder->libpermission: appops" am: 12d2d7fd9c am: 66f91640b9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1674207

Change-Id: I1ba2b9d6d8d9ce5fbdbc4b28c82ccdb76cd38875
2021-04-19 19:15:01 +00:00
Yan Yan
faf572b9ee Merge "Use #setNetwork and #getNetwork for IkeSessionParams" am: 3022c5437c am: cc0c3a5f62
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675285

Change-Id: I4c2cce2cbf18eda19b0f9a26cb2a2d93a78ddbfa
2021-04-19 19:14:30 +00:00
Aurimas Liutikas
9c0a2e0633 Merge "Cleanup nativeHeapZeroInit and memtagMode implementation." am: 6dd6c5a603 am: 8b19886f9b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1660342

Change-Id: Ie0cd5433f684c3b30690631e816f814b371db681
2021-04-19 19:12:53 +00:00
Sally Yuen
90c6d1bde6 Merge "Add UiAutomation shell permission tests to Shell presubmit tests" am: afbb23d1d3 am: 6f15edb618
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1677306

Change-Id: I99febbaed087b186b87fa12404cc7f1d984e7d51
2021-04-19 19:11:01 +00:00
Treehugger Robot
f7cde977db Merge "Hide RCS PUBLISH mapping due to complicated structure" 2021-04-19 19:09:22 +00:00
Treehugger Robot
ca53d40161 Merge "Clarify SipDelegateImsConfiguration getVersion Documentation" 2021-04-19 19:08:51 +00:00
Steven Moreland
66f91640b9 Merge "reflect libbinder->libpermission: appops" am: 12d2d7fd9c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1674207

Change-Id: Idf5634a8b157dba1ffd6ebe5fb748b4a727669b4
2021-04-19 19:03:27 +00:00
TreeHugger Robot
7904fcbb9a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: e2ebb4a3c9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7f78928e34b896d298f7014ff98dd19d6d1b5963
2021-04-19 19:00:17 +00:00
TreeHugger Robot
0b7f9e3b33 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 8c70b355ca -s ours
am skip reason: subject contains skip directive

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

Change-Id: I108549a8005bc590e3a9bdce53244e1b33bb8769
2021-04-19 18:59:54 +00:00
TreeHugger Robot
4dbc30399b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 7341f46579 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6db57596aabf54cc4556ce20fc028b5657596cbd
2021-04-19 18:59:41 +00:00
TreeHugger Robot
7534b6b0d3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 822eb952ea -s ours
am skip reason: subject contains skip directive

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

Change-Id: If5e1cc052988df458818d3f29dc397f7873a3e1f
2021-04-19 18:59:20 +00:00
TreeHugger Robot
f753b2091d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 8d7c3f4fdc -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0c268293ac60d29ed8f33b68e23dcafbb53d144e
2021-04-19 18:59:07 +00:00
TreeHugger Robot
9ea739b6e6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 8b2f0230d5 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If2a5221be90c3a65e6fdbf98851fbaee71d9569b
2021-04-19 18:58:53 +00:00
TreeHugger Robot
9b05930054 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 3caaf0524f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8a7c7fac5c5bc2e39e12c68136ddcdf24e18ebce
2021-04-19 18:58:08 +00:00
Yan Yan
cc0c3a5f62 Merge "Use #setNetwork and #getNetwork for IkeSessionParams" am: 3022c5437c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675285

Change-Id: Ia1a32d6dd831b5debe134681ed0760c79aad6555
2021-04-19 18:58:04 +00:00
TreeHugger Robot
26ac3dfe65 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: d05d301ae3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic610d7665b76d13a98bf75d1d574a5df3faf6754
2021-04-19 18:57:31 +00:00
TreeHugger Robot
5cf0907890 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: a03486f4f4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I99ea2a1ddd6b4d71bc894554b94b37a7eb4a6e81
2021-04-19 18:57:08 +00:00
TreeHugger Robot
e760a7e4f7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: d0e35be714 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If04c07403105b924ef21b8eccdcccfdb3d5cde1c
2021-04-19 18:56:31 +00:00
TreeHugger Robot
6da6adf83a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: d9cdcb2260 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9447aa767a5b4e9a8f15683bbfd404dc016fbb60
2021-04-19 18:55:18 +00:00
Aurimas Liutikas
8b19886f9b Merge "Cleanup nativeHeapZeroInit and memtagMode implementation." am: 6dd6c5a603
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1660342

Change-Id: Iebe3879874d0648771e0787f3e4f265f7ba925d6
2021-04-19 18:52:57 +00:00
Sally Yuen
6f15edb618 Merge "Add UiAutomation shell permission tests to Shell presubmit tests" am: afbb23d1d3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1677306

Change-Id: I35c9a9af4a35dda4246b51ba25b07e34f80e7b9b
2021-04-19 18:45:32 +00:00
TreeHugger Robot
e2ebb4a3c9 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-04-19 18:34:09 +00:00
TreeHugger Robot
8c70b355ca Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-04-19 18:24:10 +00:00
TreeHugger Robot
7341f46579 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-04-19 18:20:54 +00:00
TreeHugger Robot
822eb952ea Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-04-19 18:20:02 +00:00
TreeHugger Robot
8d7c3f4fdc Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-04-19 18:19:58 +00:00
TreeHugger Robot
8b2f0230d5 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-04-19 18:17:19 +00:00
TreeHugger Robot
3caaf0524f Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-04-19 18:17:15 +00:00
TreeHugger Robot
d05d301ae3 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-04-19 18:15:06 +00:00
TreeHugger Robot
a03486f4f4 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-04-19 18:11:09 +00:00
TreeHugger Robot
d0e35be714 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-04-19 18:11:05 +00:00
TreeHugger Robot
d9cdcb2260 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-04-19 18:10:15 +00:00
Steven Moreland
12d2d7fd9c Merge "reflect libbinder->libpermission: appops" 2021-04-19 17:20:21 +00:00
Yan Yan
3022c5437c Merge "Use #setNetwork and #getNetwork for IkeSessionParams" 2021-04-19 17:04:25 +00:00
Aurimas Liutikas
6dd6c5a603 Merge "Cleanup nativeHeapZeroInit and memtagMode implementation." 2021-04-19 16:52:58 +00:00
Sally Yuen
afbb23d1d3 Merge "Add UiAutomation shell permission tests to Shell presubmit tests" 2021-04-19 16:14:01 +00:00
Bill Yi
0e1e52b6cc Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I50e6222bfa764d5dcc340d76d6d21be0a4597bd6
2021-04-19 15:42:13 +00:00
TreeHugger Robot
75e671c77c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 5d4a124c24 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If5d03747df55d187721ad67fca9562293aeaedb9
2021-04-19 15:34:11 +00:00
TreeHugger Robot
dfd24298c1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: e0b7f6bcc6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id695ec2deb2b6cb12b3856bbb30ec71d6f42004f
2021-04-19 15:33:18 +00:00
TreeHugger Robot
5d4a124c24 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-04-19 15:25:24 +00:00
Bill Yi
1a33b3891f Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ia4af106b55b138e6888979ab1b5adf37910b6f48
2021-04-19 15:21:22 +00:00
Bill Yi
222e66b31b Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ia7abc39c9d9c206ebf70c123653aea25e757fc9e
2021-04-19 15:19:49 +00:00
Bill Yi
70a33f047c Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I5976317db63a764d02e22b32df87e8649757160b
2021-04-19 15:17:01 +00:00