Commit Graph

636483 Commits

Author SHA1 Message Date
Amit Mahajan
23ac92cb39 Re-expose TrafficDescriptor.Builder for testing.
Based on API council feedback.

Test: atest TrafficDescriptorTest
Bug: 185782182
Change-Id: Idb467d37728b062fa29f6bd284bd3144522d701e
2021-04-19 21:24:10 +00:00
Tony Mak
b004404a72 Merge "Add some TestAPIs for replacing some @hide API usages in ExtServices's test" into sc-dev 2021-04-19 21:07:41 +00:00
Daniel Chapin
1aa87efd66 Merge "Revert "Add icon for "Extra dim" used in accessibility shortcut"" into sc-dev 2021-04-19 20:49:26 +00:00
Amy Zhang
5c6694aa25 Merge "Fix TunerService/TunerClient implementation issues" into sc-dev 2021-04-19 20:18:30 +00:00
TreeHugger Robot
9ad39e2bf5 Merge "Set CDMA roaming/subscription mode throws ISE if not CDMA" into sc-dev 2021-04-19 20:17:34 +00:00
Changyeon Jo
33c1862f9b Merge "Add CarEvsService permissions" into sc-dev 2021-04-19 20:00:15 +00:00
Yi Jiang
8d7bd3610a Merge "Renames RotationResolutionRequest#getPackageName()" into sc-dev 2021-04-19 19:22:03 +00:00
Yan Yan
8dbc89396d Merge "Use #setNetwork and #getNetwork for IkeSessionParams" am: 3022c5437c am: cc0c3a5f62 am: faf572b9ee
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675285

Change-Id: I94d750ce60a8caaeb221875cfa8ef3f570863ab9
2021-04-19 19:18:22 +00:00
Aurimas Liutikas
460b46ba77 [automerger skipped] Merge "Cleanup nativeHeapZeroInit and memtagMode implementation." am: 6dd6c5a603 am: 8b19886f9b am: 9c0a2e0633 -s ours
am skip reason: skip tag Change-Id Iad46a1da9bc040baf4c438afbc5fd8cd128e99f1 with SHA-1 0aa606cc5a is already in history

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

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

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

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

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

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

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

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

Change-Id: I2b9518c71da84e0b381b01be342d888c8abc6a85
2021-04-19 19:15:11 +00:00
Automerger Merge Worker
9dd312bfa4 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 822eb952ea -s ours am: 7534b6b0d3 -s ours" into sc-dev 2021-04-19 19:15:05 +00:00
TreeHugger Robot
f3223a694f Merge "Add more javadoc for requestRawExternalStorageAccess" into sc-dev 2021-04-19 19:14:44 +00:00
TreeHugger Robot
81830c547f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 822eb952ea -s ours am: 7534b6b0d3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I57a057ead7fa7dba36534373522016e19f41a2f7
2021-04-19 19:14:42 +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
TreeHugger Robot
a7be8bc756 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 8d7c3f4fdc -s ours am: f753b2091d -s ours
am skip reason: subject contains skip directive

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

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

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

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

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

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

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

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

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

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

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

Change-Id: I902fefc9be28502642bd3a92cf1026466fbc67af
2021-04-19 19:12:55 +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
TreeHugger Robot
0ce95a56f9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: d9cdcb2260 -s ours am: 6da6adf83a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8c6904b6dc8fdd3a650bd74c36be677c25908c07
2021-04-19 19:12:38 +00:00
TreeHugger Robot
b8c7cb6879 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 3b2bd00153 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie81bc982b83ac015cd95e73368866f8eefa2c977
2021-04-19 19:11:13 +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
9f43163b98 Merge "Move READ_PHONE_STATE compat id to @hide" into sc-dev 2021-04-19 19:05:16 +00:00
TreeHugger Robot
f1561cd9d4 Merge "Remove the usage of hidden API" into sc-dev 2021-04-19 19:03:11 +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
Daniel Chapin
56a7a55e65 Revert "Add icon for "Extra dim" used in accessibility shortcut"
This reverts commit e9f44933ac.

Reason for revert: Bug: 185737105

Change-Id: I7978fb859451a47182bf7a2147a50254731bfc2d
2021-04-19 18:39:17 +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
3b2bd00153 Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-04-19 18:32:43 +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