Merge "Remove references to NV reset APIs" into main (e185d524) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/TelephonyManager.java

+8 −0

Original line number	Diff line number	Diff line
		@@ -8385,6 +8385,11 @@ public class TelephonyManager {
		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
		@Deprecated
		public boolean nvResetConfig(int resetType) {
		if (Flags.cleanupCdma()) {
		if (resetType != 1) { // 1: reload NV reset (reboot modem)
		return false;
		}
		}
		try {
		ITelephony telephony = getITelephony();
		if (telephony != null) {
		@@ -8425,6 +8430,9 @@ public class TelephonyManager {
		@SystemApi
		@RequiresFeature(PackageManager.FEATURE_TELEPHONY_RADIO_ACCESS)
		public boolean resetRadioConfig() {
		if (Flags.cleanupCdma()) {
		return false;
		}
		try {
		ITelephony telephony = getITelephony();
		if (telephony != null) {