Merge "Remove hidden setRadioIndicationUpdateMode in Telephony" am: 7dbf24579e (c06a4f5d) · Commits · e / os / android_frameworks_opt_telephony

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

+6 −59

Original line number	Diff line number	Diff line
		@@ -38,9 +38,7 @@ import android.os.PowerManager;
		import android.telephony.AccessNetworkConstants.AccessNetworkType;
		import android.telephony.CarrierConfigManager;
		import android.telephony.SignalThresholdInfo;
		import android.telephony.TelephonyManager;
		import android.util.LocalLog;
		import android.util.SparseIntArray;
		import android.view.Display;

		import com.android.internal.annotations.VisibleForTesting;
		@@ -67,7 +65,6 @@ public class DeviceStateMonitor extends Handler {
		protected static final String TAG = DeviceStateMonitor.class.getSimpleName();

		static final int EVENT_RIL_CONNECTED = 0;
		static final int EVENT_UPDATE_MODE_CHANGED = 1;
		@VisibleForTesting
		static final int EVENT_SCREEN_STATE_CHANGED = 2;
		static final int EVENT_POWER_SAVE_MODE_CHANGED = 3;
		@@ -175,9 +172,6 @@ public class DeviceStateMonitor extends Handler {
		/** The minimum required wait time between cell info requests to the modem */
		private int mCellInfoMinInterval = CELL_INFO_INTERVAL_SHORT_MS;


		private SparseIntArray mUpdateModes = new SparseIntArray();

		/**
		* The unsolicited response filter. See IndicationFilter defined in types.hal for the definition
		* of each bit.
		@@ -320,13 +314,8 @@ public class DeviceStateMonitor extends Handler {
		// We should not turn off signal strength update if one of the following condition is true.
		// 1. The device is charging.
		// 2. When the screen is on.
		// 3. When the update mode is IGNORE_SCREEN_OFF. This mode is used in some corner cases like
		// when Bluetooth carkit is connected, we still want to update signal strength even
		// when screen is off.
		// 4. Any of system services is registrating to always listen to signal strength changes
		if (mIsAlwaysSignalStrengthReportingEnabled \|\| mIsCharging \|\| mIsScreenOn
		\|\| mUpdateModes.get(TelephonyManager.INDICATION_FILTER_SIGNAL_STRENGTH)
		== TelephonyManager.INDICATION_UPDATE_MODE_IGNORE_SCREEN_OFF) {
		// 3. Any of system services is registrating to always listen to signal strength changes
		if (mIsAlwaysSignalStrengthReportingEnabled \|\| mIsCharging \|\| mIsScreenOn) {
		return false;
		}

		@@ -343,10 +332,7 @@ public class DeviceStateMonitor extends Handler {
		// 1. The device is charging.
		// 2. When the screen is on.
		// 3. When data tethering is on.
		// 4. When the update mode is IGNORE_SCREEN_OFF.
		if (mIsCharging \|\| mIsScreenOn \|\| mIsTetheringOn
		\|\| mUpdateModes.get(TelephonyManager.INDICATION_FILTER_FULL_NETWORK_STATE)
		== TelephonyManager.INDICATION_UPDATE_MODE_IGNORE_SCREEN_OFF) {
		if (mIsCharging \|\| mIsScreenOn \|\| mIsTetheringOn) {
		return false;
		}

		@@ -362,10 +348,7 @@ public class DeviceStateMonitor extends Handler {
		// 1. The device is charging.
		// 2. When the screen is on.
		// 3. When data tethering is on.
		// 4. When the update mode is IGNORE_SCREEN_OFF.
		if (mIsCharging \|\| mIsScreenOn \|\| mIsTetheringOn
		\|\| mUpdateModes.get(TelephonyManager.INDICATION_FILTER_DATA_CALL_DORMANCY_CHANGED)
		== TelephonyManager.INDICATION_UPDATE_MODE_IGNORE_SCREEN_OFF) {
		if (mIsCharging \|\| mIsScreenOn \|\| mIsTetheringOn) {
		return false;
		}

		@@ -381,10 +364,7 @@ public class DeviceStateMonitor extends Handler {
		// 1. The device is charging.
		// 2. When the screen is on.
		// 3. When data tethering is on.
		// 4. When the update mode is IGNORE_SCREEN_OFF.
		if (mIsCharging \|\| mIsScreenOn \|\| mIsTetheringOn
		\|\| mUpdateModes.get(TelephonyManager.INDICATION_FILTER_LINK_CAPACITY_ESTIMATE)
		== TelephonyManager.INDICATION_UPDATE_MODE_IGNORE_SCREEN_OFF) {
		if (mIsCharging \|\| mIsScreenOn \|\| mIsTetheringOn) {
		return false;
		}

		@@ -401,9 +381,7 @@ public class DeviceStateMonitor extends Handler {
		// 2. When the screen is on.
		// 3. When data tethering is on.
		// 4. When the update mode is IGNORE_SCREEN_OFF.
		if (mIsCharging \|\| mIsScreenOn \|\| mIsTetheringOn
		\|\| mUpdateModes.get(TelephonyManager.INDICATION_FILTER_PHYSICAL_CHANNEL_CONFIG)
		== TelephonyManager.INDICATION_UPDATE_MODE_IGNORE_SCREEN_OFF) {
		if (mIsCharging \|\| mIsScreenOn \|\| mIsTetheringOn) {
		return false;
		}

		@@ -411,16 +389,6 @@ public class DeviceStateMonitor extends Handler {
		return true;
		}

		/**
		* Set indication update mode
		*
		* @param filters Indication filters. Should be a bitmask of INDICATION_FILTER_XXX.
		* @param mode The voice activation state
		*/
		public void setIndicationUpdateMode(int filters, int mode) {
		sendMessage(obtainMessage(EVENT_UPDATE_MODE_CHANGED, filters, mode));
		}

		/**
		* Set if Telephony need always report signal strength.
		*
		@@ -430,24 +398,6 @@ public class DeviceStateMonitor extends Handler {
		sendMessage(obtainMessage(EVENT_UPDATE_ALWAYS_REPORT_SIGNAL_STRENGTH, isEnable ? 1 : 0));
		}

		private void onSetIndicationUpdateMode(int filters, int mode) {
		if ((filters & TelephonyManager.INDICATION_FILTER_SIGNAL_STRENGTH) != 0) {
		mUpdateModes.put(TelephonyManager.INDICATION_FILTER_SIGNAL_STRENGTH, mode);
		}
		if ((filters & TelephonyManager.INDICATION_FILTER_FULL_NETWORK_STATE) != 0) {
		mUpdateModes.put(TelephonyManager.INDICATION_FILTER_FULL_NETWORK_STATE, mode);
		}
		if ((filters & TelephonyManager.INDICATION_FILTER_DATA_CALL_DORMANCY_CHANGED) != 0) {
		mUpdateModes.put(TelephonyManager.INDICATION_FILTER_DATA_CALL_DORMANCY_CHANGED, mode);
		}
		if ((filters & TelephonyManager.INDICATION_FILTER_LINK_CAPACITY_ESTIMATE) != 0) {
		mUpdateModes.put(TelephonyManager.INDICATION_FILTER_LINK_CAPACITY_ESTIMATE, mode);
		}
		if ((filters & TelephonyManager.INDICATION_FILTER_PHYSICAL_CHANNEL_CONFIG) != 0) {
		mUpdateModes.put(TelephonyManager.INDICATION_FILTER_PHYSICAL_CHANNEL_CONFIG, mode);
		}
		}

		/**
		* Message handler
		*
		@@ -461,9 +411,6 @@ public class DeviceStateMonitor extends Handler {
		case EVENT_RADIO_AVAILABLE:
		onReset();
		break;
		case EVENT_UPDATE_MODE_CHANGED:
		onSetIndicationUpdateMode(msg.arg1, msg.arg2);
		break;
		case EVENT_SCREEN_STATE_CHANGED:
		case EVENT_POWER_SAVE_MODE_CHANGED:
		case EVENT_CHARGING_STATE_CHANGED:

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

+0 −6

Original line number	Diff line number	Diff line
		@@ -4127,12 +4127,6 @@ public abstract class Phone extends Handler implements PhoneInternalInterface {
		mCi.setSimCardPower(state, null, workSource);
		}

		public void setRadioIndicationUpdateMode(int filters, int mode) {
		if (mDeviceStateMonitor != null) {
		mDeviceStateMonitor.setIndicationUpdateMode(filters, mode);
		}
		}

		public void setCarrierTestOverride(String mccmnc, String imsi, String iccid, String gid1,
		String gid2, String pnn, String spn, String carrierPrivilegeRules, String apn) {
		}