drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
191,265 Commits 1 Branch 0 Tags
Commit Graph

1122 Commits

Author SHA1 Message Date
Prerepa Viswanadham
d1808401ca Merge changes from topic 'mwd-merge-050415' into mnc-dev 
* changes:
  Merge commit 'b6f59f4' into master_merge
  Merge commit 'f6db0ce' into master_merge
  Merge commit '17455a3' into master_merge
  Merge commit 'b4d5b32' into master_merge
  Merge commit 'a1a2fa7' into master_merge
  Merge commit '8dfdb98' into master_merge
  Merge commit 'eba66c3' into master_merge
 2015-05-05 01:06:38 +00:00
Sanket Padawe
7094d22022 Adding "Connected, no Internet" string in Wifi nw summary. 
Bug: 17380953
Change-Id: I9664bcbf33832fe722e7d2b3125939287ee98098
 2015-05-01 16:55:00 -07:00
Prerepa Viswanadham
b6f9da0b7f Merge commit '17455a3' into master_merge 2015-05-01 10:12:11 -07:00
Jan Nordqvist
e20b8ad4c4 Changed logging tag. 
Change-Id: I9a916305910c65425ffe7ea8d5a29dba0ee9a8da
 2015-04-27 22:15:53 +00:00
xinhe
ebc5ced56e No Permission check for WiFi RTT 
Bug:19918231
Change-Id: I98aea756cc15683596096e46da48efe0737ae1d1
 2015-04-24 22:17:48 +00:00
Etan Cohen
f9465fb6d2 Merge commit '7e5e791' into merge2 
Change-Id: Ie4889e3448b905afe5c0df453da96df0735e60d7
 2015-04-24 14:05:29 -07:00
Etan Cohen
644f41368f Merge commit '4cb5d80' into merge2 2015-04-24 14:03:28 -07:00
Etan Cohen
4de834eb63 Merge commit 'c91bc62' into merge2 2015-04-24 14:02:45 -07:00
Etan Cohen
94f2c27aca Merge commit '7f61051' into merge2 2015-04-24 14:02:07 -07:00
Lorenzo Colitti
fa57c489f6 Allow apps with ACCESS_WIFI_STATE to listen for wifi networks 
The compatibility measure introduced in bug 20081183 for apps
that connect to a Wi-Fi network without Internet access and then
expect to be able to use that network requires that such apps
register a NetworkCallback so that their WifiManager can pin them
to whatever wifi Network connects.

Currently, registering the callback requires ACCESS_NETWORK_STATE
and the app may not have that permission. Allow registering wifi
(only) callbacks if the app has ACCESS_WIFI_STATE.

If the app does not have ACCESS_WIFI_STATE (unlikely, since
CHANGE_WIFI_STATE is not very useful without ACCESS_WIFI_STATE),
then don't enable the compatibility measure.

Bug: 20081183
Bug: 20423580
Change-Id: Iad328d30c2d170dead883868fece3d922da68f6f
 2015-04-22 12:01:35 +09:00
Vinit Deshpande
85607190c9 Turn of WifiScanner's debug logging 
Bug: 20416721
Change-Id: I48051dbc0bb6e58279ea5ca5dce90d837f1df4e6
 2015-04-21 16:03:10 -07:00
xinhe
7e5e791d22 Fix build error on API 
Change-Id: Id7024feb6baf8c6cc607702b3ac90dfbd3d483ba
 2015-04-21 15:42:03 -07:00
xinhe
b99d4144c4 Merge "set softAP band selection API hidden 20460598" into m-wireless-dev 2015-04-21 21:39:07 +00:00
xinhe
023158cbbc set softAP band selection API hidden 
20460598

Change-Id: I2a13961896bacf0bd67c387dc1983dc45ca0e52d
 2015-04-21 14:33:14 -07:00
Jan Nordqvist
37f0820d6c Changed [gs]etDomSubjectMatch to [gs]etDomainSubjectMatch. 
Change-Id: I42a69320a95a96522500375e3e101c159ee5bf1b
 2015-04-21 21:12:10 +00:00
Stuart Scott
f1fb39763d Move factoryReset to service and protect. 
bug:16161518
Change-Id: I02d1bbae1887c62ee426e6f03e8bc1f18c6666bf
 2015-04-20 10:52:35 -07:00
Jan Nordqvist
c91bc62f2b Added setDomSuffixMatch for AAA cert suffix matching. 
Change-Id: I112399d2ce3d940ccf4451477b3b4edb93010b42
 2015-04-17 21:22:37 +00:00
Jan Nordqvist
6593256e78 A few minor fixes for EAP-TLS. 
Change-Id: I807d44d1bd84b929d21df402542c4b6f1f646b30
 2015-04-17 21:22:03 +00:00
xinhe
7f61051949 enable RTT capability exception 
Bug:20299517
Change-Id: I497cc08b90f720d1717e107f93f75fda4212c8a8
 2015-04-16 15:34:00 -07:00
Pierre Vandwalle
fc197d3923 add disconnected scan parameter, add bytes[] container to scanResults 
Change-Id: I201b52064ea764ddd406c25c86f41887029ff225
 2015-04-16 11:00:36 -07:00
Lorenzo Colitti
1022dde719 Pin a process to wifi when it calls enableNetwork(..., true) 
Bug: 20081183
Change-Id: I12bbda1061bbebeb4d0844d0b0d7f51237645958
 2015-04-17 00:26:46 +09:00
Lorenzo Colitti
1248dd3c29 Add a noInternetAccessExpected boolean to WifiConfiguration. 
This will be set if the user explicitly confirms a connection to
a Wi-Fi network without Internet access and checks the "don't ask
again" box.

Bug: 20081183
Change-Id: I75223ae41dbf0d3a827527a0a131855d8eb4c515
 2015-04-15 13:38:22 +09:00
Lorenzo Colitti
1ac50cb32c Add an UNKNOWN_UID constant to WifiConfiguration. 
This value will be used to indicate that one of the various UIDs
tracked stored in the WifiConfiguration is unknown. Currently the
code just uses "-1" everywhere for this purpose; a constant is
clearer.

Bug: 20081183
Change-Id: Id865da9284f642587eed11f67685e5b12ce772c2
 2015-04-15 12:33:13 +09:00
Pierre Vandwalle
127217a340 add disconnected scan parameter, add bytes[] container to scanResults 
Change-Id: I201b52064ea764ddd406c25c86f41887029ff225
 2015-04-14 17:16:15 -07:00
Prerepa Viswanadham
57bf2a8a38 Merge commit 'e593d0a' into merge_work 
Change-Id: I4f8ae40fc446cd9cda4d5c6ec99469a98dda595b
 2015-04-10 15:58:10 -07:00
Prerepa Viswanadham
220951a6d0 Merge commit 'b2ff415' into merge_work 
Change-Id: I4f9c662112fc49e4f94315d3c69860607be3bc1e
 2015-04-10 15:54:48 -07:00
Vinit Deshpande
0326f585e1 Merge "API for config app." into m-wireless-dev 2015-04-07 22:12:40 +00:00
Jan Nordqvist
e9b056f886 API for config app. 
Change-Id: Icda0ac1b081a08f438645ccf3667b5b81cb5e244
 2015-04-07 14:59:37 -07:00
xinhe
d5351e7b60 RTT framework interface update 
Bug:19917983
Change-Id: I1c89c4c583923137983243814e35c8981f6db54a
 2015-04-07 18:34:27 +00:00
Vinit Deshpande
b4d90fca0e Implement 'Available via Passpoint' feature 
This also fixes the issues related to explicit connection
to passpoint AP, and fixes occassional mention of
'connected via Wi-Fi Assistent'

Change-Id: Ib4de956f2ea29709d0212fbcb392815644800e78
 2015-04-03 18:03:04 -07:00
Etan Cohen
36711e0e2c Merge changes from topic 'mwd-merge-040115' 
* changes:
  Merge (manually) pag/209446: Increase allowed duration to connect to HOGP profile
  Merge commit 'd91f193' into merge2
  Merge commit '5718646' into merge2
  Merge commit '7aa0345' into merge2
 2015-04-02 03:08:02 +00:00
Etan Cohen
eb864d4000 Merge commit 'd91f193' into merge2 2015-04-01 09:31:43 -07:00
Vinit Deshpande
6f6c781cca Remove scanResultCache from WifiConfiguration 
This is in preparation to use ScanDetail - which is a superset
of ScanResult - in wifi stack. There are no external users of
scanResultCache; so it can be safely removed.

Also fixed a javadoc comment for getPlmn()

Change-Id: I7c49532664ffe2e3e5e134bfcd42615d5999d02f
 2015-03-31 15:51:55 -07:00
Stuart Scott
984dc850b4 Move reset network settings into framework. 
bug: 16161518
Change-Id: Ic3b537ebd09d1b9723feff9dcc96e20fda05a94f
 2015-03-30 18:02:55 -07:00
Adam Lesinski
4b6bd8d36b Retrieve WiFi info outside of BatteryStatsImpl 
In order to not deadlock the system, we need to retrieve
WiFi energy info outside of the BatteryStats lock. We do this,
then pass that data down to BatteryStatsImpl to process.

b/19729960

Change-Id: Ib8beba1d5ac81d89144d502c4b688d0a88c5b102
 2015-03-26 17:49:51 -07:00
Jean-Michel Bachot
adf9e95ecc EAP-AKA' : Add support of EAP-AKA' in WiFi Enterprise methods 
EAP-AKA' is a new hidden method

Change-Id: Ic103b25ad58807eebd5e0f8eefe3bfc02397aedc
Signed-off-by: Jean-Michel Bachot <jean-michel.bachot@intel.com>
Signed-off-by: Abdelmajid MLAYEH <abdelmajidx.mlayeh@intel.com>
 2015-03-25 15:38:28 -07:00
Pierre Vandwalle
ddfd35dbf9 add wifi config for power calculation 
Change-Id: Ic312ffeb299d199547cc75bc6977140f8e6e5f7b
 2015-03-24 19:30:02 -07:00
Prerepa Viswanadham
4209a28270 Merge remote-tracking branch 'goog/mirror-m-wireless-internal-release' into master_merge 
Change-Id: I49aab437af220f1139cfd2d0a9c362acce31074e
 2015-03-24 13:46:08 -07:00
Jan Nordqvist
3105289af3 Merge "More fixes to get passpoint working" into m-wireless-dev 2015-03-19 17:09:10 +00:00
Pierre Vandwalle
af3f1c995c Merge "export API to disable autojoin scan initial implementation" into lmp-mr1-wfc-dev 
automerge: 7c39808

* commit '7c398083319bbd1ad51d23cb307cfc3ac9091c3a':
  export API to disable autojoin scan initial implementation
 2015-03-19 02:58:01 +00:00
Vinit Deshpande
ad25bb8925 More fixes to get passpoint working 
Change-Id: If8639bb0fd3bdaad7ee09217a9152c1695cb9354
 2015-03-18 17:00:48 -07:00
xinhe
9954faa70d Change rtt Framework interface 
Bug:19735392
Change-Id: I0886d3c0e40a6dd5477c81a5df5dbc2746942ec3
 2015-03-18 22:26:48 +00:00
Vinit Deshpande
2522c830a3 Fix scan results to hold passpoint data 
Change-Id: I8ab75ec49226a59b04de6463de596cc9f5f6d800
 2015-03-17 17:11:06 -07:00
Vinit Deshpande
04444427d0 Improve passpoint configuration validation 
Change-Id: I717242b2f8b2e7d0f84c3a7c74c4672289387151
 2015-03-16 14:07:55 -07:00
Robert Greenwalt
88dadfaa3b am 7cff91ea: am 079cfa64: Merge "Frameworks/base: Fix a hashCode implementation" 
* commit '7cff91ea67f89ca963a822daa1b68674bfc0e587':
  Frameworks/base: Fix a hashCode implementation
 2015-03-16 16:48:46 +00:00
Andreas Gampe
34a7d13a65 Frameworks/base: Fix a hashCode implementation 
Equals uses Arrays.equals. That means two responses are equal if
the content of the data arrays is equal. By convention, the hash
code of those objects should agree. In that case one cannot use
hashCode on the array (which is the identity hash code).

Change-Id: Icce8e2e71e9142421f5dac8a0ee8a211623fb704
 2015-03-15 14:38:59 -07:00
Vinit Deshpande
fd67bf63e6 am "add 2 side RTT support on scan" 
merged from goog/mirror-m-wireless-internal-release
6e58424 add 2 side RTT support on scan
 2015-03-15 13:42:38 -07:00
Vinit Deshpande
8115762514 am "Passpoint API - Take 1" 
merged from goog/mirror-m-wireless-internal-release
b21d248 Passpoint API - Take 1
 2015-03-15 13:39:33 -07:00
Vinit Deshpande
9e535b86ee am "Do not provide 5GHz option for softap if there is no country code available" 
merged from goog/mirror-m-wireless-internal-release
b938c0e Do not provide 5GHz option for softap if there is no country code available
 2015-03-15 13:39:30 -07:00
Vinit Deshpande
a86f0741c7 am "get channel list from driver for SoftAP channel selection" 
merged from goog/mirror-m-wireless-internal-release
18ae1d2 get channel list from driver for SoftAP channel selection
 2015-03-15 13:37:54 -07:00