diff options
| author | Irfan Sheriff <isheriff@google.com> | 2012-08-21 11:47:18 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-08-21 11:47:19 -0700 |
| commit | 5e8e41e41aecd2a4951659a1f3507f3371e0cc47 (patch) | |
| tree | ea9beaa77dd2a15f262e870ab5ae632ff3a218e8 | |
| parent | 88cb79e7a168b653c9678809da67f55607ec4006 (diff) | |
| parent | 06d371f87be2588de6dddeefb919911c24e58e09 (diff) | |
| download | frameworks_base-5e8e41e41aecd2a4951659a1f3507f3371e0cc47.zip frameworks_base-5e8e41e41aecd2a4951659a1f3507f3371e0cc47.tar.gz frameworks_base-5e8e41e41aecd2a4951659a1f3507f3371e0cc47.tar.bz2 | |
Merge "Fix NPE" into jb-mr1-dev
| -rw-r--r-- | wifi/java/android/net/wifi/WifiStateMachine.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/wifi/java/android/net/wifi/WifiStateMachine.java b/wifi/java/android/net/wifi/WifiStateMachine.java index 9f506aa..1d06c76 100644 --- a/wifi/java/android/net/wifi/WifiStateMachine.java +++ b/wifi/java/android/net/wifi/WifiStateMachine.java @@ -114,7 +114,7 @@ public class WifiStateMachine extends StateMachine { private final String mPrimaryDeviceType; /* Scan results handling */ - private List<ScanResult> mScanResults; + private List<ScanResult> mScanResults = new ArrayList<ScanResult>(); private static final Pattern scanResultPattern = Pattern.compile("\t+"); private static final int SCAN_RESULT_CACHE_SIZE = 80; private final LruCache<String, ScanResult> mScanResultCache; |