Snap for 8445527 from e5cb32fc177ee2dc894f313c96b55e7cfa28ae55 to tm-d1-release (63b2372f) · Commits · e / os / android_frameworks_opt_telephony

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

+10 −0

Original line number	Diff line number	Diff line
		@@ -157,4 +157,14 @@ public class MessagingIndication extends IRadioMessagingIndication.Stub {
		mRil.mIccSmsFullRegistrant.notifyRegistrant();
		}
		}

		@Override
		public String getInterfaceHash() {
		return IRadioMessagingIndication.HASH;
		}

		@Override
		public int getInterfaceVersion() {
		return IRadioMessagingIndication.VERSION;
		}
		}

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

+10 −0

Original line number	Diff line number	Diff line
		@@ -273,4 +273,14 @@ public class MessagingResponse extends IRadioMessagingResponse.Stub {
		public void writeSmsToSimResponse(RadioResponseInfo responseInfo, int index) {
		RadioResponse.responseInts(RIL.MESSAGING_SERVICE, mRil, responseInfo, index);
		}

		@Override
		public String getInterfaceHash() {
		return IRadioMessagingResponse.HASH;
		}

		@Override
		public int getInterfaceVersion() {
		return IRadioMessagingResponse.VERSION;
		}
		}

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

+40 −12

Original line number	Diff line number	Diff line
		@@ -23,6 +23,7 @@ import android.content.IntentFilter;
		import android.os.AsyncResult;
		import android.os.Message;
		import android.os.PersistableBundle;
		import android.os.PowerManager;
		import android.telephony.AccessNetworkConstants;
		import android.telephony.Annotation;
		import android.telephony.CarrierConfigManager;
		@@ -101,8 +102,9 @@ public class NetworkTypeController extends StateMachine {
		private static final int EVENT_PCO_DATA_CHANGED = 14;
		private static final int EVENT_BANDWIDTH_CHANGED = 15;
		private static final int EVENT_UPDATE_NR_ADVANCED_STATE = 16;
		private static final int EVENT_DEVICE_IDLE_MODE_CHANGED = 17;

		private static final String[] sEvents = new String[EVENT_UPDATE_NR_ADVANCED_STATE + 1];
		private static final String[] sEvents = new String[EVENT_DEVICE_IDLE_MODE_CHANGED + 1];
		static {
		sEvents[EVENT_UPDATE] = "EVENT_UPDATE";
		sEvents[EVENT_QUIT] = "EVENT_QUIT";
		@@ -122,6 +124,7 @@ public class NetworkTypeController extends StateMachine {
		sEvents[EVENT_PCO_DATA_CHANGED] = "EVENT_PCO_DATA_CHANGED";
		sEvents[EVENT_BANDWIDTH_CHANGED] = "EVENT_BANDWIDTH_CHANGED";
		sEvents[EVENT_UPDATE_NR_ADVANCED_STATE] = "EVENT_UPDATE_NR_ADVANCED_STATE";
		sEvents[EVENT_DEVICE_IDLE_MODE_CHANGED] = "EVENT_DEVICE_IDLE_MODE_CHANGED";
		}

		private final Phone mPhone;
		@@ -129,13 +132,19 @@ public class NetworkTypeController extends StateMachine {
		private final BroadcastReceiver mIntentReceiver = new BroadcastReceiver() {
		@Override
		public void onReceive(Context context, Intent intent) {
		if (intent.getAction().equals(CarrierConfigManager.ACTION_CARRIER_CONFIG_CHANGED)
		&& intent.getIntExtra(SubscriptionManager.EXTRA_SLOT_INDEX,
		switch (intent.getAction()) {
		case CarrierConfigManager.ACTION_CARRIER_CONFIG_CHANGED:
		if (intent.getIntExtra(SubscriptionManager.EXTRA_SLOT_INDEX,
		SubscriptionManager.INVALID_PHONE_INDEX) == mPhone.getPhoneId()
		&& !intent.getBooleanExtra(CarrierConfigManager.EXTRA_REBROADCAST_ON_UNLOCK,
		false)) {
		&& !intent.getBooleanExtra(
		CarrierConfigManager.EXTRA_REBROADCAST_ON_UNLOCK, false)) {
		sendMessage(EVENT_CARRIER_CONFIG_CHANGED);
		}
		break;
		case PowerManager.ACTION_DEVICE_IDLE_MODE_CHANGED:
		sendMessage(EVENT_DEVICE_IDLE_MODE_CHANGED);
		break;
		}
		}
		};

		@@ -154,10 +163,11 @@ public class NetworkTypeController extends StateMachine {
		private String mPreviousState;
		private @LinkStatus int mPhysicalLinkStatus;
		private boolean mIsPhysicalChannelConfig16Supported;
		private Boolean mIsNrAdvancedAllowedByPco = false;
		private boolean mIsNrAdvancedAllowedByPco = false;
		private int mNrAdvancedCapablePcoId = 0;
		private boolean mIsUsingUserDataForRrcDetection = false;
		private boolean mEnableNrAdvancedWhileRoaming = true;
		private boolean mIsDeviceIdleMode = false;

		/**
		* NetworkTypeController constructor.
		@@ -220,6 +230,7 @@ public class NetworkTypeController extends StateMachine {
		EVENT_PHYSICAL_CHANNEL_CONFIG_NOTIF_CHANGED, null);
		IntentFilter filter = new IntentFilter();
		filter.addAction(CarrierConfigManager.ACTION_CARRIER_CONFIG_CHANGED);
		filter.addAction(PowerManager.ACTION_DEVICE_IDLE_MODE_CHANGED);
		mPhone.getContext().registerReceiver(mIntentReceiver, filter, null, mPhone);
		if (!mPhone.isUsingNewDataStack()) {
		mPhone.mCi.registerForPcoData(getHandler(), EVENT_PCO_DATA_CHANGED, null);
		@@ -594,6 +605,17 @@ public class NetworkTypeController extends StateMachine {
		resetAllTimers();
		transitionTo(mLegacyState);
		break;
		case EVENT_DEVICE_IDLE_MODE_CHANGED:
		PowerManager pm = mPhone.getContext().getSystemService(PowerManager.class);
		mIsDeviceIdleMode = pm.isDeviceIdleMode();
		if (DBG) {
		log("mIsDeviceIdleMode changed to: " + mIsDeviceIdleMode);
		}
		if (mIsDeviceIdleMode) {
		resetAllTimers();
		}
		transitionToCurrentState();
		break;
		default:
		throw new RuntimeException("Received invalid event: " + msg.what);
		}
		@@ -992,13 +1014,13 @@ public class NetworkTypeController extends StateMachine {
		private void transitionWithTimerTo(IState destState) {
		String destName = destState.getName();
		OverrideTimerRule rule = mOverrideTimerRules.get(mPreviousState);
		if (rule != null && rule.getTimer(destName) > 0) {
		if (!mIsDeviceIdleMode && rule != null && rule.getTimer(destName) > 0) {
		if (DBG) log("Primary timer started for state: " + mPreviousState);
		mPrimaryTimerState = mPreviousState;
		mPreviousState = getCurrentState().getName();
		mIsPrimaryTimerActive = true;
		sendMessageDelayed(EVENT_PRIMARY_TIMER_EXPIRED, destState,
		rule.getTimer(destName) * 1000);
		rule.getTimer(destName) * 1000L);
		}
		transitionTo(destState);
		}
		@@ -1006,13 +1028,13 @@ public class NetworkTypeController extends StateMachine {
		private void transitionWithSecondaryTimerTo(IState destState) {
		String currentName = getCurrentState().getName();
		OverrideTimerRule rule = mOverrideTimerRules.get(mPrimaryTimerState);
		if (rule != null && rule.getSecondaryTimer(currentName) > 0) {
		if (!mIsDeviceIdleMode && rule != null && rule.getSecondaryTimer(currentName) > 0) {
		if (DBG) log("Secondary timer started for state: " + currentName);
		mSecondaryTimerState = currentName;
		mPreviousState = currentName;
		mIsSecondaryTimerActive = true;
		sendMessageDelayed(EVENT_SECONDARY_TIMER_EXPIRED, destState,
		rule.getSecondaryTimer(currentName) * 1000);
		rule.getSecondaryTimer(currentName) * 1000L);
		}
		mIsPrimaryTimerActive = false;
		transitionTo(getCurrentState());
		@@ -1315,13 +1337,19 @@ public class NetworkTypeController extends StateMachine {
		pw.println("mIsTimerRestEnabledForLegacyStateRRCIdle="
		+ mIsTimerResetEnabledForLegacyStateRRCIdle);
		pw.println("mLtePlusThresholdBandwidth=" + mLtePlusThresholdBandwidth);
		pw.println("mNrAdvancedThresholdBandwidth=" + mNrAdvancedThresholdBandwidth);
		pw.println("mPrimaryTimerState=" + mPrimaryTimerState);
		pw.println("mSecondaryTimerState=" + mSecondaryTimerState);
		pw.println("mPreviousState=" + mPreviousState);
		pw.println("mPhysicalLinkStatus=" + mPhysicalLinkStatus);
		pw.println("mAdditionalNrAdvancedBandsList="
		+ Arrays.toString(mAdditionalNrAdvancedBandsList));
		pw.println("mIsPhysicalChannelConfig16Supported=" + mIsPhysicalChannelConfig16Supported);
		pw.println("mIsNrAdvancedAllowedByPco=" + mIsNrAdvancedAllowedByPco);
		pw.println("mNrAdvancedCapablePcoId=" + mNrAdvancedCapablePcoId);
		pw.println("mIsUsingUserDataForRrcDetection=" + mIsUsingUserDataForRrcDetection);
		pw.println("mEnableNrAdvancedWhileRoaming=" + mEnableNrAdvancedWhileRoaming);
		pw.println("mIsDeviceIdleMode=" + mIsDeviceIdleMode);
		pw.decreaseIndent();
		pw.flush();
		}

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

+3 −3

Original line number	Diff line number	Diff line
		@@ -4442,7 +4442,7 @@ public class RILUtils {
		if (record != null) {
		return record.toPhonebookRecordInfoAidl();
		}
		return null;
		return new android.hardware.radio.sim.PhonebookRecordInfo();
		}

		/**

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

+5 −1

Original line number	Diff line number	Diff line
		@@ -22,8 +22,8 @@ import android.text.TextUtils;

		import com.android.internal.telephony.util.ArrayUtils;

		import java.util.Arrays;
		import java.util.ArrayList;
		import java.util.Arrays;

		/**
		* Represents a Phonebook entry from the SIM.
		@@ -92,6 +92,8 @@ public class SimPhonebookRecord {
		pbRecordInfo.number = convertNullToEmptyString(convertNumberToRecordFormat(mNumber));
		if (mEmails != null) {
		pbRecordInfo.emails = mEmails;
		} else {
		pbRecordInfo.emails = new String[0];
		}
		if (mAdditionalNumbers != null) {
		String[] additionalNumbers = new String[mAdditionalNumbers.length];
		@@ -99,6 +101,8 @@ public class SimPhonebookRecord {
		additionalNumbers[i] = convertNumberToRecordFormat(mAdditionalNumbers[i]);
		}
		pbRecordInfo.additionalNumbers = additionalNumbers;
		} else {
		pbRecordInfo.additionalNumbers = new String[0];
		}
		return pbRecordInfo;
		}