Commit Graph

419 Commits

Author SHA1 Message Date
Steven Moreland
4d23111594 Merge "framework.jar: Include all radio HIDL libs." am: 3c7ac4e991
am: 9bb477afb6

Change-Id: Ib163804540f5c8387c3f93ee3dcdb0e73aded2bd
2019-01-28 20:49:07 -08:00
Paul Duffin
14e472690a Merge "Remove unused library framework-oahl-backward-compatibility" am: 2111aeb289
am: 6581b4116b

Change-Id: I122a8f00652adf4134aef85e7af3d4ca79b56518
2019-01-28 08:42:14 -08: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
44b56ba488 Merge "Add hidden utils and constants to NetworkStack" am: 567cc7890a
am: 7bd6398634

Change-Id: Iac0cb991653c5556c219dbed802758a32dc1b63b
2019-01-28 03:34:20 -08:00
Remi NGUYEN VAN
567cc7890a Merge "Add hidden utils and constants to NetworkStack" 2019-01-28 11:08:00 +00:00
Remi NGUYEN VAN
9a77141364 Merge "Move NetworkUtils used by NetworkStack" am: b8bbc48dee
am: 4c5b40e084

Change-Id: I0d6a40c79e92d1de18c41cc50b72fbe33db13bdc
2019-01-28 01:30:17 -08: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
455d2a92da Merge "Include OrgApacheHttpLegacyUpdater unconditionally" am: 87c1081c42
am: 34269e4b74

Change-Id: I19a0c5d9d9a2c2c0e5cf482a5a574f304a8ce765
2019-01-24 03:46:43 -08:00
Paul Duffin
87c1081c42 Merge "Include OrgApacheHttpLegacyUpdater unconditionally" 2019-01-24 11:12:47 +00:00
Colin Cross
4262bd19ad Merge "Replace annotation_processors with plugins" am: bc40469e19
am: f30fba0a60

Change-Id: I4527a2c7dfca71f3a2c19539450a414874b190f6
2019-01-23 12:50:36 -08:00
Colin Cross
bc40469e19 Merge "Replace annotation_processors with plugins" 2019-01-23 20:18:02 +00:00
Steven Moreland
00217ac44b Merge "jarjar hidl core libs." am: 436e2ad4c7
am: 977fc9bf8e

Change-Id: I13006d1ab820171739fa680aabdd661e58cf7c34
2019-01-23 10:33:27 -08:00
Steven Moreland
436e2ad4c7 Merge "jarjar hidl core libs." 2019-01-23 18:05:25 +00:00
Remi NGUYEN VAN
7a037988d0 Merge "Migrate ICaptivePortal to stable AIDL" am: eb7c53718a
am: d15930fc27

Change-Id: I6fa53f6f7c45aa801a1e48e04bdb3ca6004f565d
2019-01-22 14:35:29 -08: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
a359fc3948 Merge "Add IIpClient API for IpClient" am: 60b9ad2ec3
am: e89f53330a

Change-Id: I58d8725a1f43f42d364a53ca80d86e3f65e6cf63
2019-01-21 17:32:12 -08:00
Remi NGUYEN VAN
bba39913f8 Merge "Add stable AIDL parcelables for IIpClient API" am: 7bf90a1f97
am: 4294a0f939

Change-Id: Ifae5ae9e6e396452ce4c432d8aa613d03ba59824
2019-01-21 11:09:28 -08: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
957fe88fc9 Merge "Switch TextClassifier implementation from native to java" am: 06eb53cede
am: 6ff8cf84f7

Change-Id: Ibd2281c89692d3b1630c3c259978ace8e241068f
2019-01-17 08:13:52 -08: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
15f85cd5f2 Merge "Add stable AIDL parcelables for LinkProperties" am: c37177a7d6
am: e45592f5fd

Change-Id: I301f9ccac2008c102dbc5e14e3654cf268e20d1d
2019-01-17 00:55:38 -08: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 b7540bf1a3)
2019-01-17 09:43:25 +09:00
Sundong Ahn
f4f4b8af4b 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 b7540bf1a3)
2019-01-16 17:30:51 +09:00
Steven Moreland
93b988e6ba Merge "HIDL stuff to TestApi." am: bc79587a85
am: e6883edf8a

Change-Id: I31b92b9c23f54d889bee4bc2d2d370b5ad3af303
2019-01-15 13:41:59 -08: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 64c4cb2ea9)
2019-01-15 13:23:17 +00:00
Steven Moreland
14b9eb6b95 HIDL stuff to TestApi.
Since the CTS test for android.os is build with test_current.

Bug: 78650449
Test: android.os.cts
Change-Id: If784f4949af931c6c4efc284f1d16414705fe2d4
Merged-In: If784f4949af931c6c4efc284f1d16414705fe2d4
2019-01-14 22:36:09 +00:00
Sooraj Sasindran
a951bbe072 Merge "Rename ANS to ONS" am: c78240df19
am: ac483b306d

Change-Id: I8714b3f7b4c71d817d2a8e8361442f720bf5a5a2
2019-01-12 11:37:42 -08:00
Sooraj Sasindran
c78240df19 Merge "Rename ANS to ONS" 2019-01-12 19:11:53 +00:00
Sooraj Sasindran
9ac6a8b5d4 Rename ANS to ONS
Rename AlternativeNetworkService to OpportunisticNetworkService
Bug: 118347827
Test: compile

Merged-In: Ifbbc5eccd35c4b0c2c4e60a04425f4aea0fdeafd
Change-Id: Ifbbc5eccd35c4b0c2c4e60a04425f4aea0fdeafd
2019-01-11 17:46:50 +00:00
Chalard Jean
2304c7c508 Merge changes from topic "IPMS1" am: 3627deac88
am: 54d91e605c

Change-Id: I2541996b9bfe338acabac858fdea0ad89d55df5b
2019-01-11 03:53:57 -08:00
Chalard Jean
f89d7bee9e [MS02] Write the skeleton for the IP memory store.
This implements a minimal contract for the IP Memory Store
feature.

Test: Created new tests for parcelable code. For the rest, created
      empty tests, but there is no logic, it's boilerplate day
Bug: 116512211
Change-Id: I15dc6275b370d671385ddfdb058a8b8d39952d6e
2019-01-11 15:01:00 +09:00
Chalard Jean
8c141bdb8f [MS01] Add the IP memory store service.
Bug: 116512211
Test: Added initial tests
Change-Id: I9d9af4097e3e2d7afd9956b9cbfa29a9f9558ae0
2019-01-11 15:00:36 +09:00
Remi NGUYEN VAN
935a491a59 Merge "Move NetworkMonitor to NetworkStack" am: 81552d610a
am: 8ecc6c9e32

Change-Id: I438b95e135d0d86be53ea3a8ab61105a886e2a2e
2019-01-10 21:29:38 -08:00
Remi NGUYEN VAN
e67b0c3aee Move NetworkMonitor to NetworkStack
Bug: b/112869080
Test: atest FrameworksNetTests NetworkStackTests
Change-Id: I1b8b6a3f4390adbabf92fb9e48da61c47b08b2ec
2019-01-11 09:59:11 +09:00
Remi NGUYEN VAN
4bdc06e174 Merge "Move DhcpServer to NetworkStack app" am: 94e5b22985
am: d495691bd5

Change-Id: Ib25c0422fda31c5df7743b481d5f50da209c38fa
2019-01-09 05:27:59 -08:00
Remi NGUYEN VAN
0e3d0923a6 Move DhcpServer to NetworkStack app
Test: atest FrameworksNetTests && atest NetworkStackTests
Bug: b/112869080

Change-Id: I96c40e63e9ceb37b67705bdd4d120307e114715b
2019-01-09 15:42:16 +09:00
Remi NGUYEN VAN
815bd36c07 Merge "Add parceling for DhcpServingParams" am: f6209cf0dd
am: 133f281d12

Change-Id: Icab36165187d204de5fdbc4f4271e758ebaebed8
2019-01-07 18:16:49 -08:00
Remi NGUYEN VAN
761198a05d Add parceling for DhcpServingParams
Introduce a stable AIDL parcel class, DhcpServingParamsParcel, and
methods to convert to and from that class to DhcpServingParams.
This will be used to move DhcpServer to the NetworkStack app.

Test: atest FrameworksNetTests
Bug: b/112869080
Change-Id: I276b7affccb938059769c90a53f0f6beb26e6ede
2019-01-07 12:07:18 +09:00