summaryrefslogtreecommitdiffstats
path: root/wifi/java/android/net/wifi/passpoint
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'goog/mirror-m-wireless-internal-release' into ↵Prerepa Viswanadham2015-03-241-1/+1
|\ | | | | | | | | | | master_merge Change-Id: I49aab437af220f1139cfd2d0a9c362acce31074e
| * Fix scan results to hold passpoint dataVinit Deshpande2015-03-171-1/+1
| | | | | | | | Change-Id: I8ab75ec49226a59b04de6463de596cc9f5f6d800
| * Bring in passpoint code [DO NOT MERGE]Vinit Deshpande2015-01-1212-0/+3848
| | | | | | | | | | | | | | This change brings in all the passpoint code from master to here - so that all development can be done with partners Change-Id: I9185c35c69630ffb9b4313f973893996051075ed
| * remove passpoint - DO NOT MERGEvandwalle2014-08-2612-3690/+0
| | | | | | | | | | This CL is dependent on I3d2a230b0362520b9f1b2bc3792260116971e106 Change-Id: I1a0d655877d9368d833d62e231797af4b2560862
| * remove passpoint, except ANQP - DO NOT MERGEvandwalle2014-08-191-10/+0
| | | | | | | | | | This CL is dependend on Ic3ae7269f0ca11cec6b7aea5143499e88ecc7149 Change-Id: Ic533d1820c470bf2370a92452b37515ef7458f45
* | Remove unused imports in frameworks/base.John Spurlock2015-02-283-6/+0
| | | | | | | | Change-Id: I031443de83f93eb57a98863001826671b18f3b17
* | am bcdd58c5: am e21dd346: am 3e941c33: Merge "Revert "Revert "Revert "Revert ↵Zoltan Szatmary-Ban2014-08-151-1/+28
|\ \ | | | | | | | | | | | | | | | | | | "Revert "Update Trusted Credentials screen in settings"""""" into lmp-dev * commit 'bcdd58c572a81477a14c8a670739066783492bc3': Revert "Revert "Revert "Revert "Revert "Update Trusted Credentials screen in settings"""""
| * | Revert "Revert "Revert "Revert "Revert "Update Trusted Credentials screen in ↵Zoltan Szatmary-Ban2014-08-151-1/+28
| | | | | | | | | | | | | | | | | | | | | | | | settings""""" This reverts commit c9249c69813c6fb889d71d84583c67ae2942e6de. Change-Id: I5504fddaf7b18efb73cd6c76678b3b39ce9b0229
* | | am 08390bf9: am 1d128a5a: am 856e0928: Merge "Revert "Revert "Revert "Revert ↵Zoltan Szatmary-Ban2014-08-151-28/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | "Update Trusted Credentials screen in settings""""" into lmp-dev * commit '08390bf9cb75bfb2987a480166d02f672afa8ba1': Revert "Revert "Revert "Revert "Update Trusted Credentials screen in settings""""
| * | Revert "Revert "Revert "Revert "Update Trusted Credentials screen in ↵Zoltan Szatmary-Ban2014-08-151-28/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | settings"""" This reverts commit 87efe74e092236c372d3b6909009641123aa416a. This should be fine now with all the dependency CLs +2-ed Change-Id: I96ad14ad5ff81e6b5391035cb6c5a62339c6cc40
* | | am 2b83dc1a: am 09f669f0: am a7d930a0: Merge "Revert "Revert "Revert "Update ↵Narayan Kamath2014-08-151-1/+28
|\ \ \ | |/ / | | | | | | | | | | | | | | | Trusted Credentials screen in settings"""" into lmp-dev * commit '2b83dc1a695cec37f372945e6440fa6d9fd598c3': Revert "Revert "Revert "Update Trusted Credentials screen in settings"""
| * | Revert "Revert "Revert "Update Trusted Credentials screen in settings"""Narayan Kamath2014-08-151-1/+28
| | | | | | | | | | | | | | | | | | This reverts commit 19c8ce291e89a9ef1442a20e1feab421b11536d7. Change-Id: Ie5a5571127311e0a29f314c0566e779cfe940b53
* | | am a6e86ddf: am fe2114b4: am 19c8ce29: Revert "Revert "Update Trusted ↵Zoltan Szatmary-Ban2014-08-151-28/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | Credentials screen in settings"" * commit 'a6e86ddfd0e5eccd8657c18554cfd6ccd86608f3': Revert "Revert "Update Trusted Credentials screen in settings""
| * | Revert "Revert "Update Trusted Credentials screen in settings""Zoltan Szatmary-Ban2014-08-151-28/+1
| |/ | | | | | | | | | | This reverts commit 0f0de0bdd021bad5f85fdb0399a4ea91a1611e25. Change-Id: Ia3d0907e3d7c2ec42d64e45f60e3dfaffb932c3d
| * Unhide WifiPasspointManager for ANQP APIs - DO NOT MERGEVinit Deshpande2014-08-102-149/+1
|/ | | | | | This is unhiding some unwanted changes too; but we'll fix that later. Change-Id: I35343815e99aafbec8e4ef4d0707499fb6219457
* Revert "Update Trusted Credentials screen in settings"Zoltan Szatmary-Ban2014-08-071-1/+28
| | | | | | This reverts commit 4fde5aa9fab931d9becfc49f7d7b8526ad5640d9. Change-Id: I581c38d64e9829b0079bafa42615f2aa0bf64763
* Update Trusted Credentials screen in settingsZoltan Szatmary-Ban2014-07-291-28/+1
| | | | | | | | | | 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
* Hotspot 2.0 - connect R1 used API to stateMachine(2/2)roger.chang2014-07-083-5/+32
| | | | Change-Id: I5a0b0873be51c06a015d508af2670d36008ca7f7
* Hotspot 2.0 fix launch browser methodYuhao Zheng2014-07-011-4/+14
| | | | Change-Id: I484b526fa92c4e3651e8fe6ae5614f22ba8134d4
* Passpoint OSU bug fix + API renameYuhao Zheng2014-06-172-56/+56
| | | | | | | - OSU bug fix - API rename Change-Id: Ic4a09d53177e5c6a81269da7208841d4c6f02716
* Wifi Passpoint - add new API and change equals elementroger.chang2014-06-162-5/+164
| | | | | | | | - add createWifiConfiguration() - correct getHomeSp to isHomeSp - add clientCert for equals function in TLS case Change-Id: Ib8d563ec8937da5ef3673a31b2afd9a8856ec9bb
* Wifi passpoint - linking APIsYuhao Zheng2014-06-114-73/+112
| | | | | | | | | | cherry-pick from kwd: 99d4cc Wifi Passpoint - linking credential match API https://partner-android-review.googlesource.com/#/c/59247/ b5f5ef Wifi Passpoint - linking OSU API https://partner-android-review.googlesource.com/#/c/59282/
* Add class CellularNetwork for plmn parsing and retrieve mcc and mnc.puff wen2014-06-031-26/+21
| | | | Change-Id: Ic5d9c35ea8adcb432c7e601321050fbdfecc5fa7
* More ANQP parsingYuhao Zheng2014-06-022-102/+380
| | | | Change-Id: Ie24eeffa145f2a1bda0cd8e74a52103fdf4b7674
* Hotspot 2.0 framework - Update implementationroger.chang2014-05-303-259/+192
| | | | | | | | 1. Change API naming 2. Combine 2 constructors 3. Add comments for usage Change-Id: I13d98ed82879b46252bb86a7be7b0a5382024c72
* Wifi Passpoint API changeYuhao Zheng2014-05-292-0/+2
| | | | | | | | | - hide package android.net.wifi.passpoint - extend android.net.wifi APIs for Passpoint credential management > hide for preview Bug: 15191967 Change-Id: Ic90818cf5c91e93dd7890774543e08b842edc594
* Update Hotspot 2.0 SDK APIsYuhao Zheng2014-05-231-28/+20
| | | | Change-Id: I0528b378219e03f896497127b5c4b191bf014141
* Update Hotspot 2.0 SDK APIsYuhao Zheng2014-05-222-14/+42
| | | | | | | - Add / fix java docs - Add some setters in WifiPasspointCredential for update use Change-Id: Ifc287ab9d69ea9e02bf036f22171947fde9ee94a
* Hotspot 2.0 framework - add implementationRoger Chang2014-05-2015-392/+2566
| | | | | Bug: 5485670 Change-Id: I4d0f728f4c20676232f2d61bbf49691f6e21a100
* Fix docs build break in passpoint managerVinit Deshpande2014-05-181-1/+1
| | | | Change-Id: I045a361d3a5c3f55c77dd33271892e50f275ab0d
* Hotspot 2.0 framework API -- more functionalitiesYuhao Zheng2014-05-183-24/+145
| | | | | | | | - Added resolution parameter for requestOsuIcons() - Added ANQP parser (OSU provider list only) Bug: 5485670 Change-Id: I69f6fd2ce6f80980ad786c2a3833cca8279771b3
* Hotspot 2.0 framework APIs -- initial implementationYuhao Zheng2014-05-1812-0/+1090
Cherry-picked from klp-wireless-dev-mirror SHA1: e73969fac45aaca72528226dc8c0c5e54fb2cdd4 Bug: 5485670 Change-Id: If3250a2fae181a3774d3158e341220006ad6ebe5