Commit Graph

1861 Commits

Author SHA1 Message Date
Svet Ganov
7b7ea938f5 Prepare AttributionSource to expose to native
Separate the internal state of AttributionSource from the
class to make it a simple AIDL we can translate automatically
to native - keeping Java and native parts in sync. This
would allow writing a thin native lib for checking attribution
source permissions which would be used to teach camera and
audio about attributions.

Deinfe an AIDL interface for passing around an attribution
source and opr performing permission checker oprations allowing
native and Java permission checks on attribution chains to be
handled. The Java side permission checker functions are in a dedicated
permisison checker service on top of which sits the PermissionChecker.
We expose similar PermissionChecker native APIs sitting on top
of the same remote interface. The nice thing is that we have
native and Java permisison checkers in sync sharing remoting
code and being close in shape.

For now the PermissionChecker in Java is divorced from the
PermissionManager but in T we will consider how to unify them,
either by an extension object on the PermmissionManager or
APIs on the PermissionManager, or another approach, and then
migrate clients off the PermissionChecker APIs.

bug: 158792096

Test: atest CtsPermission5TestCases

Change-Id: I4e050e78b2361cbf524cc213802e0fef5b487f67
2021-04-25 19:00:30 +00:00
TreeHugger Robot
7f0b426d3d Merge "Revert^2 "Remove framework-connectivity from the private API"" into sc-dev 2021-04-21 10:21:15 +00:00
Remi NGUYEN VAN
4306458c29 Revert^2 "Remove framework-connectivity from the private API"
No target should build against hidden symbols in framework-connectivity,
as it has been moved to a mainline module that only exposes a stable
API.

Change-Id: I7e98314ce58419d3dce4845cba9c2b1852690c36
Fixes: 182859030
Test: m
2021-04-21 01:13:53 +00:00
Remi NGUYEN VAN
36bae70378 Merge "Revert "Remove framework-connectivity from the private API"" into sc-dev 2021-04-21 01:08:54 +00:00
Remi NGUYEN VAN
fab0a766da Revert "Remove framework-connectivity from the private API"
This reverts commit 17045d956f.

Reason for revert: Broken build: b/185947883

Change-Id: Ia7e6af3b47540142b5ea511e825a9dc86c0680c6
2021-04-21 01:07:54 +00:00
Chiachang Wang
8aaa2bc109 Merge "Remove framework-connectivity from the private API" into sc-dev 2021-04-21 00:25:20 +00:00
Jeff Sharkey
6eed56ddd3 More Bluetooth API annotation updates.
This change adds a "BluetoothPermissionChecker" that ensures that
all Bluetooth permission annotations are consistent.  In addition, it
verifies that all Bluetooth public APIs have been audited to be
permission protected where relevant.

We've currently standardized on saying that APIs that return device
or Bluetooth state information (without sharing details about any
particular remote Bluetooth device) do not need to be permission
protected.

This change is only annotations and has no behavior changes.

Bug: 183626724
Test: ./build/soong/soong_ui.bash --make-mode Bluetooth RUN_ERROR_PRONE=true
Change-Id: Ie80b15b058359bf1e9a6ee881b89cb3e5b584ca1
2021-04-16 13:31:22 -06:00
Anton Hansson
9c74c744fc Inline usage of jarjar_rules.txt
No need to have a filegroup for this. This also has the nice side-effect
of avoiding modules outside this directory depending on the file.

Bug: 185128417
Test: m
Change-Id: Idef6f2fd89116490c43427bba55202f46377a83d
2021-04-12 18:39:33 +01:00
Anton Hansson
e3d44e8b76 Move defaults closer to their targets
The top-level Android.bp is large and difficult to navigate. Move these
defaults closer to the targets that use them.

Bug: 185128417
Test: m
Change-Id: I7dd7a82837c9a0902aabd640e35ebb65c5f16c73
2021-04-12 18:39:24 +01:00
Anton Hansson
31fb58bd22 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
Change-Id: I5719ba0fa8e03dcfca0cc32dc30db3f87ea4e3cd
2021-04-12 18:39:20 +01:00
Anton Hansson
9f9f90b260 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
Change-Id: I5f3106b74edb91ac9db5b3e66cc61566d0f16e9b
2021-04-12 18:08:45 +01:00
Anton Hansson
55e59cbf48 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
Change-Id: I3fd90c2d5140e5716474ff1f8c58cbc1b3319e5b
2021-04-12 18:08:37 +01:00
Remi NGUYEN VAN
17045d956f Remove framework-connectivity from the private API
No target should build against hidden symbols in framework-connectivity,
as it has been moved to a mainline module that only exposes a stable
API.

Fixes: 182859030
Test: m
Change-Id: I376531cb34696aac9fa2d278f0698565937bea65
2021-04-07 13:34:42 +09: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
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
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
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