Commit Graph

1883 Commits

Author SHA1 Message Date
Anton Hansson
62fda9f139 Merge "Add targets to build doc-stubs for non-updatable" into sc-dev am: 714f840a8d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14467998

Change-Id: Id557f811a0e97eecab12c2416d8f490d815726f7
2021-05-07 15:05:36 +00:00
Anton Hansson
867f94c755 Add targets to build doc-stubs for non-updatable
Like the jar stubs, the doc stubs need modularization to avoid depending
on module sources and instead being assembled by merging the doc stubs
of the constituent modules. This will allow generating e.g. the lint
database, annotation zips, and the documentation itself from prebuilts
(which in turn allows mixing e.g. non-updatable R with the latest
modules).

Move the defaults for the non-updatable jar stubs to the shared bp file
and reuse it for the non-updatable doc stubs, and add two targets for
the public and the system stubs.

Bug: 186197911
Test: m android-non-updatable-doc-stubs{,-system}
Change-Id: Ic2cef748c42c141ea42b8cd7b4afd7ee78a1399d
2021-05-07 13:48:13 +01:00
Svetoslav Ganov
8fb897acef Merge "Prepare AttributionSource to expose to native" into sc-dev am: 720add59c7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14381260

Change-Id: I14f40269541872bf807f669283da9a6f3d722f97
2021-05-05 23:44:49 +00:00
Svetoslav Ganov
720add59c7 Merge "Prepare AttributionSource to expose to native" into sc-dev 2021-05-05 23:23:54 +00:00
Svet Ganov
4bf102ae26 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.

Sync app ops were not tracked across multiple binder calls which
prevents moving the permission checks in the system server as
this adds one more hop. Now sync ops are propagated backed the
call stack and only the ops for the package are dispatched to
it and the rest are propagated back to the caller, recursively.

bug: 158792096

Test: atest CtsPermission5TestCases
      atest CtsAppOps2TestCases
      atest CtsPermissionTestCases
      atest CtsPermission2TestCases
      atest CtsPermission3TestCases
      atest CtsPermission4TestCases
      atest CtsPermission5TestCases

Change-Id: Ia5cbd2eb20a2da172a5960afdddd7e467f4bcb0d
2021-05-04 07:42:45 +00:00
Chris Wailes
c6360dabab Remove annotations that have been relocated
These annotations have been relocated to frameworks/libs/modules-utils.
This CL removes the files and updates necessary build rules.

Bug: 183133670
Test: m
Merged-In: I834b9f5320e0b6fe8cb9feb7194c82085b805e07
Change-Id: I834b9f5320e0b6fe8cb9feb7194c82085b805e07
2021-04-30 13:36:40 +00:00
Baligh Uddin
4938aed9ec Merge "Remove annotations that have been relocated" 2021-04-29 14:01:59 +00:00
Svetoslav Ganov
180f5ab24e Merge "Revert "Prepare AttributionSource to expose to native"" into sc-dev am: b9b8524f38
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14315965

Change-Id: Ie3634408b2393594a914c582140f69b9c665ac20
2021-04-27 02:25:16 +00:00
Adam Bookatz
33e17a9933 Revert "Prepare AttributionSource to expose to native"
Revert "Prepare AttributionSource to expose to native - native"

Revert submission 14225527-bug-158792096-04/16/21-1

Reason for revert: b/186467053
Reverted Changes:
I16740cc2d:Prepare AttributionSource to expose to native - na...
I4e050e78b:Prepare AttributionSource to expose to native

Change-Id: I83e4091231241c2211edf5745735f4ee993c6680
2021-04-26 23:20:46 +00:00
Chris Wailes
68f38b2feb Remove annotations that have been relocated
These annotations have been relocated to frameworks/libs/modules-utils.
This CL removes the files and updates necessary build rules.

Bug: 183133670
Test: m
Change-Id: I834b9f5320e0b6fe8cb9feb7194c82085b805e07
2021-04-26 14:06:34 -07:00
TreeHugger Robot
6197966364 Merge "Prepare AttributionSource to expose to native" into sc-dev am: a095d6b2b7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14190127

Change-Id: I36a035b2bd484d4901ebcdf08dbc4960ca5d4306
2021-04-26 17:02:34 +00:00
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
7737e5672b Merge "Revert^2 "Remove framework-connectivity from the private API"" into sc-dev am: 7f0b426d3d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14254552

Change-Id: I41fc5c2021533c8ddf2d1a338ce8cecf325750a4
2021-04-21 10:25:34 +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
70ddc2308f Merge "Revert "Remove framework-connectivity from the private API"" into sc-dev am: 36bae70378
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14254551

Change-Id: Id5eae31a47d24fdc91c81dd95b8213ed7db7dd4a
2021-04-21 01:13:06 +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
bb8c4f9b89 Merge "Remove framework-connectivity from the private API" into sc-dev am: 8aaa2bc109
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14109865

Change-Id: If1fd34da00b39dc91ef74c7da9d168c72f375820
2021-04-21 00:30:08 +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
9642976bcd Merge changes from topic "apr16" into sc-dev am: 85e6031fb7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14211470

Change-Id: I69cb8391929f2223cd86f0b388c1613698f2c004
2021-04-17 12:19:46 +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
3df2e16950 Merge changes from topics "based", "jref" into sc-dev am: 5683fda342
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14161634

Change-Id: Idb06d5d3d33ae7e713ae2774bfe0846c8b838701
2021-04-13 12:15:28 +00:00
Anton Hansson
7a6a51859f Merge "Move build modules from top-level to core/java/" into sc-dev am: 797d8fffc5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14161627

Change-Id: I20357886550b9c3fc073a56f769f5be8875675a6
2021-04-13 11:55:26 +00: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
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