Merge "Fix a crash when exiting the DevTools Connectivity page." into nyc-dev

2016-05-24 20:40:10 +00:00
parent 99433f6878 2817836d75
commit 738f9df0c8
1 changed files with 3 additions and 1 deletions
--- a/apps/Development/src/com/android/development/Connectivity.java
+++ b/apps/Development/src/com/android/development/Connectivity.java
@@ -486,7 +486,9 @@ public class Connectivity extends Activity {
        mCm.unregisterNetworkCallback(mCallback);
        mCallback = null;
        unregisterReceiver(mReceiver);
-        mWml.release();
+        if (mWml.isHeld()) {
+            mWml.release();
+        }
    }

    @Override