diff options
| author | Vinit Deshpande <vinitd@google.com> | 2015-03-03 12:48:22 -0800 |
|---|---|---|
| committer | Vinit Deshpande <vinitd@google.com> | 2015-03-03 13:02:21 -0800 |
| commit | e2434ec1d0c1c75709f55dcee5e8943c1d68e6c1 (patch) | |
| tree | a1de5102bbf4ba2505296f0c7a444b237e0e0a32 /service/java/com/android/server/wifi/hotspot2/omadm | |
| parent | ef1567e413c9ed5f5c4fdb9e354861632f7b2f87 (diff) | |
| download | android_frameworks_opt_net_wifi-e2434ec1d0c1c75709f55dcee5e8943c1d68e6c1.tar.gz android_frameworks_opt_net_wifi-e2434ec1d0c1c75709f55dcee5e8943c1d68e6c1.tar.bz2 android_frameworks_opt_net_wifi-e2434ec1d0c1c75709f55dcee5e8943c1d68e6c1.zip | |
Couple of bug fixes to enable/disable wifi
It is broken, because we now try to read/write passpoint
configurations. Few null and empty checks are missing in
that code path.
Bug: 19568112
Change-Id: I4bfcbf95e19b050ba40d9df006c0f1e4880414ed
Diffstat (limited to 'service/java/com/android/server/wifi/hotspot2/omadm')
| -rw-r--r-- | service/java/com/android/server/wifi/hotspot2/omadm/MOManager.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/service/java/com/android/server/wifi/hotspot2/omadm/MOManager.java b/service/java/com/android/server/wifi/hotspot2/omadm/MOManager.java index a9141b648..7e5bd9661 100644 --- a/service/java/com/android/server/wifi/hotspot2/omadm/MOManager.java +++ b/service/java/com/android/server/wifi/hotspot2/omadm/MOManager.java @@ -250,6 +250,10 @@ public class MOManager { List<HomeSP> homeSPs = new ArrayList<HomeSP>(); + if (spList == null) { + return homeSPs; + } + for (OMANode spRoot : spList.getChildren()) { homeSPs.add(buildHomeSP(spRoot)); } |