Merge "Check if APN setting is null" into tm-dev (d4513489) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/RILUtils.java

+4 −1

Original line number	Diff line number	Diff line
		@@ -979,7 +979,10 @@ public class RILUtils {
		dpi.mtuV6 = dp.getMtuV6();
		dpi.persistent = dp.isPersistent();
		dpi.preferred = dp.isPreferred();
		dpi.alwaysOn = false;
		if (dp.getApnSetting() != null) {
		dpi.alwaysOn = dp.getApnSetting().isAlwaysOn();
		}
		dpi.trafficDescriptor = convertToHalTrafficDescriptorAidl(dp.getTrafficDescriptor());

		// profile id is only meaningful when it's persistent on the modem.