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

1025 Commits

Author SHA1 Message Date
Vinit Deshpande
33f97d8304 am 77fe4c96: am a34f3d30: am 800bf3ae: Merge "Fix WPS docs for LABEL method" into lmp-mr1-dev 
* commit '77fe4c96b75550e5d22a294314b05beabd55e97a':
  Fix WPS docs for LABEL method
 2014-11-19 22:21:38 +00:00
Vinit Deshpande
77fe4c96b7 am a34f3d30: am 800bf3ae: Merge "Fix WPS docs for LABEL method" into lmp-mr1-dev 
* commit 'a34f3d30c6a7a4b8863175f009935c61ace42b4e':
  Fix WPS docs for LABEL method
 2014-11-19 22:13:18 +00:00
Vinit Deshpande
c3eb155644 Fix WPS docs for LABEL method 
Since we don't support LABEL method in startWps, document
it explicitly.

Bug: 18298388

Change-Id: I5d4c2475a68f1b41e5fc449c911b7b01b3b82fc4
 2014-11-18 11:07:58 -08:00
Wink Saville
8ffeda02d7 Merge commit 'ec3e9805dd7c527f961d1f2a14e5752b461186ca' into fix-merge-conflict 
Conflicts:
	wifi/java/android/net/wifi/WifiConfiguration.java

Change-Id: If52be614cadf80955025097589f922072363e7ba
 2014-11-12 08:24:40 -08:00
vandwalle
4d974fa942 Merge "dont blacklist wifi config that have had validated internet status in the past" into lmp-mr1-dev automerge: 3f558e7 
automerge: 39c5118

* commit '39c5118037b5f401217db0fa5ac934291f45e378':
  dont blacklist wifi config that have had validated internet status in the past
 2014-11-12 03:23:35 +00:00
vandwalle
ec3e9805dd dont blacklist wifi config that have had validated internet status in the past 
Change-Id: Iadb4e0e1beeb9e582b944e003470815a5a865652
 2014-11-10 14:27:20 -08:00
Jeff Davidson
e40ea96f97 am a45e9897: am 8cae7f64: am 8fe7676e: Merge "Fix incorrect doc for WifiInfo#getSSID()." into lmp-mr1-dev 
* commit 'a45e98974e571ca539436b295a98d513faa10d19':
  Fix incorrect doc for WifiInfo#getSSID().
 2014-11-06 00:12:44 +00:00
Jeff Davidson
a45e98974e am 8cae7f64: am 8fe7676e: Merge "Fix incorrect doc for WifiInfo#getSSID()." into lmp-mr1-dev 
* commit '8cae7f644c59f0200f1962abdfbc6001166a192c':
  Fix incorrect doc for WifiInfo#getSSID().
 2014-11-05 23:19:44 +00:00
Jeff Davidson
f92fc1ca65 Fix incorrect doc for WifiInfo#getSSID(). 
This method will never return null. It may return "<unknown ssid>" if
no network is currently connected.

Change-Id: Iae09a6b2376e47c2d010f8d05750a16361510cca
 2014-11-05 10:26:00 -08:00
Jeff Davidson
bc2ccb48d3 am 1199a4c4: am f2a598e4: am 074c5b5b: Merge "Don\'t drop WifiConfiguration\'s ephemeral bit on copy/parcel." into lmp-mr1-dev 
* commit '1199a4c436b4e08306c02f615360e233124bff55':
  Don't drop WifiConfiguration's ephemeral bit on copy/parcel.
 2014-10-15 16:03:38 +00:00
Jeff Davidson
1199a4c436 am f2a598e4: am 074c5b5b: Merge "Don\'t drop WifiConfiguration\'s ephemeral bit on copy/parcel." into lmp-mr1-dev 
* commit 'f2a598e445800c9209dc58ab0005ca466eb14679':
  Don't drop WifiConfiguration's ephemeral bit on copy/parcel.
 2014-10-15 15:58:47 +00:00
Jeff Davidson
074c5b5b65 Merge "Don't drop WifiConfiguration's ephemeral bit on copy/parcel." into lmp-mr1-dev 2014-10-15 15:49:26 +00:00
Primiano Tucci
0f422c6d80 resolved conflicts for merge of 28495b02 into master 
Conflicts:
    wifi/java/android/net/wifi/ScanResult.java

Change-Id: I86a4537d603cbf325e5e0bff715a442d9dc6b6db
 2014-10-08 12:22:29 +01:00
Primiano Tucci
73a648990f Fix the "Fix broken merge of "handle bssid blacklist in case of dhcp failures"" 
The change Iad35fb8dc2ce14874ef7424c4be5648ca7ac916c (Fix broken merge of ...)
seem be a partial resolution of Iba13db478ed69976c37bd4882f59bf0cae2212e6: the
parcel ser/des lines are missing.
This is causing today a merge conflict (lmp-dev -> master) on a dependent
change (I89b4f5c05a1f64f9d1e8c407f62036efa0265043), which is confused by
the lack of the parcel ser/des lines.
I think this was a genuine mistakes. Readding these lines should make
the conflict go away and fix master.

Change-Id: I8499b9caeb1667f95727fdd18f318c5859a2321e
 2014-10-08 12:20:12 +01:00
vandwalle
28495b02f2 am b75369e2: am 7bbf867b: am 0c0c680d: am a741efd5: Merge "adding debug information to bug report for Bug:16751877" into lmp-dev 
* commit 'b75369e22c4617371606571398f0faa0838f02ef':
  adding debug information to bug report for Bug:16751877
 2014-10-08 07:51:57 +00:00
vandwalle
63edd98d2e adding debug information to bug report for Bug:16751877 
Change-Id: I9d417c20c6b6721933a4eb943c1305845005facf
 2014-10-07 14:38:38 -07:00
Jeff Davidson
8faf2a2a15 Don't drop WifiConfiguration's ephemeral bit on copy/parcel. 
Bug: 15892711
Change-Id: I4a027c99634a11d13bb3c8420ba959c201644689
 2014-10-06 16:29:35 -07:00
vandwalle
3041a9e07d am 542cc240: am 88b927e2: am c67e5ae2: am 4f5fd780: am 68104b05: Merge "add millisecond timestamp to locallog" into lmp-dev 
* commit '542cc240b5bd68a728067f65cd8bc4d8f6473b83':
  add millisecond timestamp to locallog
 2014-10-04 16:06:17 +00:00
vandwalle
542cc240b5 am 88b927e2: am c67e5ae2: am 4f5fd780: am 68104b05: Merge "add millisecond timestamp to locallog" into lmp-dev 
* commit '88b927e258214a31342326d46f527528e5979f85':
  add millisecond timestamp to locallog
 2014-10-04 15:45:35 +00:00
vandwalle
c520aa89a3 add millisecond timestamp to locallog 
Change-Id: I33d8672efd2747ed3f49dd8d5bcd5f47bf418053
 2014-10-03 15:35:25 -07:00
Lorenzo Colitti
fb223e848f am 65d720b3: am 6245bd9e: am eef8d3eb: am df959707: am 7fe95529: Merge "Revert the configKey generation algorithm to what it was in K." into lmp-dev 
* commit '65d720b3fb766f88c8f76bfba0538d0185cc6d21':
  Revert the configKey generation algorithm to what it was in K.
 2014-10-02 13:48:12 +00:00
Lorenzo Colitti
65d720b3fb am 6245bd9e: am eef8d3eb: am df959707: am 7fe95529: Merge "Revert the configKey generation algorithm to what it was in K." into lmp-dev 
* commit '6245bd9e19639ec3f64cae4268b204f8bfa0c6c9':
  Revert the configKey generation algorithm to what it was in K.
 2014-10-02 13:40:24 +00:00
Lorenzo Colitti
8e1e34a3f6 Revert the configKey generation algorithm to what it was in K. 
Bug: 17670914
Change-Id: Ibb2ea26ea28a38518caab7d1b45ae535a0eaf661
 2014-09-30 18:30:58 +09:00
Sky Faber
c55cd10370 User wifi separation feature. 
Change-Id: Iab79db10107ab5dbeb469c12621a9a4916bd62c9
 2014-09-26 18:32:16 -07:00
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