Merge "Fixed that PCSCF address not updated" (82abc35e) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/dataconnection/DataConnection.java

+11 −4

Original line number	Diff line number	Diff line
		@@ -1047,10 +1047,7 @@ public class DataConnection extends StateMachine {
		} else {
		if (DBG) log("onSetupConnectionCompleted received successful DataCallResponse");
		mCid = response.getId();

		mPcscfAddr = response.getPcscfAddresses().stream()
		.map(InetAddress::getHostAddress).toArray(String[]::new);

		updatePcscfAddr(response);
		result = updateLinkProperty(response).setupResult;
		}

		@@ -2885,6 +2882,16 @@ public class DataConnection extends StateMachine {
		return mConnectionParams;
		}

		/**
		* Update PCSCF addresses
		*
		* @param response
		*/
		public void updatePcscfAddr(DataCallResponse response) {
		mPcscfAddr = response.getPcscfAddresses().stream()
		.map(InetAddress::getHostAddress).toArray(String[]::new);
		}

		/**
		* @return The list of PCSCF addresses
		*/

+1 −0

Original line number	Diff line number	Diff line
		@@ -296,6 +296,7 @@ public class DcController extends Handler {
		}
		}
		} else {
		dc.updatePcscfAddr(newState);
		// Its active so update the DataConnections link properties
		UpdateLinkPropertyResult result = dc.updateLinkProperty(newState);
		if (result.oldLp.equals(result.newLp)) {