Commit graph android_packages_modules_Co.../core/java
Message SHA1
Merge \\\\"Changes for upgrade to OkHttp 2.7.5\\\\" am: 9ca932b06e am: 776136f77c am: 6b473f7b67
am: 17f75b01ef

Change-Id: I02fe28e773df3b328be8c7ea26b0df065014188a

Tobias Thierer   authored and   android-build-merger   commited 2016-06-30 13:12:46 +00:00
12af1b2ee7
Merge \\\"Changes for upgrade to OkHttp 2.7.5\\\" am: 9ca932b06e am: 776136f77c
am: 6b473f7b67

Change-Id: I3a0dc1da2ee96d71c38cab727141efcb686627e1

Tobias Thierer   authored and   android-build-merger   commited 2016-06-30 13:04:52 +00:00
17f75b01ef
Merge \"Changes for upgrade to OkHttp 2.7.5\"
am: 9ca932b06e

Change-Id: Id79249756929a61dca374f9f1d43d0ea9e6b1280

Tobias Thierer   authored and   android-build-merger   commited 2016-06-30 12:49:47 +00:00
776136f77c
Changes for upgrade to OkHttp 2.7.5
- Use com.android.okhttp.Dns in place of com.android.okhttp.internal.Network
 - Specify TimeUnit.MILLISECONDS for timeouts which 2.7.5 allows and
   brings us closer to 3+

Change-Id: I95b5d72a94ebe1389f7c2e8d95903aa1aadd944b

Tobias Thierer   commited 2016-06-29 17:41:32 +01:00
852f2e2ec0
Merge "cold sim clean up" into nyc-mr1-dev am: ba3428f01b
am: a5011d73d6

* commit 'a5011d73d6':
  cold sim clean up

Change-Id: Ie35dd1dbede46a1ae6f6a1c902e8d54321325500

Chen Xu   authored and   android-build-merger   commited 2016-06-04 05:58:44 +00:00
3b6ee9a847
cold sim clean up
- add a new field: provisioningNotificationEnabled from NetworkMisc. set
  to false if we want to hide "sign in" notification and placed
  carrier-specific notification instead. it is set on connect, once set,
  it is carrier-app's responsibility to post new UI to users
- rework on the interaction between carrier app and framework
- code cleanup
- unit test support

Bug: 28567303
Change-Id: Ic84db7ffbb920d15344717f104496d3cb82e1a85

fionaxu   commited 2016-06-03 11:45:12 -07:00
5447c49f01
Merge "API council feedback: hide and document." into nyc-dev am: d28e2363ed am: 19e2f49181
am: 2690d59a11

* commit '2690d59a11':
  API council feedback: hide and document.

Change-Id: I002236f584ddc7a5f479b8936e4b5f5ed61759eb

Jeff Sharkey   authored and   android-build-merger   commited 2016-05-25 21:06:41 +00:00
8adfd1560c
Add missing @Deprecated annotations.
Add missing @Deprecated annotations for methods with @deprecated tag
in javadoc.

Change-Id: I35b78ccb97832d86b914c21a300444ba29e33844

Aurimas Liutikas   commited 2016-05-24 15:22:55 -07:00
a6bb0231f9
API council feedback: hide and document.
Hide isMetered() and clarify moveDatabaseFrom() docs.

Bug: 28870582, 28775585
Change-Id: Iabe63045c39ce7f662488f4224b56387c3c59519

Jeff Sharkey   commited 2016-05-20 11:34:55 -06:00
c8113cac70
Merge "DHCPv4: lease expiration is fatal, renew failures are not" into nyc-dev am: 42a5755916 am: 8958153ac7
am: 57f4d9718e

* commit '57f4d9718e':
  DHCPv4: lease expiration is fatal, renew failures are not

Change-Id: I4a0be195dab4525258b455330ce6212987b0e6c0

Erik Kline   authored and   android-build-merger   commited 2016-05-19 04:27:26 +00:00
0a1cd84c4b
DHCPv4: lease expiration is fatal, renew failures are not
Bug: 24837343

Change-Id: Ib330864f8376b0907390d581b48cff5446b3392b

Erik Kline   commited 2016-05-18 16:17:03 +09:00
c6c6abab82
Merge "Make some of the UID-based VPN code reusable" into nyc-dev am: b0f3016b64 am: a7cc7c5b4e
am: 1cd027befe

* commit '1cd027befe':
  Make some of the UID-based VPN code reusable

Change-Id: I75d9871f8039d14f8d83be4696c3c4d4e864f9c0

Robin Lee   authored and   android-build-merger   commited 2016-05-17 17:59:59 +00:00
dd58655f81
Merge "Make some of the UID-based VPN code reusable" into nyc-dev
TreeHugger Robot   authored and   Android (Google) Code Review   commited 2016-05-17 17:30:01 +00:00
b0f3016b64
Merge "Documented return value of getRestrictBackgroundStatus()." into nyc-dev am: 522787f39a am: aeb254ec20
am: 2b4f3e3327

* commit '2b4f3e3327':
  Documented return value of getRestrictBackgroundStatus().

Change-Id: Ia86cbc0d7b0be02f7dad7446127c2c711bb9f771

Felipe Leme   authored and   android-build-merger   commited 2016-05-16 22:35:23 +00:00
c0343f4c3d
Documented return value of getRestrictBackgroundStatus().
Change-Id: I2c15a6d5e23cbc3c9b59c975196c1c04c1294471
Fixes: 28775490

Felipe Leme   commited 2016-05-16 13:57:19 -07:00
6bd46fc303
Make some of the UID-based VPN code reusable
By changing some member refs into arguments and having one of the
functions create the UID range instead of adding to mVpnUsers.

This will be useful for other layers of UID filtering like having
UIDs explicitly blocked from the VPN.

Deleted one broken line of code that cleared the status intent when
a restricted profile is removed. Other than that, this commit shouldn't
change any behaviour. If it does, that's a bug.

Bug: 26694104
Change-Id: Ieb656835d3282a8ba63cc3f12a80bfae166bcf44

Robin Lee   commited 2016-05-13 16:03:11 +00:00
6b78f4f48b
Merge "Merge "Add lockdownEnabled parameter to always-on VPN API" into nyc-dev am: 4c2242b254 am: 78d0888e8c" into nyc-mr1-dev-plus-aosp
am: 062a28b6a4

* commit '062a28b6a403a48d6f5f88e109a899c9c60581c1':
  Add lockdownEnabled parameter to always-on VPN API

Change-Id: I9ebd6221451ee10649a1f340031d62c6483832f1

Robin Lee   authored and   android-build-merger   commited 2016-05-04 22:04:40 +00:00
865deed1df
Merge "Add lockdownEnabled parameter to always-on VPN API" into nyc-dev
Robin Lee   authored and   Android (Google) Code Review   commited 2016-05-04 18:38:30 +00:00
4c2242b254
Add lockdownEnabled parameter to always-on VPN API
Allows callers to opt-out of blockading network traffic during boot and
on VPN app failure.

Bug: 26694104
Change-Id: Ibfbd43ad09a25f2e38053fcd6306df3711f8bde2

Robin Lee   commited 2016-05-03 13:24:42 +01:00
ab2788acbc
Merge "Flag to mark foreground jobs, fix data saver." into nyc-dev am: 9a977b7d45 am: cb8bc7c3f9
am: a410ef9790

* commit 'a410ef9790':
  Flag to mark foreground jobs, fix data saver.

Change-Id: Id863d0ff4f8e7f13049231298feaab9839b4667c

Jeff Sharkey   authored and   android-build-merger   commited 2016-04-29 23:04:05 +00:00
ba27db0800
Flag to mark foreground jobs, fix data saver.
When a job will eventually run in the foreground, the internal
scheduling needs to ignore any background network restrictions when
satisfying constraints.  This also means the job should ignore the
current device doze state, since the requesting app could get the
same behavior by starting their own foreground service.

Always dispatch network policy changes to ConnectivityService first
to ensure that it has up-to-date information.  Fix bugs around data
saver that were causing networks to not be marked as BLOCKED for
background apps; before this fix apps would have been spinning in
internal connectivity loops, thinking that the network was actually
connected when the kernel was actually blocking their traffic.

Offer new ConnectivityService method overloads to ignore the blocked
state for a specific UID.

Print unsatisfied job constraints to aid debugging.

Bug: 26571724
Change-Id: Iaaa17933e6dc1bf6d3dff26d0bfc12222e51e241

Jeff Sharkey   commited 2016-04-29 13:44:07 -06:00
833c35b354
Merge changes I8de95add,Ia6f4ccfd into nyc-dev am: f2f244a am: 27f44c4
am: aa9e2ee

* commit 'aa9e2ee4b6':
  Remove unused event tags of IpConnectivityEvent
  Better ConnectivityMetricsEvent printing

Change-Id: I8625da2af299337f385596f8015a8f7255aa2c37

Hugo Benichi   authored and   android-build-merger   commited 2016-04-27 02:51:44 +00:00
f94f0b0fa5
Merge changes I8de95add,Ia6f4ccfd into nyc-dev
* changes:
  Remove unused event tags of IpConnectivityEvent
  Better ConnectivityMetricsEvent printing

TreeHugger Robot   authored and   Android (Google) Code Review   commited 2016-04-27 01:49:53 +00:00
f2f244aa21
Better ConnectivityMetricsEvent printing
This patch adds more information printing for IpConnectivity event
classes in android.net.metrics.

example:

ConnectivityMetricsEvent(14:36:35.799, 0, 1026): DhcpClientEvent(wlan0, DhcpRequestingState)
ConnectivityMetricsEvent(14:36:35.805, 0, 1026): DhcpClientEvent(wlan0, DhcpHaveAddressState)
ConnectivityMetricsEvent(14:36:35.809, 0, 4096): IpManagerEvent(wlan0, PROVISIONING_OK, 155ms)
ConnectivityMetricsEvent(14:36:35.810, 0, 1026): DhcpClientEvent(wlan0, DhcpBoundState)
ConnectivityMetricsEvent(14:36:35.871, 0, 2048): NetworkEvent(101, NETWORK_CONNECTED, 0ms)
ConnectivityMetricsEvent(14:36:35.874, 0, 2051): ValidationProbeEvent(101, PROBE_HTTP:599, 3ms)
ConnectivityMetricsEvent(14:36:35.874, 0, 2048): NetworkEvent(101, NETWORK_VALIDATION_FAILED, 0ms)
ConnectivityMetricsEvent(14:36:35.928, 0, 3072): DefaultNetworkEvent(0 -> 101, [WIFI], IPv4: false, IPv6: false)
ConnectivityMetricsEvent(14:36:37.008, 0, 2051): ValidationProbeEvent(101, PROBE_HTTP:204, 134ms)
ConnectivityMetricsEvent(14:36:37.008, 0, 2050): NetworkEvent(101, NETWORK_VALIDATED, 1137ms)

Also fixes a couple of event logging issues:
  - do no record spurious receive DhcpErrorEvent when a network goes down.
  - add an eventType field to IpManagerEvent instead of using the
    loggger component tag.

Bug: 28204408
Change-Id: Ia6f4ccfd7a0c63a5ccec18825f226c0b5781217b

Hugo Benichi   commited 2016-04-27 09:11:29 +09:00
c41a4e4266
Merge "Frameworks/base: Make debug helper lazy in ConnectivityManager" into nyc-dev am: 9eabb38 am: 12aea50
am: e0f1d13

* commit 'e0f1d13cb6':
  Frameworks/base: Make debug helper lazy in ConnectivityManager

Change-Id: Iae09599af115044fd6e1c37c0f0222fe766281f0

Andreas Gampe   authored and   android-build-merger   commited 2016-04-26 16:15:18 +00:00
ae3f78707e
Merge "Frameworks/base: Make debug helper lazy in ConnectivityManager" into nyc-dev
TreeHugger Robot   authored and   Android (Google) Code Review   commited 2016-04-26 15:25:44 +00:00
9eabb38b7f
resolve merge conflicts of d1153a3 to master
Change-Id: Iec9a4a76d0db0fbebdca8a732b4666cfaad70267

Jeff Sharkey   commited 2016-04-25 16:40:38 -06:00
8876393960
Frameworks/base: Make debug helper lazy in ConnectivityManager
Place helper map for callback field names into a holder. This avoids
the reflective calls in static initialization of ConnectivityManager
in the common (non-debug) case, which means the class can be
compile-time initialized. Also saves the storage necessary (both
the storage array as well as the reflection metadata).

Follow-up to 7e28683228.

Bug: 27265238
Change-Id: Ib4bfaf27acd234a035a5d198458340099a156a4c

Andreas Gampe   commited 2016-04-25 10:30:53 -07:00
9537278b82
API changes for DownloadManager and JobScheduler.
To support moving DownloadManager, add new JobScheduler network type
constraint that matches "any network except roaming."  Also add an
API to get a specific JobInfo by ID.

Since the default network can be different on a per-app basis, and
individual apps may be blocked due to app standby, evaluate job
connectivity constraints on a per-UID basis.  To implement this
cleanly, add NetworkInfo.isMetered() to match the isRoaming() API.

Add new DownloadManager APIs to support charging and device idle
constraints, which are plumbed through to JobScheduler under the
hood when scheduled.

Add filtering to JobScheduler dumpsys to omit noisy details for
packages the caller isn't interested in.

Bug: 28098882, 26571724, 19821935
Change-Id: I09ca7184ef7ce6adba399f579d415a5fb2ea6110

Jeff Sharkey   commited 2016-04-24 14:39:34 -06:00
ea4037847d
Disambiguate NetworkCallback JavaDoc. am: ad458ad
am: c8a0754

* commit 'c8a0754b3d98e90a869acb9dcc8ca8ae40bcbde1':
  Disambiguate NetworkCallback JavaDoc.

Change-Id: Ibf47574237ea8467d8e536395d580bac9f8fea36

Lorenzo Colitti   authored and   android-build-merger   commited 2016-04-15 09:54:58 +00:00
8bb9fd9f37
Disambiguate NetworkCallback JavaDoc.
The JavaDoc for many of the requestNetwork and
[un]registerNetworkCallback APIs incorrectly mentions the
PendingIntent version of the APIs instead of the NetworkCallback
version.

Also fix a minor issue in the registerDefaultNetworkCallback
JavaDoc: the default network request is an implementation detail,
so don't mention it. Instead, talk about the "system default
network".

Change-Id: Id94d98261daa2bd768c10e033cb8092729b21c91

Lorenzo Colitti   commited 2016-04-15 16:24:13 +09:00
ad458adea7
Merge "Fix a memory leak in ConnectivityManager." into nyc-dev am: d97107a
am: e235da5

* commit 'e235da5d5cb1db440db228ee23314617e7dd9aa4':
  Fix a memory leak in ConnectivityManager.

Change-Id: I713b4d68033aaac4ef2ada50a486538459814e77

Pierre Imai   authored and   android-build-merger   commited 2016-04-13 06:44:29 +00:00
df03e7f2b1
Merge "Fix a memory leak in ConnectivityManager." into nyc-dev
Pierre Imai   authored and   Android (Google) Code Review   commited 2016-04-13 06:37:33 +00:00
d97107a879
Merge "If Internet probe is redirected, pass redirect destination to NetworkAgent." into nyc-dev am: 7e261a1
am: 2c1f03a

* commit '2c1f03ade023a61428b7d9101bc10e4c88ae941a':
  If Internet probe is redirected, pass redirect destination to NetworkAgent.

Change-Id: I4c5f5cb8591d8729de9036a6c2aabacd4aba0f39

Paul Jensen   authored and   android-build-merger   commited 2016-04-13 02:02:13 +00:00
3eb30186ae
If Internet probe is redirected, pass redirect destination to NetworkAgent.
Transport may use the redirect to make additional determination about network
state.

Bug: 25203607
Change-Id: I07d8918f13fdcbe0b6fd757536bfc1850a2a244f

Paul Jensen   commited 2016-04-12 08:54:36 -04:00
6b866480f5
Fix a memory leak in ConnectivityManager.
Remove callbacks from the internal storage when they are being unregistered.

Change-Id: Ia42ed7aefaebd8caf3eada8e42b6cb7a940d7647

Pierre Imai   commited 2016-04-12 15:00:28 +09:00
57f56137ea
Merge "Internal API for system apps to determine default network for other apps" into nyc-dev am: f81cbe1
am: a948f88

* commit 'a948f8872aa045ab22f42285f195fdb413c5ff66':
  Internal API for system apps to determine default network for other apps

Change-Id: Ib719f0cebb41afe4aa52241f3797598a7e468d2d

Robin Lee   authored and   android-build-merger   commited 2016-04-07 16:51:53 +00:00
826f1ebf7c
Merge "Internal API for system apps to determine default network for other apps" into nyc-dev
Robin Lee   authored and   Android (Google) Code Review   commited 2016-04-07 16:43:15 +00:00
f81cbe1697
Internal API for system apps to determine default network for other apps
Callers with CONNECTIVITY_INTERNAL permission can read off the netId
that an application is assigned to by default.

Necessary for making connections as the default network for a client
app eg. when downloading stuff on its behalf.

Bug: 27074270
Change-Id: I8d35e8e99126875f55f3c545090326f3e9be43fb

Robin Lee   commited 2016-04-07 14:55:59 +00:00
da4d2e2b67
Merge "Make public the registerDefaultNetworkCallback API" into nyc-dev am: 7faccef
am: a577a3a

* commit 'a577a3a29f601fd2b71ad89eedcc52bdd8efbccb':
  Make public the registerDefaultNetworkCallback API

Change-Id: Ic749ede5b84e443fed04701ecdd0f6521a77158f

Erik Kline   authored and   android-build-merger   commited 2016-04-06 08:58:22 +00:00
9266fade78
Make public the registerDefaultNetworkCallback API
Change-Id: I89d7a6f49f5d6a0da3402a07407b0f8d93181b4f

Erik Kline   commited 2016-04-06 12:22:47 +09:00
b3547c0a9a
Merge "Move ApfFilter from ConnectivityService to IpManager" into nyc-dev am: 732340c
am: ebdf3f0

* commit 'ebdf3f006854b04de2508314be7ac0788b6faa99':
  Move ApfFilter from ConnectivityService to IpManager

Paul Jensen   authored and   android-build-merger   commited 2016-03-25 13:01:09 +00:00
533761ca07
Move ApfFilter from ConnectivityService to IpManager
There's a few advantages to having ApfFilter in IpManager:
1. If things go wrong, crashing a particular transport is less bad then
   crashing ConnectivityService.  We also don't want to use
   ConnectivityService as a dumping ground for transport-specific logic.
2. This makes implementing WifiManager.MulticastLock a lot simpler and
   safer because enabling/disabling it doesn't have to go through the
   NetworkAgent, which could risk various races (e.g. installing a filter
   into the wrong WiFi network).
3. IpManager is the ultimate source for LinkProperties for a particular
   transport and since ApfFilter uses the LinkProperties it's better to
   have it closely paired with the IpManager. Likewise, ApfFilter needs
   to know the APF capabilities of the transport, so having it in
   the transport avoids having to parcel this information through the
   NetworkAgent.

Bug: 26238573
Change-Id: I99b85f2b64972f0e7572170ec5d1926081aa3429

Paul Jensen   commited 2016-03-25 07:46:07 -04:00
5eaf63272a
Merge "Add a null check for the OnStartTetheringCallback."
Jeremy Klein   authored and   Android (Google) Code Review   commited 2016-03-23 18:52:16 +00:00
57b63e619c
Merge "Improve NetworkCapabilities command chaining." into nyc-dev
Pierre Imai   authored and   Android (Google) Code Review   commited 2016-03-23 01:11:15 +00:00
71d97f556f
Merge changes Iddeebeb8,Idd1e37a3 into nyc-dev
* changes:
  WifiManager: Use ConnectivityThread
  Create ConnectivityThread

Paul Stewart   authored and   Android (Google) Code Review   commited 2016-03-22 22:23:48 +00:00
26d7f6c450
Improve NetworkCapabilities command chaining.
setNetworkSpecifier() now returns this.
BUG: 26797290

Change-Id: Ia8bd0836d9ac715408eca102bf4a2d23f044fa72

Pierre Imai   commited 2016-03-22 22:29:22 +09:00
f51179babc
Support registering a request for the default network
Change-Id: I079f5be97b585cf5692dd4c7a144b993d168a9a5

Erik Kline   commited 2016-03-22 15:44:16 +09:00
e0aed6342f
Remove framework code that calls SIOCKILLADDR
Bug: 26976388
Change-Id: I652361d9e650a77085070d6c26b28b7638ba2dfe

Lorenzo Colitti   commited 2016-03-22 12:54:32 +09:00
0251d679fb
Create ConnectivityThread
Create a common singleton thread to be shared among all
connectivity tasks.  Instead of launching separate threads to
handle downstream messages from the various service instances used
in connectivity, these managers can choose to share this instance.

Bug: 27695292

Change-Id: Idd1e37a3e793c5485091509c3d7351e4d29288f0

Paul Stewart   commited 2016-03-19 10:05:06 -07:00
910adce8b4