Merge change 1831 into donut (ba2a3a1b) · Commits · e / os / android_frameworks_base

telephony/java/com/android/internal/telephony/gsm/PdpConnection.java

+12 −8

Original line number	Diff line number	Diff line
		@@ -95,9 +95,7 @@ public class PdpConnection extends DataConnection {
		apn.password, obtainMessage(EVENT_SETUP_DATA_CONNECTION_DONE));
		}

		protected void disconnect(Message msg) {
		onDisconnect = msg;
		if (state == State.ACTIVE) {
		private void tearDownData(Message msg) {
		if (dataLink != null) {
		dataLink.disconnect();
		}
		@@ -105,6 +103,12 @@ public class PdpConnection extends DataConnection {
		if (phone.mCM.getRadioState().isOn()) {
		phone.mCM.deactivateDataCall(cid, obtainMessage(EVENT_DEACTIVATE_DONE, msg));
		}
		}

		protected void disconnect(Message msg) {
		onDisconnect = msg;
		if (state == State.ACTIVE) {
		tearDownData(msg);
		} else if (state == State.ACTIVATING) {
		receivedDisconnectReq = true;
		} else {
		@@ -243,7 +247,7 @@ public class PdpConnection extends DataConnection {
		// Don't bother reporting success if there's already a
		// pending disconnect request, since DataConnectionTracker
		// has already updated its state.
		disconnect(onDisconnect);
		tearDownData(onDisconnect);
		} else {
		String[] response = ((String[]) ar.result);
		cid = Integer.parseInt(response[0]);