Commit Graph

469 Commits

Author SHA1 Message Date
Steven Moreland
bfed6db4e1 Merge "Remove telephony-common classes."
am: 6d77176920

Change-Id: I04c352cc56f66b06142c9a94f0b7ca7d51b26195
2019-03-20 11:46:35 -07:00
Steven Moreland
6d77176920 Merge "Remove telephony-common classes." 2019-03-20 18:30:10 +00:00
Lorenzo Colitti
be2028471f Merge changes from topic "framework-no-networkstack-aidl"
am: 74867d1661

Change-Id: I13ba3cb016a63353cfa62a61106d16e30eff0076
2019-03-20 03:18:47 -07:00
Lorenzo Colitti
9a4ae2c3f1 Remove the framework dependency on netd_aidl_parcelables-java.
In its own change because it conflicts in internal master.

Test: m
Bug: 128804404
Change-Id: I74531ef11d504b232d4f377532d5e0812dbc88db
Merged-In: I74531ef11d504b232d4f377532d5e0812dbc88db
2019-03-20 08:56:31 +09:00
Xiao Ma
5db1518bfa Merge "Move the IpMemoryStore to the network stack."
am: 93bf5ef495

Change-Id: I672d07ca2d0a251c246993ab8c7c3075de385570
2019-03-19 06:35:31 -07:00
Xiao Ma
93bf5ef495 Merge "Move the IpMemoryStore to the network stack." 2019-03-19 13:21:12 +00:00
Jeongik Cha
43942ab500 Merge "Set sdk_version 28 in aidl_interface"
am: 353e36fe69

Change-Id: Ie532df169167d94df55c3a496349b96db6abbd52
2019-03-18 15:51:30 -07:00
Jeongik Cha
353e36fe69 Merge "Set sdk_version 28 in aidl_interface" 2019-03-18 22:29:10 +00:00
Andrei-Valentin Onea
4bd5774611 Merge "Add @UnsupportedAppUsage annotations"
am: 09426de69d

Change-Id: I8be4fa32c92a5b5ac335bfbfa0a6edffcb881b22
2019-03-18 07:49:55 -07:00
Andrei Onea
dcb67738f6 Add @UnsupportedAppUsage annotations
For packages:
  android.os

This is an automatically generated CL. See go/UnsupportedAppUsage
for more details.

Exempted-From-Owner-Approval: Mechanical changes to the codebase
which have been approved by Android API council and announced on
android-eng@

Bug: 110868826
Test: m
Merged-In: I4ece0a3f37f88fc2508cb965092aed7cabc61819
Change-Id: I0d942254f06c1a355fb906640e223ad34cced6ab
2019-03-18 12:04:18 +00:00
Jeongik Cha
41a94a5127 Set sdk_version 28 in aidl_interface
default value of sdk_version in aidl_interface is changed.("28" -> "system_current")
so sdk_version of this module have to be "28" because it is included in framework.jar.

Test: m -j
Bug: 126469673
Change-Id: I515b1b236a7212198c419432b7c9fc70c623c63a
2019-03-18 12:29:36 +09:00
Chalard Jean
952135122d Move the IpMemoryStore to the network stack.
Test: atest FrameworksNetTests
Change-Id: Ic5bd6ff54b09a6fa92b6863f240a5b053011acb6
2019-03-18 11:33:17 +09:00
Remi NGUYEN VAN
7201f61c57 Merge "Remove NetworkParcelable"
am: 205886d28f

Change-Id: I8dc6d665a33d19ecad2bd5f611c2b68e08d53b97
2019-03-17 18:44:58 -07:00
Remi NGUYEN VAN
7cf43a2f53 Merge "Remove aidl wrappers for framework parcelables"
am: 1a1396070e

Change-Id: Ib69a20153754018c951f504b5f14e91074526144
2019-03-17 18:41:05 -07:00
Remi NGUYEN VAN
205886d28f Merge "Remove NetworkParcelable" 2019-03-18 01:30:25 +00:00
Remi NGUYEN VAN
1a1396070e Merge "Remove aidl wrappers for framework parcelables" 2019-03-18 01:30:01 +00:00
Remi NGUYEN VAN
904a38be5e Remove NetworkParcelable
With the @JavaOnlyStableParcelable annotation, Network can now be used
as-is as a framework parcelable.

Test: atest FrameworksNetTests NetworkStackTests
Bug: 126477266
Change-Id: I5d9695a31b3ac48d10edcf08ccd0c34375353b79
2019-03-16 03:51:09 +09:00
Remi NGUYEN VAN
e80be85790 Remove aidl wrappers for framework parcelables
The new @JavaOnlyStableParcelable annotation allows using the framework
parcelables directly, which removes a lot of boilerplate.

Includes new copy constructors for IpPrefix and LinkAddress so they can
be copied easily as-is into parcelables.

Test: atest FrameworksNetTests
Test: booted, WiFi works
Bug: 126477266

Change-Id: Icac8afe498d0b5ebf9a0d0b9eceb14d64a29b381
2019-03-16 03:50:58 +09:00
Junyu Lai
1ed9d716fc Merge "[KA02.5] Use binder thread and executor to invoke callback"
am: f9ae70a41c

Change-Id: I892d4f4dc786aa42dcbe565f345e9a731f318c8a
2019-03-15 00:53:55 -07:00
Junyu Lai
f9ae70a41c Merge "[KA02.5] Use binder thread and executor to invoke callback" 2019-03-15 07:35:27 +00:00
junyulai
7c469179ce [KA02.5] Use binder thread and executor to invoke callback
Currently, client side of keepalive event handling rely on a
newly created thread, looper, messenger and handler per object.

However, by creating oneway AIDL interface with the executor,
the callbacks can be invoked on the binder thread with user
specified context, which not only greatly simplify the design
but also reduce the cost of current thread modeling.

Bug: 114151147
Bug: 123969871
Test: 1. atest FrameworksNetTests --generate-new-metric 10
      2. atest-deflake.sh

Change-Id: I27504074cd28d5b5eb94a7ec0e97ebaaaaa1ae3d
2019-03-14 19:24:12 +08:00
Steven Moreland
d5ac170afb Remove telephony-common classes.
Moving back to telephony-common now that HIDL '-java-shallow'
libraries are available.

Bug: N/A
Test: boot (hiddenapi.cc detects duplicate classes)
Change-Id: I2c18a1904916aaf4049f7113be1194b627db9699
2019-03-13 16:26:34 -07:00
Steven Moreland
4382755210 Merge "Use jarjar rules for framework.jar."
am: b70a6cbf9a

Change-Id: I85027c5a87f9acd2c67a804bcfe8c3f7346fdbc3
2019-03-13 14:06:12 -07:00
Steven Moreland
b70a6cbf9a Merge "Use jarjar rules for framework.jar." 2019-03-13 20:52:37 +00:00
Daniel Huang
9b82062164 Merge "Modify API return type and add callback."
am: f96cc08066

Change-Id: I8d8ff3efd4666c4548dfe8a142ae0ad3f0b34b2c
2019-03-11 23:16:53 -07:00
Daniel Huang
f96cc08066 Merge "Modify API return type and add callback." 2019-03-12 06:02:04 +00:00
Chalard Jean
b14afc3a5f Merge "Add tethering event callback API"
am: 5227285ad7

Change-Id: Ie38a521abf09e0eb530173508b14aa2acdb9267c
2019-03-11 10:26:28 -07:00
danielwbhuang
a335880efe Modify API return type and add callback.
1. Modify the type from boolean to void for updateAvailableNetworks().
2. Adding callback for updateAvailableNetworks().
3. Define error codes for update available networks results.

Test: build pass
Bug: 124616182
Merged-In: I32fe1407deabe36485227ec75931bec334d85abe
Change-Id: I32fe1407deabe36485227ec75931bec334d85abe
2019-03-11 20:02:16 +08:00
Steven Moreland
19e8d4659c Use jarjar rules for framework.jar.
Rather than copying the rules, boot libs (e.g. telephony-common
or those added by OEMs) can just add the following to their library:
    jarjar_rules: ":framework-jarjar-rules",

This will ensure that rules can be changed in framework.jar without
breaking things downstream.

Bug: 127875362
Test: manual
Change-Id: I3dd64d418eca5302bb4aa142147040c459725e11
2019-03-08 10:46:28 -08:00
markchien
26299ed5fd Add tethering event callback API
Provide OnTetheringEventCallback for system app to know
tethering's upstream.

Bug: 125583822
Test: -build, flash, boot
      -atest FrameworksNetTests

Change-Id: I7ca81b27c9b805cc01884509f5b20d9d0a24cd36
Merged-in: I7ca81b27c9b805cc01884509f5b20d9d0a24cd36
2019-03-09 00:35:55 +08:00
Benedict Wong
788be6d63a Merge changes Ie66ba631,Ic42c09a3
am: cbc409986d

Change-Id: I5c8a3364f0244c5945be2bbe919aac2dcc4eba66
2019-03-08 06:35:04 -08:00
Xiangyu/Malcolm Chen
7a2dd73329 Merge "Adding callback for setPreferredDataSubscriptionId."
am: 442084c722

Change-Id: Ic66db8504d02a22d8da38159e6d2fcf6decd1878
2019-03-08 06:19:31 -08:00
Andrei Onea
c1d180cd7b resolve merge conflicts of 04e04516b4 to stage-aosp-master
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Merged-In: If18cf25dbfb1b00d7bd39fd1e1032fd783fea792
Change-Id: I21e7d91ec2f6226c3f4b396eb00640021103006e
2019-03-08 13:26:28 +00:00
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
b5e85d6bb6 Merge "NativeHandle.java: set Nullable/NonNull"
am: 6792c595a2

Change-Id: I09cdb1ce3cc64cb8ca42a13b307b93b5dab8e42c
2019-03-06 12:28:23 -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
458d16bced Merge "Use new libcore filegroup variable"
am: 898caeeaed

Change-Id: Ib5ff380f043b31b45b4b5ef0c9593e456b656378
2019-03-04 04:37:29 -08: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
Xin Li
b455c3a7f3 DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master
Bug: 120848293
Change-Id: I2f9a524f2ba552de3f62e343075cf0abf400bbae
2019-02-21 16:02:06 -08: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