Snap for 13379675 from 92621a582afaa6fbef6140b6e0513cea67a9485d to 25Q3-release (42e82c3f) · Commits · e / os / android_frameworks_opt_telephony

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

+20 −34

Original line number	Diff line number	Diff line
		@@ -247,37 +247,27 @@ public class NetworkTypeController extends StateMachine {
		private final ConnectivityManager.NetworkCallback mNetworkCallback =
		new ConnectivityManager.NetworkCallback() {
		@Override
		public void onAvailable(Network network) {
		log("On Available: " + network);
		if (network != null) {
		public void onAvailable(@NonNull Network network) {
		if (mConnectivityManager != null) {
		NetworkCapabilities capabilities =
		mConnectivityManager.getNetworkCapabilities(network);
		updateBandwidthConstrainedStatus(capabilities);
		} else {
		log("network is null");
		if (capabilities != null) {
		updateBandwidthConstrainedStatus(
		isBandwidthConstrainedCapabilitySupported(capabilities));
		}
		}
		}

		@Override
		public void onCapabilitiesChanged(Network network,
		NetworkCapabilities networkCapabilities) {
		log("onCapabilitiesChanged: " + network);
		if (network != null) {
		updateBandwidthConstrainedStatus(networkCapabilities);
		} else {
		log("network is null");
		}
		public void onCapabilitiesChanged(@NonNull Network network,
		@NonNull NetworkCapabilities networkCapabilities) {
		updateBandwidthConstrainedStatus(
		isBandwidthConstrainedCapabilitySupported(networkCapabilities));
		}

		@Override
		public void onLost(Network network) {
		log("Network Lost");
		if (mIsSatelliteConstrainedData) {
		mIsSatelliteConstrainedData = false;
		mDisplayInfoController.updateTelephonyDisplayInfo();
		}
		public void onLost(@NonNull Network network) {
		updateBandwidthConstrainedStatus(false);
		}
		};

		@@ -296,17 +286,13 @@ public class NetworkTypeController extends StateMachine {
		}
		}

		private void updateBandwidthConstrainedStatus(NetworkCapabilities capabilities) {
		if (capabilities != null) {
		boolean isConstrained = isBandwidthConstrainedCapabilitySupported(capabilities);
		private void updateBandwidthConstrainedStatus(boolean isConstrained) {
		if (isConstrained != mIsSatelliteConstrainedData) {
		mIsSatelliteConstrainedData = isConstrained;
		log("Update network type because satellite constrained data status changed to "
		log("Reset timers because satellite constrained data status changed to "
		+ mIsSatelliteConstrainedData);
		mDisplayInfoController.updateTelephonyDisplayInfo();
		}
		} else {
		log("capabilities is null");
		resetAllTimers();
		transitionToCurrentState();
		}
		}

src/java/com/android/internal/telephony/data/AutoDataSwitchController.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -1188,7 +1188,7 @@ public class AutoDataSwitchController extends Handler {
		int subId = subInfo.getSubscriptionId();
		logl("displayAutoDataSwitchNotification: display for subId=" + subId);
		// "Mobile network settings" screen / dialog
		Intent intent = new Intent(Settings.ACTION_NETWORK_OPERATOR_SETTINGS);
		Intent intent = new Intent(Settings.ACTION_MANAGE_ALL_SIM_PROFILES_SETTINGS);
		final Bundle fragmentArgs = new Bundle();
		// Special contract for Settings to highlight permission row
		fragmentArgs.putString(SETTINGS_EXTRA_FRAGMENT_ARG_KEY, AUTO_DATA_SWITCH_SETTING_R_ID);

src/java/com/android/internal/telephony/metrics/SatelliteStats.java

+10 −0

Original line number	Diff line number	Diff line
		@@ -3378,6 +3378,16 @@ public class SatelliteStats {
		proto.satelliteDataConsumedBytes = param.mSatelliteDataConsumedBytes;
		proto.isMultiSim = param.isMultiSim();
		proto.isNbIotNtn = param.isNbIotNtn();
		proto.countOfDataConnections = param.mCountOfDataConnections;
		proto.lastFailCauses = param.mLastFailCauses;
		proto.countOfDataDisconnections = param.mCountOfDataDisconnections;
		proto.countOfDataStalls = param.mCountOfDataStalls;
		proto.averageUplinkBandwidthKbps = param.mAverageUplinkBandwidthKbps;
		proto.averageDownlinkBandwidthKbps = param.mAverageDownlinkBandwidthKbps;
		proto.minUplinkBandwidthKbps = param.mMinUplinkBandwidthKbps;
		proto.maxUplinkBandwidthKbps = param.mMaxUplinkBandwidthKbps;
		proto.minDownlinkBandwidthKbps = param.mMinDownlinkBandwidthKbps;
		proto.maxDownlinkBandwidthKbps = param.mMaxDownlinkBandwidthKbps;
		if (DBG) logd("onCarrierRoamingSatelliteSessionMetrics: " + param);
		mAtomsStorage.addCarrierRoamingSatelliteSessionStats(proto);
		}

src/java/com/android/internal/telephony/security/CellularNetworkSecuritySafetySource.java

+7 −9

Original line number	Diff line number	Diff line
		@@ -42,10 +42,9 @@ import com.android.internal.telephony.subscription.SubscriptionManagerService;
		import java.lang.annotation.Retention;
		import java.lang.annotation.RetentionPolicy;
		import java.time.Instant;
		import java.time.ZoneId;
		import java.time.format.DateTimeFormatter;
		import java.util.Calendar;
		import java.util.Date;
		import java.util.HashMap;
		import java.util.Locale;
		import java.util.Objects;
		import java.util.Optional;
		import java.util.stream.Stream;
		@@ -307,7 +306,7 @@ public class CellularNetworkSecuritySafetySource {
		context.getString(R.string.scIdentifierDisclosureIssueTitle),
		context.getString(
		R.string.scIdentifierDisclosureIssueSummaryNotification,
		getCurrentTime(),
		getCurrentTime(context),
		subInfo.getDisplayName())).build();
		SafetySourceIssue.Builder builder =
		new SafetySourceIssue.Builder(
		@@ -315,7 +314,7 @@ public class CellularNetworkSecuritySafetySource {
		context.getString(R.string.scIdentifierDisclosureIssueTitle),
		context.getString(
		R.string.scIdentifierDisclosureIssueSummary,
		getCurrentTime(),
		getCurrentTime(context),
		subInfo.getDisplayName()),
		SEVERITY_LEVEL_RECOMMENDATION,
		IDENTIFIER_DISCLOSURE_ISSUE_ID)
		@@ -347,10 +346,9 @@ public class CellularNetworkSecuritySafetySource {
		return Optional.of(builder.build());
		}

		private String getCurrentTime() {
		String pattern = DateFormat.getBestDateTimePattern(Locale.getDefault(), "hh:mm");
		return Instant.now().atZone(ZoneId.systemDefault())
		.format(DateTimeFormatter.ofPattern(pattern)).toString();
		private String getCurrentTime(Context context) {
		Date today = Calendar.getInstance().getTime();
		return DateFormat.getTimeFormat(context).format(today);
		}

		/**