Merge "[SYSUI] Fix logging on test failure" into rvc-dev am: 16f2b57048 am: 1948a640ce

Change-Id: I9cc3373abb13e92323779749857997abc4bb0801

packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerBaseTest.java

@@ -122,6 +122,10 @@ public class NetworkControllerBaseTest extends SysuiTestCase {
     public TestWatcher failWatcher = new TestWatcher() {
         @Override
         protected void failed(Throwable e, Description description) {
+            if (mNetworkController == null) {
+                Log.d(TAG, "mNetworkController = null!");
+                return;
+            }
             // Print out mNetworkController state if the test fails.
             StringWriter sw = new StringWriter();
             PrintWriter pw = new PrintWriter(sw);