Commit Graph

1730 Commits

Author SHA1 Message Date
Chong Zhang
366ef60790 Merge "transcoding: move MediaTranscodeManager to apex" 2020-12-23 03:28:03 +00:00
Chong Zhang
864d0b7220 transcoding: move MediaTranscodeManager to apex
bug: 159172726
test: builds; presubmit; manual testing transcoding locally.
Change-Id: I727912a04cf4f7f03fdf5fa0a74e522f69dca66f
2020-12-22 19:34:46 +00:00
Anton Hansson
6080e03adf Merge "Stop ignoring classes on the classpath for stubs" am: 61e082abdb am: ab3f2d3aba am: 81bfcb40a3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1533280

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I814572df3ea32202a9f348901143d0b244dad56f
2020-12-22 12:34:57 +00:00
Benedict Wong
457fe96023 Merge changes Ifabf5e2b,I2e632532 am: c0e2e1c9bd am: 0ed3d9cb2f am: ade3cf56b3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1501053

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie864a11f42cea063bf922a1df3253fcdc6abf681
2020-12-22 06:59:01 +00:00
Anton Hansson
121ccbcfee Stop ignoring classes on the classpath for stubs
We're working on moving the libcore classes away from srcs and into the
classpath, and ignoring classes on the classpath will cause incorrect
API signatures once that happens (several libcore classes appear in
public API signatures).

Keep the docs building in the same way they were before. They will be
addressed in separate CLs.

Bug: 173606718
Test: m checkapi
Change-Id: I471327c3657662d7a093e9baa2fb6e08d640f895
2020-12-21 10:46:53 +00:00
Benedict Wong
264973663c Implement basic VcnConfig and VcnGatewayConnectionConfig
This change adds some of the basic fields in VcnConfig and
VcnGatewayConnectionConfig, plus adds a persistability layer to ensure
all VcnConfig(s) are disk-stable.

Bug: 163602123
Bug: 163594033
Test: New tests added, passing
Change-Id: I2e632532809e7768b284be376f2b0a77f634fef5
2020-12-16 17:51:58 -08:00
David Su
74f5161e3d Merge "framework-wifi: Migrate ParceledListSlice to the version from module-utils" 2020-12-14 16:45:40 +00:00
David Su
e4bea7b1c8 framework-wifi: Migrate ParceledListSlice to the version from module-utils
Bug: 175130412
Test: boots up and connects to wifi
Change-Id: Ia0d26ad39e994a7a177db2ef4082ee04bff87e10
2020-12-10 09:18:06 -08:00
Michal Olech
23dcad5007 [CEC Configuration] Move master configuration from '/product/etc' to '/system/etc'
Master configuration should actually be available for all Android devices.

Bug: 168020131
Bug: 174349652
Test: atest HdmiCecConfig; also flashed and smoke tested a device
Change-Id: I79dee4798a4d2405505f58e89d78b152cdc82fd7
2020-12-10 16:14:14 +01:00
Treehugger Robot
87b5c6a2a1 Merge "Adding AudioUsage converters to AudioAttributes" 2020-12-07 18:35:21 +00:00
Hayden Gomes
c164f6a4d1 Adding AudioUsage converters to AudioAttributes
audio_policy_configuration.xsd defines strings used by HAL
to represent audio usages. This adds converters between
those strings and the AudioAttributes#attributeUsage values

Bug: 171572311
Test: atest AudioAttributesTest
Change-Id: I5301276ebd6ea1539182e9925a1e19f515e80597
Merged-In: I5301276ebd6ea1539182e9925a1e19f515e80597
2020-12-04 16:48:35 +00:00
Baligh Uddin
3eab1b0983 Migrate frameworks/base/cmds/statsd to packages/modules/StatsD/bin
Add statsd protos to platform_protos rule

BUG: 167962588
TEST: TH
TEST: Local build [ m com.android.os.statsd ]
Merged-In: I053f2a211ea28c2f181937af3d58ad16b235d096
Change-Id: I637a1af27d572924e88b1f8a930fc45d0794fa20
2020-12-04 00:40:07 +00:00
Baligh Uddin
b74ba2454c Migrate frameworks/base/cmds/statsd to packages/modules/StatsD/bin
Add statsd protos to platform_protos rule

BUG: 167962588
TEST: TH
TEST: Local build [ crosshatch-userdebug ]
Change-Id: I053f2a211ea28c2f181937af3d58ad16b235d096
2020-12-03 04:43:33 +00:00
Jeffrey Huang
17df403e9e Move enums file to new directory
Bug: 167962588
Test: m -j
Change-Id: I29b21fdc98c6c795902d23f21ef3dfd11d3f3216
Merged-In: I29b21fdc98c6c795902d23f21ef3dfd11d3f3216
2020-11-25 16:14:08 -08:00
Jeffrey Huang
677a0df03c Move enums file to new directory
Bug: 167962588
Test: m -j
Change-Id: I29b21fdc98c6c795902d23f21ef3dfd11d3f3216
2020-11-25 10:46:51 -08:00
Jeffrey Huang
91224ea837 Revert^2 "Delete atoms.proto from statsd"
217301c36f

Change-Id: I81a8287ed5b055e7b6547794d01e7ac897f0f022
2020-11-24 22:28:38 +00:00
Alex Light
217301c36f Revert "Delete atoms.proto from statsd"
Revert "Add android bp to proto_logging"

Revert submission 13070789-atomsproto

Reason for revert: Breaks multiple git_master-without-vendor targets

```
out/soong/.bootstrap/bin/soong_build -t -l out/.module_paths/Android.bp.list -b out/soong -n out -d out/soong/build.ninja.d -globFile out/soong/.bootstrap/build-globs.ninja -o out/soong/build.ninja Android.bp
error: frameworks/base/tools/stats_log_api_gen/Android.bp:49:1: "stats-log-api-gen-test" depends on undefined module "libstats_proto_host"
ninja: build stopped: subcommand failed.
```

Reverted Changes:
I184cf8bf8:Add android bp to proto_logging
I36ec354d2:Delete atoms.proto from statsd

Bug: 167962588

Change-Id: Idce97c5cf020473744eb7f96dcfbdc7677c094da
2020-11-24 21:25:39 +00:00
Jeffrey Huang
5d230a2d49 Delete atoms.proto from statsd
Use the atoms.proto in proto_logging as the source of truth. Also
migrates statsd log api gen to use the new atoms.proto

Bug: 167962588
Test: m -j && m CtsStatsdAtomHostTestCases

Change-Id: I36ec354d273dceace5245d7634c68ac63dc5a8cd
Merged-In: I36ec354d273dceace5245d7634c68ac63dc5a8cd
2020-11-24 10:57:06 -08:00
Jeffrey Huang
4e671568fe Delete atoms.proto from statsd
Use the atoms.proto in proto_logging as the source of truth. Also
migrates statsd log api gen to use the new atoms.proto

Bug: 167962588
Test: m -j && m CtsStatsdAtomHostTestCases

Change-Id: I36ec354d273dceace5245d7634c68ac63dc5a8cd
2020-11-23 23:47:38 -08:00
Chiachang Wang
1b414d61b4 Merge changes from topic "move_BSCH"
* changes:
  Remove BasicShellCommandHandler from frameworks/base
  Move BasicShellCommandHandler to frameworks/lib/modules-utils
2020-11-20 07:29:56 +00:00
TreeHugger Robot
1c1acd45d0 Merge "Camera: Enhance camera atoms for system health" 2020-11-19 18:22:50 +00:00
Chiachang Wang
d5726c1916 Move BasicShellCommandHandler to frameworks/lib/modules-utils
BasicShellCommandHandler is used by mainline modules and the
framwork. There is a new repo that was created for putting
this kind of utility class. Move BasicShellCommandHandler for
the incoming ConnectivityService mainline and updating the
related usage.

Bug: 170598012
Test: m ; verify with adb shell cmd
Change-Id: I8a2873df6e7d8342b7a8b466bda155f74c807ee3
Merged-In: Ida30c877116090616d4bf3f87fdad835446dac84
2020-11-19 03:16:03 +00:00
Chiachang Wang
d0ba3573fb Merge "Move BasicShellCommandHandler to frameworks/lib/modules-utils" 2020-11-19 00:45:29 +00:00
Jeff Sharkey
8fa2407ad2 Adjust "services.core" defaults for Error Prone.
It ends up that "services.core" itself doesn't catch Error Prone
issues, since it works with JAR output from a previous stage.  To
resolve this, we need to move up to "services.core.unboosted" where
the source code is still available.

Fix one instance of AndroidFrameworkCompatChange that had leaked
into the source tree recently.  Disable other checks since there
are hundreds of failures inside the actual "services.core" code.

Bug: 155703208
Test: manual
Exempt-From-Owner-Approval: trivial refactoring
Change-Id: I13f15db61bbcf5f74023147a95551b541d0a8845
2020-11-18 12:17:46 -07:00
Shuzhen Wang
b2443990e9 Camera: Enhance camera atoms for system health
Introduce camera system health atoms, including:
- Camera open, close, and session creation time
- Camera session and stream combination information,
- Stream statistics:
  - stream width, height, format, dataspace, usage flag,
  - max buffer count
  - buffer loss
  - first frame latency.

Test: ./out/host/linux-x86/bin/statsd_testdrive 227
Test: CTS PerformanceTest
Bug: 154159000
Change-Id: I858d64f3324bb9652a59e5857f2730c92c616a8e
2020-11-18 09:49:17 -08:00
Chiachang Wang
6a555279ec Move BasicShellCommandHandler to frameworks/lib/modules-utils
BasicShellCommandHandler is used by mainline modules and the
framwork. There is a new repo that was created for putting
this kind of utility class. Move BasicShellCommandHandler for
the incoming ConnectivityService mainline and updating the
related usage.

Bug: 170598012
Test: m ; verify with adb shell cmd
Change-Id: Ida30c877116090616d4bf3f87fdad835446dac84
2020-11-18 09:18:06 +00:00
Jeff Sharkey
3d39cd1cfc Merge changes from topic "nov14"
* changes:
  Hand-migration to TypedXml interface.
  Mechanically apply TypedXml refaster template.
  Refaster templates for new TypedXml classes.
  Mechanical refactoring to new XML resolvers.
  Refine TypedXmlPullParser API interface.
2020-11-18 01:56:22 +00:00
TreeHugger Robot
8eea08cbd6 Merge "Adding AudioUsage converters to AudioAttributes" 2020-11-17 00:27:53 +00:00
Yan Yan
5e75f56939 Merge changes from topics "PersistableBundleUtils", "bytearray-utils", "integer-utils" am: e9226f999f am: 089a20034d am: 984f6a74ad am: c6d6a9eee7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1495099

Change-Id: I7a64378dff4a8354fb27756169845f1fcd81a242
2020-11-16 22:02:20 +00:00
Jeff Sharkey
f14ed648a9 Refaster templates for new TypedXml classes.
Since we have over 100 unique schemas across the OS, it would be
incredibly tedious to try migrating all that logic to use the more
efficient TypedXmlSerializer and TypedXmlPullParser interfaces.

To aid this migration process, this change adds Refaster templates
that offer to refactor matching existing code in a no-op fashion.

This change also upgrades Error Prone to the latest release.

Bug: 171832118
Test: manual
Change-Id: Ic93a46d646edee98af7d0e2f7891d931fca4825f
2020-11-16 14:44:01 -07:00
Hayden Gomes
24b336f82c Adding AudioUsage converters to AudioAttributes
audio_policy_configuration.xsd defines strings used by HAL
to represent audio usages. This adds converters between
those strings and the AudioAttributes#attributeUsage values

Bug: 171572311
Test: atest AudioAttributesTest
Change-Id: I5301276ebd6ea1539182e9925a1e19f515e80597
2020-11-16 08:46:00 -08:00
Yan Yan
a3e954ffda Include PersistableBundleUtils in framework-ike-shared-srcs
Bug: 163604823
Test: FrameworksIkeTests, CtsIkeTestCases
Change-Id: Iee38086e122293f59ae14d3350f45a63671e8566
2020-11-13 22:51:59 +00:00
raychi
88254a2b56 Support USB Gadget V1.2 HAL
USB Gadget V1.2 HAL include:
1. support NCM function
2. add api to inquiry USB speed
3. add api to inquiry HAL version

Bug: 168282708
Test: build pass and functions are working normally
Change-Id: Idd07c55f4610740c0cf9023391125a86ba39ddee
2020-11-12 10:59:40 +08:00
Chong Zhang
c035a6f07b Merge "ActivityManager: use proc state from compiled aidl" 2020-11-11 18:57:13 +00:00
Chong Zhang
423349508c ActivityManager: use proc state from compiled aidl
bug: 172942349
bug: 159172726
test: builds
Change-Id: I3dafe7a75b2dae561583a7821284027a1896b9a5
2020-11-10 12:38:31 -08:00
David Su
fd626dbc84 framework-wifi-util-lib: compile against min_sdk_version = 30
sdk_version should still be module_current since we need to use
new Android S APIs. Change min_sdk_version to 30 to satisfy
Mainline module requirements.

Bug: 171330443
Test: compiles
Change-Id: I1129f690b06e7da8b3b8bbd60ab82253d52e75f8
2020-11-09 14:31:45 -08:00
Michael Sun
dfe0fe8583 Merge "Update to use new android.system.suspend.control AIDL interface" am: e40aa2d118 am: b726bcfd65 am: a9b465c8d8 am: f9fd07e735
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1480304

Change-Id: I45693209b358a1b1f9691d3729743688b3229172
2020-11-06 19:40:26 +00:00
Michael Sun
d523796ec5 Update to use new android.system.suspend.control AIDL interface
The suspend_control_aidl_interface is updated, renamed, and splitted
into android.system.suspend.control and
android.system.suspend.control.internal. Update to use the correct
interfaces.

Test: atest FrameworksCoreTests:KernelWakelockReaderTest
Bug: 171598743
Change-Id: I32aa339b27f3d9680a61b7338b1bdb531a1a43f7
2020-11-06 03:44:01 +00:00
Treehugger Robot
9ad8254a96 Merge changes Ib3c9affb,I1dbe3d02,I88681f21 am: 1f65c6b62e am: f2abffe107 am: df8410e677 am: 15e1f8f5eb
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1451015

Change-Id: Ia0c6195e820a04d5ac0a330a0813d308d0eb0c08
2020-11-06 02:32:52 +00:00
Treehugger Robot
1f65c6b62e Merge changes Ib3c9affb,I1dbe3d02,I88681f21
* changes:
  Keystore 2.0 SPI: Adding the keystore AIDL interface to frameworks
  Keystore 2.0: KeyProperties SignaturePadding is now public but hidden
  Keystore SPI: Add SecurityLevelEnum to KeyProperties
2020-11-06 01:01:00 +00:00
Janis Danisevskis
145e11ff93 Keystore 2.0 SPI: Adding the keystore AIDL interface to frameworks
Adds the dependency to the new Keystore 2.0 AIDL spec to the frameworks
module.

Bug: 159476414
Test: None
Change-Id: Ib3c9affbe0dfcbd78ff47b41907f5650444711a4
2020-11-05 13:11:12 -08:00
Anton Hansson
c33bf84579 Merge changes from topic "addsup"
* changes:
  [automerge] Add SuppressLint to framework-annotations-lib 2p: 2157c89792
  Add SuppressLint to framework-annotations-lib
2020-11-05 10:12:39 +00:00
Ytai Ben-tsvi
df2e907e08 Merge changes from topic "aidlize-audioflinger"
* changes:
  Remove manual parceling from Interpolator and VolumeShaper
  Add av-types-aidl to libandroid_runtime, libmedia_jni
  Add dependencies to libandroid_runtime, libmedia_jni
  Add dependency to libandroid_runtime
2020-11-04 21:03:37 +00:00
vichang
bd61a3225e Merge "Add app compat config from ICU4J" am: 6d5fbc8434 am: cf0dc89869 am: 334b0811ac am: b295aad1bc
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1481306

Change-Id: Ie64209ccda762c3c7ebabdeace1a34c16794c47d
2020-11-04 13:34:08 +00:00
vichang
6d5fbc8434 Merge "Add app compat config from ICU4J" 2020-11-04 12:28:57 +00:00
Ytai Ben-Tsvi
c3cd3cda9b Remove manual parceling from Interpolator and VolumeShaper
Change-Id: Ic5c3bfeb67c6e1b9b2b3c6275ea4badbef8536d3
2020-11-03 16:21:15 -08:00
Presubmit Automerger Backend
ddd05ba022 [automerge] Add SuppressLint to framework-annotations-lib 2p: 2157c89792
Change-Id: I9c0d36bb0cdfdfa4d5d1fa20a62bd5151a02e63f
2020-11-03 09:56:32 +00:00
Anton Hansson
2157c89792 Add SuppressLint to framework-annotations-lib
Not having this on the classpath causes metalava to ignore
@SuppressLint annotations on APIs.

(The annotation has CLASS retention).

Bug: 172266358
Test: m <framework-module>-check-current-api (with suppressions)
Change-Id: I4aeecf6f067f5c141c6f2a31c9e8b46df3ff7e6a
2020-11-03 09:55:56 +00:00
Victor Chang
a4fae275d5 Add app compat config from ICU4J
Bug: 139480281
Bug: 171979766
Test: device boots
Change-Id: Ib2065368e2c5e0904c229c9383bc774269a0f410
2020-10-30 12:14:34 +00:00
Treehugger Robot
67b2e68a7c Merge changes from topic "bug_167962976_visibility" am: 39c6068cbc am: 5942721506 am: 29bed11140 am: a678e6b183
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1478840

Change-Id: I476629002e075d01c83f77be8343157dbd66ce9b
2020-10-29 08:48:24 +00:00