Commit Graph

1853 Commits

Author SHA1 Message Date
Paul Duffin
16a4fc0da8 Merge "Remove framework-atb-backward-compatibility" am: 9f82ba21f1 am: 4f48fa4d6f am: 87827b5eb3 am: 8c7e28c9b4
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1663339

Change-Id: I610b1aa097cefb06d029c0d28005d49d897054ea
2021-04-06 15:44:07 +00:00
Anton Hansson
441c97bf8b Merge "Remove hwbinder" am: 1bf83b28d9 am: 2f3ad490b1 am: bf856b1aa1 am: 7071e29172
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1658059

Change-Id: Ie0df1462252d797e73f622db2628c94de7ff251e
2021-04-06 15:42:41 +00:00
Paul Duffin
8c7e28c9b4 Merge "Remove framework-atb-backward-compatibility" am: 9f82ba21f1 am: 4f48fa4d6f am: 87827b5eb3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1663339

Change-Id: I61bcf109ebcc8a746fde814fbd9dc5fe69e9dfca
2021-04-06 15:27:40 +00:00
Anton Hansson
7071e29172 Merge "Remove hwbinder" am: 1bf83b28d9 am: 2f3ad490b1 am: bf856b1aa1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1658059

Change-Id: Iae9a0ce89f495f9aa15d21c68790cd5d310bebea
2021-04-06 15:26:02 +00:00
Paul Duffin
9f82ba21f1 Merge "Remove framework-atb-backward-compatibility" 2021-04-06 14:09:30 +00:00
Anton Hansson
1bf83b28d9 Merge "Remove hwbinder" 2021-04-06 13:08:56 +00:00
Paul Duffin
20c056dacb Remove framework-atb-backward-compatibility
The class in this library no longer needs to be conditionally included
on the bootclasspath based on the REMOVE_ATB_FROM_BCP flag so is being
built as part of framework-minus-apex.

Bug: 184331423
Test: m nothing
Change-Id: If7c2ec51be0670ffda22e18ce1e028783a1513e7
2021-04-06 11:41:49 +01:00
Janis Danisevskis
eb7f5a130c Merge "Keystore 2.0: Remove Keystore 1.0 SPI with all remaining references" am: a8b1b1a2e6 am: 08945c21ef am: 66ead4fb0b am: 9ba0f37f8a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1624872

Change-Id: I1d15cbe4c91b0121b51f3b33f07cf0d3e9d86b01
2021-04-03 02:16:34 +00:00
Janis Danisevskis
9ba0f37f8a Merge "Keystore 2.0: Remove Keystore 1.0 SPI with all remaining references" am: a8b1b1a2e6 am: 08945c21ef am: 66ead4fb0b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1624872

Change-Id: I08fcf329e59c309d9292edc846653b02e7a60f21
2021-04-03 02:02:03 +00:00
Ytai Ben-tsvi
42360c9531 Merge changes from topic "sthal-aidl"
* changes:
  Documentation improvements in Sound Trigger Middleware
  Add support for STHAL 3 (AIDL)
  Model ISoundTriggerHal after the AIDL HAL
  Add equals() / toString() to media parcelables
  Rename SoundTriggerHw2 to SoundTriggerHal
  Extract capture session out of RecognitionEvent
  Extract stable AIDL modules
2021-04-02 17:01:16 +00:00
Janis Danisevskis
a6dcf091f5 Keystore 2.0: Remove Keystore 1.0 SPI with all remaining references
Bug: 171305684
Test: CtsKeystoreTestCases
Change-Id: I337515dadc9e45b909bff058d4e13371b4fa843c
2021-04-01 17:06:41 -07:00
Steven Moreland
bd32be9d25 Merge "Partial: ActivityManager: use proc state from compiled aidl" 2021-04-01 18:33:54 +00:00
Steven Moreland
42c6e93fde Partial: ActivityManager: use proc state from compiled aidl
In order to fix divergence in libbinder Android.bp file, adding an
empty file group corresponding to an internal file group.

This is needed to easily manipulate where source files are included
in libbinder without having to land patches internally and externally.

Bug: 183654927
Test: N/A

Merged-In: I3dafe7a75b2dae561583a7821284027a1896b9a5
Change-Id: I8821242efdc0a27daddf30368f948855062f2d14
2021-04-01 18:30:28 +00:00
Ytai Ben-Tsvi
128df2aa11 Model ISoundTriggerHal after the AIDL HAL
This changes makes ISoundTriggerHal look similar to the AIDL version
of ISoundTriggerHw (see JavaDoc of the interface for a discussion of
the differences).

This change makes adding support for the AIDL HAL almost trivial and
would allow eventually cleanly dropping support for HIDL by confining
dependencies on it to below the ISoundTriggerHal interface.

AIDL/HIDL conversion now all happen at the Hw2Compat level.

Test: atest atest FrameworksServicesTests:SoundHw2CompatTest FrameworksServicesTests:SoundTriggerMiddlewareImplTest
Test: Manual verification of basic soundtrigger use-cases.
Bug: 178722883
Change-Id: I7cb406b33eac695c1dae0094a3b948fb73cf75f1
2021-04-01 09:29:23 -07:00
Aaron Huang
e427565991 Merge "Move some constants from TrafficStatsConstants to NetworkStackConstants" 2021-04-01 15:59:39 +00:00
Aaron Huang
42951ddb37 Move some constants from TrafficStatsConstants to NetworkStackConstants
Keep the constants are only used by framework in TrafficStatsConstants
and move the others to NetworkStackConstants which is in libs/net.

Bug: 182349970
Test: FrameworksNetTests
      NetworkStackTests
      TetheringTests
Change-Id: Ib667c115e5f1e01237d88b77bba753363da309cc
Merged-In: Ib667c115e5f1e01237d88b77bba753363da309cc
2021-04-01 05:10:03 +00:00
Anton Hansson
5013902a24 Merge changes I97086e30,Ic55df4cf,I81a08c29 am: 4199ef90b9 am: 4bc578052d am: ec1f981309
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1655736

Change-Id: I5d242cf5b18c4b556105cfcfe78df2ac18a8544e
2021-03-31 18:01:32 +00:00
Anton Hansson
4199ef90b9 Merge changes I97086e30,Ic55df4cf,I81a08c29
* changes:
  Move framework java filegroups into subdirectories
  Partial cp of "Move Tuner resource updating from Tuner java into Tuner client"
  Partial cp of "Initial boilerplate for an updatable graphics jar"
2021-03-31 16:13:13 +00:00
Anton Hansson
9a7ad7fa85 Merge "Delete framework-updatable-sources filegroup" 2021-03-31 14:33:20 +00:00
Anton Hansson
703cde0322 Delete framework-updatable-sources filegroup
Inline these sources in the only place it is used.

Test: presubmit
Merged-In: I42e7044471262bf901b8c130a50e1a8a8170c600
Change-Id: I42e7044471262bf901b8c130a50e1a8a8170c600
2021-03-31 13:16:11 +00:00
Anton Hansson
35c0b09876 Delete framework-updatable-sources filegroup
Inline these sources in the only place it is used.

Bug: 184125529
Test: presubmit
Change-Id: I42e7044471262bf901b8c130a50e1a8a8170c600
2021-03-31 09:33:33 +00:00
Anton Hansson
355f8c28b1 Merge "Remove custom annotation libs" 2021-03-31 09:20:54 +00:00
Anton Hansson
c092d80a11 Merge "Add framework-mime-sources to stubs generation" am: ba4eeb87dd am: 9c26127d17 am: 7e0527c567
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1655732

Change-Id: Id8119533bbd8320d81d0e8166086fd6565ba54b4
2021-03-30 18:34:04 +00:00
Anton Hansson
28e58b4783 Merge "Add a shared filegroup for non-updatable stub sources" am: 4ffb28c5f3 am: 4d79002c3c am: 916e38597d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1655731

Change-Id: I1ac2e12c782acac9087ff741676406557a19859e
2021-03-30 18:32:35 +00:00
Anton Hansson
2d9cd59eeb Merge "Revert "Add SuppressLint to framework-annotations-lib"" into mainline-prod am: 7d5365b2f8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14033674

Change-Id: Icbfc2c81baf8eebe9862f154170c53b23c08e717
2021-03-30 18:06:57 +00:00
Anton Hansson
7d5365b2f8 Merge "Revert "Add SuppressLint to framework-annotations-lib"" into mainline-prod 2021-03-30 17:10:25 +00:00
Anton Hansson
f5c654654d Remove custom annotation libs
Various modules were previously creating their own annotation libs
as some appeared to be missing from framework-annotations-lib. Add the
missing ones instead (they all have SOURCE retention), and delete the
custom ones.

Bug: 183133670
Test: m
Merged-In: I4583da7bf5849783d6c5e88a762e04a8fe3e8760
Change-Id: I4583da7bf5849783d6c5e88a762e04a8fe3e8760
2021-03-30 16:18:49 +01:00
Anton Hansson
374770e158 Revert "Add SuppressLint to framework-annotations-lib"
This reverts commit 2157c89792.

Reason for revert: Not the right fix. SuppressLint is apparently
in the SDK, so modules should be picking it up from there.

Change-Id: I7fdca1e4c30f897a77eb348f92d3ca18d2175dff
2021-03-30 15:18:00 +00:00
Anton Hansson
31df3e6e2b Remove custom annotation libs
Various modules were previously creating their own annotation libs
as some appeared to be missing from framework-annotations-lib. Add the
missing ones instead (they all have SOURCE retention), and delete the
custom ones.

Bug: 183133670
Test: m
Change-Id: I4583da7bf5849783d6c5e88a762e04a8fe3e8760
2021-03-30 14:30:28 +01:00
Anton Hansson
f1f4000c14 Merge "Remove framework-aidl-mappings" am: e492ec434d am: 44f83d814d am: be66c03569
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1655729

Change-Id: I27dfc300108e8788a9deaadde6af393447d5a0e7
2021-03-30 13:22:24 +00:00
Anton Hansson
c11a1cba0a Remove hwbinder
Noone uses this.

Bug: 77285514
Test: m
Change-Id: Ia6903ee91011b9bb5d8765e2534737da1d6ac45c
2021-03-30 13:21:08 +01:00
Anton Hansson
9b2c4a650b Move framework java filegroups into subdirectories
All the java code used to build the framework jar and run metalava
was previously defined in the toplevel Android.bp files. Move these
into the subdirs where the source actually lives.

This simplifies the rules themselves (no path and needless prefix) and
declutters the top level Android.bp.

Test: m
Change-Id: I97086e309eacb879d16facb8497d9940fa5ddaf6
2021-03-30 12:26:55 +01:00
Anton Hansson
459d9506ee Partial cp of "Move Tuner resource updating from Tuner java into Tuner client"
Cherry-pick the change to the media filegroup in the root Android.bp
to avoid merge conflicts in upcoming changes.

Test: m nothing
Merged-In: I46acdd2f118d5b082aa162c680661a304b4f628b
Change-Id: Ic55df4cfeb295cfa1657c64f9747c90e30cb73a2
2021-03-30 12:21:21 +01:00
Anton Hansson
fbb283fb4d Partial cp of "Initial boilerplate for an updatable graphics jar"
Rename the filegroup for graphics was was done in the internal change
I148b54fe47560b2335e9d878ed93bf167d6c7517.

Test: m nothing
Merged-In: I148b54fe47560b2335e9d878ed93bf167d6c7517
Change-Id: I81a08c29ca99568101f31dc74f8c9d4d5d65663e
2021-03-30 12:09:53 +01:00
Anton Hansson
a08dc6905f Add framework-mime-sources to stubs generation
It was used in the docs stubs generation but it doesn't have its own
(jar) stub generation. Add it to the shared non-updatable sources for
consistency.

The only class in these sources is @hide, so it makes no
immediate difference.

Test: diff android_stubs_current artifact before/after
Change-Id: I33e75623d8d71da362fb16befb78c8c7596fa400
2021-03-30 10:45:27 +01:00
Anton Hansson
77ff72fd71 Add a shared filegroup for non-updatable stub sources
It is always a mistake to add something to the stub sources but not
the doc stub sources.

Test: m
Change-Id: I6b76f5d2c7f0adc01b8a9eb141f2f34d9c2d2967
2021-03-30 10:45:27 +01:00
Anton Hansson
6f1d267633 Remove framework-aidl-mappings
Only used on-demand by potential future app-compat LSCs. We can add it
back if it is needed.

Remove the now unused framework-all-sources at the same time (yay!!).

Bug: 149906971
Test: m
Change-Id: I61176f48d6b90b47f4b9c348e0686111fb704a77
2021-03-30 10:24:33 +01:00
Automerger Merge Worker
b69d8105d1 Merge "Merge "split packagemanager_aidl from libbinder_aidl" am: 1f4ac9e0aa am: c644182c1e" into rvc-qpr-dev-plus-aosp am: 684c42187b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653203

Change-Id: Ib4f30b4f32a62fbeb982a183fca9b1c4e130e37f
2021-03-29 19:14:11 +00:00
Steven Moreland
8bb6bc2716 split packagemanager_aidl from libbinder_aidl
This filegroup contains libbinder things plus packagemanager things.
Ideally this packagemanager dependency should only be taken by the
things that need it since libbinder is loaded by very many processes,
and it may consider to dirty memory in these processes (the vtables for
AIDL interfaces). This is a preparation CL.

Bug: 183654927
Test: N/A
Change-Id: Iba8153a50244101875fcfd1148924430c0907b37
2021-03-26 01:51:47 +00:00
Remi NGUYEN VAN
7b6b006f5d Use connectivity APIs from framework-connectivity
Instead of compiling framework-connectivity source into
frameworks-minus-apex, have the APIs loaded separately from
framework-connectivity.

Bug: 171540887
Test: device boots, has connectivity
Change-Id: I8f07ff2082c3de80821e121807e66a43a870de7b
2021-03-25 06:34:52 +00:00
Remi NGUYEN VAN
f31149794e Merge framework-connectivity impl and stub targets
Instead of using api_only: true, use a single java_sdk_library to
generate both framework-connectivity stubs and
framework-connectivity.impl.

Bug: 183600168
Test: m
Change-Id: I76d7cf1ba31a3f38ae6b9facbf1b668860c8c165
2021-03-24 23:52:58 +09:00
Paul Duffin
1db80b814f Merge "Remove unnecessary dependency on libcore-platform-compat-config" am: 82cd5382b7 am: e70b70a77b am: f083c90ae9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1646303

Change-Id: I1c3ed0bb99cb1a61397147f75b752cd921a6cc6d
2021-03-23 14:06:23 +00:00
Paul Duffin
82cd5382b7 Merge "Remove unnecessary dependency on libcore-platform-compat-config" 2021-03-23 11:17:06 +00:00
Janis Danisevskis
15212609ca Use source for keystore/keymint interfaces.
This patch makes frameworks use generated sources instead of libraries
for keystore, keymint and related interfaces and dependencies to break
circular build system dependencies occuring when using @SensitiveData
annotations.

Bug: 174857732
Bug: 176110256
Test: N/A
Merged-In: Ia7fc2403cfe6dece86ed0ab9d6f415be2a2726b8
Change-Id: Ia7fc2403cfe6dece86ed0ab9d6f415be2a2726b8
2021-03-22 18:26:16 +00:00
Janis Danisevskis
c0a2fc8e91 Merge "Use source for keystore/keymint interfaces." into sc-dev 2021-03-22 17:51:45 +00:00
Paul Duffin
c130918e25 Remove unnecessary dependency on libcore-platform-compat-config
Bug: 182402754
Test: m droid
Change-Id: I2d8558acf2d61452e1994259dd05a15b2252e577
2021-03-22 08:39:06 +00:00
Janis Danisevskis
2390267db8 Use source for keystore/keymint interfaces.
This patch makes frameworks use generated sources instead of libraries
for keystore, keymint and related interfaces and dependencies to break
circular build system dependencies occuring when using @SensitiveData
annotations.

Bug: 174857732
Bug: 176110256
Test: N/A
Change-Id: Ia7fc2403cfe6dece86ed0ab9d6f415be2a2726b8
2021-03-20 20:36:03 -07:00
Shuzhen Wang
1c9985c2ef Camera: Define camera stream proto separately
Define camera stream proto within framework so that the atoms.proto can
be used in standalone fashion, avoiding extra dependency.

Test: Run camera and inspect logging data using statsd_testdrive
Bug: 175339054
Change-Id: I41299025504ff009116c9149750c5c505ce27504
2021-03-19 16:20:26 +00:00
Aaron Huang
c03b2044dc Move some constants from TrafficStatsConstants to NetworkStackConstants
Keep the constants are only used by framework in TrafficStatsConstants
and move the others to NetworkStackConstants which is in libs/net.

Bug: 182349970
Test: FrameworksNetTests
      NetworkStackTests
      TetheringTests
Change-Id: Ib667c115e5f1e01237d88b77bba753363da309cc
2021-03-15 22:50:37 +08:00
Remi NGUYEN VAN
c538773be1 Merge "Create a service-connectivity-pre-jarjar library" 2021-03-15 01:32:47 +00:00