From 2817836d7522c876b022bd7002a81f3d23d57645 Mon Sep 17 00:00:00 2001
From: Evan Birenbaum <birenbaum@google.com>
Date: Fri, 20 May 2016 12:18:32 -0700
Subject: [PATCH] Fix a crash when exiting the DevTools Connectivity page.

A lock was being released without checking if it was held, which
resulted in a crash because WifiManager.MulticastLock is reference
counted by default.

BUG=28668604

Change-Id: I306731129894d5525e974561c2680ae7db5aff4b
---
 .../Development/src/com/android/development/Connectivity.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/apps/Development/src/com/android/development/Connectivity.java b/apps/Development/src/com/android/development/Connectivity.java
index 47bba601e..56504821e 100644
--- 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