Merge "DO NOT MERGE: Add radio state condition for high power indications" (e4b65f09) · Commits · e / os / android_frameworks_opt_telephony

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

+37 −4

Original line number	Diff line number	Diff line
		@@ -82,6 +82,8 @@ public class DeviceStateMonitor extends Handler {
		@VisibleForTesting
		static final int EVENT_WIFI_CONNECTION_CHANGED = 7;
		static final int EVENT_UPDATE_ALWAYS_REPORT_SIGNAL_STRENGTH = 8;
		static final int EVENT_RADIO_ON = 9;
		static final int EVENT_RADIO_OFF_OR_NOT_AVAILABLE = 10;

		private static final int WIFI_UNAVAILABLE = 0;
		private static final int WIFI_AVAILABLE = 1;
		@@ -179,6 +181,12 @@ public class DeviceStateMonitor extends Handler {
		*/
		private boolean mIsCarModeOn;

		/**
		* Radio is on. False means that radio is either off or not available and it is ok to reduce
		* commands to the radio to avoid unnecessary power consumption.
		*/
		private boolean mIsRadioOn;

		/**
		* True indicates we should always enable the signal strength reporting from radio.
		*/
		@@ -279,6 +287,7 @@ public class DeviceStateMonitor extends Handler {
		mIsPowerSaveOn = isPowerSaveModeOn();
		mIsCharging = isDeviceCharging();
		mIsScreenOn = isScreenOn();
		mIsRadioOn = isRadioOn();
		mIsCarModeOn = isCarModeOn();
		// Assuming tethering is always off after boot up.
		mIsTetheringOn = false;
		@@ -292,7 +301,8 @@ public class DeviceStateMonitor extends Handler {
		+ ", mIsCarModeOn=" + mIsCarModeOn
		+ ", mIsWifiConnected=" + mIsWifiConnected
		+ ", mIsAlwaysSignalStrengthReportingEnabled="
		+ mIsAlwaysSignalStrengthReportingEnabled, false);
		+ mIsAlwaysSignalStrengthReportingEnabled
		+ ", mIsRadioOn=" + mIsRadioOn, false);

		final IntentFilter filter = new IntentFilter();
		filter.addAction(PowerManager.ACTION_POWER_SAVE_MODE_CHANGED);
		@@ -305,6 +315,8 @@ public class DeviceStateMonitor extends Handler {

		mPhone.mCi.registerForRilConnected(this, EVENT_RIL_CONNECTED, null);
		mPhone.mCi.registerForAvailable(this, EVENT_RADIO_AVAILABLE, null);
		mPhone.mCi.registerForOn(this, EVENT_RADIO_ON, null);
		mPhone.mCi.registerForOffOrNotAvailable(this, EVENT_RADIO_OFF_OR_NOT_AVAILABLE, null);

		ConnectivityManager cm = (ConnectivityManager) phone.getContext().getSystemService(
		Context.CONNECTIVITY_SERVICE);
		@@ -315,7 +327,7 @@ public class DeviceStateMonitor extends Handler {
		* @return True if low data is expected
		*/
		private boolean isLowDataExpected() {
		return !mIsCharging && !mIsTetheringOn && !mIsScreenOn;
		return (!mIsCharging && !mIsTetheringOn && !mIsScreenOn) \|\| !mIsRadioOn;
		}

		/**
		@@ -399,12 +411,14 @@ public class DeviceStateMonitor extends Handler {
		* @return True if the response update should be enabled.
		*/
		public boolean shouldEnableHighPowerConsumptionIndications() {
		// We should enable indications reports if one of the following condition is true.
		// We should enable indications reports if radio is on and one of the following conditions
		// is true:
		// 1. The device is charging.
		// 2. When the screen is on.
		// 3. When the tethering is on.
		// 4. When car mode (Android Auto) is on.
		return mIsCharging \|\| mIsScreenOn \|\| mIsTetheringOn \|\| mIsCarModeOn;
		return (mIsCharging \|\| mIsScreenOn \|\| mIsTetheringOn \|\| mIsCarModeOn)
		&& mIsRadioOn;
		}

		/**
		@@ -455,6 +469,12 @@ public class DeviceStateMonitor extends Handler {
		case EVENT_RADIO_AVAILABLE:
		onReset();
		break;
		case EVENT_RADIO_ON:
		onUpdateDeviceState(msg.what, /* state= */ true);
		break;
		case EVENT_RADIO_OFF_OR_NOT_AVAILABLE:
		onUpdateDeviceState(msg.what, /* state= */ false);
		break;
		case EVENT_SCREEN_STATE_CHANGED:
		case EVENT_POWER_SAVE_MODE_CHANGED:
		case EVENT_CHARGING_STATE_CHANGED:
		@@ -490,6 +510,11 @@ public class DeviceStateMonitor extends Handler {
		mIsCharging = state;
		sendDeviceState(CHARGING_STATE, mIsCharging);
		break;
		case EVENT_RADIO_ON:
		case EVENT_RADIO_OFF_OR_NOT_AVAILABLE:
		if (mIsRadioOn == state) return;
		mIsRadioOn = state;
		break;
		case EVENT_TETHERING_STATE_CHANGED:
		if (mIsTetheringOn == state) return;
		mIsTetheringOn = state;
		@@ -739,6 +764,13 @@ public class DeviceStateMonitor extends Handler {
		return false;
		}

		/**
		* @return True if the radio is on.
		*/
		private boolean isRadioOn() {
		return mPhone.isRadioOn();
		}

		/**
		* @return True if car mode (Android Auto) is on.
		*/
		@@ -804,6 +836,7 @@ public class DeviceStateMonitor extends Handler {
		ipw.println("mIsWifiConnected=" + mIsWifiConnected);
		ipw.println("mIsAlwaysSignalStrengthReportingEnabled="
		+ mIsAlwaysSignalStrengthReportingEnabled);
		ipw.println("mIsRadioOn=" + mIsRadioOn);
		ipw.println("Local logs:");
		ipw.increaseIndent();
		mLocalLog.dump(fd, ipw, args);

tests/telephonytests/src/com/android/internal/telephony/DeviceStateMonitorTest.java

+52 −3

Original line number	Diff line number	Diff line
		@@ -92,7 +92,6 @@ public class DeviceStateMonitorTest extends TelephonyTest {
		// Keep the same value as correspoinding event
		// See state2Event() for detail
		private static final int STATE_TYPE_RIL_CONNECTED = 0;
		// EVENT_UPDATE_NODE_CHANGED is not here, it will be removed in aosp soon
		private static final int STATE_TYPE_SCREEN = 2;
		private static final int STATE_TYPE_POWER_SAVE_MODE = 3;
		private static final int STATE_TYPE_CHARGING = 4;
		@@ -100,6 +99,8 @@ public class DeviceStateMonitorTest extends TelephonyTest {
		private static final int STATE_TYPE_RADIO_AVAILABLE = 6;
		private static final int STATE_TYPE_WIFI_CONNECTED = 7;
		private static final int STATE_TYPE_ALWAYS_SIGNAL_STRENGTH_REPORTED = 8;
		private static final int STATE_TYPE_RADIO_ON = 9;
		private static final int STATE_TYPE_RADIO_OFF_OR_NOT_AVAILABLE = 10;

		/** @hide */
		@IntDef(prefix = {"STATE_"}, value = {
		@@ -226,19 +227,42 @@ public class DeviceStateMonitorTest extends TelephonyTest {
		public void testScreenOnOff() {
		// screen was off by default, turn it on now
		updateState(STATE_TYPE_SCREEN, STATE_ON);
		processAllMessages();

		verify(mSimulatedCommandsVerifier).setUnsolResponseFilter(
		eq(INDICATION_FILTERS_WHEN_SCREEN_ON), nullable(Message.class));

		// turn screen off
		updateState(STATE_TYPE_SCREEN, STATE_OFF);
		processAllMessages();

		verify(mSimulatedCommandsVerifier).setUnsolResponseFilter(
		eq(INDICATION_FILTERS_MINIMUM), nullable(Message.class));
		}

		@Test
		public void testScreenOnOffwithRadioToggle() {
		// screen was off by default, turn it on now
		updateState(STATE_TYPE_SCREEN, STATE_ON);
		// turn off radio
		updateState(STATE_TYPE_RADIO_OFF_OR_NOT_AVAILABLE, /* stateValue is not used */ 0);

		verify(mSimulatedCommandsVerifier)
		.sendDeviceState(eq(LOW_DATA_EXPECTED), eq(true), nullable(Message.class));
		reset(mSimulatedCommandsVerifier);

		// turn screen off and on
		updateState(STATE_TYPE_SCREEN, STATE_OFF);
		updateState(STATE_TYPE_SCREEN, STATE_ON);

		verify(mSimulatedCommandsVerifier, never())
		.sendDeviceState(anyInt(), anyBoolean(), nullable(Message.class));

		// turn on radio
		updateState(STATE_TYPE_RADIO_ON, /* stateValue is not used */ 0);

		verify(mSimulatedCommandsVerifier)
		.sendDeviceState(eq(LOW_DATA_EXPECTED), eq(false), nullable(Message.class));
		}

		@Test
		public void testTethering() {
		// Turn tethering on
		@@ -366,4 +390,29 @@ public class DeviceStateMonitorTest extends TelephonyTest {
		updateState(STATE_TYPE_SCREEN, STATE_ON);
		verify(mSimulatedCommandsVerifier).getBarringInfo(nullable(Message.class));
		}

		@Test
		public void testGetBarringInfowithRadioToggle() {
		// screen was off by default, turn it on now
		updateState(STATE_TYPE_SCREEN, STATE_ON);

		verify(mSimulatedCommandsVerifier).getBarringInfo(nullable(Message.class));
		reset(mSimulatedCommandsVerifier);

		// turn off radio
		updateState(STATE_TYPE_RADIO_OFF_OR_NOT_AVAILABLE, /* stateValue is not used */ 0);

		verify(mSimulatedCommandsVerifier, never()).getBarringInfo(nullable(Message.class));

		// turn screen off and on
		updateState(STATE_TYPE_SCREEN, STATE_OFF);
		updateState(STATE_TYPE_SCREEN, STATE_ON);

		verify(mSimulatedCommandsVerifier, never()).getBarringInfo(nullable(Message.class));

		// turn on radio
		updateState(STATE_TYPE_RADIO_ON, /* stateValue is not used */ 0);

		verify(mSimulatedCommandsVerifier).getBarringInfo(nullable(Message.class));
		}
		}