Merge "Merge pi-qpr1-release PQ1A.181105.017.A1 to pi-platform-release am: e78d749f7b" into pie-gsi (20ac52ac) · Commits · e / os / android_frameworks_opt_telephony

proto/src/telephony.proto

+9 −0

Original line number	Diff line number	Diff line
		@@ -47,6 +47,9 @@ message TelephonyLog {

		// Modem power stats
		optional ModemPowerStats modem_power_stats = 8;

		// Hardware revision (EVT, DVT, PVT etc.)
		optional string hardware_revision = 9;
		}

		// The time information
		@@ -1355,6 +1358,12 @@ message SmsSession {

		// Service category of CB message
		optional int32 service_category = 4;

		// Message's serial number
		optional int32 serial_number = 5;

		// The delivered time (UTC) of the message
		optional int64 delivered_timestamp_millis = 6;
		}

		enum CBMessageType {

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -88,7 +88,8 @@ public class CellBroadcastHandler extends WakeLockStateMachine {
		TelephonyMetrics metrics = TelephonyMetrics.getInstance();
		metrics.writeNewCBSms(mPhone.getPhoneId(), message.getMessageFormat(),
		message.getMessagePriority(), message.isCmasMessage(), message.isEtwsMessage(),
		message.getServiceCategory());
		message.getServiceCategory(), message.getSerialNumber(),
		System.currentTimeMillis());

		Intent intent;
		if (message.isEmergencyMessage()) {

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

+8 −0

Original line number	Diff line number	Diff line
		@@ -107,6 +107,7 @@ public abstract class Connection {
		public void onDisconnect(int cause);
		public void onRttInitiated();
		public void onRttTerminated();
		public void onOriginalConnectionReplaced(Connection newConnection);
		}

		/**
		@@ -152,6 +153,8 @@ public abstract class Connection {
		public void onRttInitiated() {}
		@Override
		public void onRttTerminated() {}
		@Override
		public void onOriginalConnectionReplaced(Connection newConnection) {}
		}

		public static final int AUDIO_QUALITY_STANDARD = 1;
		@@ -1022,6 +1025,11 @@ public abstract class Connection {
		}
		}

		public void onOriginalConnectionReplaced(Connection newConnection) {
		for (Listener l : mListeners) {
		l.onOriginalConnectionReplaced(newConnection);
		}
		}
		/**
		* Notifies the connection that there was a failure while handing over to WIFI.
		*/

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

+7 −4

Original line number	Diff line number	Diff line
		@@ -64,6 +64,7 @@ public class DeviceStateMonitor extends Handler {
		private static final int EVENT_POWER_SAVE_MODE_CHANGED = 3;
		private static final int EVENT_CHARGING_STATE_CHANGED = 4;
		private static final int EVENT_TETHERING_STATE_CHANGED = 5;
		private static final int EVENT_RADIO_AVAILABLE = 6;

		// TODO(b/74006656) load hysteresis values from a property when DeviceStateMonitor starts
		private static final int HYSTERESIS_KBPS = 50;
		@@ -200,6 +201,7 @@ public class DeviceStateMonitor extends Handler {
		mPhone.getContext().registerReceiver(mBroadcastReceiver, filter, null, mPhone);

		mPhone.mCi.registerForRilConnected(this, EVENT_RIL_CONNECTED, null);
		mPhone.mCi.registerForAvailable(this, EVENT_RADIO_AVAILABLE, null);
		}

		/**
		@@ -344,7 +346,8 @@ public class DeviceStateMonitor extends Handler {
		log("handleMessage msg=" + msg, false);
		switch (msg.what) {
		case EVENT_RIL_CONNECTED:
		onRilConnected();
		case EVENT_RADIO_AVAILABLE:
		onReset();
		break;
		case EVENT_UPDATE_MODE_CHANGED:
		onSetIndicationUpdateMode(msg.arg1, msg.arg2);
		@@ -420,14 +423,14 @@ public class DeviceStateMonitor extends Handler {
		}

		/**
		* Called when RIL is connected during boot up or reconnected after modem restart.
		* Called when RIL is connected during boot up or radio becomes available after modem restart.
		*
		* When modem crashes, if the user turns the screen off before RIL reconnects, device
		* state and filter cannot be sent to modem. Resend the state here so that modem
		* has the correct state (to stop signal strength reporting, etc).
		*/
		private void onRilConnected() {
		log("RIL connected.", true);
		private void onReset() {
		log("onReset.", true);
		sendDeviceState(CHARGING_STATE, mIsCharging);
		sendDeviceState(LOW_DATA_EXPECTED, mIsLowDataExpected);
		sendDeviceState(POWER_SAVE_MODE, mIsPowerSaveOn);

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

+6 −0

Original line number	Diff line number	Diff line
		@@ -1682,7 +1682,13 @@ public class GsmCdmaPhone extends Phone {
		Message resp;
		mVmNumber = voiceMailNumber;
		resp = obtainMessage(EVENT_SET_VM_NUMBER_DONE, 0, 0, onComplete);

		IccRecords r = mIccRecords.get();

		if (!isPhoneTypeGsm() && mSimRecords != null) {
		r = mSimRecords;
		}

		if (r != null) {
		r.setVoiceMailNumber(alphaTag, mVmNumber, resp);
		}