diff options
| author | Evan Birenbaum <birenbaum@google.com> | 2016-05-24 20:57:06 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-24 20:57:06 +0000 |
| commit | 5a4be418dab5d46b04247c5138ce6b606a8d8c77 (patch) | |
| tree | dc8a09e9f5fe0fb390a18627bd1688cbd9052132 /apps | |
| parent | 9070e8728bc8e6b2dd2024595c56a775a1f3330b (diff) | |
| parent | 58bee650564ae112f8070dc55cdd305a755e5b7b (diff) | |
| download | android_development-5a4be418dab5d46b04247c5138ce6b606a8d8c77.tar.gz android_development-5a4be418dab5d46b04247c5138ce6b606a8d8c77.tar.bz2 android_development-5a4be418dab5d46b04247c5138ce6b606a8d8c77.zip | |
Merge "Fix a crash when exiting the DevTools Connectivity page." into nyc-dev am: 738f9df0c8 am: db7f7668de
am: 58bee65056
* commit '58bee650564ae112f8070dc55cdd305a755e5b7b':
Fix a crash when exiting the DevTools Connectivity page.
Change-Id: I2be1d3938a0c15157484aa88848e035b02664d8b
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/Development/src/com/android/development/Connectivity.java | 4 |
1 files changed, 3 insertions, 1 deletions
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 |