Jeff Davidson
f680c8434a
am 63226dd8: Merge "Allow apps with SCORE_NETWORKS to set the active scorer." into lmp-mr1-dev automerge: 24f535b
...
* commit '63226dd8f3570bd3b28e4241668843385ba99c2d':
Allow apps with SCORE_NETWORKS to set the active scorer.
2014-11-06 01:48:45 +00:00
Jeff Davidson
24f535b873
Merge "Allow apps with SCORE_NETWORKS to set the active scorer." into lmp-mr1-dev
2014-11-06 01:25:04 +00:00
Robert Greenwalt
c47a91273c
am a4f34edd: am 7efdb83c: Merge "Fix Legacy typing of net-specific requests." into lmp-mr1-dev
...
* commit 'a4f34eddb3b46a81ce90a9eded54b35b62e40337':
Fix Legacy typing of net-specific requests.
2014-11-05 23:45:03 +00:00
Robert Greenwalt
7efdb83cee
Merge "Fix Legacy typing of net-specific requests." into lmp-mr1-dev
2014-11-05 23:36:01 +00:00
Robert Greenwalt
06314e4eab
Fix Legacy typing of net-specific requests.
...
We're starting to get network requests for specific SIMs
and the Legacy Type Inference was broken because the incoming
request included a network specifier while the legacy requests
it was compared with did not. Only compare the things we care
about.
bug:18031008
Change-Id: If107042828c152ede51a2497a3859bc1a6c83694
2014-11-05 15:06:20 -08:00
Jeff Davidson
e56f2bb5ec
Allow apps with SCORE_NETWORKS to set the active scorer.
...
This allows for a more streamlined UX in the current world, where
scorer apps are trusted (by virtue of being in /system/priv-app).
Trusted apps can continue to use the system dialog for consent, but
they may also set the scorer directly, under the assumption that they
are using their own consent UX to explain the feature to the user.
Bug: 16577529
Change-Id: I2a6edb7f1f688aaacf9b0152fa1da1a88636c3dc
2014-11-05 14:25:20 -08:00
Jeff Davidson
fb68a97620
am dd40ccf3: am b42bdef5: Merge "Rename BROADCAST_SCORE_NETWORKS to BROADCAST_NETWORK_PRIVILEGED." into lmp-mr1-dev
...
* commit 'dd40ccf36203c740aea3849f54495d1287d02b2b':
Rename BROADCAST_SCORE_NETWORKS to BROADCAST_NETWORK_PRIVILEGED.
2014-11-05 21:43:10 +00:00
Jeff Davidson
b42bdef51c
Merge "Rename BROADCAST_SCORE_NETWORKS to BROADCAST_NETWORK_PRIVILEGED." into lmp-mr1-dev
2014-11-05 21:33:16 +00:00
Paul Jensen
a21622df7e
am 021a95f7: Merge "Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()" into lmp-mr1-dev
...
automerge: 6ad91cb
2014-11-05 20:00:46 +00:00
Paul Jensen
021a95f761
Merge "Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()" into lmp-mr1-dev
2014-11-05 19:05:09 +00:00
Paul Jensen
c53113b37f
Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()
...
setDomain() and toLinkProperties() were not setting the domains.
The setDomain() bug affected Wifi and I believe the toLinkProperties()
bug affected Ethernet and Bluetooth reverse-tethering.
bug:18252947
Change-Id: I8764cb944c293e01d99822bb52b55af7e9d77853
2014-11-05 09:35:26 -05:00
Jeff Davidson
161977998f
Rename BROADCAST_SCORE_NETWORKS to BROADCAST_NETWORK_PRIVILEGED.
...
This is necessary/desired for two reasons:
1. UX around network scoring shipped with L despite lacking underlying
platform support. We do not want network scoring applications to
trigger this UX on L devices, and therefore we must break the contract
of what defines a network scorer so that apps build against the new
contract don't trigger the old UX.
2. As a start towards generalizing the term "score" for a potentially
broader role in the future, though that role is very much undefined.
Bug: 18160480
Change-Id: If228977513e32e45bc44dbeda24aa18436fdfca6
2014-11-04 10:55:49 -08:00
Kenny Root
affff32908
am d00ced98: am b0cb0734: Merge "Track change to Conscrypt"
...
* commit 'd00ced983ee235f72a9261fd967309a2638dde05':
Track change to Conscrypt
2014-11-03 18:50:21 +00:00
Kenny Root
d00ced983e
am b0cb0734: Merge "Track change to Conscrypt"
...
* commit 'b0cb07348e6320ce51d0e8b88d240ecf834850d1':
Track change to Conscrypt
2014-11-03 18:40:55 +00:00
Kenny Root
b0cb07348e
Merge "Track change to Conscrypt"
2014-11-03 18:34:00 +00:00
Narayan Kamath
f2459e2e16
am 10ac55ba: am 5f8099ed: Merge "Add java.util.List import."
...
* commit '10ac55ba4f0beed608b310c473bb052cbcdf19c1':
Add java.util.List import.
2014-11-03 16:52:41 +00:00
Narayan Kamath
10ac55ba4f
am 5f8099ed: Merge "Add java.util.List import."
...
* commit '5f8099ed181c2ba279c4a747096442389d5f8840':
Add java.util.List import.
2014-11-03 16:00:57 +00:00
Narayan Kamath
2b4378fef8
Add java.util.List import.
...
Unused on master but used downstream.
Change-Id: I7c072e25d1f7c3a645efb2986d23e81068dced22
2014-11-03 15:55:03 +00:00
Narayan Kamath
cd4910ef60
am 2e1bd46a: am ef5d43a7: Merge "Revert "Revert "Remove unused apache related API."""
...
* commit '2e1bd46a1567fa987df04dd8eef66e91b50ef4f3':
Revert "Revert "Remove unused apache related API.""
2014-11-03 14:38:02 +00:00
Narayan Kamath
2e1bd46a15
am ef5d43a7: Merge "Revert "Revert "Remove unused apache related API."""
...
* commit 'ef5d43a7cf694ffac8b0069aa5026862d6b32735':
Revert "Revert "Remove unused apache related API.""
2014-11-03 14:31:11 +00:00
Narayan Kamath
4b8f1846ca
Revert "Revert "Remove unused apache related API.""
...
This reverts commit 31f54ef815
2014-11-03 13:32:10 +00:00
Alex Klyubin
a409cdf161
am dcf5af38: am 8129b8b4: am dd8accfe: Merge "Mention ECDHE_PSK bug in Javadoc of PskKeyManager." into lmp-docs automerge: 2f1c76f
...
automerge: 42340b9
2014-11-01 15:00:10 +00:00
Alex Klyubin
2f1c76f074
am dcf5af38: am 8129b8b4: am dd8accfe: Merge "Mention ECDHE_PSK bug in Javadoc of PskKeyManager." into lmp-docs
...
* commit 'dcf5af38bfd306af77613aa051393bf7d8e8fb44':
Mention ECDHE_PSK bug in Javadoc of PskKeyManager.
2014-11-01 14:08:40 +00:00
Kenny Root
8a97063720
Track change to Conscrypt
...
Change way in which an outside caller can get the preferred SSLContext.
Bug: 17136008
Change-Id: Ide578664bcb605304322bfddd2e640a63042fa09
2014-10-31 12:06:09 -07:00
Alex Klyubin
dcf5af38bf
am 8129b8b4: am dd8accfe: Merge "Mention ECDHE_PSK bug in Javadoc of PskKeyManager." into lmp-docs
...
* commit '8129b8b471e782708be945e40fa82d2c20ebceef':
Mention ECDHE_PSK bug in Javadoc of PskKeyManager.
2014-10-31 15:48:44 +00:00
Alex Klyubin
8e93f0c3bc
Mention ECDHE_PSK bug in Javadoc of PskKeyManager.
...
Bug: 18144779
Change-Id: I50e1bb18456295170ef288ad089a0edad7f00ecf
2014-10-30 21:39:03 +00:00
Erik Kline
0d74973a08
am befe778c: Treat optimistic addresses as global preferred.
...
automerge: 9a8351d
2014-10-30 19:10:04 +00:00
Narayan Kamath
78b3f5ab70
am fa945c10: am e87d36f8: Merge "Revert "Remove unused apache related API.""
...
* commit 'fa945c105b4f7bb3e3844e8ce467ca701d5f3a9f':
Revert "Remove unused apache related API."
2014-10-29 19:34:10 +00:00
Elliott Hughes
b5ce284aa8
resolved conflicts for merge of d3389e2f to lmp-mr1-dev-plus-aosp
...
Change-Id: Ic4969a59ef22d4911f74cc1e75ea5ccfab59b770
2014-10-29 12:31:48 -07:00
Narayan Kamath
fa945c105b
am e87d36f8: Merge "Revert "Remove unused apache related API.""
...
* commit 'e87d36f8925a34f85ba80c886757d07ad03fed42':
Revert "Remove unused apache related API."
2014-10-29 11:30:11 +00:00
Narayan Kamath
d3389e2f32
resolved conflicts for merge of 9834af9c to stage-aosp-master
...
Change-Id: Ibdada14406f49684cf345162204b9810452f25a2
2014-10-29 11:23:45 +00:00
Erik Kline
befe778c73
Treat optimistic addresses as global preferred.
...
If the kernel sends notification of an optimistic address then
treat is a useable address (isGlobalPreferred()).
Note that addresses flagged as IFA_F_OPTIMISTIC are
simultaneously flagged as IFA_F_TENTATIVE (when the tentative
state has cleared either DAD has succeeded or failed, and both
flags are cleared regardless).
Additionally: do not consider RFC 4193 ULA addresses sufficient
for "global preffered". They are, by definition, of global scope
but not sufficient for global reachability.
Bug: 17769720
Change-Id: I759623b28fd52758f2d4d76d167f3cafd9319d6a
2014-10-29 19:11:58 +09:00
Erik Kline
e9810e8d53
Merge "(re)define the definition of "provisioned"" into lmp-mr1-dev automerge: dd91fb4
...
automerge: 8fc600d
2014-10-28 08:54:03 +00:00
Lorenzo Colitti
9d6f408ab5
am 111cc9f5: Merge "Change removeStackedLink to take an interface name." into lmp-mr1-dev
...
automerge: 35261c4
2014-10-28 08:50:41 +00:00
Erik Kline
dd91fb4474
Merge "(re)define the definition of "provisioned"" into lmp-mr1-dev
2014-10-28 07:53:37 +00:00
Lorenzo Colitti
111cc9f511
Merge "Change removeStackedLink to take an interface name." into lmp-mr1-dev
2014-10-28 07:00:31 +00:00
Lorenzo Colitti
f3cab63ef2
Change removeStackedLink to take an interface name.
...
This simplifies callers.
Also remove all "implementations" of addStackedLink and
removeStackedLink except the one in LinkProperties, because they
are unused.
Bug: 12111730
Change-Id: Ie294b855facba4b1436299dcb3211b72d9ba448e
2014-10-28 15:13:57 +09:00
Erik Kline
d3b9fd33c6
(re)define the definition of "provisioned"
...
Specifically:
[1] provide a hasIPv4(), and
[2] a hasIPv6()
each of which requires an IP address, a default route, and
address-family-specific DNS servers to evaluate to true.
Additionally:
[3] redefine isProvisioned() to return the logical OR
of [1] and [2] above.
Any external caller can still use any of the has*() methods to
construct its own, different definition of "provisioned".
Bug: 17769720
Change-Id: Ia692fb8508484ff403d3920c94d0e1db4563f807
2014-10-28 14:47:42 +09:00
Narayan Kamath
31f54ef815
Revert "Remove unused apache related API."
...
This reverts commit 3f2714e18b
2014-10-27 16:55:14 +00:00
Narayan Kamath
3f2714e18b
Remove unused apache related API.
...
Hidden and used only in unit tests.
Change-Id: I492b735f0f7e129946e28c31ad9d91c98aacf987
2014-10-24 14:27:07 +01:00
Narayan Kamath
0d50b5d0ee
am e572a77f: am fa36b36c: Merge "Deprecate more apache-http." into lmp-mr1-dev
...
* commit 'e572a77f05948fdc9c17ccdce0784d8b179a03ee':
Deprecate more apache-http.
2014-10-24 10:40:00 +00:00
Narayan Kamath
fa36b36c8b
Merge "Deprecate more apache-http." into lmp-mr1-dev
2014-10-24 08:58:45 +00:00
Sreeram Ramachandran
4573944e96
am b9248a55: am b1df48e4: Merge "Add an API to select a network for a DatagramSocket." into lmp-mr1-dev
...
* commit 'b9248a5552dde8bf76db77054ed31a59300fe0cd':
Add an API to select a network for a DatagramSocket.
2014-10-23 22:02:25 +00:00
Narayan Kamath
823675fdbb
Deprecate more apache-http.
...
bug: 18067888
Change-Id: I50511d53dfc9ae236dfb1646c55a5dd7fa15d7b2
2014-10-23 17:43:05 +01:00
Sreeram Ramachandran
e15db7c23d
Add an API to select a network for a DatagramSocket.
...
Mirrors the API that does this for Sockets.
Bug: 18076907
Change-Id: Ifa27b39e23797558546aab751fbfb3aed3b7dbcb
2014-10-23 08:37:33 -07:00
Robert Greenwalt
271d79ecf1
am a9ba8347: am eb35fa56: am 3515ab80: am 24861eab: Merge "Send callbacks for Net property changes" into lmp-dev
...
* commit 'a9ba8347afb7252b28f51b74b6e1f1ae9befdd75':
Send callbacks for Net property changes
2014-10-03 15:55:37 +00:00
Robert Greenwalt
3515ab8092
am 24861eab: Merge "Send callbacks for Net property changes" into lmp-dev
...
* commit '24861eabe641d5a147f127c8e7f98fab949224ab':
Send callbacks for Net property changes
2014-10-03 15:41:04 +00:00
Robert Greenwalt
d4fb0501d9
am 24861eab: Merge "Send callbacks for Net property changes" into lmp-dev
...
* commit '24861eabe641d5a147f127c8e7f98fab949224ab':
Send callbacks for Net property changes
2014-10-03 15:40:33 +00:00
Robert Greenwalt
24861eabe6
Merge "Send callbacks for Net property changes" into lmp-dev
2014-10-03 15:36:39 +00:00
Robert Greenwalt
a848c1cc0a
Send callbacks for Net property changes
...
LinkProperties and NetworkCapabilities changes were not calling app callbacks.
bug:17681483
Change-Id: I67dac3c4dc1284f5c4bfb24de239da4ec776336f
2014-10-02 21:05:44 -07:00
