1945 Commits

Author SHA1 Message Date
Eran Messeri
6c41bcee6f Upgrade KeyMint version
This is a cherry-pick of a change to internal master to upgrade the
KeyMint version.

The cherry-pick is necessary because the changes to support Curve
25519 will land in AOSP and there are currently merge conflicts for
Android.bp with internal master.

Bug: 194359292
Test: That it compiles.
Merged-In: I95191fd09b138bf3ba1cbb50534fdbdcf36d1596
Change-Id: Ibbd2f1ddd71ad855e26d59f72633c47351320ce6
2022-02-16 11:16:15 +00:00
Junyu Lai
66760b299b [MS53] Add connectivity aidl exports to stubs
This is needed to solve the dependencies where platform
code such as ITelephony.aidl needs aidl definitions.

Test: TH
Bug: 204830222
Change-Id: Ie19a258c2e8a724dc087bc5ad5f8f522e29feca5
Merged-In: Ie19a258c2e8a724dc087bc5ad5f8f522e29feca5
2022-02-08 10:21:53 +00:00
Anton Hansson
9a4e4e9156 Merge "Auto-generate list of module impl jars" 2022-02-07 11:51:11 +00:00
Lorenzo Colitti
b5e914a343 Delete DhcpResults from frameworks/base.
This class is only used by NetworkStack, so move it to the
NetworkStack project.

Test: m
Change-Id: I356ee7b24613e84b8a90ddccd6d25d0742d13ae7
Merged-In: I356ee7b24613e84b8a90ddccd6d25d0742d13ae7
2022-02-07 06:03:11 +00:00
Anton Hansson
95e89a8cb9 Auto-generate list of module impl jars
Eliminate another duplicated list of all modules. This one has a couple
of workarounds due to different naming of impl libs, and bluetooth not
being ready.

Bug: 169103987
Test: m framework-all and diff intermediates (no diffs)
Merged-In: Ia8627c6e3977cd271e389ec482388ff73661881d
Change-Id: Ia8627c6e3977cd271e389ec482388ff73661881d
2022-02-04 16:36:21 +00:00
Roopa Sattiraju
86058b62d8 Moving over core/api/*txt files
Bug: 196026708
Test: Compile
Merged-In: I636f00132a13467e63b08f21d9cc9dcaab250b8a
Change-Id: I636f00132a13467e63b08f21d9cc9dcaab250b8a
2022-01-26 14:21:29 -08:00
Anton Hansson
9dce832eea Split android-non-updatable-stubs-defaults in two
Put the module classpath defaults into a separate defaults module,
such that users can choose to add the module symbols in a different
way.

Update all the current users to apply both defaults.

Test: m nothing
Change-Id: I22f9518c2e205bfa8ad8d4b630ec976921786b73
2022-01-24 15:50:59 +00:00
paulhu
c100db56a2 Split out the nsd API surface and use framework-connectivity-tiramisu
- Split out nsd APIs and hidden APIs to Connectivity module.
- Keep the all files in f/b/packages/Connectivity-T and add
  framework-connectivity-tiramisu library on p/m/Connectivity.
  Then make framework to use this module library.
- Remove NsdService from SystemServer which will register from
  ConnectivityServiceInitializer

Bug: 206893064
Test: m online-sdk-dev-docs
Test: atest FrameworksNetTests CtsNetTestCases
CTS-Coverage-Bug: 207804007
Merged-In: I72c7de124b9cc53f2263bd452ecd5f39e88e485b
Change-Id: I72c7de124b9cc53f2263bd452ecd5f39e88e485b
2022-01-19 18:47:45 +08:00
Treehugger Robot
070f2b0502 Merge "Migrating frameworks/base BT files" 2022-01-19 00:31:25 +00:00
Colin Cross
a9e0018834 Merge "Fix incorrect licenses in frameworks/base" 2022-01-18 23:31:25 +00:00
Roopa Sattiraju
33a02acc17 Migrating frameworks/base BT files
Bug: 206121418
Test: Compile and Test

Merged-In: Idb55371e9d678296fe46e5f4231ec2d12ec8b978
Change-Id: Idb55371e9d678296fe46e5f4231ec2d12ec8b978
2022-01-17 20:48:03 -08:00
Anton Hansson
cb00f94596 Convert merged module lib stub to api.go
Bug: 169103987
Test: m framework-updatable-stubs-module_libs_api and diff intermediates
      folder before and after.
Merged-In: I6018791ae136bc764a6e846078c6bce59bcc123b
Change-Id: I6018791ae136bc764a6e846078c6bce59bcc123b
2022-01-17 19:07:09 +00:00
Anton Hansson
365a2bab75 Merge "Rename framework-media-sources" 2022-01-17 12:01:38 +00:00
Anton Hansson
3b6477f81b Rename framework-media-sources
So that we can use this name for the sources of the module called
"framework-media". non-updatable-sources is a pattern employed by other
modules.

Test: m nothing
Change-Id: I766675d2f10aadd1dd753271e5e39f9c28372716
2022-01-17 10:17:15 +00:00
Aaron Huang
314e2b37f2 Add PolicyDirection InfDef annotation to IpSecManager
IpSec is going to be moved into Connectivity module and it needs to
use PolicyDirection annotation. Add PolicyDirection IntDef annotation
so that it can be used in the module.

Bug: 204153604
Test: FrameworksNetTests
Change-Id: Ib411d8c436d67574bfaf7f3aba43e5f31e7487e2
2022-01-13 10:43:54 +08:00
Colin Cross
c1309ecfba Fix incorrect licenses in frameworks/base
SPDX-license-identifier-GPL and SPDX-license-identifier-W3C are
false positives in the detector in binary files.

libs/usb/test/accessorytest/f_accessory.h is an original kernel
header file with GPL 2.0 license. Replace it with the file from
libs/usb/tests/AccessoryChat/accessorychat/linux/usb/f_accessory.h,
which is the same header after running it through bionic's script
to remove copyrightable information from the header.

Move CPL license into test-runner/ and test-base/ where it is
used.

Test: m checkbuild
Change-Id: I09e760d02b3712d5a8d225ce4cff6515c9f3c5e1
2022-01-11 19:23:50 -08:00
William Escande
6b5464ca69 Remove allowBlocking from all BluetoothProfiles
Since Bluetooth is becoming a mainline module, it can no longer call the
allowBlocking hidden api.
Instead, all interface are moved to be oneway and use a synchronous data
to handle the return value.

Bug: 200200870
Test: Build + start Bt and play something on speaker
Tag: #refactor
Merged-In: I776a6322faadca1504bce24f2b6b041e756b6448
Change-Id: I776a6322faadca1504bce24f2b6b041e756b6448
2021-12-16 19:34:35 +01:00
Junyu Lai
d82296cf33 [MS08] Move NetworkStats files to f/b/package/ConnectivityT
NetworkStatsService is going to be moved into ConnectivityService
module. Move all related files to packages/ConnectivityT so that
it can be easily migrate these files to connectivity module
after clearing the hidden API usages.

Bug: 197717846
Test: TH
Change-Id: Iead00832b5eb7b1dc40a92027c5a14ae8316b16c
2021-12-10 16:11:08 +00:00
paulhu
4e690dd40d Centralize nsd associated files
Move all nsd associated files include framework, service and test
to package/Nsd first. After clear all hidden API dependencies, we
can easily migrate these files into connectivity mainline module.

Bug: 206893064
Test: atest FrameworksNetTests CtsNetTestCases
Change-Id: Id26f471a10fe7882e31ccc2dbb73219461f00dbd
2021-11-29 23:08:06 +08:00
Jack Yu
f7a480d824 Merge changes from topic "OMAPI_VNTF"
* changes:
  replaced android.se.omapi-V1-ndk_platform library with android.se.omapi-V1-ndk
  VTS tests added for OMAPI Vendor stable interface
  Support for OMAPI Vendor stable interface
2021-11-23 04:54:02 +00:00
Marcus Hagerott
6c681056bb Allow ContactsProvider to use compat change framework
BUG=188347648
Test: m droid

Change-Id: Ifb6675777c76ca1c44af96ceb02a6207d28bd045
2021-11-16 13:40:41 -08:00
Mark Chien
1176dd4409 Merge "Compile android-non-updatable with framework-tethering module-lib stub" 2021-11-15 13:36:51 +00:00
markchien
cd813a30ed Compile android-non-updatable with framework-tethering module-lib stub
To resolve framework-tethering's module-lib for android-non-updatable
API, compile android-non-updatable with
sdk_module-lib_current_framework-tethering.

Bug: 205658040
Test: make update-api && make

Change-Id: Ib4bd0312f6c621ba19552a2608e47f9158b0fe25
2021-11-12 23:13:18 +08:00
Treehugger Robot
8aa04b89e0 Merge "Migrate NetworkStack modules to use modules-utils" 2021-11-11 13:56:26 +00:00
Daniel Norman
653a1c1a28 Fix RRO loading from inside APEXes.
APEXes can already contain RRO APKs by using the 'rro' apex Soong
module field. However, these RROs were not being loaded properly by
Zygote or PackageManagerService.

For all RROs inside APEXes, the RRO uses the same overlay config that
is used for other RROs on the APEX's preinstalled partition.

For RROs targeting 'android', which are installed by Zygote
using AssetManager:
1. OverlayConfig looks for active APEXes in the apex-info-list file,
   which is already accessible to Zygote.
2. OverlayConfig passes the APEX module names to OverlayConfigParser,
   for each preinstalled-partition.
3. OverlayConfigParser uses OverlayScanner to scan the
   each /apex/<APEX>/overlay directory.

For other RROs:
1. PackageManagerService already parses and provides RROs inside APEXes
   to OverlayConfig.
2. RROs inside APEXes used to have no config rule applied because their
   path prefix (/apex/) did not match any partition rule. Now, their
   preinstalled path is used instead.

Bug: 199200417
Test: Define a static RRO targeting 'android' inside a /vendor APEX.
      Define a static RRO for settings provider inside a /vendor APEX.
      Observe APEXes are enabled by default.
Test: Make a change to an RRO inside a /vendor APEX.
      m <apex>; adb install <apex artifact>; adb reboot;
      Observe change has taken effect.
Change-Id: I2bce9bc704789329b8c6aac6d476f17ff6718e0f
Merged-In: I2bce9bc704789329b8c6aac6d476f17ff6718e0f
2021-10-25 13:04:24 -07:00
Rajesh Nyamagoud
4fe64fb471 Support for OMAPI Vendor stable interface
Changes are made to existing OMAPI inteface to make it as Vendor Stable
Interface.

Bug: b/180639372
Test: Run OMAPI CTS and VTS tests

Change-Id: Ibfd23215ad180d78af843c0d0b394b42ba8e9daa
2021-10-11 15:51:58 +00:00
Sarah Chin
80b8c7f128 Update constructors for IRadioData classes
Test: atest FrameworksTelephonyTests
Bug: 198331673
Change-Id: I8480df1164548dde491c6ae6251bbc2725c3eadf
Merged-In: I8480df1164548dde491c6ae6251bbc2725c3eadf
2021-10-06 10:14:30 +00:00
Treehugger Robot
83a970d901 Merge "Migrate IPsec modules to use state machine lib" am: 4e23d56de4
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1834516

Change-Id: Ic803f5ca7acc720e0291caacb414c6ef453bebd0
2021-09-23 14:53:03 +00:00
Treehugger Robot
4e23d56de4 Merge "Migrate IPsec modules to use state machine lib" 2021-09-23 14:40:55 +00:00
wescande
56b8d5570f Migrate NetworkStack modules to use modules-utils
StateMachine stand-alone library will replace all specific filegroup
created for module.
It will be then moved into modules-utils
preconditions is already a modules-utils

Bug: 198418216
Tag: #refactor
Test: Build
Change-Id: I6de6c2575adf896e283672ebae82431f5c8172af
2021-09-23 16:01:53 +02:00
wescande
3f9c6ba8ad Migrate IPsec modules to use state machine lib
StateMachine stand-alone library will replace all specific filegroup
created for module.
It will be then moved into modules-utils

Bug: 198418216
Tag: #refactor
Test: Build
Change-Id: I9dacffe74be54f378d1034f0ec4ef8b3b16afb29
2021-09-23 14:01:11 +02:00
Mohammad Samiul Islam
9b02b2e12c Merge "libbinder: split out PackageManagerNative aidl" into stage-aosp-master 2021-09-22 10:28:10 +00:00
William Escande
0153d5ff19 Wifi use state machine from modules-utils
Bug: 198418216
Tag: #refactor
Test: atest FrameworkWifiApiTests
Merged-In: I2087b15cf34b76dabeb14d51d041533f55e1b5ba
Change-Id: I2087b15cf34b76dabeb14d51d041533f55e1b5ba
2021-09-20 21:18:45 +00:00
wescande
4f2420f84b Migrate dependency from base to modules-utils
Use stand-alone modules-utils library.

Bug: 198418216
Tag: #refactor
Test: Build
Merged-In: I248dc29e68d3564c6723626b683b10c8a863853f
Change-Id: I248dc29e68d3564c6723626b683b10c8a863853f
2021-09-17 20:41:26 +00:00
Samiul Islam
bdbf40efd6 libbinder: split out PackageManagerNative aidl
Very few clients of libbinder use PackageManagerNative service, as such
it's a waste to couple them together. Now, user of PackageManagerNative
service need to add the corresponding aidl files as shared library.

Bug: 183654927
Test: builds + presubmit

Change-Id: Ie64fb3502d8e5164df4710feb2f525db7c4234a2
Merged-In: Ie64fb3502d8e5164df4710feb2f525db7c4234a2
2021-09-15 12:48:13 +00:00
wescande
9150afa330 Migrate dependency from base to modules-utils
Use stand-alone modules-utils library.

Bug: 198418216
Tag: #refactor
Test: Build
Merged-In: I248dc29e68d3564c6723626b683b10c8a863853f
Change-Id: I248dc29e68d3564c6723626b683b10c8a863853f
2021-09-09 18:30:43 +00:00
Jeff Sharkey
ce6a9699b6 Merge "Pass metadata as AttributionSourceSource." into sc-dev am: a57ee36d6c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15388734

Change-Id: Iabda6bed8f2392201a0fc87eb31f9d01a3ecac1e
2021-07-27 19:43:33 +00:00
Jeff Sharkey
75d4f93a4e Pass metadata as AttributionSourceSource.
These two PermissionManager methods are using AttributionSource as
metadata only, and aren't interested in the remote caller enforcing
that the claimed UID matches the caller, since they're not actually
being used for permission enforcement.

Thus we pass the metadata using the AttributionSourceState holder
object and reconstruct on the remote side, entirely avoiding the
enforceCallingUid() check.

Bug: 193842956
Test: atest CtsPermission5TestCases
Change-Id: I576b6feb8cc2b0586b4341268866d8027689293f
2021-07-27 09:45:54 -06:00
Rambo Wang
02adf2d91d Merge "Support platform-compat-framework for TeleService" am: 7ad8aa929e am: 2e7d4fe98b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1747977

Change-Id: Iedefd178c03f988435e6fbf21a8744aefa3ae174
2021-07-16 22:16:53 +00:00
Rambo Wang
05e55c9e3e Support platform-compat-framework for TeleService
Bug: 191911306
Test: atest ServiceStateProviderTest
Change-Id: I23e0e0867c89c0e107258c723f29e9ae9b5ba9f1
2021-07-01 23:46:49 +00:00
Janis Danisevskis
6ebb4df635 Merge "Keystore 2.0: Renaming the vpnstore interface." into sc-dev am: 3f0c227d93
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14969456

Change-Id: Icfe611bc66e6dc2ce94f4a6eeee292158e98f15e
2021-06-30 19:57:21 +00:00
Janis Danisevskis
84e082d3da Keystore 2.0: Renaming the vpnstore interface.
Renaming the vpnstore interface to legacykeystore.

Bug: 190229655
Test: TBD
Merged-In: Icd304ef621f0de52d6ebc415a0628d63f827fbcd
Change-Id: Icd304ef621f0de52d6ebc415a0628d63f827fbcd
2021-06-30 12:29:29 -07:00
Janis Danisevskis
191b206410 Keystore 2.0: Renaming the vpnstore interface.
Renaming the vpnstore interface to legacykeystore.

Bug: 191373871
Test: TBD
Change-Id: Icd304ef621f0de52d6ebc415a0628d63f827fbcd
2021-06-30 09:45:54 -07:00
Hasini Gunasinghe
75d0aa0e00 Merge "Keystore2 Metrics: System server rerouting" into sc-dev am: 06327bba21
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14976533

Change-Id: I97d68b7726cdde00c414eef803792e6b6d40c3b2
2021-06-30 13:32:33 +00:00
Tej Singh
932f870d92 Keystore2 Metrics: System server rerouting
System server changes for rerouting keystore atoms.

Bug: 191050796
Bug: 188590587
Test: statsd testdrive
Change-Id: Id4d0880c4a8a53097ca7007c40026d2d4bc0bc5b
2021-06-29 17:38:51 +00:00
Yan Yan
edbc5449df Merge "Include WakeupMessage in framework-ike-shared-srcs" am: e2a58ab718 am: 1e848eaeb5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1734130

Change-Id: Ia86447c7b3bd5bca7328dd91c8769f5f9d2ec03c
2021-06-18 02:17:49 +00:00
Yan Yan
e2a58ab718 Merge "Include WakeupMessage in framework-ike-shared-srcs" 2021-06-17 22:04:26 +00:00
Harry Zhang
b4befa4537 Create platformtestprotos.
This target contains some proto definitions used by TradeFed. TF will
use this instead of platformprotos to reduce proto dependencies on the
platform.

A separate build file is created so its ownership is managed separately.
The OWNERS file will be updated due to merge conflicts.

Bug: 181921006
Test: New target builds.
Change-Id: I87e7a73d1160e3cf56a4c013e74989cdc90e1211
Merged-In: I82386a6c8a5e6ddf42d8377148001f4ede2f297f
2021-06-11 14:12:53 -07:00
Yan Yan
e7a360f7ff Include WakeupMessage in framework-ike-shared-srcs
Bug: 180653278
Test: make
Change-Id: I3d7d789ab6f71ece64318e5aff74f7f739e2b2c0
2021-06-10 18:45:39 -07:00
Harry Zhang
d61699e86c Create platformtestprotos.
This target includes a subset of protos in platformprotos, and will
replace it in TradeFed. It is created as a separate file so that it can
have its own set of owners. The owners will be updated in AOSP, but this
change has to be submitted first due to this target requiring one
additional dependency compared to AOSP.

Bug: 181921006
Test: The target builds.
Change-Id: I82386a6c8a5e6ddf42d8377148001f4ede2f297f
2021-06-03 17:18:02 +00:00