1093 Commits

Author SHA1 Message Date
Mark Chien
339e06ba90 Merge "Remove Preconditions usage to stop dependecy with non-updatble class" 2020-04-27 10:54:19 +00:00
markchien
2a52c09dda Remove Preconditions usage to stop dependecy with non-updatble class
Stop depending on Preconditions that is not released on the same cadence
as the module, and is maintained as part of the framework.

Bug: 148636687
Test: atest TetheringTests NetworkStackNextTests

Change-Id: Id0dcec44f362f79bc8c046d722635687a7388aa2
2020-04-24 00:47:56 +08:00
David Su
6ef1235b47 framework-wifi: remove duplicate classes
Preconditions & Inet4AddressUtils are statically
linked into both framework-wifi and service-wifi.
This creates duplicate classes, which should be
avoided. Instead, service-wifi should simply refer
to the copy of Preconditions/Inet4AddressUtils in
framework-wifi.

(dirty cherry pick from internal branch)

Bug: 153596226
Test: device boots up and connects to wifi
Change-Id: Ie78e5cf0f6ff7bc8a2fa8d7264b742f912601143
Merged-In: Ie78e5cf0f6ff7bc8a2fa8d7264b742f912601143
2020-04-21 20:14:23 -07:00
Jiyong Park
803dc1c218 Mark some aidl_interface modules as unstable
With b/152655547, all aidl_interface modules are considered as stable
unless it is explicitly with "unstable: true". This change marks the
aidl_interface that are not used across updatable module bounraries
as unstable, so that the build system does not run the API
dumping/checking on them.

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

Bug: 152655547
Test: m
Merged-In: I1257c66de6dd42b2d32d47ed74cb2878f79d14fb
(cherry picked from commit db589dded495c6c5f3f9890fa7b0e4ce3b1916fe)
Change-Id: I1257c66de6dd42b2d32d47ed74cb2878f79d14fb
2020-04-20 07:44:52 +00:00
Paul Duffin
f090c45f0f Add ike-internals when building framework-all-sources
The framework-all-sources filegroup includes sources from ike-srcs
which in turn depends on bouncycastle sources. This change

Bug: 152328618
Test: m droid
Change-Id: I1e9c1dac3e0ad7e7d07f6a72e38171403b23493b
Merged-In: Ife5d1b2c80469ee5196d61806b721cf9dae251ed
2020-03-30 12:50:05 +01:00
satayev
3fa88993cd Merge "Export change id processor." 2020-03-29 18:10:55 +00:00
Artur Satayev
db23306e83 Export change id processor.
- Don't declare the plugin directly, it is exported via java_library that defines the sources.
- Remove unneeded framework-annotation-proc.

Bug: 152220864
Test: m && diff merged_compat_config.xml
Change-Id: Ie750b5391229d21679a8610780b9f8d4a997e204
Merged-In: Ie750b5391229d21679a8610780b9f8d4a997e204
2020-03-27 22:44:30 +00:00
Artur Satayev
bbccaf70fc Remove unsupportedappusage-annotation library.
It is not needed anymore, and is replaced by "unsupportedappusage" library.

Bug: 145132366
Test: m
Change-Id: I589b3f80979e38ff81ff5f0ad2de1ae8df9c9f00
Merged-In: I589b3f80979e38ff81ff5f0ad2de1ae8df9c9f00
Exempt-From-Owner-Approval: clean up
(cherry picked from commit fc864b4acf8dbd712da5e3ae7fdd7c008056906e)
2020-03-26 14:26:14 +00:00
Yan Yan
a6d47fba4a Merge "Include HexDump in framework-ike-shared-srcs" 2020-03-24 17:30:24 +00:00
Treehugger Robot
31145f453b Merge changes Idf2c9bd8,Iec48362f
* changes:
  Remove unnecessary art.module.api.annotations
  Remove dependency on dalvik.annotation.compat.VersionCodes
2020-03-24 11:31:33 +00:00
Paul Duffin
c58441f56a Remove unnecessary art.module.api.annotations
Test: m droid
Change-Id: Idf2c9bd8b1cd1cfc573cf84cb1c3a1f8afc07f4b
2020-03-23 21:06:02 +00:00
satayev
cce5cd451a Merge "Remove unsupportedappusage_index.csv from droidcore target." 2020-03-23 19:42:25 +00:00
Anton Hansson
e53bec0567 Remove SDK dep from module_lib_api
This had the consequence of making two large metalava invocations
run in sequence rather than parallell.

For now, add back the dependency on framework-all instead. Building
framework-all should be a lot faster than the sdk stubs.

Also move the module stubs dep from framework_defaults to
framework-minus-apex. framework-all does not need this dep.

Bug: 151092414
Test: m
Test: NINJA_ARGS="-t path out/soong/.intermediates/frameworks/base/module-lib-api-stubs-docs/android_common/module-lib-api-stubs-docs-stubs.srcjar \
                          out/soong/.intermediates/frameworks/base/system-api-stubs-docs/android_common/system-api-stubs-docs-stubs.srcjar" m
Change-Id: Ifdf8823d374254e594330b43ae3a39a76c7b90c5
Merged-In: Ifdf8823d374254e594330b43ae3a39a76c7b90c5
(cherry picked from commit 92d79fddd49b1b502f0b47c574fb1aec7ca85b15)
2020-03-20 11:30:59 +00:00
Treehugger Robot
488efe3350 Merge "services.net: Add a static library needed by wifi module" 2020-03-17 09:22:12 +00:00
Anton Hansson
228610294b Merge "Prune framework-all visibility" 2020-03-17 09:11:10 +00:00
Anton Hansson
5f208a263d Improve consistency of stubs for framework targets
Group all the module stubs together and use them consistently
where needed.

Bug: 151092414
Test: m
Change-Id: I0ddeb0c1a8764ac64980395eec8d5703ea4eea7e
Merged-In: I0ddeb0c1a8764ac64980395eec8d5703ea4eea7e
2020-03-16 16:04:31 +00:00
Anton Hansson
cec9266610 Create all variants of stubs for tethering
Add separate publicapi, systemapi and module_libs stubs for tethering.

Bug: 147768409
Test: m
Test: m framework-tethering-stubs-{public,system,module_libs_}api
Change-Id: I0ed44691b4e7080818442a9d0eb37d874f707195
Merged-In: I0ed44691b4e7080818442a9d0eb37d874f707195
2020-03-16 15:54:19 +00:00
Anton Hansson
5b4b699c4f Prune framework-all visibility
IKE doesn't need this anymore.

Bug: 149906971
Test: m
Change-Id: I29bf83efc6f6d906b5d2f3a161623ed8678acf85
Merged-In: I29bf83efc6f6d906b5d2f3a161623ed8678acf85
2020-03-16 15:44:54 +00:00
Roshan Pius
eb7edd5620 services.net: Add a static library needed by wifi module
Add a new static library that compiles against system_current which
includes all the parts needed by the wifi mainline module.

Also,
a) Refactored TcpKeepalivePacketData to use public APIs. The parcel
read/write methods in the base class are @hide and they're not used by
the other child class (NatKeepalivePacketData). So, remove the @hide
method from base class and use it direcly in the child class.

Bug: 145825329
Test: Device boots up & connects to wifi networks.
Change-Id: Ifde69b579cfe5b813766f676acb10e436e64a44c
Merged-In: Ifde69b579cfe5b813766f676acb10e436e64a44c
2020-03-16 00:23:42 +00:00
Anton Hansson
fce09e2ddd Add visibility to framework-all
Clamp down on framework-all visibility to avoid anyone else
addinga dependency on this problematic library.

Bug: 149928788
Bug: 149906971
Test: m
Change-Id: Ic819b90911220032130c3f8a01b612edd7fa3ecc
Merged-In: Ic819b90911220032130c3f8a01b612edd7fa3ecc
(cherry picked from commit 7c2f73b4ac0a17c31fe523df9c82e11811b9ee7e)
2020-03-07 13:08:32 +00:00
Haibo Huang
715857dbda Uses python3 for fontTools
Change-Id: I33bb8881823278c990faeb1a0e119f855c9948b9
2020-03-07 02:02:19 +00:00
Artur Satayev
e1b9738578 Remove unsupportedappusage_index.csv from droidcore target.
out/soong/hiddenapi/hiddenapi-index.csv produced by a singleton rule replaced the target.

Test: m
Bug: 145132366
Change-Id: I29267c179f301ebcb128d615229858ced549d670
Merged-In: I29267c179f301ebcb128d615229858ced549d670
2020-03-05 22:55:25 +00:00
evitayan
e9cc49411c Include HexDump in framework-ike-shared-srcs
Bug: 148689509
Test: FrameworksIkeTests, FrameworksNetTests
Change-Id: I6a28a173a6ab0d89c0e80d9e335a15e5e685fa27
2020-03-04 14:49:03 -08:00
Artur Satayev
b19903dd3d Export annotation processor via unsupportedappusage lib.
Bug: 145132366
Test: diff unsupportedappusage_index.csv
Change-Id: Ic2762ec4eabf6ec6b397d2a3e4fd360e42be566c
2020-02-28 17:29:29 +00:00
evitayan
78ed90270a Dynamically include ike-stubs in services.core.unboosted
Previously because compilation will preferentially uses the
ike-stubs statically included in framework.jar,
FrameworksIkeTests has to jarjar the ike_test.jar. Otherwise
the tests will use the ike-stubs and cannot access to the hidden
implementation.

This commit removes ike-stubs in framework-minus-apex and framework
and statically includes it in services.core.unboosted.

In this way, system server can still compile against ike.jar and
at the same time FrameworksIkeTests does not need to jarjar the
ike_test.jar anymore

Bug: 145995723
Test: build, flash, boot, loaded in system server
Test: atest FramewokrsIkeTests (passed)
Test: m mts && mts-tradefed run mts-ipsec (passed)
Change-Id: I75dabcc522e89c94c3e888f5cea22ad5ce0a77e5
Merged-In: I75dabcc522e89c94c3e888f5cea22ad5ce0a77e5
2020-02-21 06:22:12 +00:00
Nikita Ioffe
9b6f6674eb Merge "Log UserspaceRebootReported atom from system_server" 2020-02-20 13:38:27 +00:00
Anton Hansson
3ff1caf424 Merge "Remove unused filegroup" 2020-02-20 12:14:36 +00:00
Nikita Ioffe
9c4b572553 Log UserspaceRebootReported atom from system_server
UserspaceRebootLogger class is introduced to encapsulate (tiny) state
machine for logging of userspace reboot.

So far state is stored in a persistent property, but that can be changed
in the future.

Unit tests will be added in a follow-up CL.

Test: adb shell svc power reboot userspace
Bug: 148767783
Change-Id: Ib9e2c6cef7094ccac7862be249d619212f0013fd
Merged-In: Ib9e2c6cef7094ccac7862be249d619212f0013fd
(cherry picked from commit 779d6bee21fada56116ff44d11943b241dc3531c)
2020-02-19 17:35:04 +00:00
Anton Hansson
7ede3dd2b3 Remove obsolete subdirs and optional_subdirs
I was looking for documentation of what these mean, but discovered
that these attributes have been obsolete for years.

Test: m
Change-Id: Ifcf47e99d22b1546780968d1030f835173612a27
Merged-In: Ifcf47e99d22b1546780968d1030f835173612a27
2020-02-19 15:27:58 +00:00
Anton Hansson
646cc67c49 Remove unused filegroup
Test: m
Change-Id: Ia83b310abdd9fb2a1343fe899758584510c5d421
2020-02-19 13:33:36 +00:00
Remi NGUYEN VAN
2d14a4b3e0 Fix usage of annotations in TetheringLib
Annotations such as @SystemApi cannot be jarjared to a different
package, as the members would not match the system API declarations.

Instead, only build against the annotations from
framework-annotations-lib, but do not include them as classes in the
output jar; annotations are not required to be available to the
classloader at runtime.

Test: builds, boots, tethering working
Bug: 147812912
Fixes: 148609988
Change-Id: I1fae97a1c1e0ba07fa3e2d64cde7650cd26d0acd
Merged-In: I1fae97a1c1e0ba07fa3e2d64cde7650cd26d0acd
2020-02-19 16:32:26 +08:00
markchien
8cf2a5588b Use framework-tethering-stub instead of framework-tethering
The non-updatable part of the platform now is built with
framework-tethering-stub, which is a stub library of
framework-tethering.

Bug: 147200698
Test: m
Change-Id: I97ef83f7f9b4c1376f373713036f5256318f1050
Merged-In: I97ef83f7f9b4c1376f373713036f5256318f1050
2020-02-19 15:10:44 +08:00
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