Commit Graph

567007 Commits

Author SHA1 Message Date
TreeHugger Robot
c55482fcde Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2021-04-13 15:57:17 +00:00
Treehugger Robot
0087b62300 Merge "OOB: Implement getLocalOutOfBand API" am: c1349d4c56
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1662621

Change-Id: Ia0e052f0fcc8c7f17e5f099e9bad2cc596887de7
2021-04-13 15:44:37 +00:00
Treehugger Robot
c1349d4c56 Merge "OOB: Implement getLocalOutOfBand API" 2021-04-13 15:28:25 +00:00
Anton Hansson
24eb9ef668 Merge "Remove disabling of errorprone checks for stubs" am: 34fb03a88f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1671725

Change-Id: I28021969d9d234424a400b97b0d644bed092611b
2021-04-13 15:18:27 +00:00
Anton Hansson
34fb03a88f Merge "Remove disabling of errorprone checks for stubs" 2021-04-13 15:00:29 +00:00
Treehugger Robot
e0351bf49f Merge "CEC: Implement handleReportArcTermination method" am: 9026f587b7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1589692

Change-Id: I1fcd93a1f411dada4d9fd3b552cb97a314e3342b
2021-04-13 14:57:42 +00:00
Treehugger Robot
9026f587b7 Merge "CEC: Implement handleReportArcTermination method" 2021-04-13 14:24:27 +00:00
Anton Hansson
7f06596361 Merge changes I5719ba0f,I5f3106b7,I3fd90c2d am: fd7056c7c9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1673390

Change-Id: I7fa6f421b3ec88af5711ef9c46a0dbd08ff29652
2021-04-13 14:04:48 +00:00
Anton Hansson
7e27fd99aa Move font tool build rules to subdir am: 702aa95096
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1673389

Change-Id: Idbf084313f8abcae9caaad94db798c501b1d8f4a
2021-04-13 14:01:35 +00:00
Anton Hansson
5ed18f82f3 Move build modules from top-level to core/java/ am: 84918d5674
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1673386

Change-Id: I401ed248f28f593e46689a66574c4e50f1ce18b2
2021-04-13 13:59:06 +00:00
Jeff Sharkey
6bc88ceb5d Merge "uwb: Add owners for uwb service" am: 15ee3b3c0e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1673236

Change-Id: I79233c4e5cc6b6e78143eb264460b4e5121b95e0
2021-04-13 13:46:57 +00:00
Aravind Angadi
7fba133318 CEC: Implement handleReportArcTermination method
Bug: 159901363
Test: None

Change-Id: I0d22678f09219e47aa93af13992c3050b32334a8
Merged-In: I0d22678f09219e47aa93af13992c3050b32334a8
2021-04-13 13:14:10 +00:00
Anton Hansson
fd7056c7c9 Merge changes I5719ba0f,I5f3106b7,I3fd90c2d
* changes:
  Move framework proto build rules to separate file
  Move font tool build rules to subdir
  Move build modules from top-level to core/java/
2021-04-13 12:57:12 +00:00
Jeff Sharkey
15ee3b3c0e Merge "uwb: Add owners for uwb service" 2021-04-13 12:56:41 +00:00
Paul Duffin
26efc48ba8 Merge "Export monolithic hidden api files to the dist" am: f94ff5a36e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1673385

Change-Id: Ifeabdabd6b6b75ee7da1f067b2db1b66b15bfdf7
2021-04-13 11:55:07 +00:00
Bill Yi
8f2025d9b9 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I0adf77eaf7bab1dc98cb677a22a5baf75816e01c
2021-04-13 04:12:34 -07:00
Paul Duffin
f94ff5a36e Merge "Export monolithic hidden api files to the dist" 2021-04-13 09:57:12 +00:00
Chiachang Wang
6b7167e807 Merge "Make getUid a method on UserHandle itself instead of static" am: bd1cc4f2a2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669185

Change-Id: If47dccc346aa78c7cb49aafbd5e07d35d3403c6a
2021-04-13 08:51:12 +00:00
Chiachang Wang
bd1cc4f2a2 Merge "Make getUid a method on UserHandle itself instead of static" 2021-04-13 08:15:47 +00:00
Chiachang Wang
a8ae705499 Merge "Add SDK version check to skip S added API test" am: 739195c5b0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1673167

Change-Id: I40516d56f9ca477d62c362dbdf11aad713c620ae
2021-04-13 05:17:53 +00:00
Chiachang Wang
739195c5b0 Merge "Add SDK version check to skip S added API test" 2021-04-13 04:30:36 +00:00
Roshan Pius
c773d42a04 uwb: Add owners for uwb service
The code changes are in internal branch in topic:
https://googleplex-android-review.git.corp.google.com/q/topic:uwb_aosp_service

Only pulling in the OWNERS changes to AOSP.

Bug: 183904955
Test: N/A
Change-Id: I035e908e32090415c6f0e9071084c360abf5aee7
2021-04-12 21:22:51 -07:00
Amy Zhang
012a4243cd Merge "Allow Descrambler.add/removePid to pass a nullable optional filter" am: 0b8ff8e00e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1672265

Change-Id: Ifdbe40af2a6e8e6b70ad9689a819e4c5b793a978
2021-04-13 03:17:31 +00:00
Wonsik Kim
69814e45a1 Merge "MediaCodec: minor revision of APIs for vendor parameters" am: 5d41bf1b65
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1673760

Change-Id: I4e6a062210c5e08ca207d26c5c39667c2f26a1d8
2021-04-13 03:02:43 +00:00
Amy Zhang
0b8ff8e00e Merge "Allow Descrambler.add/removePid to pass a nullable optional filter" 2021-04-13 02:59:06 +00:00
Wonsik Kim
5d41bf1b65 Merge "MediaCodec: minor revision of APIs for vendor parameters" 2021-04-13 02:23:35 +00:00
Chiachang Wang
c35a8165bb Add SDK version check to skip S added API test
NetworkAgentConfigTest is a part of CtsNetTestCasesLatestSdk.
It will be used in mainline test with a R build. Test will
fail with method not found error. Add a version check to skip
the S added API tests.

Test: atest NetworkAgentConfigTest in R and S device
Fix: 185151127
Change-Id: Ib372e68afa99af455eb2713c8f6f1c8ef1d4cfdf
2021-04-13 10:18:36 +08:00
Amy Zhang
93b3dd7fb0 Allow Descrambler.add/removePid to pass a nullable optional filter
Test: make
Bug: 184851519
Change-Id: I5457150579e57cc2c39a3bd390bbef62de73520b
Merged-In: Icf7d9526fa15dc11b23e9f73dbfceee748640772
2021-04-13 01:09:45 +00:00
Josh Gao
95949aed66 Merge "Increase DropBox size to 10MiB." am: e1b4e1d594
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1651533

Change-Id: I337b8077934400a7e0cbd04c6700f0f37883438c
2021-04-12 22:41:07 +00:00
TreeHugger Robot
1678346f96 Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2021-04-12 22:07:22 +00:00
Josh Gao
e1b4e1d594 Merge "Increase DropBox size to 10MiB." 2021-04-12 21:51:07 +00:00
Wonsik Kim
66ee5e4b75 MediaCodec: minor revision of APIs for vendor parameters
- add hashCode() and equals() to ParameterDescriptor
- clarify documentation for subscribe/unsubscribe APIs

Bug: 184537653
Test: atest CtsMediaTestCases:MediaCodecTest
Change-Id: Ie98d2d29eccd94f26ecf6763ae47cee942fc08f8
2021-04-12 14:46:30 -07:00
TreeHugger Robot
b4c4f6d65e Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2021-04-12 20:35:50 +00:00
Bill Yi
2dde39b5d3 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I6ad32a60f663bfe6ac6bed3befd0bd5ef5940c8f
2021-04-12 13:30:42 -07:00
Paul Duffin
72b1ff135f Merge "Move global hidden API flags generation to platform_bootclasspath" am: f277259089
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1670845

Change-Id: Id60304459924aa75456d167fe18091f91ff62851
2021-04-12 19:29:12 +00:00
Paul Duffin
f277259089 Merge "Move global hidden API flags generation to platform_bootclasspath" 2021-04-12 18:43:31 +00:00
Anton Hansson
92b6c725b0 Move framework proto build rules to separate file
The proto build rules are quite large and makes the top-level Android.bp
file difficult to navigate. Move them to a separate file.

Bug: 185128417
Test: m
Merged-In: I5719ba0fa8e03dcfca0cc32dc30db3f87ea4e3cd
Change-Id: I5719ba0fa8e03dcfca0cc32dc30db3f87ea4e3cd
2021-04-12 18:38:42 +01:00
TreeHugger Robot
a700a70372 Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2021-04-12 17:25:34 +00:00
TreeHugger Robot
27bb7521ba Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2021-04-12 17:25:03 +00:00
Bill Yi
c2b2a83aa7 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I2c695011c8aea85bd8046dd96280ab4378c40b6f
2021-04-12 10:21:42 -07:00
Anton Hansson
702aa95096 Move font tool build rules to subdir
The top-level Android.bp file is very large, so move modules that can be
in subdirs.

Also rename the vague "base_defaults" module to something more suitable.

Bug: 185128417
Test: m
Merged-In: I5f3106b74edb91ac9db5b3e66cc61566d0f16e9b
Change-Id: I5f3106b74edb91ac9db5b3e66cc61566d0f16e9b
2021-04-12 17:57:51 +01:00
Anton Hansson
84918d5674 Move build modules from top-level to core/java/
The top-level Android.bp is large and difficult to navigate. Move rules
that don't have any "top level" things in them down in the core/java
directory.

Bug: 185128417
Test: m
Merged-In: I3fd90c2d5140e5716474ff1f8c58cbc1b3319e5b
Change-Id: I3fd90c2d5140e5716474ff1f8c58cbc1b3319e5b
2021-04-12 17:57:38 +01:00
Roland Levillain
87744c8b58 Merge "Fix typo in documentation of ZygoteCommandBuffer.nativeForkRepeatedly." am: 304329d202
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1673345

Change-Id: I01d24f0653d476888db7a354d106b92acd91da6d
2021-04-12 16:16:20 +00:00
Paul Duffin
58554cc6c7 Merge "Enforce formatting of bp files on repo upload" am: 8a8b0e9525
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1671837

Change-Id: I76612c02f60b51f9ef3b5f004eaf8876d43801d2
2021-04-12 16:13:02 +00:00
Roland Levillain
304329d202 Merge "Fix typo in documentation of ZygoteCommandBuffer.nativeForkRepeatedly." 2021-04-12 15:59:04 +00:00
Paul Duffin
8a8b0e9525 Merge "Enforce formatting of bp files on repo upload" 2021-04-12 15:16:21 +00:00
Jeff Sharkey
15ed33c883 Merge "Update OWNERS for core/tests/coretests/src/android/app/admin" am: ad62c97749
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1670846

Change-Id: I5c44c4c0f9a1a148dd5606775e1d40f27422b89b
2021-04-12 14:34:25 +00:00
Lorenzo Colitti
7c25333050 Merge "Add debug logging to requestRouteToHostAddress." am: cd54a8bf4b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1671786

Change-Id: I87f0ab1fe739359c115fce8da250a00b5fd0242b
2021-04-12 14:30:00 +00:00
Jeff Sharkey
ad62c97749 Merge "Update OWNERS for core/tests/coretests/src/android/app/admin" 2021-04-12 14:25:04 +00:00
Chiachang Wang
1de3108a3f Merge "Rename APIs in NetworkAgentConfig.Builder" am: a0445d3546
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669047

Change-Id: Ia437814497ef603043980c37add9e2ddfccf11c9
2021-04-12 14:25:01 +00:00