Commit graph android_packages_modules_Co.../core/java
Message SHA1
Merge "Disable roaming sanity checking." into pi-dev
am: a394296b37

Change-Id: I93bb07583ef90fb8c31c5c9a0c3e2c6e4968f975

Jeff Sharkey   authored and   android-build-merger   commited 2018-04-09 18:15:36 -07:00
51faeb468e
Disable roaming sanity checking.
We've traced down all code paths where NetworkInfo.isRoaming() and
NET_CAPABILITY_NOT_ROAMING can disagree, so we're only left with
noise that happens from NetworkAgent race conditions when someone
asks for a NetworkState between pending NetworkInfo and
NetworkCapabilities updates.

We can look at adding a way for a NetworkAgent to update these
two objects atomically, but not for this release.

Bug: 70174865
Test: builds, boots
Change-Id: I830e1fc6dc922e9eb7f8c2698d75181e00aaf7fb

Jeff Sharkey   commited 2018-04-09 16:17:23 -06:00
9813abb032
Remove unwanted capability code per API council feedback.
am: cfef78edd5

Change-Id: I359aad5d7dceb2b188544db18424598decf14c08

Lorenzo Colitti   authored and   android-build-merger   commited 2018-04-06 19:56:30 -07:00
7e6b687a68
Remove unwanted capability code per API council feedback.
The addition of hasUnwantedCapability was late in the release
cycle and does not simplify the API enough to be worth it. The
recommendation is, in a future release, to do something more
complete: not just add something like addUnwantedCapability, but
also deprecate all the NET_CAPABILITY_NOT_xxx constants and add
opposite NET_CAPABILITY_xxx constants for use with it.

Fix: 77601789
Test: builds, boots
Test: atest android.net.cts.NetworkRequestTest
Test: atest android.net.cts.ConnectivityManagerTest
Change-Id: Ib98fb01da4a4a0bae464787b589ad88f45002eb8

Lorenzo Colitti   commited 2018-04-06 23:02:51 +09:00
cfef78edd5
Merge "Add hasUnwantedCapability method" into pi-dev
am: 088b1f55a0

Change-Id: I7feec81a3f1525055030ee16f34b8e7251e79b9b

Pavel Maltsev   authored and   android-build-merger   commited 2018-04-04 10:15:10 -07:00
4d0cacd6f5
Merge "Add hasUnwantedCapability method" into pi-dev
TreeHugger Robot   authored and   Android (Google) Code Review   commited 2018-04-04 16:55:14 +00:00
088b1f55a0
Mark networks with OEM_PAID always restricted
Bug: 68762530
Test: runtest -x frameworks/base/tests/net/ -c android.net.NetworkCapabilitiesTest

Cherry-picked from AOSP with no conflicts

Merged-in: I173ee0a3bc1797d03ba34c5f025844eaada87ee4
Change-Id: I173ee0a3bc1797d03ba34c5f025844eaada87ee4
(cherry picked from commit efbacc0ccb70917b2782272e6b8f1a0fb3f56cbe)

Lorenzo Colitti   authored and   Pavel Maltsev   commited 2018-04-04 05:35:54 +00:00
653a5c203c
Merge "Make addUnwantedCapability method public" into pi-dev
am: 2874a14212

Change-Id: I6d1676b72f125baf5b72e8718bd331a30b3c3c30

Pavel Maltsev   authored and   android-build-merger   commited 2018-04-02 21:47:22 +00:00
feb3be4f2b
Add hasUnwantedCapability method
If you put values into the Builder, you should be able to observe
those values on the built object.

Test: atest android.net.cts.NetworkRequestTest

Bug: 74945408
Bug: 72828388
Change-Id: Ib4026b8d7370d570f1b606f0d221d00fed6e787d

Pavel Maltsev   commited 2018-04-02 11:10:13 -07:00
6fe8f5b7a3
Merge "Make addUnwantedCapability method public" into pi-dev
TreeHugger Robot   authored and   Android (Google) Code Review   commited 2018-04-02 15:07:25 +00:00
2874a14212
Merge "Add OEM_PAID capability to system api" into pi-dev
am: 62e4efeee2

Change-Id: Ic164c4a29cd449a31b2f1c12c8c345bcc5dc77fa

Pavel Maltsev   authored and   android-build-merger   commited 2018-03-30 18:30:23 +00:00
518c3decff
Merge "API council requested tweaks to NetworkRequest." into pi-dev
am: 66b0087e58

Change-Id: I0d090ebb7d57689a061badcf593ae9a37d88f7ce

Jeff Sharkey   authored and   android-build-merger   commited 2018-03-30 18:22:13 +00:00
6c5e373f30
Merge "Add OEM_PAID capability to system api" into pi-dev
Pavel Maltsev   authored and   Android (Google) Code Review   commited 2018-03-30 16:32:52 +00:00
62e4efeee2
Merge "API council requested tweaks to NetworkRequest." into pi-dev
Jeff Sharkey   authored and   Android (Google) Code Review   commited 2018-03-30 16:30:24 +00:00
66b0087e58
Merge "Fix socket leaks in various android.net.Network methods." into pi-dev
am: 4baa5d48e3

Change-Id: I2a2254ce65c2176ae0be1d6276034b1bb0cad987

Paul Jensen   authored and   android-build-merger   commited 2018-03-30 16:22:51 +00:00
ef15944d4f
Merge "Add Network.fromNetworkHandle()" into pi-dev
am: c0b767a937

Change-Id: I22e68ab29982690dee5b2c0c6e1fbd47df0b0326

Lorenzo Colitti   authored and   android-build-merger   commited 2018-03-30 14:55:48 +00:00
9e0b6ce895
Merge "Fix socket leaks in various android.net.Network methods." into pi-dev
TreeHugger Robot   authored and   Android (Google) Code Review   commited 2018-03-30 09:47:51 +00:00
4baa5d48e3
Merge "Mark networks with OEM_PAID always restricted" am: 99613ff80b
am: 88650629fa

Change-Id: I88500f6add4f1a6c8a77eb976a489c11c7dc5b6d

Lorenzo Colitti   authored and   android-build-merger   commited 2018-03-30 09:05:09 +00:00
1f594309aa
Merge "Clarify documentation for getActiveNetworkInfo and friends" am: a47ebd7f70
am: fc45f0749c

Change-Id: I339bb71182723907ed078e8be739c4d4ea2d1da5

Chalard Jean   authored and   android-build-merger   commited 2018-03-30 08:51:38 +00:00
ef6b974a62
Merge "Mark networks with OEM_PAID always restricted"
am: 99613ff80b

Change-Id: I4ffcf01e1f79c8a3570ea2b819688b55904939fe

Lorenzo Colitti   authored and   android-build-merger   commited 2018-03-30 08:47:25 +00:00
88650629fa
Merge "Clarify documentation for getActiveNetworkInfo and friends"
am: a47ebd7f70

Change-Id: I167776fb6ec44aff4b35b58378b54e3b55907427

Chalard Jean   authored and   android-build-merger   commited 2018-03-30 08:36:58 +00:00
fc45f0749c
Merge "Clarify documentation for getActiveNetworkInfo and friends" into pi-dev
TreeHugger Robot   authored and   Android (Google) Code Review   commited 2018-03-30 08:22:29 +00:00
7db624228a
Merge "Mark networks with OEM_PAID always restricted"
Lorenzo Colitti   authored and   Gerrit Code Review   commited 2018-03-30 07:00:54 +00:00
99613ff80b
Mark networks with OEM_PAID always restricted
Bug: 68762530
Exempt-From-Owner-Approval: OWNERS have approved, but gerrit doesn't see it
Test: runtest -x frameworks/base/tests/net/ -c android.net.NetworkCapabilitiesTest
Change-Id: Ieadef7c42634d890281543226203530fb18eb0a3

Pavel Maltsev   authored and   Lorenzo Colitti   commited 2018-03-30 07:00:39 +00:00
fa0f612d29
Clarify documentation for getActiveNetworkInfo and friends
For VPNs it's unobvious what these methods do, so document that.

Bug: 70917007
Test: Comment changes only. Checkdoc passes.
Change-Id: I31ec1aea356d88d969eaf9fc7d8c2ed13ce924eb

Chalard Jean   commited 2018-03-30 12:22:06 +09:00
7c85ba400c
Fix socket leaks in various android.net.Network methods.
Bug: 72124526
Test: make CtsNetTestCases
Change-Id: I3398b67272360f894e01a8cdfbc47b17d77c2330

Paul Jensen   commited 2018-03-29 07:43:01 -04:00
75184ed674
Add Network.fromNetworkHandle()
This is the counterpart to Network.getNetworkHandle() and facilitates
native code calling back to Java with network handle values from
getNetworkHandle.

Bug: 77210159
Bug: 64148938
Test: make CtsNetTestCases

Change-Id: I032b959d84180c063a79ddd97c35e7384b0f50a1

Paul Jensen   commited 2018-03-29 07:24:59 -04:00
bcf88e4576
Clarify documentation for getActiveNetworkInfo and friends
For VPNs it's unobvious what these methods do, so document that.

Bug: 70917007
Test: Comment changes only. Checkdoc passes.
Change-Id: I31ec1aea356d88d969eaf9fc7d8c2ed13ce924eb

Chalard Jean   commited 2018-03-29 18:10:56 +09:00
ba7a3467fd
Make addUnwantedCapability method public
Allow apps to specify a list of capabilities that network must not have
in order to satisfy the request.

Bug: 72828388
Test: m -j
Change-Id: I91ee54963f7b92899c7a107b3a450b268c62fd8d

Pavel Maltsev   commited 2018-03-28 15:09:50 -07:00
fc2abf2b4c
API council requested tweaks to NetworkRequest.
If you put values into the Builder, you should be able to observe
those values on the built object.

Test: atest android.net.cts.NetworkRequestTest
Bug: 74945408
Change-Id: I9aacceb82c98f7881f0eb5e1106d89d469b816a7

Jeff Sharkey   commited 2018-03-28 14:02:00 -06:00
fc5a07fe83
Add OEM_PAID capability to system api
Some system apps should be able to request OEM_PAID networks.  This
makes a lot of sense when Android is used as in-vehicle infotainment
systems.

Bug: 68762530

Test: runtest -x frameworks/base/tests/net/ -c android.net.NetworkCapabilitiesTest

Change-Id: Ic916de7522a9f803a2410bc4e3e82101fd9d0dbd

Pavel Maltsev   commited 2018-03-27 23:17:14 -07:00
0b2e0b0280
Merge "Minor clean-up in NetworkCapabilities" am: 98dc002acc am: 6d8274ebf1
am: fbb48a210f

Bug: 72828388
Test: frameworks/base/tests/net/ -c android.net.NetworkCapabilitiesTest

Change-Id: I2f45d2c70c7c0142ae3b3ce9e6329c5f25b63380
(cherry picked from commit feb8d1498a822730e29cf346fe3382e3f5293a58)

Pavel Maltsev   commited 2018-03-27 22:45:49 +00:00
3585034ec9
Merge "Improve ConnectivityManager.getNetworkWatchlistConfigHash() javadoc" into pi-dev
am: 9bf657d1e7

Change-Id: Ic3de4d136a995a8291fb43c780a311e423aeb9b7

Ricky Wai   authored and   android-build-merger   commited 2018-03-26 17:01:45 +00:00
a635ed5a99
Merge "Improve ConnectivityManager.getNetworkWatchlistConfigHash() javadoc" into pi-dev
Ricky Wai   authored and   Android (Google) Code Review   commited 2018-03-26 16:46:20 +00:00
9bf657d1e7
Merge "Have the status bar listen to all macro-users VPN changes." am: b84083ae3b
am: cad715f0d8

Change-Id: Ib4daa5f4136662721794bd8bcd4f185cb2944824

Chalard Jean   authored and   android-build-merger   commited 2018-03-23 09:29:28 +00:00
e9d037c6ef
Merge "Have the status bar listen to all macro-users VPN changes." into pi-dev
TreeHugger Robot   authored and   Android (Google) Code Review   commited 2018-03-23 09:26:46 +00:00
55f0dd815d
Merge "Have the status bar listen to all macro-users VPN changes."
am: b84083ae3b

Change-Id: Icc4fe4fbdb75c90abaaee8009f08f1220536686e

Chalard Jean   authored and   android-build-merger   commited 2018-03-23 09:22:36 +00:00
cad715f0d8
Merge "Have PermissionMonitor arbiter which app can access background networks"
am: c907d94361

Change-Id: Ic05e362af58d667b5be84c3bd421c9250927abe2

Chalard Jean   authored and   android-build-merger   commited 2018-03-23 08:12:51 +00:00
3234396b78
Merge "Have the status bar listen to all macro-users VPN changes."
Chalard Jean   authored and   Gerrit Code Review   commited 2018-03-23 07:33:02 +00:00
b84083ae3b
Merge "Have PermissionMonitor arbiter which app can access background networks" into pi-dev
am: 1f654aa247

Change-Id: I8d725b07e59654232ee41b82aac007dc6a495a01

Chalard Jean   authored and   android-build-merger   commited 2018-03-23 06:48:49 +00:00
48bb6ede68
Have PermissionMonitor arbiter which app can access background networks
This will let ConnectivityService send the right callbacks to the
relevant apps.

Test: manual with apps
      runtest frameworks-net
      cts
      new tests for this functionality
Bug: 67408339

Change-Id: I6f08efd9e73c7e191f833d7f307a3bf4c9e2f0b4

Chalard Jean   commited 2018-03-23 13:37:56 +09:00
a43eede395
Improve ConnectivityManager.getNetworkWatchlistConfigHash() javadoc
Test: NULL
Bug: 74831039
Change-Id: I227ba1377a51821204cd5830e7da6ff3a15bca02

Ricky Wai   commited 2018-03-22 20:13:05 +00:00
573dcabcff
Have PermissionMonitor arbiter which app can access background networks
This will let ConnectivityService send the right callbacks to the
relevant apps.

Test: manual with apps
      runtest frameworks-net
      cts
      new tests for this functionality
Bug: 67408339

Change-Id: I6f08efd9e73c7e191f833d7f307a3bf4c9e2f0b4

Chalard Jean   commited 2018-03-22 19:03:59 +09:00
f8d5bd9441
Have the status bar listen to all macro-users VPN changes.
Bug: 73217368
Test: manual
      Using Datally on work profile. Before this, enabling the VPN
      does not show the key icon. After this it does.

Change-Id: I454eb8f3881a48af1b0187c2b14a2a399d3c2445

Chalard Jean   commited 2018-03-22 13:25:52 +09:00
06f604fcbd
Have the status bar listen to all macro-users VPN changes.
Bug: 73217368
Test: manual
      Using Datally on work profile. Before this, enabling the VPN
      does not show the key icon. After this it does.

Change-Id: I454eb8f3881a48af1b0187c2b14a2a399d3c2445

Chalard Jean   commited 2018-03-22 13:25:09 +09:00
be4e459af5
Merge "Fixing comments in Network Capabilities" am: d6da5146e7
am: fd41459278

Change-Id: If3c0d76f9598d931d801271c4d0634e15f4b9ed4

Pavel Maltsev   authored and   android-build-merger   commited 2018-03-12 08:08:31 +00:00
84eab7e76c
Merge "Fixing comments in Network Capabilities"
am: d6da5146e7

Change-Id: Iacbcac2e740099ea6b6a6f7a646f046370fd16f5

Pavel Maltsev   authored and   android-build-merger   commited 2018-03-12 07:57:07 +00:00
fd41459278
Merge "Fixing comments in Network Capabilities"
Treehugger Robot   authored and   Gerrit Code Review   commited 2018-03-12 07:42:58 +00:00
d6da5146e7
Fixing comments in Network Capabilities
Clean up after aosp/606338

Test: m -j (only comments has been changed)
Change-Id: I2627654450244024c2be92f9067534dfc2a80891

Pavel Maltsev   commited 2018-03-09 10:42:32 -08:00
c30002742f
Merge "Deprecate most of NetworkInfo." am: 12c57e795c
am: 94d7da3a7c

Change-Id: Ia00fbfa38a28583198278df2a94642ed8139d7d1

Chalard Jean   authored and   android-build-merger   commited 2018-03-09 13:12:08 +00:00
b295d028c8