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

1101 Commits

Author SHA1 Message Date
Sky Faber
3e3857c4f5 Separate wifi AP added by applications. 
-Add field for tracking user approval of application added networks.
-Add WifiConfig fields for creating/updating application name
-Add permission to allow system apps to modify any network

Bug: 16953082

Change-Id: I12943563ef714c4287e13488578f020d136d006d
 2014-09-26 14:01:37 -07:00
Mike Lockwood
0561030490 Fix broken merge of "handle bssid blacklist in case of dhcp failures" 
Change-Id: Iba13db478ed69976c37bd4882f59bf0cae2212e6

Conflicts:
	wifi/java/android/net/wifi/ScanResult.java
 2014-09-24 14:27:06 -07:00
vandwalle
6933d61f2d am 9e22f280: am 713b200d: am 9794dc95: am 0829f6b6: Merge "handle bssid blacklist in case of dhcp failures" into lmp-dev 
* commit '9e22f2803c26626851f24db7c54fa68b85ca5e45':
  handle bssid blacklist in case of dhcp failures
 2014-09-23 23:18:18 +00:00
vandwalle
176a27f3ab handle bssid blacklist in case of dhcp failures 
Change-Id: Iba13db478ed69976c37bd4882f59bf0cae2212e6
 2014-09-23 12:38:06 -07:00
Vinit Deshpande
2e88cecdb5 am ccafcfbc: am 6839bf68: am 41fa5e86: am 699ba17f: am 14f0aba3: Merge "Fix documentation for Wifi ScanResult.timestamp" into lmp-dev 
* commit 'ccafcfbc63a0f7e279112b8ce717f7408ac3774d':
  Fix documentation for Wifi ScanResult.timestamp
 2014-09-23 16:22:06 +00:00
Vinit Deshpande
28a15a1fe0 am 6839bf68: am 41fa5e86: am 699ba17f: am 14f0aba3: Merge "Fix documentation for Wifi ScanResult.timestamp" into lmp-dev 
* commit '6839bf68d8f557e7d31410a3f88f2e32a4f1a2b8':
  Fix documentation for Wifi ScanResult.timestamp
 2014-09-23 15:51:52 +00:00
Vinit Deshpande
02b115b2d8 Fix documentation for Wifi ScanResult.timestamp 
Bug: 14997906
Change-Id: Idfcf9ade905c7565cc1d59d15aa4362c1b597b72
 2014-09-19 14:23:25 -07:00
Prem Kumar
58e5d5e4c6 am 27f19d75: am c3eea0ee: am a203fbc8: Merge "Allow creating EAP_TLS network without specifying Phase2.None" into lmp-dev 
* commit '27f19d75d3dd5e6c8524a8214fa768052c396849':
  Allow creating EAP_TLS network without specifying Phase2.None
 2014-09-15 02:13:18 +00:00
Prem Kumar
e2b32aff76 am c3eea0ee: am a203fbc8: Merge "Allow creating EAP_TLS network without specifying Phase2.None" into lmp-dev 
* commit 'c3eea0ee551af36c4ad18e8b0f96e5e04bef270c':
  Allow creating EAP_TLS network without specifying Phase2.None
 2014-09-15 01:42:04 +00:00
Prem Kumar
97a0c45cf8 Merge "Allow creating EAP_TLS network without specifying Phase2.None" into lmp-dev 2014-09-15 00:51:13 +00:00
vandwalle
3d6e7eb89b am ffbae6e2: am dfb82a24: am 35967d04: Merge "make wifi cellular params configurable" into lmp-dev 
* commit 'ffbae6e26a354dceadd2f1c9a18dffd0b1151fe3':
  make wifi cellular params configurable
 2014-09-14 19:58:10 +00:00
vandwalle
397b30b1bd am dfb82a24: am 35967d04: Merge "make wifi cellular params configurable" into lmp-dev 
* commit 'dfb82a243b00ced8f093b54a9ed51c06ab11d7ac':
  make wifi cellular params configurable
 2014-09-14 19:43:06 +00:00
vandwalle
2e93c38fa6 make wifi cellular params configurable 
Change-Id: Ia2a4ac3e11f2b0c7412f33496a655c5d5297ea0c
 2014-09-13 13:44:34 -07:00
Vinit Deshpande
26a98001ad Allow creating EAP_TLS network without specifying Phase2.None 
Phase2 isn't required for EAP_TLS networks, and it is possible
for a developer to miss it. We are requiring it for internal
book keeping - so this change just sets Phase2 to 'None' when
EAP_TLS is set on the configuration.

Bug: 17043082
Change-Id: I5a8e0a3a236d0dfd1295584de55d5b9a1b76b483
 2014-09-13 11:10:07 -07:00
vandwalle
a487843425 am 4ae83802: am 8c8f56ca: am e62a18e5: Merge "various fixes:" into lmp-dev 
* commit '4ae83802fb462233a5caea9e94cc2692ea84a389':
  various fixes:
 2014-09-13 03:06:33 +00:00
vandwalle
f28489b816 am 8c8f56ca: am e62a18e5: Merge "various fixes:" into lmp-dev 
* commit '8c8f56ca16fd9d28ea2c2bf1d4f2fe59dcb1a8a7':
  various fixes:
 2014-09-13 02:35:03 +00:00
vandwalle
94fe7e99d1 various fixes: 
- allow for making use of more aggressive initial autojoin attempt rssi thresholds
- create a blacklist due to missing identiy reason
- make autojoin parameters configurable

Change-Id: I385db83aab1da7918ff6935eb59a209b253d42e6
 2014-09-12 14:30:51 -07:00
vandwalle
37b26b4cea am 0689adb0: am a5ef501a: am 9e444d7a: Merge "make autojoin configurable, clean up BSSID info that may be stake in WifiConfiguration" into lmp-dev 
* commit '0689adb05583357b213ec0ce491cdcd5a7080074':
  make autojoin configurable, clean up BSSID info that may be stake in WifiConfiguration
 2014-09-11 17:23:46 +00:00
vandwalle
afc4885042 am a5ef501a: am 9e444d7a: Merge "make autojoin configurable, clean up BSSID info that may be stake in WifiConfiguration" into lmp-dev 
* commit 'a5ef501abfec5b93486f59c1140dc5791433656d':
  make autojoin configurable, clean up BSSID info that may be stake in WifiConfiguration
 2014-09-10 21:38:22 +00:00
vandwalle
e26bc8fda7 make autojoin configurable, clean up BSSID info that may be stake in WifiConfiguration 
Change-Id: I5052f6a76bcd1f980ef558bff54ce1b172319743
 2014-09-10 13:49:48 -07:00
Vinit Deshpande
3120fb3d5e am 9f593a21: am b73e94b4: am 8270c789: Merge "Secure access to WifiScanner" into lmp-dev 
* commit '9f593a217435b5639245917043696ed18b312856':
  Secure access to WifiScanner
 2014-09-10 07:23:14 +00:00
Vinit Deshpande
174538fff5 am b73e94b4: am 8270c789: Merge "Secure access to WifiScanner" into lmp-dev 
* commit 'b73e94b4173aca543ea506fbda70890311eba4d5':
  Secure access to WifiScanner
 2014-09-10 07:09:32 +00:00
Vinit Deshpande
a0000c6c3c Merge "Secure access to WifiScanner" into lmp-dev 2014-09-10 06:34:25 +00:00
Vinit Deshpande
43f6edae1b am 80adb33a: am 33e1b95c: am fc591cc1: Merge "Implement getAvailableChannels" into lmp-dev 
* commit '80adb33a9f07b7f6bfa55165deb3f35d1fd3411e':
  Implement getAvailableChannels
 2014-09-09 05:29:06 +00:00
Vinit Deshpande
bb90cfffc1 am 33e1b95c: am fc591cc1: Merge "Implement getAvailableChannels" into lmp-dev 
* commit '33e1b95ca08f8ecc114665f3eed3e9c71355310c':
  Implement getAvailableChannels
 2014-09-09 05:14:04 +00:00
Vinit Deshpande
592b95901e Merge "Implement getAvailableChannels" into lmp-dev 2014-09-09 01:28:45 +00:00
Vinit Deshpande
4b9975671f Secure access to WifiScanner 
This change implements access control for WifiScanner. It is now
available to only those apps that have CONNECTIVITY_INTERNAL permissions.

Bug: 15088601
Change-Id: I6acc13079b6dac6f190644b6d1a270c271cc679f
 2014-09-08 18:03:12 -07:00
vandwalle
bc189d8a40 am e1677497: am 344ddea4: am a35a795f: Merge "add more info to WifiConfiguration.toString: - add the noInternetAccess field - add stats about user triggered wifi state disabling requests - Wifi SSID can change even though we don\'t loose connection, hence it must be l 
* commit 'e16774976b9c09ca3992f21199e012d8a2dacaed':
  add more info to WifiConfiguration.toString: - add the noInternetAccess field - add stats about user triggered wifi state disabling requests - Wifi SSID can change even though we don't loose connection, hence it must be looked at with each Network State Change
 2014-09-08 19:58:31 +00:00
vandwalle
8828537f61 am 344ddea4: am a35a795f: Merge "add more info to WifiConfiguration.toString: - add the noInternetAccess field - add stats about user triggered wifi state disabling requests - Wifi SSID can change even though we don\'t loose connection, hence it must be looked at with 
* commit '344ddea49fb61cde1d9161f3cd010428c137dd6b':
  add more info to WifiConfiguration.toString: - add the noInternetAccess field - add stats about user triggered wifi state disabling requests - Wifi SSID can change even though we don't loose connection, hence it must be looked at with each Network State Change
 2014-09-08 19:48:59 +00:00
vandwalle
448e208b0a add more info to WifiConfiguration.toString: 
- add the noInternetAccess field
- add stats about user triggered wifi state disabling requests
- Wifi SSID can change even though we don't loose connection, hence it must be looked at with each Network State Change

Bug:17348200

Change-Id: Ic956e11e7d61faf472a7332f84a46a746922455a
 2014-09-07 21:43:25 -07:00
Vinit Deshpande
15f8907878 Implement getAvailableChannels 
This API allows finding channels by band, so scanning services
can find out which channels to use.

Bug: 16652660
Change-Id: I690825333988a336efa3fc8886297e5b8baf8e1d
 2014-09-05 20:43:57 -07:00
David Christie
4ec0cf048a am 1fc17b58: am d3a78eff: am 36b0eac4: Merge "Add @SystemApi annotations to methods used by GmsCore. -Currently these methods are called using reflection for location. Bug: 17371392 Change-Id: I6546f5b485415beff69164ba0d526757ee831f69" into lmp-dev 
* commit '1fc17b58efa68b7128fd5b1cfa3355c353aaff4e':
  Add @SystemApi annotations to methods used by GmsCore. -Currently these methods are called using reflection for location. Bug: 17371392 Change-Id: I6546f5b485415beff69164ba0d526757ee831f69
 2014-09-04 21:29:00 +00:00
David Christie
25fb15035b am d3a78eff: am 36b0eac4: Merge "Add @SystemApi annotations to methods used by GmsCore. -Currently these methods are called using reflection for location. Bug: 17371392 Change-Id: I6546f5b485415beff69164ba0d526757ee831f69" into lmp-dev 
* commit 'd3a78eff9d1a34f4638ddfdb6b1f3519b10426b7':
  Add @SystemApi annotations to methods used by GmsCore. -Currently these methods are called using reflection for location. Bug: 17371392 Change-Id: I6546f5b485415beff69164ba0d526757ee831f69
 2014-09-04 21:17:20 +00:00
David Christie
e7baf5afc0 Merge "Add @SystemApi annotations to methods used by GmsCore. -Currently these methods are called using reflection for location. Bug: 17371392 Change-Id: I6546f5b485415beff69164ba0d526757ee831f69" into lmp-dev 2014-09-04 20:53:39 +00:00
David Christie
c20b795cf0 Add @SystemApi annotations to methods used by GmsCore. 
-Currently these methods are called using reflection for location.
Bug: 17371392
Change-Id: I6546f5b485415beff69164ba0d526757ee831f69
 2014-09-04 20:53:21 +00:00
Vinit Deshpande
3df10a64b9 am 21790061: am f4b970e5: am 2705b859: Merge "Address API Council feedback for WifiAdapter/WPS APIs" into lmp-dev 
* commit '217900618fedda7ddc447b2fb861d0458cf8ed0e':
  Address API Council feedback for WifiAdapter/WPS APIs
 2014-09-03 15:34:59 +00:00
Vinit Deshpande
f0f4058c6a am f4b970e5: am 2705b859: Merge "Address API Council feedback for WifiAdapter/WPS APIs" into lmp-dev 
* commit 'f4b970e5fc0204334ff3990ccb47f6323fd68ee7':
  Address API Council feedback for WifiAdapter/WPS APIs
 2014-09-03 14:33:41 +00:00
Vinit Deshpande
73f5d16ad5 Address API Council feedback for WifiAdapter/WPS APIs 
This change addresses concerns from the API review. Things that
are fixed are -

1. WifiAdapter is removed, until we have 'real' support for it
2. All the methods from WifiAdapter are moved to WifiManager
3. Changed WPSListener API names to be onFailed/onSucceeded et al
4. Removed ActionListener from WPS APIs, they now take WpsListener

Bug: 16403303
Bug: 17115004

Change-Id: Ia721dd95041acb3e50d16690319e3320fe550ff5
 2014-08-29 13:36:51 -07:00
vandwalle
8c1f0b3faf am f7c9ffc3: am 4c5d4e29: Merge "fix ScanResult read from parcel, this function was broken and causes wifi settings to crash" into lmp-dev 
* commit 'f7c9ffc381b4f8001caacfdd82386f0b060e4dd1':
  fix ScanResult read from parcel, this function was broken and causes wifi settings to crash
 2014-08-27 14:11:21 +00:00
vandwalle
b1dce0220b fix ScanResult read from parcel, this function was broken and causes wifi settings to crash 
Bug: 17293156

Change-Id: I5f7a8141adb21103e98913c9802d8364164eaba7
 2014-08-27 08:16:31 +00:00
vandwalle
fb9cf903fb am 39b53f3c: am bdc65df3: Merge "remove passpoint - DO NOT MERGE" into lmp-dev 
* commit '39b53f3c10e1e758c2bcc27ffd9f4c1076d13539':
  remove passpoint - DO NOT MERGE
 2014-08-26 22:00:54 +00:00
vandwalle
7aea15a08e Merge "remove passpoint - DO NOT MERGE" into lmp-dev 2014-08-26 21:26:42 +00:00
vandwalle
0f5734dda8 am 362448d4: am dbf54ec2: am b2139607: Merge "add radio stats to link layer" into lmp-dev 
* commit '362448d4b91704503340e9f751d26b88706c2057':
  add radio stats to link layer
 2014-08-26 21:13:03 +00:00
vandwalle
10d3d97b56 am dbf54ec2: am b2139607: Merge "add radio stats to link layer" into lmp-dev 
* commit 'dbf54ec22d1215cdf9991b79ecef8b17b9e58fe0':
  add radio stats to link layer
 2014-08-26 21:02:29 +00:00
vandwalle
808079bd27 remove passpoint - DO NOT MERGE 
This CL is dependent on I3d2a230b0362520b9f1b2bc3792260116971e106

Change-Id: I1a0d655877d9368d833d62e231797af4b2560862
 2014-08-26 14:56:04 +00:00
vandwalle
b928a3802b add radio stats to link layer 
Bug:15563188

Change-Id: I3d2a230b0362520b9f1b2bc3792260116971e106
 2014-08-26 00:28:42 +00:00
Wenchao Tong
5223cc6167 am de1bc6cb: am f654d5b2: am 2954d35a: Merge "Revert "Annotate @SystemApi on some WifiManager methods."" into lmp-dev 
* commit 'de1bc6cb3ecdfab5e7f42bc9f865f39a1ef0c01e':
  Revert "Annotate @SystemApi on some WifiManager methods."
 2014-08-21 16:47:38 +00:00
Wenchao Tong
0a3bd24f4c am f654d5b2: am 2954d35a: Merge "Revert "Annotate @SystemApi on some WifiManager methods."" into lmp-dev 
* commit 'f654d5b210419e90ba674c73a20a3bcfa9f394e6':
  Revert "Annotate @SystemApi on some WifiManager methods."
 2014-08-21 16:20:34 +00:00
Wenchao Tong
ddd0986311 Merge "Revert "Annotate @SystemApi on some WifiManager methods."" into lmp-dev 2014-08-21 16:05:00 +00:00
vandwalle
82615a6ba2 am fad9e3a0: am 01c23ffb: am 23e25851: Merge "per bssid blacklist" into lmp-dev 
* commit 'fad9e3a007593ce9ace3b426e1b037e3b73d6357':
  per bssid blacklist
 2014-08-21 15:21:54 +00:00