Commit graph android_packages_modules_Co.../core/java
Message SHA1
Merge changes I98573a5c,Ic7394f24 am: 0855a3c457
am: 9567abb46b

Change-Id: I279765199a80b0639dde31302778a95c0f9fd705

Benedict Wong   authored and   android-build-merger   commited 2019-04-11 10:05:20 -07:00
8cb5bb604b
Merge changes I98573a5c,Ic7394f24
* changes:
  Enable checks for MANAGE_TEST_NETWORKS in TestNetworkService
  Cleanup of Test Network service

Benedict Wong   authored and   Gerrit Code Review   commited 2019-04-10 17:06:17 +00:00
0855a3c457
Merge "Fix comment on StaticIpConfiguration#getDomains" am: 4aca98b5f5
am: 26174b9b95

Change-Id: I6a2ff0368193aaa988585613d99662a01cf4fa26

Remi NGUYEN VAN   authored and   android-build-merger   commited 2019-04-10 00:07:05 -07:00
747c63e385
Merge "Fix comment on StaticIpConfiguration#getDomains"
Treehugger Robot   authored and   Gerrit Code Review   commited 2019-04-10 06:30:55 +00:00
4aca98b5f5
Cleanup of Test Network service
This follow-up change performs some cleanup changes without affecting
functionality

Bug: 72950854
Test: Compiles, CTS tests using this pass
Change-Id: Ic7394f24f11d713c9374b438182e29d2a02ea236

Benedict Wong   commited 2019-04-09 16:34:35 -07:00
8856354a8a
Merge "Move attach*Filter() and addArpEntry() methods to NetworkStack" am: 82b74785d7
am: 6dad7305af

Change-Id: If5c236c85585a440bfb645cff9d3cb0bb4e11102

Remi NGUYEN VAN   authored and   android-build-merger   commited 2019-04-05 03:31:36 -07:00
85c61fc88d
Merge "Move attach*Filter() and addArpEntry() methods to NetworkStack"
Remi NGUYEN VAN   authored and   Gerrit Code Review   commited 2019-04-05 06:38:08 +00:00
82b74785d7
Merge "Some cleanups for Tethering" am: 7cf4907b89 am: 997009af45
am: e28dc820e4

Change-Id: I0f5c8f33f13dfa2366992a2b2e0ada7667b90e2f

Mark Chien   authored and   android-build-merger   commited 2019-04-03 03:54:42 -07:00
5ca20d48aa
Merge "Some cleanups for Tethering"
Mark Chien   authored and   Gerrit Code Review   commited 2019-04-03 10:16:25 +00:00
7cf4907b89
Move attach*Filter() and addArpEntry() methods to NetworkStack
The SocketUtils.attach*Filter and SocketUtils.addArpEntry methods
were added there because they could not be added as JNI inside
the NetworkStack. This was not possible because on Go devices,
the NetworkStack was a jar library. But now, Go also uses an APK.
Hence, move these methods to the NetworkStack.

Change-Id: I1d88a0f0be23f2b15d5103fa092b9bf982329d7c
Fix: 129433183
Test: atest NetworkStackTests FrameworksNetTests

paulhu   commited 2019-04-03 17:49:36 +08:00
fd7c030082
Merge "Fix API in CaptivePortal, StaticIpConfiguration" am: cf0f380f4e am: fb943d00ca
am: 69528af3db

Change-Id: Icda65fe4a009a754b6a1a763d402820652d55391

Remi NGUYEN VAN   authored and   android-build-merger   commited 2019-04-03 02:28:11 -07:00
99d282d2f6
Fix comment on StaticIpConfiguration#getDomains
Add consistency with setDomains().

Test: m
Change-Id: I9ff2de98cec2caf903310d7e8eb7b32362c0e151

Remi NGUYEN VAN   commited 2019-04-03 15:55:15 +09:00
9ed32081bf
Merge "Fix API in CaptivePortal, StaticIpConfiguration"
Remi NGUYEN VAN   authored and   Gerrit Code Review   commited 2019-04-03 06:51:35 +00:00
cf0f380f4e
Some cleanups for Tethering
Bug: 126481523
Test: -build, flash, boot
      -FrameworksNetTests

Change-Id: I904646efa87eb5434124c7828aca4ab09c5dc38e

markchien   commited 2019-04-03 13:56:00 +08:00
42e22097c3
Merge "Address leftover comments on 923337 and 930217." am: a9b8e31cf8 am: bc8ca075ef
am: 6106d1e017

Change-Id: I75eadb66c81d72c768e77feddd383d60f8accd65

Paul Hu   authored and   android-build-merger   commited 2019-04-02 01:29:08 -07:00
6aeeca832f
Merge "Address leftover comments on 923337 and 930217."
Paul Hu   authored and   Gerrit Code Review   commited 2019-04-02 07:39:04 +00:00
a9b8e31cf8
Fix API in CaptivePortal, StaticIpConfiguration
- Add documentation to CaptivePortal#logEvent
 - Add paragraph breaks to StaticIpConfiguration class javadoc
 - Format javadoc for API documentation
 - Move setters to a builder and hide fields for apps targeting P or
   older
 - Document StaticIpConfiguration getters and builder setters
 - Add documentation for StaticIpConfiguration#getRoutes

Bug: 129362244
Bug: 129433304
Test: built, flashed, booted, WiFi working
Test: atest FrameworksNetTests NetworkStackTests
Change-Id: Ia66c1097f01ca87d02eba3456547aedb1e480186

Remi NGUYEN VAN   commited 2019-04-02 10:43:04 +09:00
04c58fe907
Address leftover comments on 923337 and 930217.
- Restrict unprivileged apps to use
  NetworkRequest.Builder#setSignalStrength.

- Remove the "throws NullPointerException" in
  CaptivePortalProbeSpec constructor.

- Remove the null check in LinkProperties.

- Add annotataion into all ConnectivityManager.NetworkCallback
  methods.

Change-Id: Id275cac1d6a30d7515cd7b113394f5e8a0179314
Fix: 129097486
Test: atest FrameworksNetTests

paulhu   commited 2019-04-01 16:24:10 +08:00
1a40765101
Merge "Fix ApfCapabilities, LinkAddress, RouteInfo, IpPrefix API issues." am: 1f041d1443 am: 9420c284b5
am: ea2bcdfa4e

Change-Id: I599dcdb2312a3e1bb1de8e03f349df207c7cc075

Paul Hu   authored and   android-build-merger   commited 2019-04-01 00:52:53 -07:00
614b2571b6
Merge "Fix ApfCapabilities, LinkAddress, RouteInfo, IpPrefix API issues."
Paul Hu   authored and   Gerrit Code Review   commited 2019-04-01 07:20:53 +00:00
1f041d1443
Fix ApfCapabilities, LinkAddress, RouteInfo, IpPrefix API issues.
Fix: 129362082
Fix: 129361362
Fix: 129360330
Fix: 129362379
Test: atest FrameworksNetTests NetworkStackTests
Change-Id: I05fbc6f98207d5cf002e3cbc5829040af7d6be52

paulhu   commited 2019-04-01 10:23:51 +08:00
895a741bf1
Merge "Minor change for async DNS API" am: 80be1b1127 am: e0b323df1b
am: 2f0336caa9

Change-Id: Iebc2946e5705cfda16f44cb468804c2be385c02a

Luke Huang   authored and   android-build-merger   commited 2019-03-29 12:03:25 -07:00
31f19f7af7
Merge "Unremove DnsResolver#query method used by external developers" am: 3dd6df002b am: f674528970
am: 22f7e75f67

Change-Id: Ibfba10cb92e63a7ae727f48543da040aa5f39116

Lorenzo Colitti   authored and   android-build-merger   commited 2019-03-29 08:38:15 -07:00
6180380e75
Minor change for async DNS API
do the minor changes to address comments before

Bug: 129395490
Test: atest DnsResolverTest
Change-Id: I56e2e5bc4352ff5c979579247a333a41950079da

Luke Huang   commited 2019-03-29 18:12:26 +08:00
293ffaa081
Unremove DnsResolver#query method used by external developers
This method was removed as part of addressing API council feedback in b/129261432
Add back previous DnsResolver#query which is already being used by developers.

Bug: 129395490
Test: atest DnsResolverTest

Change-Id: Ic956db204f3940d39d42e1b11dda39e57d356fad

Luke Huang   commited 2019-03-29 18:12:26 +08:00
fb5afabcb8
Merge "Fix cancellation race problem for aysnc DNS API" am: de6217b8e2 am: 829e409827
am: ae338a8030

Change-Id: I4e10bfaa43a63cedd9fbddfc6f8bf8853c426eba

Luke Huang   authored and   android-build-merger   commited 2019-03-28 21:18:41 -07:00
19dcd80972
Fix cancellation race problem for aysnc DNS API
This problem might cause double-close fd and result in app crash
or unexpected behaviour

Bug: 129317069
Test: atest DnsResolverTest
      manual test with delaying response callback/cancel
Change-Id: I223234f527edafc51d34fa6be390419c05def8d8

Luke Huang   commited 2019-03-28 19:46:56 +08:00
e17bb2dff4
Merge changes I0baf582f,I4bba01ba am: 6d7c97dc5c am: a0540419f9
am: 7fd6b91b04

Change-Id: I2cc021899270b41e4b9047ef32869af53ea6fb65

Junyu Lai   authored and   android-build-merger   commited 2019-03-27 18:43:18 -07:00
bf7917290e
Block unpriviledged apps which create keepalives with null fd
Currently, socketKeepalive implementation is accepting null fd
due to backward compatibility with legacy packet keepalive API.
However, due to lack of the fd, the service cannot guarantee the
port is not reused by another app if the caller release the port
for any reason.

Thus, grant the null fd access only for priviledged apps.

This commit also address some comments from aosp/918533.

Bug: 126699232
Test: atest FrameworksNetTests
Change-Id: I0baf582ff4ca8af6082c3754e8dfbcd867f39792

junyulai   commited 2019-03-27 19:51:08 +08:00
828dad188c
Merge "Add nullability annotations" am: 539821c978 am: 97350573b9
am: c66eb1e12e

Change-Id: I43088399da1d81556ab903ef1ca716439129f00d

Remi NGUYEN VAN   authored and   android-build-merger   commited 2019-03-25 06:56:43 -07:00
e289064a7b
Merge "Add nullability annotations"
Treehugger Robot   authored and   Gerrit Code Review   commited 2019-03-25 13:19:19 +00:00
539821c978
Merge "Fix SocketKeepalive APIs which do not meet API review requirement" am: 66bc22760a am: 7246f1a563
am: 0f69af35db

Change-Id: I873a82de90efce6f3baa17761c0576dc9c8210be

Junyu Lai   authored and   android-build-merger   commited 2019-03-25 04:16:18 -07:00
40ad433f92
Merge "Fix SocketKeepalive APIs which do not meet API review requirement"
Junyu Lai   authored and   Gerrit Code Review   commited 2019-03-25 10:42:37 +00:00
66bc22760a
Fix SocketKeepalive APIs which do not meet API review requirement
Per API review, change the use of FileDescriptor to
ParcelFileDescriptor.
This change also fix nullability according to API review
feedbacks.

Fix: 126698610
Fix: 126699425
Fix: 126699232
Fix: 126700278

Test: 1. m -j
      2. atest FrameworksNetTests --generate-new-metrics 50
      3. m -j doc-comment-check-docs
Change-Id: I19476c50dd1ca290bf3f41973829da2bd229796a

junyulai   commited 2019-03-25 15:56:35 +08:00
7e06ad4ce9
Add nullability annotations
Add nullability annotations on the following methods:
 - StaticIpConfiguration#getRoutes
 - ValidationProbeEvent#getProbeName

Test: m
Bug: 128935825
Change-Id: I1c17d200f3125e684c4e4d67b2f7f079eda310b6

Remi NGUYEN VAN   commited 2019-03-25 16:46:34 +09:00
be381ab943
Merge "Separate NetworkMonitor/framework portal URL" am: 8ab472e77a am: afa7a43b17
am: 0fabd5dca2

Change-Id: I85e744d94d96ecf9ac558e62016418d8199bb98c

Remi NGUYEN VAN   authored and   android-build-merger   commited 2019-03-24 20:23:39 -07:00
fa062e4857
Merge "Separate NetworkMonitor/framework portal URL"
Remi NGUYEN VAN   authored and   Gerrit Code Review   commited 2019-03-25 02:50:37 +00:00
8ab472e77a
Merge "Fix API in CaptivePortal and ConnectivityManager"
Treehugger Robot   authored and   Gerrit Code Review   commited 2019-03-25 02:37:28 +00:00
8f4c739827
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

(already merged in internal as:
I09545c00af3519dbf141dd5951b28f49e37b3e80)

Test: flashed, WiFi and captive portal works
Bug: 128935314
Bug: 128935673
Merged-In: I09545c00af3519dbf141dd5951b28f49e37b3e80
Change-Id: I7395d4a4db6a64398a827692aee1956c011873e5

Remi NGUYEN VAN   commited 2019-03-25 01:43:48 +00:00
1fb7cabbfc
Merge "Fix API in CaptivePortal and ConnectivityManager"
Lorenzo Colitti   authored and   Android (Google) Code Review   commited 2019-03-22 11:46:21 +00:00
0eabf54862
Merge "Support query cancellation for async DNS API" am: 6aea92f594 am: 697b5a4aab
am: 7bc21f13af

Change-Id: I034361541f64c10d72474beaefdb3547c9c2733e

Luke Huang   authored and   android-build-merger   commited 2019-03-22 03:35:57 -07:00
63c28c2c1c
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
d6d5505edf
Separate NetworkMonitor/framework portal URL
The framework cannot return URLs used by the updatable NetworkStack,
which may use configurable URLs, changing URLs, or mechanisms not
involving URLs to detect captive portals. NetworkMonitor has already
been using random fallback URLs for a while that do not match the value
returned by ConnectivityManager#getCaptivePortalServerUrl.

With this change, the default value returned by the framework is
configured in framework resources as
config_networkDefaultCaptivePortalServerUrl. NetworkMonitor behavior may
change as it is an updatable component, but the current URL is
configured in NetworkMonitor resources as
config_captive_portal_http_url.

Test: flashed, booted, WiFi and captive portal working
Test: ConnectivityManager#getCaptivePortalServerUrl returns correct
      value.
Bug: 127908503
Change-Id: I371dedc5b22efa909d7fd58e1ebe9b8aaced9780

Remi NGUYEN VAN   commited 2019-03-22 15:11:14 +09:00
035f65367b
Merge "Support query cancellation for async DNS API"
Luke Huang   authored and   Gerrit Code Review   commited 2019-03-22 03:26:21 +00:00
6aea92f594
Merge "Fix Automated API Review issues." am: acb5eca325 am: f1f3b08982
am: affa3f497d

Change-Id: Iba1630161579571d4975aba9bbd5c767f82c8a98

Paul Hu   authored and   android-build-merger   commited 2019-03-21 11:54:51 -07:00
2e2bc9c173
Merge "Fix Automated API Review issues."
Paul Hu   authored and   Gerrit Code Review   commited 2019-03-21 17:19:26 +00:00
acb5eca325
Merge "Fix Automated API Review issues." am: a793b48cf0 am: 9a9dac2b98
am: d29d268abe

Change-Id: I1968eb36c2f4fafd33846ec0f91710c665d936e6

Paul Hu   authored and   android-build-merger   commited 2019-03-21 07:49:37 -07:00
d387c2abc8
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
3806853f94
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
cbbc3db924
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
6505a76d78