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

1103 Commits

Author SHA1 Message Date
Stuart Scott
f1fb39763d Move factoryReset to service and protect. 
bug:16161518
Change-Id: I02d1bbae1887c62ee426e6f03e8bc1f18c6666bf
 2015-04-20 10:52:35 -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
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
Vinit Deshpande
fc19120fc7 am "Revert "Initial Passpoint code."" 
merged from goog/mirror-m-wireless-internal-release
5d7768f Revert "Initial Passpoint code."
 2015-03-15 13:37:52 -07:00
Vinit Deshpande
53f8738448 am "Initial Passpoint code." 
merged from goog/mirror-m-wireless-internal-release
2eba02a Initial Passpoint code.
 2015-03-15 13:37:24 -07:00
Vinit Deshpande
b35f4efe15 am "set softAP on a specified band, including both 2.4 and 5 GHz band" 
merged from goog/mirror-m-wireless-internal-release
a0be0fb set softAP on a specified band, including both 2.4 and 5 GHz band

Change-Id: I8f2514dfc35fafddc52d9244a093f2924697b748
 2015-03-15 13:34:56 -07:00
Pierre Vandwalle
5914caff06 export API to disable autojoin scan initial implementation 
Change-Id: I28e268dd8b859a3a22c3d6f699216bbd7124af26
 2015-03-13 13:58:53 -07:00
Vinit Deshpande
046ac5e6f7 Few changes to make API check happy [DO NOT MERGE] 
These changes are made to make the API check in mwd-staging
happy. It doesn't look like they are needed in master branch;
so marking them as DO NOT MERGE.

Change-Id: I45363165b6a8ffe896cf9a31c0b3cb410aa69cba
 2015-03-09 19:02:09 -07:00
Vinit Deshpande
0019e53e11 am "add 2 side RTT support on scan" 
merged from partner/m-wireless-wifi-dev
6e58424 add 2 side RTT support on scan
 2015-03-09 19:01:39 -07:00
Vinit Deshpande
d2585f3050 am "Passpoint API - Take 1" 
merged from partner/m-wireless-wifi-dev
b21d248 Passpoint API - Take 1
 2015-03-09 19:01:37 -07:00
Vinit Deshpande
e95944300e am "Do not provide 5GHz option for softap if there is no country code available" 
merged from partner/m-wireless-wifi-dev
b938c0e Do not provide 5GHz option for softap if there is no country code available
 2015-03-09 19:01:37 -07:00
Vinit Deshpande
14a2008f63 am "Introduce onLost event on bssid hotlist [DO NOT MERGE]" 
merged from partner/m-wireless-wifi-dev
ab325cb Introduce onLost event on bssid hotlist [DO NOT MERGE]
 2015-03-09 19:01:36 -07:00
Vinit Deshpande
3cb5e4d72f am "get channel list from driver for SoftAP channel selection" 
merged from partner/m-wireless-wifi-dev
18ae1d2 get channel list from driver for SoftAP channel selection
 2015-03-09 19:01:35 -07:00
Vinit Deshpande
76f9aceecf am "Revert "Initial Passpoint code."" 
merged from partner/m-wireless-wifi-dev
5d7768f Revert "Initial Passpoint code."
 2015-03-09 19:01:34 -07:00
Vinit Deshpande
29267b6dd6 am "Initial Passpoint code." 
merged from partner/m-wireless-wifi-dev
2eba02a Initial Passpoint code.
 2015-03-09 19:01:33 -07:00
Vinit Deshpande
b4499afde5 am "set softAP on a specified band, including both 2.4 and 5 GHz band" 
merged from partner/m-wireless-wifi-dev
a0be0fb set softAP on a specified band, including both 2.4 and 5 GHz band
 2015-03-09 19:01:31 -07:00
Vinit Deshpande
1aa4dcee03 am "Bring in passpoint code [DO NOT MERGE]" 
merged from partner/m-wireless-wifi-dev
7dd2f6b Bring in passpoint code [DO NOT MERGE]
 2015-03-09 19:01:31 -07:00
Vinit Deshpande
472cca08eb am "New Additions to WifiScanner APIs [DO NOT MERGE]" 
merged from partner/m-wireless-wifi-dev
f45acfe New Additions to WifiScanner APIs [DO NOT MERGE]
 2015-03-09 19:01:29 -07:00
Adam Lesinski
488caeb702 Change WiFi and Bluetooth ActivityEnergyInfo classes 
Have them take an elapsed time millis timestamp instead
of having the constructor call System.currentTimeMillis.

Change-Id: Ic9ca8f92347c336beee8ebcc3407de2c1e5b4073
 2015-03-09 15:28:29 -07:00
xinhe
6e58424f5b add 2 side RTT support on scan 
Bug:19533713
Change-Id: I6b7a32aae1a038eb2941f5564d03a4a0286d5bf3
 2015-03-04 15:26:49 -08:00
John Spurlock
08c7116ab9 Remove unused imports in frameworks/base. 
Change-Id: I031443de83f93eb57a98863001826671b18f3b17
 2015-02-28 14:47:49 -05:00
xinhe
a357b5adf0 Merge "Do not provide 5GHz option for softap if there is no country code available" into m-wireless-wifi-dev 2015-02-25 23:34:40 +00:00