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

955 Commits

Author SHA1 Message Date
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
vandwalle
5197859685 am 01c23ffb: am 23e25851: Merge "per bssid blacklist" into lmp-dev 
* commit '01c23ffbf8f50e4a8d3889c05ebb459a82e0a930':
  per bssid blacklist
 2014-08-21 15:15:06 +00:00
vandwalle
beec21522d Merge "per bssid blacklist" into lmp-dev 2014-08-21 14:55:12 +00:00
Jeff Davidson
99d853f212 am 00fde029: am 5e3130d6: am fa141926: Merge "Improve documentation of ScanResult and WifiInfo." into lmp-dev 
* commit '00fde029a5d9ec74dd5e47e29f53c5885779e4ac':
  Improve documentation of ScanResult and WifiInfo.
 2014-08-21 04:07:39 +00:00
Jeff Davidson
2cfe5359eb am 5e3130d6: am fa141926: Merge "Improve documentation of ScanResult and WifiInfo." into lmp-dev 
* commit '5e3130d63a745ad6cd3ccf535845128ae744d092':
  Improve documentation of ScanResult and WifiInfo.
 2014-08-21 02:47:05 +00:00
Wenchao Tong
cd8e041668 Revert "Annotate @SystemApi on some WifiManager methods." 
This reverts commit 041bcc22bd21f84358e5b2102e3a919bcdd99b81.

Bug: 17134034
Change-Id: I1ebcdd9b4c56e5c93fd5667699c8971e8c6e5452
 2014-08-20 22:10:36 +00:00
vandwalle
612519db40 per bssid blacklist 
Bug: 16823537

This CL is dependent on Iff32fae2cd67343e63046d58d75fa1e10d9775d0

Change-Id: Id9411c8097337b37ac1ce1a6ac8b28b4bda31ff3
 2014-08-20 21:07:02 +00:00
Jeff Davidson
833dcd4bea Merge "Improve documentation of ScanResult and WifiInfo." into lmp-dev 2014-08-20 20:15:45 +00:00
vandwalle
ccb019d04e am 3a7bbbff: am 14aa17a2: Merge "remove passpoint, except ANQP - DO NOT MERGE" into lmp-dev 
* commit '3a7bbbff1e526dce660fc1d08113167134402b75':
  remove passpoint, except ANQP - DO NOT MERGE
 2014-08-20 19:26:13 +00:00
vandwalle
da3475dba7 Merge "remove passpoint, except ANQP - DO NOT MERGE" into lmp-dev 2014-08-20 16:06:26 +00:00
Wenchao Tong
b413f19d8f am 143817b4: am 3e76a3aa: am 3ddfe1ce: Merge "Annotate @SystemApi on some WifiManager methods." into lmp-dev 
* commit '143817b4302baa8f42f2f2a489a75b429735a3eb':
  Annotate @SystemApi on some WifiManager methods.
 2014-08-20 03:27:12 +00:00
Wenchao Tong
459fcb6c31 am 3e76a3aa: am 3ddfe1ce: Merge "Annotate @SystemApi on some WifiManager methods." into lmp-dev 
* commit '3e76a3aa299c6c7abde43ed5e9b780eb1dd13b8d':
  Annotate @SystemApi on some WifiManager methods.
 2014-08-20 03:17:57 +00:00
Lorenzo Colitti
aa740d3fdc am 5eb792fc: am 45b565ff: am 14152c79: Merge "Stop using LinkProperties for static configuration." into lmp-dev 
* commit '5eb792fcdebc92a872c17a54310db3de60e7d620':
  Stop using LinkProperties for static configuration.
 2014-08-19 19:49:10 +00:00
Lorenzo Colitti
56d4c18e2f am 45b565ff: am 14152c79: Merge "Stop using LinkProperties for static configuration." into lmp-dev 
* commit '45b565ffdbd2962c336f385d80d6516cd1cc489a':
  Stop using LinkProperties for static configuration.
 2014-08-19 19:37:53 +00:00
Wenchao Tong
4d11492071 Annotate @SystemApi on some WifiManager methods. 
Bug: 17112931
Change-Id: I5980bc46bc1f16316caecd7fcc6cd771b8ca6cdf
 2014-08-19 09:42:41 -07:00
Wenchao Tong
36ecb30b87 Merge "Annotate @SystemApi on some WifiManager methods." into lmp-dev 2014-08-19 02:43:23 +00:00
vandwalle
1575d90605 remove passpoint, except ANQP - DO NOT MERGE 
This CL is dependend on Ic3ae7269f0ca11cec6b7aea5143499e88ecc7149

Change-Id: Ic533d1820c470bf2370a92452b37515ef7458f45
 2014-08-19 01:54:41 +00:00
Elliott Hughes
74eea2aa38 am 61520b2e: am 400ec1b9: am 085889e3: Merge "WifiP2pWfdInfo set device type bugfix" 
* commit '61520b2ef9c766a75bced02b4cc65dc66414d234':
  WifiP2pWfdInfo set device type bugfix
 2014-08-18 19:58:38 +00:00
Elliott Hughes
c97de79ad2 am 400ec1b9: am 085889e3: Merge "WifiP2pWfdInfo set device type bugfix" 
* commit '400ec1b938ddc8da367c594105bfaa7485c80564':
  WifiP2pWfdInfo set device type bugfix
 2014-08-18 19:48:26 +00:00
Elliott Hughes
400ec1b938 am 085889e3: Merge "WifiP2pWfdInfo set device type bugfix" 
* commit '085889e37f5798dd50ec8c66cd0e2cd2ec37c6bd':
  WifiP2pWfdInfo set device type bugfix
 2014-08-18 19:38:36 +00:00
Lorenzo Colitti
0a82e80073 Stop using LinkProperties for static configuration. 
LinkProperties can represent way more complicated configurations
than what we can actually apply to interfaces. This makes it
error-prone to use it to represent static configuration, both
when trying to apply configuration coming from LinkProperties
and when trying to save configuration from current
LinkProperties.

Instead, move static configuration (IPv4 only, since we don't
support static IPv6 configuration) into a separate
StaticIpConfiguration class.

Bug: 16114392
Bug: 16893413
Change-Id: Ib33f35c004e30b6067bb20235ffa43c247d174df
 2014-08-19 11:59:43 -07:00
Grigoriy Kraynov
8b3b81000c WifiP2pWfdInfo set device type bugfix 
Change-Id: I37a53aed80574e78c80dc4a4192bd8cc4320de9d
Signed-off-by: Grigoriy Kraynov <kraynov@mgpro.ru>
 2014-08-18 01:18:34 +04:00
Zoltan Szatmary-Ban
d7d06fed40 am bcdd58c5: am e21dd346: am 3e941c33: Merge "Revert "Revert "Revert "Revert "Revert "Update Trusted Credentials screen in settings"""""" into lmp-dev 
* commit 'bcdd58c572a81477a14c8a670739066783492bc3':
  Revert "Revert "Revert "Revert "Revert "Update Trusted Credentials screen in settings"""""
 2014-08-15 14:44:23 +00:00
Zoltan Szatmary-Ban
7db442e2bd am 08390bf9: am 1d128a5a: am 856e0928: Merge "Revert "Revert "Revert "Revert "Update Trusted Credentials screen in settings""""" into lmp-dev 
* commit '08390bf9cb75bfb2987a480166d02f672afa8ba1':
  Revert "Revert "Revert "Revert "Update Trusted Credentials screen in settings""""
 2014-08-15 13:40:33 +00:00
Narayan Kamath
a93fb72f85 am 2b83dc1a: am 09f669f0: am a7d930a0: Merge "Revert "Revert "Revert "Update Trusted Credentials screen in settings"""" into lmp-dev 
* commit '2b83dc1a695cec37f372945e6440fa6d9fd598c3':
  Revert "Revert "Revert "Update Trusted Credentials screen in settings"""
 2014-08-15 13:40:22 +00:00
Zoltan Szatmary-Ban
55083f240b am a6e86ddf: am fe2114b4: am 19c8ce29: Revert "Revert "Update Trusted Credentials screen in settings"" 
* commit 'a6e86ddfd0e5eccd8657c18554cfd6ccd86608f3':
  Revert "Revert "Update Trusted Credentials screen in settings""
 2014-08-15 13:39:57 +00:00
Zoltan Szatmary-Ban
1e7bc0def8 Revert "Revert "Update Trusted Credentials screen in settings"" 
This reverts commit 0f0de0bdd021bad5f85fdb0399a4ea91a1611e25.

Change-Id: Ia3d0907e3d7c2ec42d64e45f60e3dfaffb932c3d
 2014-08-15 12:55:35 +01:00
Zoltan Szatmary-Ban
f8d72cc14f Revert "Revert "Revert "Revert "Update Trusted Credentials screen in settings"""" 
This reverts commit 87efe74e092236c372d3b6909009641123aa416a.

This should be fine now with all the dependency CLs +2-ed


Change-Id: I96ad14ad5ff81e6b5391035cb6c5a62339c6cc40
 2014-08-15 12:58:37 +00:00
Narayan Kamath
f75aadc028 Revert "Revert "Revert "Update Trusted Credentials screen in settings""" 
This reverts commit 19c8ce291e89a9ef1442a20e1feab421b11536d7.

Change-Id: Ie5a5571127311e0a29f314c0566e779cfe940b53
 2014-08-15 12:25:52 +00:00
Zoltan Szatmary-Ban
3291de8f6c Revert "Revert "Revert "Revert "Revert "Update Trusted Credentials screen in settings""""" 
This reverts commit c9249c69813c6fb889d71d84583c67ae2942e6de.

Change-Id: I5504fddaf7b18efb73cd6c76678b3b39ce9b0229
 2014-08-15 14:01:14 +00:00
Jeff Davidson
e4ce619880 Improve documentation of ScanResult and WifiInfo. 
Valid dBm ranges should *not* be mentioned in the documentation.
Manufacturers should be able to produce devices which can detect
signal strengths with arbitrary sensitivity rather than being forced
to restrict strengths to a certain range.

Adds a reference to WifiManager.calculateSignalLevel(), an
often-useful method to convert these RSSI values into an absolute
signal level that can be displayed to a user as the signal strength.

Bug: 13731529
Change-Id: I0aae85a6d8bc48ffddd1927d816a1dfbf5230f7e
 2014-08-12 18:46:42 -07:00
Chelsea Derrick
c216c473eb Revert "Changes in framework for WIFI_CREDENTIAL_CHANGE broadcast. [DO NOT MERGE]" 
This reverts commit 41158d90a69cae2a9c4ced0e04f235e8cfef5259.

Bug: 16871063
Change-Id: I93623be92f2de41789b16827867f3f95bf0480c5
 2014-08-11 12:51:18 -07:00
Vinit Deshpande
88992bc90c Merge "Unhide WifiPasspointManager for ANQP APIs - DO NOT MERGE" into lmp-dev 2014-08-09 00:40:15 +00:00
Vinit Deshpande
894651bab5 Unhide WifiPasspointManager for ANQP APIs - DO NOT MERGE 
This is unhiding some unwanted changes too; but we'll fix that later.

Change-Id: I35343815e99aafbec8e4ef4d0707499fb6219457
 2014-08-10 19:30:00 +00:00
Vinit Deshpande
c850593142 Support EAP-SIM and EAP-AKA 
This change un-hides constants for these two methods and
also un-hides RADIUS/AAA FQDN field to allow creating
Passpoint release 1 credentials.

Change-Id: Ia3501017dc1f5c0b4932bb45e1e9c5bf7262d7fe
 2014-08-08 21:06:12 -07:00
Chelsea Derrick
75e3ad631c Merge "Unhide broadcasts for WiFi network changes." into lmp-dev 2014-08-07 15:00:45 +00:00
Chelsea Derrick
e75c0b8e3b Unhide broadcasts for WiFi network changes. 
This change will fulfill the same role as ag/487624, which unhid other broadcast
constants (and is being rolled back).  We can leverage the existing broadcasts
in this CL rather than introducing new ones.  They just need to be exposed.

Bug: 16871063
Change-Id: I91462851c8016ed962cdafa54e9ec938d52c84b6
 2014-08-07 14:43:40 -07:00
Vinit Deshpande
db0c15dd67 Read/Write numBssidsPerScan in ParcelableScanResults 
Setting the value has no effect because it was lost in marshalling
across binder interface.

Bug: 16826305
Change-Id: I5b308441608e0b7fc159fc249a16aec3728bac82
 2014-08-07 16:52:37 -07:00
Zoltan Szatmary-Ban
138b324d5d Merge "Revert "Update Trusted Credentials screen in settings"" into lmp-dev 2014-08-07 12:44:12 +00:00
Zoltan Szatmary-Ban
678e3ecc93 Revert "Update Trusted Credentials screen in settings" 
This reverts commit 4fde5aa9fab931d9becfc49f7d7b8526ad5640d9.

Change-Id: I581c38d64e9829b0079bafa42615f2aa0bf64763
 2014-08-07 13:41:08 +00:00
Zoltan Szatmary-Ban
0f5efe0b44 Merge "Update Trusted Credentials screen in settings" into lmp-dev 2014-08-05 00:19:02 +00:00
Zoltan Szatmary-Ban
1386627335 Update Trusted Credentials screen in settings 
Trusted credentials for both the primary user and its managed profiles are shown
on the Trusted Credentials fragment. All functionalities (e.g. disabling/enabling
of certificates) remain available.

Bug: 16029580

Change-Id: Ia92ae02d8c572bf4a3be172f6c255726cefc0fa1
 2014-07-29 16:43:37 +01:00
Vinit Deshpande
ea676a0e51 Rename HotspotListener to BssidListener 
And other usage of term Hotspot. This is to be technically correct
with the name usage, should the API become public later.

This change also fixes few outstanding requests from GScan API.These
include

a. An event with scan results when REPORT_AFTER_EACH_SCAN is set.
b. ScanSettings now takes in number of APs as an argument.
c. Removed single shot scan API (since it is not implemented anyway)

Change-Id: Id160f9f14193a37cce5f3ab8d6ea528344b788a0
 2014-07-30 08:54:41 -07:00
vandwalle
f7d3700ea1 record join attempts 
Change-Id: I82ef09ec46d7ac7cc8bbe2939873a5f966ee0df7

 On branch scorer-logs
 Changes to be committed:
	modified:   java/android/net/wifi/WifiConnectionStatistics.java

 On branch scorer-logs
 Changes to be committed:
	modified:   java/android/net/wifi/WifiConnectionStatistics.java
 2014-07-29 12:33:12 -07:00
vandwalle
0ae4e5da22 Merge "fix typo in scanresult" into lmp-dev 2014-07-25 21:16:23 +00:00
vandwalle
ec5a901ea8 fix typo in scanresult 
Change-Id: I4a7998097419bebeb94b23785567865b19205642
 2014-07-28 20:48:33 -07:00
vandwalle
16a40cc7b5 add debug info to wificonfiguration dump 
Change-Id: I4887afa21d6e1d9463fa4a5cd0aa7ae22973239f
 2014-07-28 20:35:44 -07:00