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

This commit is contained in:
Chris Iremonger
2016-05-24 20:40:10 +00:00
committed by Android (Google) Code Review

View File

@@ -486,8 +486,10 @@ public class Connectivity extends Activity {
mCm.unregisterNetworkCallback(mCallback); mCm.unregisterNetworkCallback(mCallback);
mCallback = null; mCallback = null;
unregisterReceiver(mReceiver); unregisterReceiver(mReceiver);
if (mWml.isHeld()) {
mWml.release(); mWml.release();
} }
}
@Override @Override
public void onResume() { public void onResume() {