Commit graph android_packages_modules_Co.../core/java
Message SHA1
Merge "Fix API in CaptivePortal and ConnectivityManager"
Lorenzo Colitti   authored and   Android (Google) Code Review   commited 2019-03-22 11:46:21 +00:00
f5773c7279
Merge "Support query cancellation for async DNS API" am: fb47755153 am: b899f2b3bc
am: 79de471561

Change-Id: I034361541f64c10d72474beaefdb3547c9c2733e

Luke Huang   authored and   android-build-merger   commited 2019-03-22 03:35:57 -07:00
44e37b74f3
Fix API in CaptivePortal and ConnectivityManager
- Remove CaptivePortal constructor from SystemApi. This constructor was
   added in Q timeframe and ends up being unnecessary since
   CaptivePortal creation was refactored to ConnectivityService because
   of visibility issues on ICaptivePortal.
 - Rename getAvoidBadWifi to shouldAvoidBadWifi
 - Add permission annotation for shouldAvoidBadWifi

Test: flashed, WiFi and captive portal works
Bug: 128935314
Bug: 128935673
(clean cherry-pick of AOSP I7395d4a4db6a64398a827692aee1956c011873e5)

Change-Id: I09545c00af3519dbf141dd5951b28f49e37b3e80

Remi NGUYEN VAN   commited 2019-03-22 17:16:52 +09:00
65c187466b
Merge "Support query cancellation for async DNS API"
Luke Huang   authored and   Gerrit Code Review   commited 2019-03-22 03:26:21 +00:00
fb47755153
Merge "Fix Automated API Review issues." am: e9109ceb23 am: fa662c4b91
am: 67646b0f22

Change-Id: Iba1630161579571d4975aba9bbd5c767f82c8a98

Paul Hu   authored and   android-build-merger   commited 2019-03-21 11:54:51 -07:00
9acc3e21d1
Merge "Fix Automated API Review issues."
Paul Hu   authored and   Gerrit Code Review   commited 2019-03-21 17:19:26 +00:00
e9109ceb23
Merge "Fix Automated API Review issues." am: 8c128c9413 am: 0565167d6b
am: 6c4e6f1153

Change-Id: I1968eb36c2f4fafd33846ec0f91710c665d936e6

Paul Hu   authored and   android-build-merger   commited 2019-03-21 07:49:37 -07:00
b779656ba8
Fix Automated API Review issues.
These API's argument/return value must be marked either @NonNull
or @Nullable.

Bug: 126701148
Bug: 126699090
Bug: 126701058
Bug: 126700772
Bug: 126699941
Bug: 126701299
Bug: 126700007
Bug: 126700900
Test: atest FrameworksNetTests
Change-Id: Id030a9f1116178b96aa3d4614b10969a537b2fc4

paulhu   commited 2019-03-21 15:16:58 +08:00
2a0fccf6ae
Fix Automated API Review issues.
1. Some API's argument/return value must be marked either
@NonNull or @Nullable.
2. Change some system APIs to public APIs.
3. Modify the method name

Bug: 126700123
Bug: 126702339
Bug: 126699682
Bug: 118296575
Bug: 126699216
Bug: 126699675
Bug: 126699429
Bug: 126699193
Bug: 123586045
Test: atest FrameworksNetTests
Change-Id: Iaa2832cdcf83758ed0fec81b954a0c63bc5a7bf6

paulhu   commited 2019-03-21 13:55:37 +08:00
9bb0480c2a
Merge changes from topic "framework-no-networkstack-aidl"
* changes:
  Remove the framework dependency on netd_aidl_parcelables-java.
  Move TcpKeepalivePacketData out of the framework.
  Stop using netd parcelables in the framework.

Lorenzo Colitti   authored and   Gerrit Code Review   commited 2019-03-20 09:45:37 +00:00
0063d13ca7
Merge "Add documentation for CaptivePortal APP_RETURN_*" am: a15a1c53d5 am: d623ba8571
am: 94aebc6bc6

Change-Id: I2fce43bf23ac9689f69bc2c432b3032cc9abb7d9

Remi NGUYEN VAN   authored and   android-build-merger   commited 2019-03-19 23:13:15 -07:00
64738bea9f
Merge "Add documentation for CaptivePortal APP_RETURN_*"
Remi NGUYEN VAN   authored and   Gerrit Code Review   commited 2019-03-20 05:40:41 +00:00
a15a1c53d5
Merge "Add Parcelable implementation for ApfCapabilities" am: 9a35341fe2 am: 78d8ff6bf8
am: 887c5f639d

Change-Id: I4d878b8dc0928aca47f944050becaa4d5206e336

Remi NGUYEN VAN   authored and   android-build-merger   commited 2019-03-19 18:09:23 -07:00
b03aada33f
Merge "Add Parcelable implementation for ApfCapabilities"
Remi NGUYEN VAN   authored and   Gerrit Code Review   commited 2019-03-20 00:34:53 +00:00
9a35341fe2
Move TcpKeepalivePacketData out of the framework.
This class is not used in framework.jar, only in services.jar.
Move it out of the framework so framework.jar can stop depending
on the NetworkStack stable AIDL interfaces.

This should really under com.android.server as well, but that's
a cross-project change to be done in another CL.

Test: m
Bug: 128804404
Change-Id: Ib2805f7fcc516a5f6989c252365d1c95b8042703
Merged-In: Ib2805f7fcc516a5f6989c252365d1c95b8042703

Lorenzo Colitti   commited 2019-03-20 08:56:31 +09:00
d9d3bced06
Stop using netd parcelables in the framework.
The only actual users of these classes are in services.jar, not
in frameworks.jar. The only reason the framework depends on them
is that the code that converts to and from stable parcelables is
currently in the framework. Move that code to services and cut
the dependency.

These classes aren't used in the networkstack app so they don't
need to be in shared. They also can't be in shared because the
classes are not in the SDK. So put the conversion functions
directly inside their only user (NetworkManagementService).

Also remove the jarjar rules that rename the classes for use by
the NetworkStack app.

This does not actually remove the dependency from the build file,
that will be done in a future CL.

Bug: 128804404
Test: builds, boots
Test: atest FrameworksNetTests android.net.cts.ConnectivityManagerTest HostsideVpnTests
Change-Id: I027d50ba56091f5558f45e6e08f32e5912b2a82a
Merged-In: I027d50ba56091f5558f45e6e08f32e5912b2a82a

Lorenzo Colitti   commited 2019-03-20 08:56:24 +09:00
196fe35040
Move TcpKeepalivePacketData out of the framework.
This class is not used in framework.jar, only in services.jar.
Move it out of the framework so framework.jar can stop depending
on the NetworkStack stable AIDL interfaces.

This should really under com.android.server as well, but that's
a cross-project change to be done in another CL.

Test: m
Bug: 128804404
Change-Id: Ib2805f7fcc516a5f6989c252365d1c95b8042703

Lorenzo Colitti   commited 2019-03-20 00:49:33 +09:00
ec1fd15589
Stop using netd parcelables in the framework.
The only actual users of these classes are in services.jar, not
in frameworks.jar. The only reason the framework depends on them
is that the code that converts to and from stable parcelables is
currently in the framework. Move that code to services and cut
the dependency.

These classes aren't used in the networkstack app so they don't
need to be in shared. They also can't be in shared because the
classes are not in the SDK. So put the conversion functions
directly inside their only user (NetworkManagementService).

Also remove the jarjar rules that rename the classes for use by
the NetworkStack app.

This does not actually remove the dependency from the build file,
that will be done in a future CL.

Bug: 128804404
Test: builds, boots
Test: atest FrameworksNetTests android.net.cts.ConnectivityManagerTest HostsideVpnTests
Change-Id: I027d50ba56091f5558f45e6e08f32e5912b2a82a

Lorenzo Colitti   commited 2019-03-20 00:49:32 +09:00
bdcf77e375
Add documentation for CaptivePortal APP_RETURN_*
This fixes API review requests.

Test: atest FrameworksNetTests NetworkStackTests
Bug: 126883311
Change-Id: I0632a98675e65c5e722e81a2c1e0cf1403b54395

Remi NGUYEN VAN   commited 2019-03-19 18:57:44 +09:00
cd13f8f3d5
Merge "Replace Handler with Executor for async DNS API" am: 44bd665c9e am: b856fc1410
am: aef7db0037

Change-Id: Ia2305094fe66017fbdfdc18b2c7284452ac90036

Luke Huang   authored and   android-build-merger   commited 2019-03-18 23:40:49 -07:00
b1dcfd090c
Merge "Refactor answer callback for async DNS query JAVA API" am: b65af07286 am: 9ddf2c10aa
am: 9f9d2e8f02

Change-Id: Id4d0ae87b1ac8618c28da666619c5c5b5bd2d722

Luke Huang   authored and   android-build-merger   commited 2019-03-18 23:24:06 -07:00
490879ff04
Merge "Replace Handler with Executor for async DNS API"
Luke Huang   authored and   Gerrit Code Review   commited 2019-03-19 05:35:39 +00:00
44bd665c9e
Merge "Refactor answer callback for async DNS query JAVA API"
Luke Huang   authored and   Gerrit Code Review   commited 2019-03-19 05:35:18 +00:00
b65af07286
Merge "Remove deprecated entitlement API" am: 9d9850ae30 am: c818ace0cc
am: 057dc5b976

Change-Id: I6bb5611de8d45e9a5c17128ea38ba1bdd8f86ac2

Mark Chien   authored and   android-build-merger   commited 2019-03-18 20:38:36 -07:00
c520bdaa2f
Merge "Remove deprecated entitlement API"
Mark Chien   authored and   Gerrit Code Review   commited 2019-03-19 02:44:37 +00:00
9d9850ae30
Support query cancellation for async DNS API
Bug: 124882626
Test: built, flashed, booted
      atest DnsResolverTest DnsPacketTest

Change-Id: Iaa72f5c17f58cf0a58663b892bb18cfdf23cd545

Luke Huang   commited 2019-03-16 18:53:09 +08:00
93f29cb930
Replace Handler with Executor for async DNS API
Bug: 124882626
Test: built, flashed, booted
      atest DnsResolverTest DnsPacketTest

Change-Id: Ie1dc27643d4767f2a8a39da755edf388a00962d5

Luke Huang   commited 2019-03-16 18:53:07 +08:00
9aa1520d40
Refactor answer callback for async DNS query JAVA API
1. refactor AnswerCallback with a generic type
2. support onError in AnswerCallback
3. Fix minor problem reported from API Review

Bug: 124882626
Test: built, flashed, booted
      atest DnsResolverTest DnsPacketTest

Change-Id: I685c9989f8401acb63d2e83f552b2d5b20c41af0

Luke Huang   commited 2019-03-16 18:53:05 +08:00
144cd67c38
Merge "Integrate testNetworkService and Manager with Connectivity stack"
Benedict Wong   authored and   Gerrit Code Review   commited 2019-03-15 17:41:02 +00:00
bc233c9e62
Remove deprecated entitlement API
The deprecated entitlement APIs[1] is introduced in the Q
development cycle. It should be replaced by new APIs[2][3].

[1] https://android-review.googlesource.com/c/platform/frameworks/base/+/874220
[2] https://android-review.googlesource.com/c/platform/frameworks/base/+/920354
[3] https://android-review.googlesource.com/c/platform/frameworks/base/+/927513

Test: -build, flash, boot
bug: 126701557
bug: 126392011
Change-Id: I96487e9038c07363680a76db840994719d7ff768

markchien   authored and   Mark Chien   commited 2019-03-15 09:03:50 +00:00
5fe817f59c
Merge "[KA02.5] Use binder thread and executor to invoke callback" am: f9ae70a41c am: 750fbd0ab2
am: 686be8c9b0

Change-Id: I881c1ab09187ab23facc03bb71cc38a7978e442c

Junyu Lai   authored and   android-build-merger   commited 2019-03-15 01:19:55 -07:00
6c1a593fef
Add Parcelable implementation for ApfCapabilities
This is necessary to allow usage of ApfCapabilities as-is in AIDL,
instead of relying on ApfCapabilitiesParcelable, assuming that stable
AIDL starts allowing usage of @SystemApi classes. The Parcelable
implementation would be convenient for clients in any case.

Bug: 126477266
Test: atest FrameworksNetTests
Change-Id: Id2ef3cad261832a2918ccb6bb6bc154d99d75746

Remi NGUYEN VAN   commited 2019-03-15 13:41:59 +09:00
619010079e
[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

junyulai   commited 2019-03-14 19:24:12 +08:00
9f87223db2
Merge "Integrate testNetworkService and Manager with Connectivity stack"
Benedict Wong   authored and   Android (Google) Code Review   commited 2019-03-13 16:48:07 +00:00
0077ec0d3f
Merge "Rename entitlement callback to adhere to API guidelines." am: a3c10cd22b am: b0f9bd21a2
am: 3abf3bc260

Change-Id: Iba73611c9330463f4517ac1555b6ee000d740c71

Jeremy Klein   authored and   android-build-merger   commited 2019-03-12 23:57:05 -07:00
c31936d4b4
Merge "Rename entitlement callback to adhere to API guidelines."
Treehugger Robot   authored and   Gerrit Code Review   commited 2019-03-13 04:48:24 +00:00
a3c10cd22b
Integrate testNetworkService and Manager with Connectivity stack
This change adds TestAPIs for tests to retrive an instance of
ConnectivityManager, allowing it to build test TUN interfaces, as well
as test networks.

This also integrates the TestNetwork types with ConnectivityManager,
creating virtual networks if the network agent is a test agent.

Bug: 72950854
Test: Compiles, CTS tests using this passing correctly
Change-Id: Ic1a04aa66014d1c66a74e65dbace3218437403ae
Merged-In: I741ef9cdf4bd4125d9129af3a030edf32f438e4f

Benedict Wong   commited 2019-03-13 02:26:30 +00:00
7f6071dc6e
Integrate testNetworkService and Manager with Connectivity stack
This change adds TestAPIs for tests to retrive an instance of
ConnectivityManager, allowing it to build test TUN interfaces, as well
as test networks.

This also integrates the TestNetwork types with ConnectivityManager,
creating virtual networks if the network agent is a test agent.

Bug: 72950854
Test: Compiles, CTS tests using this passing correctly
Change-Id: I741ef9cdf4bd4125d9129af3a030edf32f438e4f

Benedict Wong   commited 2019-03-12 19:21:28 -07:00
8e972f5b2c
Rename entitlement callback to adhere to API guidelines.
The method for OnTetheringEntitlementResultListener needs to be
onTetheringEntitlementResult in order to meet our API guidelines:

"Use Listener when there is a single callback method and there will
never be any others. It should be an interface whose name is the same
as the callback method plus Listener."

Bug: 126392011
Change-Id: I9a883765541ae853c4eb3bd52c9d93a7af16e661
Test: Manual build

Jeremy Klein   commited 2019-03-12 13:36:21 -07:00
a9aad90398
Tell the factory it is already serving a request.
This is a cherry-pick of ag/607226 that has been rebased on
top of four years of changes and with comments addressed.

Gives each factory a serial number and propagates it to every
NetworkAgent so when a score comes back indicating a request is
being handled the factory can account for it properly.

Without this, a new request that's already handled by a network
offered by a factory will not cause an increment of the factorys
ref count. Concretely this results in issues like the RAT icon
not being displayed in spite of the network actually being up
and usable.

This will be ported to AOSP as soon as possible, but immediately
some master-only WiFi tests need to be adjusted with this change
which would not let me submit to AOSP.

Bug: 18637384
Bug: 29030667
Test: manual
Test: atest frameworks/opt/telephony/tests/telephonytests
Test: atest frameworks-net
Test: atest CtsNetTestCases CtsHostsideNetworkTests
Change-Id: I597ac588f76dd507512ff02868fd1310b7e63f7e
Merged-In: I597ac588f76dd507512ff02868fd1310b7e63f7e

Chalard Jean   commited 2019-03-12 21:47:21 +09:00
44689aab3b
Merge "[CS] Support "instant failure" from factories"
Chalard Jean   authored and   Gerrit Code Review   commited 2019-03-12 12:04:46 +00:00
6e6bca7632
Merge "Check if network has partial connectivity" am: e54e1235e6 am: 9ebfc37ff9
am: 8a7575af75

Change-Id: Ib6c5ecc8238e1ac237eddcc00802fa5e7c0e24b9

Lucas Lin   authored and   android-build-merger   commited 2019-03-12 01:47:25 -07:00
79309b59af
Check if network has partial connectivity
In some networks, network validation may only get success
result for http probe but fail result for https probe.
For this kind of network, it may still work at some websites
or apps, but user didn't know about that. In order to fix this
issue, we will check if network has partial connectivity and
notify user to make a choice if they want to use this partial
connectivity or not.

Bug: 113450764
Test: 1. Build pass.
      2. Fake partial connectivity case for testing.
      3. atest FrameworksNetTests
      4. atest NetworkStackTests

Change-Id: I69ed00ac4850904ff708c9fef22e148879a10e92

lucaslin   authored and   Lucas Lin   commited 2019-03-12 07:37:33 +00:00
25a5047d2c
Merge "Improve keepalive offload documentation and error handling" am: 43b275b281 am: 8896c4a4f5
am: af523a54e4

Change-Id: If13af1a50c9bb12c85559c9c7a83d0e861d76d09

Junyu Lai   authored and   android-build-merger   commited 2019-03-11 22:40:00 -07:00
6a944483f8
Merge "Improve keepalive offload documentation and error handling"
Junyu Lai   authored and   Gerrit Code Review   commited 2019-03-12 05:11:50 +00:00
43b275b281
[CS] Support "instant failure" from factories
Add a mechanism by which a factory can declare "instant failure" for
a request - which would result in it getting an OnUnavailable()
(even without a timeout).

Factories may only do this iff:
1. They know they are the only factory which may fulfill this
   request (common for transport-specific requests).
2. The know that the request can definitely not be
   fulfilled at any point in the future.

Bug: 31382922
Test: atest ConnectivityServiceTest
Merged-In: I9bce0f4d85fa8cad7f8a9998819f945b778c5ac5
Change-Id: I9bce0f4d85fa8cad7f8a9998819f945b778c5ac5

Etan Cohen   commited 2019-03-11 16:15:43 -07:00
06633de8ce
Merge "Minor changes to the async DNS query JAVA API" am: e11e530257 am: 67de0767d9
am: 0882684893

Change-Id: I5ce24db3888c9ac4e05af254aa99aae3abcb7140

Luke Huang   authored and   android-build-merger   commited 2019-03-09 04:33:13 -08:00
17fb1ae03e
resolve merge conflicts of 40f59e9f2d to master
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ia76e345ddda5972b2c00731cd1d73a2c1d41c1db

Benedict Wong   commited 2019-03-08 23:45:49 +00:00
eb8cf2cb1d
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

markchien   commited 2019-03-09 00:35:55 +08:00
a005c999b2
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

markchien   commited 2019-03-08 17:28:33 +08:00
0a6eaab280