summaryrefslogtreecommitdiffstats
path: root/service/java/com/android
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Fail scan request if no channels are available" into oc-mr1-devTreeHugger Robot2017-10-041-6/+16
|\
| * Fail scan request if no channels are availableNingyuan Wang2017-09-281-6/+16
| | | | | | | | | | | | | | | | | | | | | | This fails scan request if no available channels could be scanned for this request. With this fix we can avoid the freezing of WifiScanner in aformentioned case. Bug: 67015387 Test: compile, unit test, integration test Change-Id: I68654ce8d53104484c1559d8b0525585ab50b9e5
* | Merge "WifiConfigManager: Don't reset the userId on user stop" into oc-mr1-devTreeHugger Robot2017-10-041-2/+9
|\ \
| * | WifiConfigManager: Don't reset the userId on user stopRoshan Pius2017-09-281-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Couple of fixes in user stop handling: a) Only clear the network data belonging to the user that is stopped. b) Don't reset the user Id on stop. It will be done in the user switch handling. Bug: 65939780 Test: Unit tests Change-Id: Ia3ab033d893009cfd8019ee27d52a490a8040438
* | | Merge changes I38c31645,Ib6f61b81 into oc-mr1-devRoshan Pius2017-09-293-35/+63
|\| | | | | | | | | | | | | | | | | * changes: WifiStateMachine: Handle WifiManager.save() when wifi is off NetworkListStoreData: Set creatorUid for all networks on load
| * | WifiStateMachine: Handle WifiManager.save() when wifi is offRoshan Pius2017-09-281-33/+42
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 66909738 Test: Verified that you can save networks even when wifi is off using ag/2930541. Test: Unit tests Change-Id: I38c316456e74ce5ad1ec43750b075f0999c28327
| * | NetworkListStoreData: Set creatorUid for all networks on loadRoshan Pius2017-09-262-2/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some network configurations saved during N have the creatorUid set to -1. (Not sure what was the root cause in N which introduced this issue in saved networks) Ensure that we set |creatorUid| for such networks with invalid uid to SYSTEM_UID on loading. The networks with invalid creatorUid can anyway only be modified only by settings/sysui (because they possess NETWORK_SETTINGS permission). Bug: 65623732 Test: Unit tests Change-Id: Ib6f61b81e19877cdf0c42d29c9f5ae3869725517
* | | Merge "WifiMetrics: add methods to increment ONA metrics." into oc-mr1-devTreeHugger Robot2017-09-293-4/+180
|\ \ \
| * | | WifiMetrics: add methods to increment ONA metrics.Stephen Chen2017-09-283-4/+180
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tracks the number of notifications posted for each state of ONA, and the number of user actions made for each notification type. Also tracks the state of the feature setting, the size of the recommender blacklist, recommendation update counts, and connection initiation failure counts. Also adds additional debug logging. Bug: 37501326 Bug: 66996715 Test: frameworks/opt/net/wifi/tests/wifitests/runtests.sh and verify in dumpsys Change-Id: Ia00ae95fbcf923ebae051ba82cd3174cfe11be31
* | / Cherry-pick: Remove temporarily disabled networks from PNO listNingyuan Wang2017-09-291-2/+3
| |/ |/| | | | | | | | | | | | | | | | | This also adds corresponding unit tests. Bug: 66910426 Test: compile, unit tests Merged-In: I58f7061887ebc1dd78d3941218653460f80abb1f Change-Id: I58f7061887ebc1dd78d3941218653460f80abb1f
* | Merge "WifiStateMachine: check for null config after dhcp" into oc-mr1-devRebecca Silberstein2017-09-271-3/+10
|\ \ | |/ |/|
| * WifiStateMachine: check for null config after dhcpRebecca Silberstein2017-09-071-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | If a network config is removed while we are in the ObtainingIpState, we will attempt to get the configured network from WifiConfigManager but it will be null. As we move to the Connected state, this throws a NPE. Instead of moving along to the Connected state, disconnect from the network if we find out we have null for the current config. Also add an additional null check where the NPE was thrown further down the line. Bug: 65257934 Test: frameworks/opt/net/wifi/tests/wifitests/runtests.sh Change-Id: Ibbce6491970de16cf5265b03398b50a7cdd50ba2
* | Fix case for not reverting country code on cellular lossNingyuan Wang2017-09-121-12/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | This CL allows us to keep using last known country code on cellular loss and |mRevertCountryCodeOnCellularLoss| is set to false. This also fixes simCardRemoved() to revert country code unconditionally, and cleans up code for airplaneModeEnabled(). Bug: 65602314 Test: compile, unit tests Change-Id: I7b15d9ae197c5e2aacd7788b505e386f970786ed
* | capture BR on wificond or HAL crashesNingyuan Wang2017-09-112-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows us to save the most recent kernel logs when wificond or hal crashes. This saved log could help us debug underlying driver/kernel issues. Bug: 65550505 Bug: 64934608 Test: compile Test: run frameworks/opt/net/wifi/tests/wifitests/runtests.sh Test: manually kill wificond and take bugreport Find if there is a "Bug dump" section with "reason = 8" Change-Id: Id9311cee34b3fc25400e804bd96795c7f28f537a
* | Merge "[AWARE] Support multiple NAN data interfaces (NDI)" into oc-mr1-devEtan Cohen2017-09-113-11/+41
|\ \
| * | [AWARE] Support multiple NAN data interfaces (NDI)Etan Cohen2017-09-053-11/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support all the NAN data-interfaces which the firmware supports - based on the returned capability. - Create the data-interfaces - Assign data-paths to data-interfaces based on constraints of unique [(src mac, dst mac), security config] tuples. I.e. a single data-interface can only have a single security configuration to a specific destination interface. Bug: 63635857 Test: unit tests + integrated test suite Change-Id: I4a21f3b025e8164673366e22da062d536d588148
* | | Merge "ONA: Enable new UI and connection flow." into oc-mr1-devStephen Chen2017-09-083-45/+43
|\ \ \
| * | | ONA: Enable new UI and connection flow.Stephen Chen2017-09-073-45/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new Open Network Available notification UI introduces a connection flow in which users can connect to a recommended open network directly by interacting with the notification. "Connect" and "See all" action buttons are introduced to initiate the flow, and once a connection attempt is made, the connection status will be reflected on the notification. Bug: 37357441 Test: frameworks/opt/net/wifi/tests/wifitests/runtests.sh Change-Id: I30231c4f71476a7417a3b423848575d5488f51f7
* | | | Merge "ONA: Add connection related notifications." into oc-mr1-devTreeHugger Robot2017-09-084-131/+298
|\| | | | |_|/ |/| |
| * | ONA: Add connection related notifications.Stephen Chen2017-09-074-131/+298
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change introduces the new notifications but does not utilize them to change the existing functionality yet. It also refactors the state handling of the notifier to represent the new connection and notification states. When attempting to connect to a network, the notification will update based on connection success and failures. Bug: 37357441 Bug: 65257065 Test: frameworks/opt/net/wifi/tests/wifitests/runtests.sh Change-Id: I3cf188f7f0fac1ea7d1ec882c9473bdbaccccabd
* | | Merge "ONA: Implement connection attempt and failure callback." into oc-mr1-devTreeHugger Robot2017-09-074-7/+78
|\| |
| * | ONA: Implement connection attempt and failure callback.Stephen Chen2017-09-064-7/+78
| | | | | | | | | | | | | | | | | | Bug: 37357441 Test: frameworks/opt/net/wifi/tests/wifitests/runtests.sh Change-Id: I2d531304598249dcb18bdc45492e48ee90ddff5f
* | | Merge "WifiConfigStore: Remove legacy modules" into oc-mr1-devRoshan Pius2017-09-076-1557/+3
|\ \ \
| * | | WifiConfigStore: Remove legacy modulesRoshan Pius2017-08-316-1557/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These modules were used to migrate store data out of the old store files. Now that O is released, these classes are unused so cleaning up dead code. Bug: 31041781 Test: Unit test passes. Test: Flashed a device and ensured that none of the saved networks are lost. Change-Id: Ib6936cace3c72408ba4be2e33226737228159a48
* | | | Handle a condition when the result of getting configured networks returns ↵Aleks Rozman2017-09-071-3/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | null am: 3abc7f0561 am: 3b17189719 am: 1e779938f2 am: fb9027f897 Change-Id: I2198545cb8000378e7350c9d2e580da74af2e3b9
| * \ \ \ Handle a condition when the result of getting configured networks returns ↵Aleks Rozman2017-09-071-3/+7
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | null am: 3abc7f0561 am: 3b17189719 am: 1e779938f2 Change-Id: I29953e283339c00ddbfcfb6e23ef2c0690551285
| | * \ \ \ Handle a condition when the result of getting configured networks returns ↵Aleks Rozman2017-09-071-3/+7
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | null am: 3abc7f0561 am: 3b17189719 Change-Id: I6f2c96f8ef75e97e5df867a6122ee94b0060d0ad
| | | * \ \ \ Handle a condition when the result of getting configured networks returns nullAleks Rozman2017-09-071-3/+7
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 3abc7f0561 Change-Id: Icec60ffafda1366688fa3045d9be929f3cfb99cc
| | | | * | | | Handle a condition when the result of getting configured networks returns nullAleks Rozman2017-09-061-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Linked with ag/2842135 BUG:65267749 Change-Id: Idebc1b76f454640a2b493db9fb4bf263c0e448f5
| | | * | | | | DO NOT MERGE Add missing null check to WifiStateMachine#dumpErik Wolsheimer2017-05-021-1/+1
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 0dffd1db07 Change-Id: I905f4e948536e16a2b7f081994123d055d72320d
| | | | * | | | DO NOT MERGE Add missing null check to WifiStateMachine#dumpErik Wolsheimer2017-05-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 33932575 Change-Id: If84866598eb4b0482f93dc3256c4dcb4d5182469
| | | | * | | | DO NOT MERGE: OMAParser: throw IOException when parsing a null XML stringPeter Qiu2017-01-271-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This avoids a NullPointerException when parsing a null XML string. OMAParser.parse is only used by PasspointManagementObjectManager for adding/building/modifying a HomeSP from a XML string. It is fine to use IOException since it is already being handled gracefully by its upstream callers. Bug: 31497435 Test: unit tests Test: Verify system server crashes when executing the command below without the fix and doesn't crash with the fix: "adb shell service call wifi 8 i32 0" Change-Id: If2ad13b8573d49ba0ccbea2427f3c63d841f866d (cherry picked from commit 519056861a467ae64e142ff07d53891514ef9c70) (cherry picked from commit 81080a8430568399a14e9b85007a8aaea5c2e6eb)
| | | * | | | | DO NOT MERGE: Fix to enable reconnecting to a Carrier network.pkanwar2017-01-181-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We now generate a new Config for each connection attempt. BUG: 30760683 Change-Id: I88393ecc2964e299e80f6f2802dd85a142e1f473
| | | * | | | | DO NOT MERGE: Fix to maintain the Carrier Network connection.pkanwar2017-01-123-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added isCarrierNetwork param in WifiConfiguration, which is then used in WifiStateMachine. After this change, the connection to Carrier Network should be maintained. BUG: 30760683 Change-Id: Ie6df849182aafc018e336631c502ff7749bfdc35
| | | * | | | | Merge "[DO NOT MERGE] WifiStateMachine: prevent erroneous wifi toggle" into ↵Rebecca Silberstein2017-01-112-8/+18
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | nyc-mr2-dev
| | | | * | | | | [DO NOT MERGE] WifiStateMachine: prevent erroneous wifi toggleRebecca Silberstein2017-01-042-8/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The icon for wifi toggles on/off quickly when transitioning between states if location scans are enabled. This is due to two errors: 1 - WifiStateMachine sends the wifi enabled broadcast before wifi has entered client mode. 2 - WifiStateMachine assumes it is entering client mode if it has not been told otherwise. This CL works around the assumptions in WifiStateMachine and avoids sending the wifi enabled broadcast when it should be going in to scan mode and not client mode. Bug: 28336982 Test: verified state transitions manually Test: runtest frameworks-wifi Change-Id: I5e34ee4f0ef90668ecc97f5d6d726444fd08ffb3
| | | * | | | | | Merge "DO NOT MERGE: WifiConfigStore: Strip out FT flags in ↵Roshan Pius2017-01-111-0/+9
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WifiConfiguration" into nyc-mr2-dev
| | | | * | | | | | DO NOT MERGE: WifiConfigStore: Strip out FT flags in WifiConfigurationRoshan Pius2017-01-101-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The FT flags are added dynamically to wpa_supplicant. These are not exposed in the public API's and hence should not be returned in the configs retrieved by apps. So, strip out the FT flags when reading network configuration from wpa_supplicant. Bug: 34095472 Test: Will send for regression testing. Change-Id: I0d49fb3c98e49207f2faf30d54493f1147924e3b
| | | * | | | | | | DO NOT MERGE ANYWHERE: Connect to Carrier networks if enabled inpkanwar2017-01-102-1/+14
| | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Settings. After this change the WifiQualifiedSelector will only connect to Carrier networks if enabled in the Settings. Provided a method in WifiConfigManager that will be used to decide if we try connecing to the Carrier network. BUG: 30760683 Change-Id: I5c6841f784bd82f3811837331d3dd0c795da7688
| | | * / / / / / DO NOT MERGE: Fix null dereference in carrier networksPaul Stewart2017-01-051-1/+1
| | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WifiStateMachine can respond to CMD_HAS_CARRIER_CONFIGURED_NETWORKS with a null object if it is not in a state to handle this. Therefore syncHasCarrierConfiguredNetworks must check for null before attempting to cast the result object back to boolean. Bug: 34050164 Test: Compile Change-Id: I21b80ef3989ca2d6a09784f9c9a44f4af19b5850
| | | * | | | | resolve merge conflicts of fe09754c1 to nyc-dev am: f35c310b1a am: ↵Peter Qiu2017-01-041-10/+0
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bd91d4a476 am: 39ec37cefe am: e4890ae5f6 Change-Id: Ib39ff0bf19dd2a0390cee7c371167d9db3bda487
| | | | * | | | resolve merge conflicts of fe09754c1 to nyc-dev am: f35c310b1a am: bd91d4a476Peter Qiu2017-01-041-10/+0
| | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 39ec37cefe Change-Id: I82862cd9b911f3de01ce97be4dcb225259e72a74
| | | | | * \ \ \ resolve merge conflicts of fe09754c1 to nyc-dev am: f35c310b1aPeter Qiu2017-01-041-10/+0
| | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: bd91d4a476 Change-Id: I8afeca7863e3973205272eabc7df7d8b4f2d3cf7
| | | | | | * \ \ \ resolve merge conflicts of fe09754c1 to nyc-devPeter Qiu2017-01-041-10/+0
| | | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: f35c310b1a Change-Id: Ie8d68a8964d49b629e37d79dd14dac7e523f1461
| | | | | | | * \ \ \ resolve merge conflicts of fe09754c1 to nyc-devPeter Qiu2017-01-041-10/+0
| | | | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9845a6826188ea0c05508947f5c1266a245b04fd
| | | | | | | | * \ \ \ configparse: do not delete passpoint configuration file am: de3de10eec am: ↵Peter Qiu2017-01-041-6/+0
| | | | | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8d43428276 am: 39ae399af7 Change-Id: Ice3c49e6f2377f2822cce0fe1138f5c837507d1b
| | | | | | | | | * \ \ \ configparse: do not delete passpoint configuration file am: de3de10eecPeter Qiu2017-01-041-6/+0
| | | | | | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 8d43428276 Change-Id: I2fdc59cf23a122bcc6cbc4f0596e384152d29160
| | | | | | | | | | * \ \ \ configparse: do not delete passpoint configuration filePeter Qiu2017-01-041-6/+0
| | | | | | | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: de3de10eec Change-Id: I04ebda0dccafa98a4b08d35cddc17d005f6a735f
| | | | | | | | | | | * | | | configparse: do not delete passpoint configuration filePeter Qiu2016-12-121-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is the caller's responsibility for deleting configuration files. This avoids the ConfigBuilder from deleting arbitrary files (specified by URI) pass-in by the callers. Bug: 33178389 Test: Verify Passpoint Configuration installation works using Shamu Change-Id: I54803dc711ede98a1ec1259077522032c543dca1
| | | * | | | | | | | | | | | In permission review mode, always request user's consent to toggle WiFi.Ivan Podogov2017-01-031-13/+10
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 054ddcd931 Change-Id: Id40da72090217210ac0ffbc1029475a8ef0ee2da
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-27 03:02:59 +0000