Merge "Moved SimStateToString to TelephonyManager" (4d48b39b) · Commits · e / os / android_frameworks_opt_telephony

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

+1 −3

Original line number	Diff line number	Diff line
		@@ -31,8 +31,6 @@ import static android.telephony.TelephonyManager.SIM_STATE_NOT_READY;
		import static android.telephony.TelephonyManager.SIM_STATE_READY;
		import static android.telephony.TelephonyManager.SIM_STATE_UNKNOWN;

		import static com.android.internal.telephony.SubscriptionInfoUpdater.simStateString;

		import android.annotation.ElapsedRealtimeLong;
		import android.annotation.NonNull;
		import android.annotation.Nullable;
		@@ -526,7 +524,7 @@ public class CarrierPrivilegesTracker extends Handler {
		SystemClock.uptimeMillis() + CLEAR_UICC_RULES_DELAY_MILLIS;
		sendMessageAtTime(obtainMessage(ACTION_CLEAR_UICC_RULES),
		mClearUiccRulesUptimeMillis);
		mLocalLog.log("SIM is gone, simState=" + simStateString(simState)
		mLocalLog.log("SIM is gone, simState=" + TelephonyManager.simStateToString(simState)
		+ ". Delay " + TimeUnit.MILLISECONDS.toSeconds(
		CLEAR_UICC_RULES_DELAY_MILLIS) + " seconds to clear UICC rules.");
		} else {

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

+6 −44

Original line number	Diff line number	Diff line
		@@ -46,7 +46,6 @@ import android.telephony.SubscriptionInfo;
		import android.telephony.SubscriptionManager;
		import android.telephony.SubscriptionManager.UsageSetting;
		import android.telephony.TelephonyManager;
		import android.telephony.TelephonyManager.SimState;
		import android.telephony.UiccAccessRule;
		import android.telephony.euicc.EuiccManager;
		import android.text.TextUtils;
		@@ -1301,9 +1300,9 @@ public class SubscriptionInfoUpdater extends Handler {
		if (slot != null) {
		i.putExtra(PhoneConstants.PORT_KEY, slot.getPortIndexFromPhoneId(phoneId));
		}
		logd("Broadcasting intent ACTION_SIM_CARD_STATE_CHANGED " + simStateString(state)
		+ " for phone: " + phoneId + " slot: " + slotId + " port: "
		+ slot.getPortIndexFromPhoneId(phoneId));
		logd("Broadcasting intent ACTION_SIM_CARD_STATE_CHANGED "
		+ TelephonyManager.simStateToString(state) + " for phone: " + phoneId
		+ " slot: " + slotId + " port: " + slot.getPortIndexFromPhoneId(phoneId));
		sContext.sendBroadcast(i, Manifest.permission.READ_PRIVILEGED_PHONE_STATE);
		TelephonyMetrics.getInstance().updateSimState(phoneId, state);
		}
		@@ -1333,51 +1332,14 @@ public class SubscriptionInfoUpdater extends Handler {
		if (slot != null) {
		i.putExtra(PhoneConstants.PORT_KEY, slot.getPortIndexFromPhoneId(phoneId));
		}
		logd("Broadcasting intent ACTION_SIM_APPLICATION_STATE_CHANGED " + simStateString(state)
		+ " for phone: " + phoneId + " slot: " + slotId + "port: "
		+ slot.getPortIndexFromPhoneId(phoneId));
		logd("Broadcasting intent ACTION_SIM_APPLICATION_STATE_CHANGED "
		+ TelephonyManager.simStateToString(state) + " for phone: " + phoneId
		+ " slot: " + slotId + "port: " + slot.getPortIndexFromPhoneId(phoneId));
		sContext.sendBroadcast(i, Manifest.permission.READ_PRIVILEGED_PHONE_STATE);
		TelephonyMetrics.getInstance().updateSimState(phoneId, state);
		}
		}

		/**
		* Convert SIM state into string
		*
		* @param state SIM state
		* @return SIM state in string format
		*/
		public static String simStateString(@SimState int state) {
		switch (state) {
		case TelephonyManager.SIM_STATE_UNKNOWN:
		return "UNKNOWN";
		case TelephonyManager.SIM_STATE_ABSENT:
		return "ABSENT";
		case TelephonyManager.SIM_STATE_PIN_REQUIRED:
		return "PIN_REQUIRED";
		case TelephonyManager.SIM_STATE_PUK_REQUIRED:
		return "PUK_REQUIRED";
		case TelephonyManager.SIM_STATE_NETWORK_LOCKED:
		return "NETWORK_LOCKED";
		case TelephonyManager.SIM_STATE_READY:
		return "READY";
		case TelephonyManager.SIM_STATE_NOT_READY:
		return "NOT_READY";
		case TelephonyManager.SIM_STATE_PERM_DISABLED:
		return "PERM_DISABLED";
		case TelephonyManager.SIM_STATE_CARD_IO_ERROR:
		return "CARD_IO_ERROR";
		case TelephonyManager.SIM_STATE_CARD_RESTRICTED:
		return "CARD_RESTRICTED";
		case TelephonyManager.SIM_STATE_LOADED:
		return "LOADED";
		case TelephonyManager.SIM_STATE_PRESENT:
		return "PRESENT";
		default:
		return "INVALID";
		}
		}

		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
		private static void logd(String message) {
		Rlog.d(LOG_TAG, message);

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

+3 −4

Original line number	Diff line number	Diff line
		@@ -82,7 +82,6 @@ import com.android.internal.annotations.VisibleForTesting;
		import com.android.internal.telephony.Phone;
		import com.android.internal.telephony.PhoneConstants;
		import com.android.internal.telephony.SlidingWindowEventCounter;
		import com.android.internal.telephony.SubscriptionInfoUpdater;
		import com.android.internal.telephony.TelephonyComponentFactory;
		import com.android.internal.telephony.data.AccessNetworksManager.AccessNetworksManagerCallback;
		import com.android.internal.telephony.data.DataConfigManager.DataConfigManagerCallback;
		@@ -2327,7 +2326,7 @@ public class DataNetworkController extends Handler {
		log("onCarrierConfigUpdated: config is "
		+ (mDataConfigManager.isConfigCarrierSpecific() ? "" : "not ")
		+ "carrier specific. mSimState="
		+ SubscriptionInfoUpdater.simStateString(mSimState));
		+ TelephonyManager.simStateToString(mSimState));
		updateNetworkRequestsPriority();
		onReevaluateUnsatisfiedNetworkRequests(DataEvaluationReason.DATA_CONFIG_CHANGED);
		}
		@@ -2985,7 +2984,7 @@ public class DataNetworkController extends Handler {
		* @param simState SIM state. (Note this is mixed with card state and application state.)
		*/
		private void onSimStateChanged(@SimState int simState) {
		log("onSimStateChanged: state=" + SubscriptionInfoUpdater.simStateString(simState));
		log("onSimStateChanged: state=" + TelephonyManager.simStateToString(simState));
		if (mSimState != simState) {
		mSimState = simState;
		if (simState == TelephonyManager.SIM_STATE_ABSENT) {
		@@ -3705,7 +3704,7 @@ public class DataNetworkController extends Handler {
		pw.println("mImsDataNetworkState="
		+ TelephonyUtils.dataStateToString(mImsDataNetworkState));
		pw.println("mDataServiceBound=" + mDataServiceBound);
		pw.println("mSimState=" + SubscriptionInfoUpdater.simStateString(mSimState));
		pw.println("mSimState=" + TelephonyManager.simStateToString(mSimState));
		pw.println("mDataNetworkControllerCallbacks=" + mDataNetworkControllerCallbacks);
		pw.println("Subscription plans:");
		pw.increaseIndent();

src/java/com/android/internal/telephony/uicc/PinStorage.java

+2 −3

Original line number	Diff line number	Diff line
		@@ -61,7 +61,6 @@ import com.android.internal.annotations.VisibleForTesting;
		import com.android.internal.telephony.Phone;
		import com.android.internal.telephony.PhoneConstants;
		import com.android.internal.telephony.PhoneFactory;
		import com.android.internal.telephony.SubscriptionInfoUpdater;
		import com.android.internal.telephony.TelephonyStatsLog;
		import com.android.internal.telephony.nano.StoredPinProto.EncryptedPin;
		import com.android.internal.telephony.nano.StoredPinProto.StoredPin;
		@@ -519,8 +518,8 @@ public class PinStorage extends Handler {

		/** Handle the update of the {@code state} of the SIM card in {@code slotId}. */
		private synchronized void onSimStatusChange(int slotId, @SimState int state) {
		logd("SIM card/application changed[%d]: %s",
		slotId, SubscriptionInfoUpdater.simStateString(state));
		logd("SIM card/application changed[%d]: %s", slotId,
		TelephonyManager.simStateToString(state));
		switch (state) {
		case TelephonyManager.SIM_STATE_ABSENT:
		case TelephonyManager.SIM_STATE_PIN_REQUIRED: {