378 Commits

Author SHA1 Message Date
Benedict Wong
cbc409986d Merge changes Ie66ba631,Ic42c09a3
* changes:
  Implement TestNetworkService
  Add shell TestNetworkManager and Service
2019-03-07 23:32:55 +00:00
Xiangyu/Malcolm Chen
442084c722 Merge "Adding callback for setPreferredDataSubscriptionId." 2019-03-07 22:47:31 +00:00
Andrei-Valentin Onea
04e04516b4 Merge "Add target for generating aidl mappings" 2019-03-07 16:31:14 +00:00
Malcolm Chen
fd11df2924 Adding callback for setPreferredDataSubscriptionId.
The purpose is to provide a way to return success or failure upon
switching data to CBRS subscription.
The same callback is used for ONS to call internal API. Later it
will also be used by Carrier apps to call TelephonyManager#
setPreferredOpportunisticDataSubscription.

Bug: 122255288
Test: manual

Change-Id: Id3f43e024c902d6785017e7866f9e804a486b04f
Merged-In: Id3f43e024c902d6785017e7866f9e804a486b04f
2019-03-06 14:54:41 -08:00
Steven Moreland
0ff061a607 NativeHandle.java: set Nullable/NonNull
Fixes: 126700972
Test: hidl_test_java
Test: atest android.os.cts.HwBinderTest
Change-Id: Id45c6d0757913014028f7629db78b64f27cad084
2019-03-06 17:17:30 +00:00
Andrei Onea
ae93c8b46f Add target for generating aidl mappings
Test: make framework-aidl-mappings
Change-Id: I8a6e2c876a9569477e2919d437ab6684799a029f
Merged-In: If18cf25dbfb1b00d7bd39fd1e1032fd783fea792
2019-03-04 16:05:26 +00:00
Neil Fuller
898caeeaed Merge "Use new libcore filegroup variable" 2019-03-04 12:14:59 +00:00
Benedict Wong
e40eab608a Add shell TestNetworkManager and Service
This adds the scaffolding for TestNetworkManager and TestNetworkService.
These are separate from the ConnectivityManager/ConnectivityService in
order to prevent polluting the API space, and making them harder to
maintain.

Bug: 72950854
Test: Compiles, CTS tests relying on this pass
Change-Id: Ic42c09a33d962471e2587ec27f3fab2d72bbcd42
2019-02-28 21:46:58 -08:00
Neil Fuller
cce7b33289 Use new libcore filegroup variable
This change switches frameworks/base/ targets to a generic "interface"
libcore filegroup variable, core_public_api_files, rather than having
it know about Core Library internal filegroups. It is not perfect
because the command line tools need to know to exclude certain packages,
but it is a step in the right direction.

Bug: 126332291
Test: build only
Merged-In: I72667f30dc5685fdc24aca3f8ee82b20c7548449
Change-Id: I72667f30dc5685fdc24aca3f8ee82b20c7548449
2019-02-26 16:19:17 +00:00
Paul Duffin
fab8754054 Allow framework-atb-backward-compatibility to be added to bootclasspath
Fixes a build failure that occurs when it is executed with
REMOVE_ATB_FROM_BCP=true.

Setting REMOVE_ATB_FROM_BCP=true adds the
framework-atb-backward-compatibility target to the PRODUCT_BOOT_JARS
path in place of android.test.base. That causes a problem because the
build expects that everything on the PRODUCT_BOOT_JARS is installable.

Bug: 73711752
Test: make droid and flash both with and without REMOVE_ATB_FROM_BCP=true
Change-Id: I6595ff8dba42e6b85abbf6a6cad4d8970b5a91a0
2019-02-21 10:42:12 +00:00
Remi NGUYEN VAN
3f23efdd13 Merge "Fix framework and NetworkStack classes conflicts" 2019-02-16 00:22:29 +00:00
Remi NGUYEN VAN
1b57e8e9db Fix framework and NetworkStack classes conflicts
Classes that are used in framework.jar cannot be linked in NetworkStack,
as the framework takes precedence in the classpath. This prevents the
networkstack from using these classes due to the hidden API usage
detection.

Do the following:
 - jarjar any shared source file between framework and NetworkStack, so
   the version in the NetworkStack uses a different package.
 - Move any shared class not used in the NetworkStack to services.net

The CL  uses jarjar on the app copy and not the framework classes, as
the framework cannot be updated without an OTA, and non-network stack
specific classes should not be renamed because of the network stack.

Test: atest FrameworksNetTests NetworkStackTests
Test: flashed svelte build, WiFi works
Bug: 124033493
Change-Id: I85d888b756adc28c36638913632bfdfdbf0e0486
2019-02-15 17:30:07 +09:00
Remi NGUYEN VAN
bfe928d593 Merge "Remove NetworkMonitor dependency on ICaptivePortal" 2019-02-15 08:09:29 +00:00
Remi NGUYEN VAN
cfff01e2db Remove NetworkMonitor dependency on ICaptivePortal
ICaptivePortal is used in the framework and cannot be used as a
dependency in NetworkMonitor, as the framework class takes precedence
when linking.
Also fix NetworkMonitorTest that was not verifying the right
startCaptivePortalApp call.

Test: atest FrameworksNetTests NetworkStackTests
Bug: 124033493
Change-Id: I8e7bb79e50650ae182a2e4277fb49abf5fb6d910
Merged-In: Ib6a89e54312628662b130fbeec18d11e139f09fa
2019-02-15 12:20:03 +09:00
Remi NGUYEN VAN
d36e3df7b0 Merge "Remove deps from framework on netd interfaces" 2019-02-15 03:11:31 +00:00
Remi NGUYEN VAN
dacee147b4 Remove deps from framework on netd interfaces
If included in framework.jar, the interfaces conflict with any app that
needs to depend on them, including the NetworkStack.

Bug: 124033493
Test: atest FrameworksNetTests NetworkStackTests
Change-Id: I2db9f87b7154130726d4700b241d55b041635d98
Merged-In: I0ecae20d514bf888f3a80331f19369ceb1c52aa3
2019-02-14 17:26:59 +09:00
Paul Duffin
0440e1fca9 Add :frameworks-base-api-current.txt filegroup
Needed by external/apache-http/Android.bp.

Bug: 119021844
Test: make checkbuild
Change-Id: Iab599d0e85524d2efa0aee9358a602e3da9931ad
2019-02-13 10:26:38 +00:00
Paul Duffin
32bfd77b79 Merge "Use filegroup name not contents in $(location ...)" 2019-02-13 10:12:46 +00:00
Steven Moreland
3e141a27c9 Merge "Remove duplicate networkstack-aidl-interfaces-java" 2019-02-12 18:29:24 +00:00
Paul Duffin
cf2e989220 Use filegroup name not contents in $(location ...)
Bug: 124218911
Test: make checkbuild
Change-Id: I0427ed4c73e4cf06f09b520a886ccf6ed0d150b2
2019-02-12 12:39:42 +00:00
Paul Duffin
e1a3fa5ef8 Remove unused build variable framework_docs_args
Bug: 124218911
Test: make checkbuild
Change-Id: I39c73bc8bee3824161e91967ec187ce60e838b48
2019-02-12 12:39:42 +00:00
Steven Moreland
771478ca17 Remove duplicate networkstack-aidl-interfaces-java
Bug: N/A
Test: N/A
Change-Id: Id34a25e54f742d20e7d451e88d2712c9ed9cdd05
2019-02-11 17:11:54 -08:00
Neil Fuller
1fe970651f Merge "Revert "Minimum viable TimeZoneDetectorService"" 2019-02-06 18:02:38 +00:00
junyulai
2ed5d4cf92 [KA03.5] Add stable AIDL parcelable for TcpKeepalivePacketData
Bug: 114151147
Test: atest FrameworksNetTests
Change-Id: I057dde79013b9eda5037b9a44f8eee06cc07352e
2019-02-06 14:07:39 +09:00
Neil Fuller
963fea9056 Revert "Minimum viable TimeZoneDetectorService"
Remove the stubbed TimeZoneDetectorService. Priorities
dictated that it not be worked on so it has never been
used.

This reverts commit 7fb88c3928b6fef1f3d559ea23468ccd1379bd49.

Bug: 112827764
Bug: 78217059
Test: build / boot
Change-Id: I39ed2fc7f8de8d4b2c0d883cd264cc126579af27
Merged-In: I39ed2fc7f8de8d4b2c0d883cd264cc126579af27
(cherry picked from commit f4894d391b9f335cec5c7eb483212a998b7bbe19)
2019-02-01 13:21:55 +00:00
Howard Chen
f17f42b0df Add the DynamicAndroid Service
Define the DynamicAndroid with AIDL.
  Add a java implementation.
  Start a service instance in the system server.
  Add a permission test.

Bug: 122015653
Test: Build & Test on a pixel phone with following command \
  ./frameworks/base/services/tests/runtests.py -e class com.android.server.DynamicAndroidTest

Merged-In: I2e54b6b71fac4a4c5a9c9c25ce6bdac74cddcfb7
Change-Id: I2e54b6b71fac4a4c5a9c9c25ce6bdac74cddcfb7
2019-01-31 15:10:21 +08:00
Remi NGUYEN VAN
231b52bc03 Remove last NetworkStack usage of hidden APIs
Includes various small changes to stop using hidden APIs

Test: make NetworkStack
Test: flashed, booted, WiFi and tethering working
Bug: 112869080
Change-Id: Id2830795a444f484b377ed6437435a1cd833697a
2019-01-30 10:23:24 +09:00
Steven Moreland
3c7ac4e991 Merge "framework.jar: Include all radio HIDL libs." 2019-01-28 16:30:36 +00:00
Paul Duffin
2111aeb289 Merge "Remove unused library framework-oahl-backward-compatibility" 2019-01-28 15:40:13 +00:00
Remi NGUYEN VAN
567cc7890a Merge "Add hidden utils and constants to NetworkStack" 2019-01-28 11:08:00 +00:00
Remi NGUYEN VAN
b8bbc48dee Merge "Move NetworkUtils used by NetworkStack" 2019-01-28 09:06:20 +00:00
Remi NGUYEN VAN
3ba6c0d56d Add hidden utils and constants to NetworkStack
Test: atest FrameworksNetTests NetworkStackTests
Bug: 112869080
Change-Id: I1a803f7954ab760294436226d6c1cffb934e98f9
2019-01-28 13:45:27 +09:00
Remi NGUYEN VAN
e88516f13b Move NetworkUtils used by NetworkStack
Depending on usage move into NetworkStackUtils or shared
Inet4AddressUtils.

Test: atest FrameworksNetTests NetworkStackTests
Bug: 112869080
Merged-In: Ie20dcee375b377236004a7689890729493aca857
Change-Id: Ib8d000529872796022706a35050fdc2c7141f2ab
2019-01-28 13:45:17 +09:00
Steven Moreland
2f5d7d8563 framework.jar: Include all radio HIDL libs.
Before, some of these were duplicated, some weren't. Now they are here
and telephony-common doesn't double-include them.

Bug: 111107855
Test: (sanity) boot Pixel 2 and check logs
Change-Id: I5b40ba139d60ff330cfbc0d9d881f775616ad0dd
Merged-In: I5b40ba139d60ff330cfbc0d9d881f775616ad0dd
2019-01-25 02:43:39 +00:00
Paul Duffin
87c1081c42 Merge "Include OrgApacheHttpLegacyUpdater unconditionally" 2019-01-24 11:12:47 +00:00
Colin Cross
bc40469e19 Merge "Replace annotation_processors with plugins" 2019-01-23 20:18:02 +00:00
Steven Moreland
436e2ad4c7 Merge "jarjar hidl core libs." 2019-01-23 18:05:25 +00:00
Steven Moreland
20a1848bc0 jarjar hidl core libs.
Otherwise, these might conflict with priv-apps that use them.

Bug: 86259915
Test: boot Pixel 2/3, look for relevant logs

Change-Id: I5f088303ba33cc2d641eea622dcdca2a642a7cd2
2019-01-22 21:11:25 +00:00
Colin Cross
a1f8e1ab3d Replace annotation_processors with plugins
The annotation_processors property is deprecated, replace it with
plugins, and use java_plugin for modules that provide annotation
processors.

Bug: 77284273
Test: m checkbuild
Change-Id: I14ed4d81e097510866cbb9a27c72be4426117885
2019-01-22 11:09:51 -08:00
Remi NGUYEN VAN
1e6b186023 Migrate ICaptivePortal to stable AIDL
Also add required API for the captive portal app to stop using hidden
members.

Test: atest FrameworksNetTests NetworkStackTests
Bug: 112869080
Merged-In: I62b457e709fa199822bb8f80b0eab990be4ded93
Change-Id: I62b457e709fa199822bb8f80b0eab990be4ded93
2019-01-23 00:53:13 +09:00
Paul Duffin
c4bd26a0ac Remove unused library framework-oahl-backward-compatibility
Bug: 18027885
Test: cts/tests/signature/runSignatureTest.sh make checkbuild
Change-Id: I0be69f5cc6f3f65a6302a81df6a412ce0b0ff10a
2019-01-22 14:16:14 +00:00
Paul Duffin
025bfab929 Include OrgApacheHttpLegacyUpdater unconditionally
Previously, OrgApacheHttpLegacyUpdater was added to the bootclasspath
(in the framework-oahl-backward-compatibility library) if and only if
the org.apache.http.legacy.jar was not on the bootclasspath. Its
presence caused the runtime to maintain backwards compatibility by
adding org.apache.http.legacy.jar to the app's classpath for apps that
target < P.

The org.apache.http.legacy.jar was permanently removed from the
bootclasspath in P and so the framework-oahl-backward-compatibility
library, and hence OrgApacheHttpLegacyUpdater, are always on the
bootclasspath and so there is no need to treat it as optional. To that
end this change:
1) Includes it in the main framework target, previously it was
   explicitly excluded.
2) Removes the code for handling the case when it is not present.
3) Removes tests for when it is not present.
4) Removes documentation describing what happens when it is not
   present.

Bug: 18027885
Test: cts/tests/signature/runSignatureTest.sh
Change-Id: I3892ead8cd2a8bf17e57bf08e3bf6ee65afac0a1
2019-01-22 14:16:14 +00:00
Remi NGUYEN VAN
a5d31f53b6 Add IIpClient API for IpClient
The API will be used to interact with IpClient once it is moved to the
NetworkStack process.
This change keeps compatibility with the previous API so that clients
can be migrated independently.

Test: atest FrameworksNetTests NetworkStackTests
Bug: b/112869080
Change-Id: I57d8164afae849230bbc0e25f17859c0b22d0f29
2019-01-21 18:25:46 +09:00
Remi NGUYEN VAN
6b0b2b735e Add stable AIDL parcelables for IIpClient API
Test: atest FrameworksNetTests NetworkStackTests
Bug: b/112869080
Change-Id: Ia4ac1eb482850a06c4dc1b6c1fe55d33d4087388
2019-01-21 12:54:24 +09:00
Nikita Iashchenko
06eb53cede Merge "Switch TextClassifier implementation from native to java" 2019-01-17 15:34:02 +00:00
Treehugger Robot
1eb5db6cf0 Merge "Change the impl lib name of java_sdk_library" 2019-01-17 10:01:37 +00:00
Remi NGUYEN VAN
4855a2e2c6 Add stable AIDL parcelables for LinkProperties
Test: atest android.net.shared.LinkPropertiesParcelableUtilTest
Bug: b/112869080
Change-Id: I2b69980e25bae9f51fb5b8cd3cafb403e6bd53da
2019-01-17 13:11:12 +09:00
Sundong Ahn
f8732bb2db Change the impl lib name of java_sdk_library
The impl lib name of java_sdk_library is changed to {module_name}.jar
instead of {module_name}.impl.jar
android.test.mock.impl is removed from stubs_defaults.
RepetitiveTest class is added to public API in android.test.base

Bug: 110404779
Test: m -j
Change-Id: I5dd7f3a28bc22136b4e921de3eb5a3e77e5fc75f
Merged-In: I5dd7f3a28bc22136b4e921de3eb5a3e77e5fc75f
(cherry picked from commit b7540bf1a3f7e7f041ea8b3d3a3a23b15cab187c)
2019-01-17 09:43:25 +09:00
Steven Moreland
bc79587a85 Merge "HIDL stuff to TestApi." 2019-01-15 21:15:34 +00:00
Nikita Iashchenko
7ea2f83f9f Switch TextClassifier implementation from native to java
Thic CL eliminates the native dependency on libtextclassifier in favor of the java one
because the .java implementation is built on top of stable APIs (@CorePlatformAPI, Android SDK)
while the native API might change in future, leading to breakages.

Bug: 119788152
Test: m droid successfully builds + atest frameworks/base/core/tests/coretests/src/android/view/textclassifier
Change-Id: I4c3bb4790c360dd514ed2ea48e0634de43dab9e7
Merged-In: Ide5e58d1c80d9a028cea4e9192a91aeac2843c71
(cherry picked from commit 64c4cb2ea929a00f5e67df1802e461fcbcc96d0c)
2019-01-15 13:23:17 +00:00