commit d27cbe81e1b51f09081c667c275019e63a0399a2
author Vinit Deshpande <vinitd@google.com> Fri Jun 05 19:12:00 2015 -0700
committer Vinit Deshpande <vinitd@google.com> Mon Jun 08 18:48:35 2015 +0000
tree 1773ce3dcf7accef647e0459eb2abe55ddfe653e
parent 10943fe0f4b3beb8998300b6a2517bbd8bac9f0a

Fix a null pointer exception in logger

Bug: 21668637
Change-Id: I677c971cb06fbcb638d9a40f6aee3114d517f0ba

service/java/com/android/server/wifi/WifiLogger.java

diff --git a/service/java/com/android/server/wifi/WifiLogger.java b/service/java/com/android/server/wifi/WifiLogger.java
index b4947ec..7998873 100644
--- a/service/java/com/android/server/wifi/WifiLogger.java
+++ b/service/java/com/android/server/wifi/WifiLogger.java
@@ -339,8 +339,10 @@
     }
 
     private boolean stopLoggingAllBuffers() {
-        for (WifiNative.RingBufferStatus buffer : mRingBuffers){
-            stopLoggingRingBuffer(buffer);
+        if (mRingBuffers != null) {
+            for (WifiNative.RingBufferStatus buffer : mRingBuffers) {
+                stopLoggingRingBuffer(buffer);
+            }
         }
         return true;
     }