Commit Graph

817 Commits

Author SHA1 Message Date
Lorenzo Colitti
59d474b3c2 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
2019-03-20 00:49:33 +09:00
Xiao Ma
2ce206c82d Merge "Move the IpMemoryStore to the network stack." am: 93bf5ef495 am: 5db1518bfa
am: 3176d57308

Change-Id: I243056012d2f099d96a33657c0eb63a5b66a2cfe
2019-03-19 06:54:43 -07: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
f34cc1d6dc Merge "Set sdk_version 28 in aidl_interface" am: 353e36fe69 am: 43942ab500
am: 35b92a4598

Change-Id: I4c5e8a59c05127224506825c169d05d286571712
2019-03-18 16:28:45 -07: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
Andrei-Valentin Onea
e3cbf906ee Merge "Add @UnsupportedAppUsage annotations" 2019-03-18 10:56:26 +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
a47b222a5f Merge "Remove NetworkParcelable" am: 205886d28f am: 7201f61c57
am: 13be9e9fcd

Change-Id: Ifec0dd683bf9c9b73c4af12835b76d284559daf8
2019-03-17 19:12:02 -07:00
Remi NGUYEN VAN
462e944ff9 Merge "Remove aidl wrappers for framework parcelables" am: 1a1396070e am: 7cf43a2f53
am: 5fd40295cb

Change-Id: I019fbbfd5dde5268cbb38bdaee1bc50a434372bc
2019-03-17 18:59:43 -07: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
Andrei Onea
24ec321bf3 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
Change-Id: I4ece0a3f37f88fc2508cb965092aed7cabc61819
2019-03-15 18:44:27 +00:00
Junyu Lai
235f8d3b05 Merge "[KA02.5] Use binder thread and executor to invoke callback" am: f9ae70a41c am: 1ed9d716fc
am: d3b8a5c332

Change-Id: I881c1ab09187ab23facc03bb71cc38a7978e442c
2019-03-15 01:19:55 -07: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
090f646c10 Merge "Use jarjar rules for framework.jar." am: b70a6cbf9a am: 4382755210
am: bcf1be1c91

Change-Id: Ib5402b555f789e5958e41dd702a9c02400e88d60
2019-03-13 14:31:17 -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
Mingguang Xu
e05b0ec4da Merge "Wifi usability: Comments from API review council are addressed" 2019-03-12 18:21:08 +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
TreeHugger Robot
9b9406f8c1 Merge "Use a boolean Consumer instead of RoleManagerCallback." 2019-03-11 17:22:40 +00: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
Benedict Wong
44faad3e22 Merge "resolve merge conflicts of 836402e0e8 to master" 2019-03-09 08:37:00 +00:00
Sooraj Sasindran
153a235d10 Merge "Modify API return type and add callback." 2019-03-09 05:44:06 +00:00
Mingguang Xu
e77cabc488 Wifi usability: Comments from API review council are addressed
Addressed all comments from API review council:
1. Rename WifiUsabilityStatsListener to OnWifiUsabilityStatsListener.
2. Change the modifier of member variables in WifiUsabilityStatsEntry.java to private and use getters.
3. Document the unit of predicitonHoirzonSec and its expected range.
4. Add @ProbeStaus in probeStatusSinceLastUpdate.
5. Rename probeElapsedTimeMsSinceLastUpdate to
ProbeElapsedTimeSinceLastUpdateMs.
6. Marked @NonNull for Argument 3 in onWifiUsabilityStats.

Bug: 126391553
Bug: 126699865
Bug: 113262380

Test: frameworks/base/wifi/tests/runtests.sh

Change-Id: I20d9ad05dc0bb537b09006ca44a447401b3e1001
Signed-off-by: Mingguang Xu <mingguangxu@google.com>
2019-03-08 17:24:27 -08:00
Hai Zhang
f5e8ccd88f Use a boolean Consumer instead of RoleManagerCallback.
And use RemoteCallback for it under the hood. This removes one AIDL
interface and allows using lambda, while aligning with what
PermissionControllerService does.

Bug: 127691087
Test: manual
Change-Id: Ia94e5bac59773380b2a4764d766bf6ff1dd5b7ff
2019-03-08 15:51:02 -08:00
Benedict Wong
18a4ebb257 resolve merge conflicts of 836402e0e8 to master
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ia76e345ddda5972b2c00731cd1d73a2c1d41c1db
2019-03-08 23:45:49 +00:00
TreeHugger Robot
d1bd765392 Merge "Add RoleControllerManager for role controller service." 2019-03-08 21:32:00 +00: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
markchien
6ea3454f07 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
2019-03-08 17:28:33 +08:00
Hai Zhang
a4959e569d Add RoleControllerManager for role controller service.
This allows us to expose both system-only and app available APIs for
role in RoleControllerService.

Bug: 127691087
Test: manual
Change-Id: I86fe3736fc28516aae25d48efe3ba599ffdf45d5
2019-03-07 21:33:12 -08:00
danielwbhuang
1f2850c472 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
Change-Id: I32fe1407deabe36485227ec75931bec334d85abe
2019-03-08 12:30:15 +08: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