commit e42441a232ae1a75cdd2541f974ed8da258b97cd
author Erik Kline <ek@google.com> Thu Jun 25 03:46:33 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jun 25 03:46:35 2015 +0000
tree 848fdc7e0d1678e8547681bcca7265228b03e437
parent 57f2dac721e01ad92843511b142cfc5ed738dda9
parent ed1b45968edb11ce8dc5c1d5a5db09d943e8d425

Merge "Don't lose critical success/failure messages" into mnc-dev

services/core/java/com/android/server/connectivity/NetworkDiagnostics.java

diff --git a/services/core/java/com/android/server/connectivity/NetworkDiagnostics.java b/services/core/java/com/android/server/connectivity/NetworkDiagnostics.java
index 5d56d4a..74ba404 100644
--- a/services/core/java/com/android/server/connectivity/NetworkDiagnostics.java
+++ b/services/core/java/com/android/server/connectivity/NetworkDiagnostics.java
@@ -113,18 +113,18 @@
 
         public void recordSuccess(String msg) {
             maybeFixupTimes();
+            result = SUCCEEDED + ": " + msg;
             if (mCountDownLatch != null) {
                 mCountDownLatch.countDown();
             }
-            result = SUCCEEDED + ": " + msg;
         }
 
         public void recordFailure(String msg) {
             maybeFixupTimes();
+            result = FAILED + ": " + msg;
             if (mCountDownLatch != null) {
                 mCountDownLatch.countDown();
             }
-            result = FAILED + ": " + msg;
         }
 
         private void maybeFixupTimes() {