Commit graph android_packages_modules_Co.../core/java/android
Message SHA1
Don't require ACCESS_NETWORK_STATE in setProcessDefaultNetwork
The documentation for setProcessDefaultNetwork does not
mention that it requires ACCESS_NETWORK_STATE, but a process
without ACCESS_NETWORK_STATE that calls it will crash because
we can't fetch the proxy properties.

Because ACCESS_NETWORK_STATE is not required to obtain a Network
object (Network objects can come from broadcasts too), it may not
be reasonable to require the permission. We did not do so in L.

For now, ignore the failure and don't crash the app. I've filed
http://b/20470604 to track a longer term fix.

Bug: 20081183
Bug: 20423580
Bug: 20470604
Change-Id: I158016130b4afb1d300357fe703804d2e7bc609b

Lorenzo Colitti   commited 2015-04-22 12:27:33 +09:00
41b1fbca30
Merge "update API name to requestBandwidthUpdate()"
fenglu   authored and   Android (Google) Code Review   commited 2015-04-22 01:32:19 +00:00
3595251977
update API name to requestBandwidthUpdate()
Change-Id: If26942978ffcc43f06f17dfad5da790f34758395

fenglu   commited 2015-04-21 17:12:05 -07:00
b00f48834e
Merge "Revert "requestBwUpdate() public API review""
Robert Greenwalt   authored and   Android (Google) Code Review   commited 2015-04-21 23:59:35 +00:00
f780ac8cd6
Revert "requestBwUpdate() public API review"
This reverts commit 85d7af1f8b.

Change-Id: I8c22d285ff1f56f1bd31a0fa9f2e6a79959347b1

Robert Greenwalt   commited 2015-04-21 23:59:14 +00:00
d915d64bd6
Merge "requestBwUpdate() public API review"
Robert Greenwalt   authored and   Android (Google) Code Review   commited 2015-04-21 23:55:48 +00:00
3d9f44446a
requestBwUpdate() public API review
Change-Id: I1e780b2705d13bfc85a0a8712ac1dbd623b474a1

fenglu   commited 2015-04-21 15:33:19 -07:00
85d7af1f8b
Final removal of CONNECTIVITY_ACTION_IMMEDIATE.
Since the demise of the connectivity change delay,
CONNECTIVITY_ACTION_IMMEDIATE has been sent out back to back with
CONNECTIVITY_ACTION.

Interested parties should watch for CONNECTIVITY_ACTION.

Bug: 20013379
Change-Id: I072dddf95adb3bbd17fa1f7159d4ea848ade8f19

Erik Kline   commited 2015-04-21 17:02:34 +09:00
934122fbbb
Move factoryReset to service and protect.
bug:16161518
Change-Id: I02d1bbae1887c62ee426e6f03e8bc1f18c6666bf

Stuart Scott   commited 2015-04-20 10:52:35 -07:00
d546364a81
LCE service implementation - connectivity side
Change-Id: If11bd99c44c7dc8d2aa2bc05a10e04421739baa6

fenglu   commited 2015-04-16 02:53:39 -07:00
3f35740bd8
Merge "am b5e0cfb..557d2f5 from mirror-m-wireless-internal-release"
Vinit Deshpande   authored and   Android (Google) Code Review   commited 2015-04-16 02:36:30 +00:00
e80d3096ad
Merge changes from topic 'no_internet'
* changes:
  Add a noInternetAccessExpected boolean to WifiConfiguration.
  Prompt if a network without an Internet connection is selected
  Give SystemUI the OVERRIDE_WIFI_CONFIG permission.
  Add an UNKNOWN_UID constant to WifiConfiguration.

Lorenzo Colitti   authored and   Android (Google) Code Review   commited 2015-04-15 11:48:22 +00:00
9b8639edbc
multinetwork API: native implementation
Bug: 19537384
Change-Id: I04f4a7de2b1e583989b67a853df6ab50289c2185

Erik Kline   commited 2015-04-15 15:32:08 +09:00
7b139a856b
Prompt if a network without an Internet connection is selected
When a network is explicitlySelected, keep it connected but do
not automatically switch to it. Instead, attempt to validate it,
and if 8 seconds have passed and the network is not yet
validated, prompt the user asking whether to switch to it anyway.

Bug: 20081183
Change-Id: I03a8459eb39979e3dc8e94662b85a44605dd7e69

Lorenzo Colitti   commited 2015-04-15 13:38:22 +09:00
6947c067bd
am b5e0cfb..557d2f5 from mirror-m-wireless-internal-release
557d2f5 Merge "Add ConnectivityManager.reportNetworkConnectivity() API" into m-wireless-dev
ab5267a Fix onLost/onFound logic in isSettingsAndFilterComboAllowed
b95d795 Add ConnectivityManager.reportNetworkConnectivity() API
238e0f9 OBEX Over L2CAP + SDP search API for BT profiles
1f56738 Add ConnectivityManager.getActiveNetwork(). Rework NetID allocation in ConnectivityService so registerNetworkAgent() can return the allocated NetID.
bf18bed Merge "Non-functional code cleanup of ConnectivityService." into m-wireless-dev
db8784e Merge "Cleanup of Video Call pause functionality." into m-wireless-dev
c7a1d23 Non-functional code cleanup of ConnectivityService.
e593d0a Onfound onlost feature.
0326f58 Merge "API for config app." into m-wireless-dev
e9b056f API for config app.
d5351e7 RTT framework interface update
224ab3d Unhide Network.openConnection(URL, Proxy).
bd2d378 Fix typos in ConnectivityManager documentation.

Change-Id: Ib4c88f6d7ad1b24227b032555c62a5804194384b

Vinit Deshpande   commited 2015-04-14 16:15:02 -07:00
fda5739846
am 73e056d3: am 402f2501: am 3312c6b9: Merge "Add android.net.IpPrefix#contains()"
* commit '73e056d3931b419c2653eb7365fb72b50a9a36c3':
  Add android.net.IpPrefix#contains()

Erik Kline   authored and   Android Git Automerger   commited 2015-04-14 09:58:38 +00:00
1fee823879
Add android.net.IpPrefix#contains()
This was originally to avoid RuntimeException in RouteInfo#matches():
    When an IPv6 prefix with a length greater than the max permitted
    for IPv4 is matched against an Inet4Address, the call to
    NetworkUtils throws RuntimeException.

Change-Id: I92e2bd19a4e7d656cf682fd27678da07e211850d

Erik Kline   commited 2015-04-14 16:19:11 +09:00
b98afb001c
Add ConnectivityManager.reportNetworkConnectivity() API
This new API allows reporting networks that are perceived to provide Internet
connectivity and networks that are not.  This allows the framework to avoid
needlessly reevaluating networks where the apps perception matches the
framework's perception.  This was not possible with the prior API,
reportBadNetwork.

Bug: 16214361
Change-Id: Id4409bd7538854bd837231fb50e693c10a62b4f2

Paul Jensen   commited 2015-04-13 18:48:54 +00:00
b95d7950f5
Merge commit 'e593d0a' into merge_work
Change-Id: I4f8ae40fc446cd9cda4d5c6ec99469a98dda595b

Prerepa Viswanadham   commited 2015-04-10 15:58:10 -07:00
9dd7ce3ca2
Add ConnectivityManager.getActiveNetwork().
Rework NetID allocation in ConnectivityService so registerNetworkAgent() can
return the allocated NetID.

Bug: 19416463
Change-Id: I68e395552cf27422c80b4dfae5db5d56a0d68f5d

Paul Jensen   commited 2015-04-10 14:03:13 +00:00
1f567385ff
Non-functional code cleanup of ConnectivityService.
1. Remove ConnectivityService.findConnectionTypeForIface() as this can be done
   just as easily with supported APIs now.
2. Avoid making copies of Network objects as this precludes reuse of Network
   internals (e.g. socket factory, connection pool).

Change-Id: I52f92e35d769d8350471f485e408169608630082

Paul Jensen   commited 2015-04-08 07:46:49 -04:00
c7a1d23cdf
Unhide Network.openConnection(URL, Proxy).
Spun off from
https://partner-android-review.googlesource.com/#/c/205463/ for
ease of review.

Bug: 19416463
Change-Id: Ia37a53a350d55b5514b949242368dfe396f6b9a0

Lorenzo Colitti   commited 2015-04-07 13:13:20 +09:00
224ab3d3a3
Fix typos in ConnectivityManager documentation.
Spun off from
https://partner-android-review.googlesource.com/#/c/205463/ for
ease of review.

Bug: 19416463
Change-Id: I2f88ac415177ecd96c9191df5e390830869f52e1

Paul Jensen   authored and   Lorenzo Colitti   commited 2015-04-07 13:13:13 +09:00
bd2d378b7f
Deprecate EXTRA_PROXY_INFO and unhide ConnectivityManager.getDefaultProxy().
1. Unhide ConnectivityManager.getDefaultProxy() and update it to
   take into account process-bound-Networks.
2. Deprecate EXTRA_PROXY_INFO and instead encourage querying via
   getDefaultProxy().

Bug: 17905627
Bug: 17420465
Bug: 18144582

Change-Id: I45358ee82fe705d048022c8238b2452f52c37b88

Paul Jensen   commited 2015-04-03 07:25:55 -04:00
6fabfa0e32
Deprecate static ConnectivityManager.get/setProcessDefaultNetwork() functions.
These functions risk hitting an unchecked Exception due to ConnectivityManager
not being instantiated yet.  Also, change Network.openConnection() to throw a
checked Exception rather than an unchecked Exception when ConnectivityManager
is not yet instantiated.

bug:19416463
Change-Id: Ie1e2b3238aec0343d267c76b64927073f2f05f85

Paul Jensen   commited 2015-04-02 14:03:43 +00:00
ee2f45d85f
Move reset network settings into framework.
bug: 16161518
Change-Id: Ic3b537ebd09d1b9723feff9dcc96e20fda05a94f

Stuart Scott   commited 2015-03-30 18:02:55 -07:00
0f835acb91
Merge remote-tracking branch 'goog/mirror-m-wireless-internal-release' into master_merge
Change-Id: I49aab437af220f1139cfd2d0a9c362acce31074e

Prerepa Viswanadham   commited 2015-03-24 13:46:08 -07:00
5d4c045bcf
Merge "Make NetworkCapabilities.NOT_VPN javadoc visible." into m-wireless-dev
Paul Jensen   authored and   Android Partner Code Review   commited 2015-03-20 11:27:18 +00:00
703642c635
Add a protectFromVpn method that takes a FileDescriptor
Bug: 19704592
Change-Id: I9aeb29c2f6cf55fa010bc606c99b21a797ac5a19

Lorenzo Colitti   commited 2015-03-20 16:32:40 +09:00
ddf811b950
DHCP: Add a native method for making a DHCP socket.
Bug: 19704592
Change-Id: Iadd60d39c93aaabd2917e76791101a7d313b34be

Lorenzo Colitti   commited 2015-03-20 16:32:35 +09:00
06b991f444
Add two utility methods for IPv4 netmasks.
1. Add a validating method to convert a netmask to a prefix length.
2. Add a function to get the implicit netmask of an IPv4 address.
3. Add a unit test.

Bug: 19704592
Change-Id: Icb9f58d3903ea01df9e3720383c9bd5db6dd8f26

Lorenzo Colitti   commited 2015-03-20 16:32:34 +09:00
2af6f557df
Remove dead code, mostly DataStateTracker.
(cherry picked from AOSP commit 9edb1fc511)

Change-Id: I18c44cd08dfb51e02a96d0b726e9af1db21e3058

Paul Jensen   commited 2015-03-18 12:29:13 -04:00
8357dfd520
Make NetworkCapabilities.NOT_VPN javadoc visible.
Also adjust wording to be more suitable for NetworkRequests and NetworkAgents.

Change-Id: I1cc93cb20779cf02d6ffa0fa11ad2916c199b365

Paul Jensen   commited 2015-03-18 09:33:07 -04:00
ba9c42f661
Add a protectFromVpn method that takes a FileDescriptor
Bug: 19704592
Change-Id: I9aeb29c2f6cf55fa010bc606c99b21a797ac5a19

Lorenzo Colitti   commited 2015-03-17 19:46:12 +09:00
b85f0b44a7
Merge changes from topic 'dhcpclient' into m-wireless-dev
* changes:
  DHCP: Minor cleanups to the packet code.
  DHCP: Move the packet code to frameworks/base/services.
  DHCP: Add a native method for making a DHCP socket.
  DHCP: Add a superclass for DhcpStateMachine.

Lorenzo Colitti   authored and   Android Partner Code Review   commited 2015-03-16 12:12:42 +00:00
1271037d00
Merge "Add two utility methods for IPv4 netmasks." into m-wireless-dev
Lorenzo Colitti   authored and   Android Partner Code Review   commited 2015-03-16 12:11:37 +00:00
0210a8c5d9
DHCP: Add a native method for making a DHCP socket.
Bug: 19704592
Change-Id: Iadd60d39c93aaabd2917e76791101a7d313b34be

Lorenzo Colitti   commited 2015-03-16 20:08:45 +09:00
c70fbac892
Add two utility methods for IPv4 netmasks.
1. Add a validating method to convert a netmask to a prefix length.
2. Add a function to get the implicit netmask of an IPv4 address.
3. Add a unit test.

Bug: 19704592
Change-Id: Icb9f58d3903ea01df9e3720383c9bd5db6dd8f26

Lorenzo Colitti   commited 2015-03-16 16:07:36 +09:00
e82e0f0a8c
am "Refactor NetworkUtils interaction with DHCP."
merged from goog/mirror-m-wireless-internal-release
9def7be Refactor NetworkUtils interaction with DHCP.

Vinit Deshpande   commited 2015-03-15 13:40:27 -07:00
8d1c3be573
Fix javadoc braces for ConnectivityManager.EXTRA_NETWORK.
Change-Id: I5ad30a34f96e9e99a557b5bae9a30bfc08c89620

Paul Jensen   commited 2015-03-13 14:06:12 -04:00
051135c956
resolved conflicts for merge of b6b9fe21 to master
Change-Id: If4f62aa1fd8bb774288a677e7008e86a7e3ea6d9

Andreas Gampe   commited 2015-03-13 00:04:10 -07:00
8679a46283
NetworkStatsService to adjust VPN stats before recording.
* Creates a new Parcelable class VpnInfo to hold required
  parameters for VPN stats adjustments.
* ConnectivityService to collect infomation and provide
  a list of VpnInfo, one for each user.
* NetworkStatsService passes the VpnInfo array to
  NetworkStatsRecorder.
* NetworkStatsRecorder calls NetworkStats.migrateTun()
  to do the math.
* Poll NetworkStats when the vpn application calls
  setUnderlyingNetworks().

Bug: 19536273
Change-Id: I7a4c7726b8243fead10416f7ec6eb5cf95f20183

Wenchao Tong   commited 2015-03-12 17:43:41 -07:00
e164e0063b
Remove dead code, mostly DataStateTracker.
Change-Id: I1433937bffdb29bd42fb1adbfcf0a50ceffac7dd

Paul Jensen   commited 2015-03-11 10:03:58 -04:00
9edb1fc511
Refactor NetworkUtils interaction with DHCP.
Separate out starting DHCP (DISCOVER) and RENEW operations from fetching
the results.  Add NetworkUtils.getDhcpResults(), to enable quick checks
of any available DhcpResults without extraneous interaction with the
DHCP daemon.

Bug: 19422416
Change-Id: I58808e529dda8429737e749f5caef56d923c0809

Erik Kline   commited 2015-03-02 12:35:35 +09:00
9def7be67d
Remove unused imports in frameworks/base.
Change-Id: I031443de83f93eb57a98863001826671b18f3b17

John Spurlock   commited 2015-02-28 14:47:49 -05:00
c3c163f3f4
Merge "Move apache specific portions of android.net.http to external/apache-http."
Narayan Kamath   authored and   Android (Google) Code Review   commited 2015-02-13 09:51:44 +00:00
3473245e45
am 0992f962: am 1267462c: am f456d4dc: am d4d604e2: Merge "Update Javadoc for EXTRA_NETWORK." into lmp-mr1-dev
* commit '0992f96246':
  Update Javadoc for EXTRA_NETWORK.

Jeremy Joslin   authored and   Android Git Automerger   commited 2015-02-12 19:40:48 +00:00
3aee237f28
am 1267462c: am f456d4dc: am d4d604e2: Merge "Update Javadoc for EXTRA_NETWORK." into lmp-mr1-dev
* commit '1267462c0bf8ef5a0cfaca535847fc962b2cf32e':
  Update Javadoc for EXTRA_NETWORK.

Jeremy Joslin   authored and   Android Git Automerger   commited 2015-02-12 18:56:35 +00:00
0992f96246
Move apache specific portions of android.net.http to external/apache-http.
We continue to compile external/apache-http into ext.jar. This contains
a few changes apart fom the classes moving around :

- Makefile changes to build docs and api-stubs for now. A future change
  will revert these changes and remove these classes from stubs and
  docs.
- Hardcode event IDs in legacyerrorstrings to avoid a dependency between
  the frameworks and apache. These strings are on their way out and will
  never change anyway.
- Remove imports due to {@link} tags and use {@code} instead.
- Remove an accidental(?) dependency on apache commons code that's a
  part of apache-http.

bug: 18027885

Change-Id: I51cd038d846ec7d02c283a4541b10a6a9cf62ecf

Narayan Kamath   commited 2015-02-12 11:15:49 +00:00
9a87ca5691
Update Javadoc for EXTRA_NETWORK.
Bug: 19352840
Change-Id: Ib668bee0fb2c6f5bcd01a7908ebd20b9ec8a40ef

Jeremy Joslin   commited 2015-02-11 18:28:57 -08:00
c53026391a