Commit Graph

1061 Commits

Author SHA1 Message Date
Treehugger Robot
5ccfef6e6b Merge "Export Wifi Parcelables AIDLs from framework.jar" 2020-02-03 02:05:12 +00:00
Muhammad Qureshi
1de1df4c60 Add FrameworkStatsLog
Add a genrule for FrameworkStatsLog and it to frameworks.jar

As part of statsd becoming a Mainline module in R, autogenerated
StatsLog.write() calls are going away and replaced by *StatsLog.java
that is autogenerated for each module.
This CL adds autogenerated FrameworkStatsLog.

Follow up CLs will replace usages of StatsLog.write calls with
FrameworkStatsLog.write.

Bug: 145952197
Test: m
Merged-In: I6ba6a67e019a3b5cffd936dad7ce9db6c8c51632
Change-Id: I6ba6a67e019a3b5cffd936dad7ce9db6c8c51632
(cherry-pick from internal branch with minor conflicts)
2020-01-31 19:35:00 +00:00
Xiao Ma
859af50899 Export Wifi Parcelables AIDLs from framework.jar
Add Wifi public/@SystemApi Parcelable AIDLs to
framework.jar AIDL exports so that they can be
referenced outside the Wifi module.

Create a new folder "aidl-export" to separate
the AIDLs we want to export to allow external
callers to reference in their AIDL. Private AIDLs
remain in the "java" folder.

most of modifications cherry-pick from internal master
(ag/10139892), but slight change for Android.bp to be
able to compile in aosp build system. keeping the same
aidl path as master to find the correct path when importing
ScanResult from wifi.

Bug: 140299412
Bug: 137835398
Test: atest FrameworksWifiTests

Merged-In: I4e0dc1119bf2b49865c9b5cdf23c571528228902
Change-Id: Idaae4f365e4efaead023ee175391a9e9432a6e00
2020-01-31 13:01:30 +09:00
Muhammad Qureshi
cb2c0230a1 Merge changes Icce2f6ed,Ic1788f65,I59e327d4
* changes:
  Add flag to stats-log-api-gen for WorkSource.
  Make writeKeyValuePairs accept Nullable args
  Use preview_sdk_int for version code checks
2020-01-29 23:46:20 +00:00
Remi NGUYEN VAN
6674b930fd Merge "Do not block for connector in TetheringManager" 2020-01-29 23:46:00 +00:00
satayev
c5dd215f8a Merge "Remove unused UnsupportedAppUsage annotations." 2020-01-29 21:34:59 +00:00
Artur Satayev
33ce802378 Remove unused UnsupportedAppUsage annotations.
The new annotation is android.compat.annotation.UnsupportedAppUsage.

Test: m
Bug: 145132366
Exempt-From-Owner-Approval: approved in internal
Change-Id: Ie12e28eee0ed20b5677ee3162143700813b7ab64
Merged-In: Ie12e28eee0ed20b5677ee3162143700813b7ab64
2020-01-29 21:34:04 +00:00
Remi NGUYEN VAN
24b7b6a047 Do not block for connector in TetheringManager
Instead of blocking for the ITetheringConnector, in the rare case (only
on boot) that the connector is not ready, queue requests and poll for
the connector until it is available.

Bug: 146821053
Test: Flashed, verified tethering working
Change-Id: I4bd45fcbdce2336694c3b6a349f121e40230f001
2020-01-29 15:15:58 +09:00
Aurimas Liutikas
d4454de42f Merge "Specify which packages metalava should skip in API linting." 2020-01-28 00:09:27 +00:00
Aurimas Liutikas
1f76a5ad2e Specify which packages metalava should skip in API linting.
Test: make -j checkapi
Change-Id: Iaced9d204ba72fb17d34a7085b685978125b890d
2020-01-27 22:32:45 +00:00
Lorenzo Colitti
2458be40f4 Merge changes I7065d081,Ic7c3a331,Ia432057b
* changes:
  Add API for tethering clients change
  Allows the caller to specify configuration by TetheringRequest
  Make TetheringManager to system API
2020-01-24 16:23:18 +00:00
markchien
75b6d7b8ae Make TetheringManager to system API
Also deprecated tethering APIs in ConnectivityManager.
Will have follow up change to remove @hide tethering function in
ConnectivityManager.

Bug: 145093446
Bug: 148038547
Test: -build, flash, boot
      -atest TetheringTests

Change-Id: Ia432057bf9056727c4a0ca97d160a49274d33581
Merged-In: Ia432057bf9056727c4a0ca97d160a49274d33581
2020-01-24 23:39:49 +09:00
Muhammad Qureshi
b11e00d655 Add flag to stats-log-api-gen for WorkSource.
As part of getting rid of StatsLogInternal and moving every atom to be
logged from a module, this CL addresses 2 issues:
1. Add WorkSource logging to modules.
2. Gate WorkSource logging via a CLI flag to prevent WorkSource methods
from being included in modules that are Mainline modules and can't have
@hide calls.

Bug: 147541828
Test: m
Test: atest android.cts.statsd.atom.UidAtomTests

Change-Id: Icce2f6ed7298be5e5ceebfb05d87e6fa7cd6bdbb
Merged-In: Icce2f6ed7298be5e5ceebfb05d87e6fa7cd6bdbb
2020-01-23 11:39:38 -08:00
Treehugger Robot
2fb5112a35 Merge "Add Framework APIs for Identity Credential." 2020-01-21 14:38:14 +00:00
David Zeuthen
045b6de975 Add Framework APIs for Identity Credential.
The Identity Credential APIs provides an interface to a secure store
for user identity documents.  These APIs are deliberately fairly
general and abstract.  To the extent possible, specification of the
message formats and semantics of communication with credential
verification devices and Issuing Authorities (IAs) is out of scope for
these APIs.

The Identity Credential APIs rely on user authentication to protect
data elements in credentials which is implemented through
auth-tokens. This CL contains changes to CryptoObject to allow this.

Bug: 111446262
Test: CtsIdentityTestCases
Change-Id: I48f21a561b762d86c9ca8d229962782572412f47
2020-01-20 15:56:57 -05:00
Jiyong Park
673e298ba5 Set the visibility of framework-core-sources-for-test-mock
It is visible only to frameworks/base/test-mock as its name says.

Bug: N/A
Test: m
Change-Id: I0ad1bfe038f8b494bfbb0e0015cfe0565934a229
2020-01-17 16:15:35 +09:00
Treehugger Robot
ff3210b045 Merge "Statically link AsyncChannel/AsyncService in telephony" 2020-01-15 19:35:22 +00:00
Yan Yan
259781e84a Merge "Statically include @StringDef in IKE module" 2020-01-15 18:16:00 +00:00
Meng Wang
3043dac37a Statically link AsyncChannel/AsyncService in telephony
Bug: 137202333
Test: make
Change-Id: I14512b3c65d9a0a0ddb08c9e69a072141accfab5
2020-01-14 14:21:50 -08:00
Yan Yan
a32fcb74e5 Merge "Add module IPsec(IKE) stubs and sources to platform" 2020-01-14 18:17:24 +00:00
evitayan
bddbfb03a8 Statically include @StringDef in IKE module
Bug: 146360859
Test: build, flash, boot
Test: atest FrameworksIkeTests
Change-Id: I85216a62ff56e1d635d486cd5b3c2a63ee93843c
2020-01-13 21:31:00 -08:00
Benedict Wong
7f58c0d848 Add module IPsec(IKE) stubs and sources to platform
As IKE is used in the frameworks for IKEv2/IPsec VPNs, IKE stubs
must be built and added to the frameworks build process

Bug: 147096727
Test: build, flash, boot
Test: FrameworksNetTests, FrameworksIkeTests passing
Change-Id: I51aad4ab800442d018bb170225c114a4ae5ea3b1
(cherry picked from commit 589b6ffe7c)
Merged-In: I51aad4ab800442d018bb170225c114a4ae5ea3b1
2020-01-13 20:16:56 -08:00
Yan Yan
c0f518b2d3 Merge "Make mainline IKE statically include Android StateMachine" 2020-01-14 00:10:01 +00:00
Chalard Jean
107fe4130e Merge "Add net-utils-framework-common-srcs to framework" 2020-01-14 00:09:22 +00:00
Aaron Huang
c4081b2898 Add net-utils-framework-common-srcs to framework
Bug: 139268426
Bug: 135998869
Bug: 138306002
Bug: 143925787
Test: atest NetworkStaticLibTests
      atest FrameworksNetTests
      atest FrameworksTelephonyTests
      ./frameworks/opt/net/wifi/tests/wifitests/runtests.sh
Change-Id: Ic7b5b07f0e95068eb53f54ced1fbc52743a7a5cd
2020-01-13 23:33:35 +08:00
Artur Satayev
bc3d8b9071 Use new UnsupportedAppUsage annotation.
Existing annotations in libcore/ and frameworks/ will deleted after the migration. This also means that any java library that compiles @UnsupportedAppUsage requires a direct dependency on "unsupportedappusage" java_library.

Bug: 145132366
Test: m && diff unsupportedappusage_index.csv
Change-Id: I534e3fd1305e2f4af076986770033478448a665c
Merged-In: I534e3fd1305e2f4af076986770033478448a665c
2020-01-13 12:39:59 +00:00
evitayan
0efc7400a3 Make mainline IKE statically include Android StateMachine
This commit adds Android StateMachine source files to the
filegroup that is statically included in mainline IKE.

Bug: 146457741
Test: build, flash, boot
Test: atest FrameworksIkeTests
Change-Id: I2549299350090ae02e9ccc965663aeb2b311c6d8
2020-01-10 18:34:07 -08:00
Jiyong Park
90247c8a1c Platform shouldn't directly link to jars in APEXes
The non-updatable part of the platform shouldn't directly link to the
boot jars in APEXes. Ensure this by

1) setting the visibility property for the boot jars so that they are
not visible to non-APEX modules and
2) setting the apex_available property so that the boot jars are only
built for the corresponding APEXes, but not for others.

Bug: b/146167933
Bug: b/146218515
Bug: b/147200698
Test: m
Change-Id: I251fabd773bc31f46d572d143c72dd9162f3f0a6
Merged-In: I251fabd773bc31f46d572d143c72dd9162f3f0a6
2020-01-10 15:15:24 +00:00
Yan Yan
614fd1b51b Merge changes from topic "include-uiccapptype"
* changes:
  Make mainline IPsec(IKE) to statically include @UiccAppType
  move UiccAppType to annotation class
2020-01-10 00:23:28 +00:00
Yan Yan
17d04f08d6 Merge "Allow mainline IPsec(IKE) to statically include @PolicyDirection" 2020-01-09 23:42:59 +00:00
Mark Chien
6a95399667 Merge "Fix some @hide usage in Tethering(Cont.)" 2020-01-09 08:47:07 +00:00
markchien
87d3f7d4f1 Fix some @hide usage in Tethering(Cont.)
Using alternative way to fix @hide usage. Do not have API change.

Bug: 144814072
Test: buid
Change-Id: Ia23e319ad3779318471d01cbfa17b8c6df4960d3
2020-01-09 05:40:42 +00:00
evitayan
996aa2a146 Make mainline IPsec(IKE) to statically include @UiccAppType
This commit adds android.telephony.Annotation to
framework-ike-shared-srcs so that mainline module IPsec(IKE) can
statically include it.

Bug: 146360859
Test: build, flash, boot
Test: atest FrameworksIkeTests
Change-Id: I58b733fd6c020b76313b750e18eebb7bd0c12e7c
2020-01-08 14:17:31 -08:00
evitayan
e22e47f48e Allow mainline IPsec(IKE) to statically include @PolicyDirection
@PolicyDirection was hidden API defined in IpSecManager and
mainline module IPsec(IKE) needs to depend on it.

To remove this hidden API dependency, this commit:
- Moves definition of @PolicyDirection to a separate class
- Creates sharing filegroup framework-ike-shared-srcs for mainline
  IKE and include PolicyDirection.java

Bug: 146360859
Test: build, flash, boot
Test: atest FrameworksIkeTests
Change-Id: Ic6d7c06d4b92e16a9a65430365c9acc73932147b
2020-01-08 13:53:14 -08:00
Anton Hansson
87743c6d55 Rename sdkext module to sdkextensions
It's a better name.

Bug: 137191822
Test: presubmit
Change-Id: Icc39779d49bf31f911f9f72bd7610e84c5f49466
Merged-In: Icc39779d49bf31f911f9f72bd7610e84c5f49466
(cherry picked from commit 5b97269cff)
2020-01-08 11:42:58 +00:00
markchien
986750b327 Fix some @hide usage in Tethering
Using alternative way to replace some @hide API.

Bug: 144814072
Test: build, flash, boot
      atest TetheringTests

Change-Id: I1e12d69db1ad91dff553e142e17c6a70808e1639
2020-01-07 21:29:52 +08:00
Treehugger Robot
a6a681768c Merge "Make TokenBucket available to the network stack" 2020-01-07 06:57:46 +00:00
johnson.yeh
095b7a0ce8 Make TokenBucket available to the network stack
Bug: b/144826001

Test: Build Pass: OK
Test: Power ON/OFF: OK
Test: Verify CPU loading improvement: OK

Change-Id: I75d55c3e53fce57e50533dc74af3381a6cee4b96
2019-12-23 19:50:51 +08:00
Jiyong Park
7fb4b183d8 Separate modules for API docs and API stubs
frameworks/base/Android.bp became too big. Modularize it into multiple
files for better readability and extensibility.

droidstubs and java_library modules for API stub libraries are moved to
StubLibraries.bp.

droidstubs and droiddoc modules for API documents are moved to
ApiDocs.bp

Also, added some documentation to explain the roles of the many modules
and how they are related with each other.

Bug: N/A
Test: m

Exempt-From-Owner-Approval: cherry-pick from internal

Merged-In: I285e8c82078d5bd3ed85b0343db2f6375ce7ffb7
(cherry picked from commit 0d7e86d03c)
Change-Id: I285e8c82078d5bd3ed85b0343db2f6375ce7ffb7
2019-12-22 17:27:49 +09:00
Jiyong Park
5640e1d836 Merge changes I4af73809,Iba6a564a,I3305b71e
* changes:
  Hide com.android.server package with @hide javadoc tag
  Add more enums for the client and process attributes of SystemApi
  SystemApi is parameterized
2019-12-22 08:15:25 +00:00
Mark Chien
2410d67357 Merge "[Tether13] Move TetheringManager into framework" 2019-12-20 13:43:46 +00:00
Jiyong Park
63bf3e4d98 Merge "Add updatable_media_stub to framework" 2019-12-19 18:04:54 +00:00
markchien
6d06f6d51a [Tether13] Move TetheringManager into framework
Move tethering out of ConnectivityService. All client would
use TetheringManager to talk with TetheringService directly.

Bug: 144320246
Test: -build, flash, boot
      -atest TetheringTests

Change-Id: Ib051bea724a256f9c4572b566e46ae7b9c4abe6e
Merged-In: Ib051bea724a256f9c4572b566e46ae7b9c4abe6e
2019-12-19 20:53:06 +08:00
Jiyong Park
025e56e7de Add updatable_media_stub to framework
The module framework is now a build-only library whose purpose is to
provide hidden APIs from the non-updatable part of the platform and APIs
from the modules. Merging updatable_media_stub to framework, like the
stub libraries from other modules.

Bug: N/A
Test: m

Exempt-From-Owner-Approval: cherry-pick from internal

Merged-In: Ib627523aab44b7c41d27d70c6ae34cda5dc2e27c
(cherry picked from commit 92721349d9)
Change-Id: Ib627523aab44b7c41d27d70c6ae34cda5dc2e27c
2019-12-19 11:57:07 +09:00
Treehugger Robot
f65e0e3181 Merge "framework is not available to APEXes" 2019-12-18 08:24:49 +00:00
Jiyong Park
79242c2d2d framework is not available to APEXes
The modules 'framework', 'framework-minus-apex', 'framework-all' contain
private symbols that shouldn't be accessible to Mainline modules.
Restrict the access by making the framework modules to be accessible
only to the platform (the non updatable part).

Bug: 145796956
Test: m
Merged-In: I08cb61a67aef88ffe04ef52670144e1cbeff3cf9
Change-Id: I08cb61a67aef88ffe04ef52670144e1cbeff3cf9
2019-12-18 05:45:46 +00:00
Meng Wang
b713828c17 Merge "Statically link util classes into Telephony module." 2019-12-18 00:28:34 +00:00
Jiyong Park
abe6158431 SystemApi is parameterized
We have decided to reuse the existing annotation @SystemApi for all Java
APIs regardless of whether they are for apps or platform internal
modules. This was because introducing new annotation types every time
when we have to create new API surfaces will only increase the confusion
without giving much benefit.

Instead, to differenciate the different API surfaces of @SystemApi, the
annotation type is parameterized. Specifically, it has to axises.

client: specifies the intended client of the API.

process: specifies the process(es) that the API is available.

The default for client and process are priv-apps and all, respectively,
which corresponds to the today's @SystemApi for privileged apps like
GMS.

Exempt-From-Owner-Approval: cherry-pick from internal

Bug: 140202860
Test: m
Merged-In: I3305b71e22970e80db95f3daf3d7713603c7d68d
(cherry picked from commit 119afc0695)
Change-Id: I3305b71e22970e80db95f3daf3d7713603c7d68d
2019-12-17 17:52:15 +09:00
Meng Wang
8532de9d05 Telephony module will staticlly link IState.java
to avoid hidden API dependency.

Bug: 137202333
Test: make
Merged-In: I5a9ddbebadcf6226402f6e4a37ced168fe07d55b
Change-Id: I5a9ddbebadcf6226402f6e4a37ced168fe07d55b
2019-12-16 12:22:01 -08:00
Anton Hansson
4c1f4c2bc6 Merge "Add stubs and an sdk definition for sdkext" 2019-12-16 16:00:43 +00:00