Merge "Remove references to IRadio HIDL" (d7476641) · Commits · e / os / android_frameworks_base

Android.bp

+4 −8

Original line number	Diff line number	Diff line
		@@ -100,6 +100,10 @@ filegroup {
		":android.hardware.gnss-V2-java-source",
		":android.hardware.graphics.common-V3-java-source",
		":android.hardware.keymaster-V4-java-source",
		":android.hardware.radio-V3-java-source",
		":android.hardware.radio.data-V3-java-source",
		":android.hardware.radio.network-V3-java-source",
		":android.hardware.radio.voice-V3-java-source",
		":android.hardware.security.keymint-V3-java-source",
		":android.hardware.security.secureclock-V1-java-source",
		":android.hardware.thermal-V1-java-source",
		@@ -212,12 +216,6 @@ java_library {
		"android.hardware.gnss-V1.0-java",
		"android.hardware.gnss-V2.1-java",
		"android.hardware.health-V1.0-java-constants",
		"android.hardware.radio-V1.0-java",
		"android.hardware.radio-V1.1-java",
		"android.hardware.radio-V1.2-java",
		"android.hardware.radio-V1.3-java",
		"android.hardware.radio-V1.4-java",
		"android.hardware.radio-V1.5-java",
		"android.hardware.radio-V1.6-java",
		"android.hardware.radio.data-V3-java",
		"android.hardware.radio.ims-V2-java",
		@@ -650,8 +648,6 @@ stubs_defaults {
		libs: [
		"android.hardware.cas-V1.2-java",
		"android.hardware.health-V1.0-java-constants",
		"android.hardware.radio-V1.5-java",
		"android.hardware.radio-V1.6-java",
		"android.hardware.thermal-V1.0-java-constants",
		"android.hardware.thermal-V2.0-java",
		"android.hardware.tv.input-V1.0-java-constants",

services/tests/servicestests/src/com/android/server/power/stats/BatteryStatsNoteTest.java

+22 −12

Original line number	Diff line number	Diff line
		@@ -32,7 +32,6 @@ import static org.mockito.Mockito.mock;

		import android.app.ActivityManager;
		import android.app.usage.NetworkStatsManager;
		import android.hardware.radio.V1_5.AccessNetwork;
		import android.os.BatteryStats;
		import android.os.BatteryStats.HistoryItem;
		import android.os.BatteryStats.Uid.Sensor;
		@@ -1727,27 +1726,38 @@ public class BatteryStatsNoteTest extends TestCase {
		}
		}

		specificInfoList.add(new ActivityStatsTechSpecificInfo(AccessNetwork.UNKNOWN,
		specificInfoList.add(new ActivityStatsTechSpecificInfo(
		AccessNetworkConstants.AccessNetworkType.UNKNOWN,
		ServiceState.FREQUENCY_RANGE_UNKNOWN, new int[txLevelCount], 0));
		specificInfoList.add(new ActivityStatsTechSpecificInfo(AccessNetwork.GERAN,
		specificInfoList.add(new ActivityStatsTechSpecificInfo(
		AccessNetworkConstants.AccessNetworkType.GERAN,
		ServiceState.FREQUENCY_RANGE_UNKNOWN, new int[txLevelCount], 0));
		specificInfoList.add(new ActivityStatsTechSpecificInfo(AccessNetwork.UTRAN,
		specificInfoList.add(new ActivityStatsTechSpecificInfo(
		AccessNetworkConstants.AccessNetworkType.UTRAN,
		ServiceState.FREQUENCY_RANGE_UNKNOWN, new int[txLevelCount], 0));
		specificInfoList.add(new ActivityStatsTechSpecificInfo(AccessNetwork.EUTRAN,
		specificInfoList.add(new ActivityStatsTechSpecificInfo(
		AccessNetworkConstants.AccessNetworkType.EUTRAN,
		ServiceState.FREQUENCY_RANGE_UNKNOWN, new int[txLevelCount], 0));
		specificInfoList.add(new ActivityStatsTechSpecificInfo(AccessNetwork.CDMA2000,
		specificInfoList.add(new ActivityStatsTechSpecificInfo(
		AccessNetworkConstants.AccessNetworkType.CDMA2000,
		ServiceState.FREQUENCY_RANGE_UNKNOWN, new int[txLevelCount], 0));
		specificInfoList.add(new ActivityStatsTechSpecificInfo(AccessNetwork.IWLAN,
		specificInfoList.add(new ActivityStatsTechSpecificInfo(
		AccessNetworkConstants.AccessNetworkType.IWLAN,
		ServiceState.FREQUENCY_RANGE_UNKNOWN, new int[txLevelCount], 0));
		specificInfoList.add(new ActivityStatsTechSpecificInfo(AccessNetwork.NGRAN,
		specificInfoList.add(new ActivityStatsTechSpecificInfo(
		AccessNetworkConstants.AccessNetworkType.NGRAN,
		ServiceState.FREQUENCY_RANGE_UNKNOWN, new int[txLevelCount], 0));
		specificInfoList.add(new ActivityStatsTechSpecificInfo(AccessNetwork.NGRAN,
		specificInfoList.add(new ActivityStatsTechSpecificInfo(
		AccessNetworkConstants.AccessNetworkType.NGRAN,
		ServiceState.FREQUENCY_RANGE_LOW, new int[txLevelCount], 0));
		specificInfoList.add(new ActivityStatsTechSpecificInfo(AccessNetwork.NGRAN,
		specificInfoList.add(new ActivityStatsTechSpecificInfo(
		AccessNetworkConstants.AccessNetworkType.NGRAN,
		ServiceState.FREQUENCY_RANGE_MID, new int[txLevelCount], 0));
		specificInfoList.add(new ActivityStatsTechSpecificInfo(AccessNetwork.NGRAN,
		specificInfoList.add(new ActivityStatsTechSpecificInfo(
		AccessNetworkConstants.AccessNetworkType.NGRAN,
		ServiceState.FREQUENCY_RANGE_HIGH, new int[txLevelCount], 0));
		specificInfoList.add(new ActivityStatsTechSpecificInfo(AccessNetwork.NGRAN,
		specificInfoList.add(new ActivityStatsTechSpecificInfo(
		AccessNetworkConstants.AccessNetworkType.NGRAN,
		ServiceState.FREQUENCY_RANGE_MMWAVE, new int[txLevelCount], 0));

		final ActivityStatsTechSpecificInfo[] specificInfos = specificInfoList.toArray(

services/tests/servicestests/src/com/android/server/power/stats/MobileRadioPowerCalculatorTest.java

+17 −13

Original line number	Diff line number	Diff line
		@@ -27,7 +27,6 @@ import static org.mockito.Mockito.mock;
		import static org.mockito.Mockito.when;

		import android.app.usage.NetworkStatsManager;
		import android.hardware.radio.V1_5.AccessNetwork;
		import android.net.NetworkCapabilities;
		import android.net.NetworkStats;
		import android.os.BatteryConsumer;
		@@ -35,6 +34,7 @@ import android.os.BatteryStats;
		import android.os.BatteryUsageStatsQuery;
		import android.os.Process;
		import android.os.UidBatteryConsumer;
		import android.telephony.AccessNetworkConstants;
		import android.telephony.ActivityStatsTechSpecificInfo;
		import android.telephony.CellSignalStrength;
		import android.telephony.DataConnectionRealTimeInfo;
		@@ -248,22 +248,24 @@ public class MobileRadioPowerCalculatorTest {
		mStatsRule.setNetworkStats(networkStats);

		ActivityStatsTechSpecificInfo cdmaInfo = new ActivityStatsTechSpecificInfo(
		AccessNetwork.CDMA2000, ServiceState.FREQUENCY_RANGE_UNKNOWN,
		AccessNetworkConstants.AccessNetworkType.CDMA2000,
		ServiceState.FREQUENCY_RANGE_UNKNOWN,
		new int[]{10, 11, 12, 13, 14}, 15);
		ActivityStatsTechSpecificInfo lteInfo = new ActivityStatsTechSpecificInfo(
		AccessNetwork.EUTRAN, ServiceState.FREQUENCY_RANGE_UNKNOWN,
		AccessNetworkConstants.AccessNetworkType.EUTRAN,
		ServiceState.FREQUENCY_RANGE_UNKNOWN,
		new int[]{20, 21, 22, 23, 24}, 25);
		ActivityStatsTechSpecificInfo nrLowFreqInfo = new ActivityStatsTechSpecificInfo(
		AccessNetwork.NGRAN, ServiceState.FREQUENCY_RANGE_LOW,
		AccessNetworkConstants.AccessNetworkType.NGRAN, ServiceState.FREQUENCY_RANGE_LOW,
		new int[]{30, 31, 32, 33, 34}, 35);
		ActivityStatsTechSpecificInfo nrMidFreqInfo = new ActivityStatsTechSpecificInfo(
		AccessNetwork.NGRAN, ServiceState.FREQUENCY_RANGE_MID,
		AccessNetworkConstants.AccessNetworkType.NGRAN, ServiceState.FREQUENCY_RANGE_MID,
		new int[]{40, 41, 42, 43, 44}, 45);
		ActivityStatsTechSpecificInfo nrHighFreqInfo = new ActivityStatsTechSpecificInfo(
		AccessNetwork.NGRAN, ServiceState.FREQUENCY_RANGE_HIGH,
		AccessNetworkConstants.AccessNetworkType.NGRAN, ServiceState.FREQUENCY_RANGE_HIGH,
		new int[]{50, 51, 52, 53, 54}, 55);
		ActivityStatsTechSpecificInfo nrMmwaveFreqInfo = new ActivityStatsTechSpecificInfo(
		AccessNetwork.NGRAN, ServiceState.FREQUENCY_RANGE_MMWAVE,
		AccessNetworkConstants.AccessNetworkType.NGRAN, ServiceState.FREQUENCY_RANGE_MMWAVE,
		new int[]{60, 61, 62, 63, 64}, 65);

		ActivityStatsTechSpecificInfo[] ratInfos =
		@@ -719,22 +721,24 @@ public class MobileRadioPowerCalculatorTest {
		mStatsRule.setNetworkStats(networkStats);

		ActivityStatsTechSpecificInfo cdmaInfo = new ActivityStatsTechSpecificInfo(
		AccessNetwork.CDMA2000, ServiceState.FREQUENCY_RANGE_UNKNOWN,
		AccessNetworkConstants.AccessNetworkType.CDMA2000,
		ServiceState.FREQUENCY_RANGE_UNKNOWN,
		new int[]{10, 11, 12, 13, 14}, 15);
		ActivityStatsTechSpecificInfo lteInfo = new ActivityStatsTechSpecificInfo(
		AccessNetwork.EUTRAN, ServiceState.FREQUENCY_RANGE_UNKNOWN,
		AccessNetworkConstants.AccessNetworkType.EUTRAN,
		ServiceState.FREQUENCY_RANGE_UNKNOWN,
		new int[]{20, 21, 22, 23, 24}, 25);
		ActivityStatsTechSpecificInfo nrLowFreqInfo = new ActivityStatsTechSpecificInfo(
		AccessNetwork.NGRAN, ServiceState.FREQUENCY_RANGE_LOW,
		AccessNetworkConstants.AccessNetworkType.NGRAN, ServiceState.FREQUENCY_RANGE_LOW,
		new int[]{30, 31, 32, 33, 34}, 35);
		ActivityStatsTechSpecificInfo nrMidFreqInfo = new ActivityStatsTechSpecificInfo(
		AccessNetwork.NGRAN, ServiceState.FREQUENCY_RANGE_MID,
		AccessNetworkConstants.AccessNetworkType.NGRAN, ServiceState.FREQUENCY_RANGE_MID,
		new int[]{40, 41, 42, 43, 44}, 45);
		ActivityStatsTechSpecificInfo nrHighFreqInfo = new ActivityStatsTechSpecificInfo(
		AccessNetwork.NGRAN, ServiceState.FREQUENCY_RANGE_HIGH,
		AccessNetworkConstants.AccessNetworkType.NGRAN, ServiceState.FREQUENCY_RANGE_HIGH,
		new int[]{50, 51, 52, 53, 54}, 55);
		ActivityStatsTechSpecificInfo nrMmwaveFreqInfo = new ActivityStatsTechSpecificInfo(
		AccessNetwork.NGRAN, ServiceState.FREQUENCY_RANGE_MMWAVE,
		AccessNetworkConstants.AccessNetworkType.NGRAN, ServiceState.FREQUENCY_RANGE_MMWAVE,
		new int[]{60, 61, 62, 63, 64}, 65);

		ActivityStatsTechSpecificInfo[] ratInfos =

telephony/java/android/telephony/AccessNetworkConstants.java

+156 −154

File changed.

Preview size limit exceeded, changes collapsed.

telephony/java/android/telephony/BarringInfo.java

+14 −14

Original line number	Diff line number	Diff line
		@@ -58,41 +58,41 @@ public final class BarringInfo implements Parcelable {
		BARRING_SERVICE_TYPE_SMS})
		public @interface BarringServiceType {}

		/* Applicabe to UTRAN */
		/* Applicable to UTRAN */
		/** Barring indicator for circuit-switched service; applicable to UTRAN */
		public static final int BARRING_SERVICE_TYPE_CS_SERVICE =
		android.hardware.radio.V1_5.BarringInfo.ServiceType.CS_SERVICE;
		android.hardware.radio.network.BarringInfo.SERVICE_TYPE_CS_SERVICE;
		/** Barring indicator for packet-switched service; applicable to UTRAN */
		public static final int BARRING_SERVICE_TYPE_PS_SERVICE =
		android.hardware.radio.V1_5.BarringInfo.ServiceType.PS_SERVICE;
		android.hardware.radio.network.BarringInfo.SERVICE_TYPE_PS_SERVICE;
		/** Barring indicator for circuit-switched voice service; applicable to UTRAN */
		public static final int BARRING_SERVICE_TYPE_CS_VOICE =
		android.hardware.radio.V1_5.BarringInfo.ServiceType.CS_VOICE;
		android.hardware.radio.network.BarringInfo.SERVICE_TYPE_CS_VOICE;

		/* Applicable to EUTRAN, NGRAN */
		/** Barring indicator for mobile-originated signalling; applicable to EUTRAN and NGRAN */
		public static final int BARRING_SERVICE_TYPE_MO_SIGNALLING =
		android.hardware.radio.V1_5.BarringInfo.ServiceType.MO_SIGNALLING;
		android.hardware.radio.network.BarringInfo.SERVICE_TYPE_MO_SIGNALLING;
		/** Barring indicator for mobile-originated data traffic; applicable to EUTRAN and NGRAN */
		public static final int BARRING_SERVICE_TYPE_MO_DATA =
		android.hardware.radio.V1_5.BarringInfo.ServiceType.MO_DATA;
		android.hardware.radio.network.BarringInfo.SERVICE_TYPE_MO_DATA;
		/** Barring indicator for circuit-switched fallback for voice; applicable to EUTRAN and NGRAN */
		public static final int BARRING_SERVICE_TYPE_CS_FALLBACK =
		android.hardware.radio.V1_5.BarringInfo.ServiceType.CS_FALLBACK;
		android.hardware.radio.network.BarringInfo.SERVICE_TYPE_CS_FALLBACK;
		/** Barring indicator for MMTEL (IMS) voice; applicable to EUTRAN and NGRAN */
		public static final int BARRING_SERVICE_TYPE_MMTEL_VOICE =
		android.hardware.radio.V1_5.BarringInfo.ServiceType.MMTEL_VOICE;
		android.hardware.radio.network.BarringInfo.SERVICE_TYPE_MMTEL_VOICE;
		/** Barring indicator for MMTEL (IMS) video; applicable to EUTRAN and NGRAN */
		public static final int BARRING_SERVICE_TYPE_MMTEL_VIDEO =
		android.hardware.radio.V1_5.BarringInfo.ServiceType.MMTEL_VIDEO;
		android.hardware.radio.network.BarringInfo.SERVICE_TYPE_MMTEL_VIDEO;

		/* Applicable to UTRAN, EUTRAN, NGRAN */
		/** Barring indicator for emergency services; applicable to UTRAN, EUTRAN, and NGRAN */
		public static final int BARRING_SERVICE_TYPE_EMERGENCY =
		android.hardware.radio.V1_5.BarringInfo.ServiceType.EMERGENCY;
		android.hardware.radio.network.BarringInfo.SERVICE_TYPE_EMERGENCY;
		/** Barring indicator for SMS sending; applicable to UTRAN, EUTRAN, and NGRAN */
		public static final int BARRING_SERVICE_TYPE_SMS =
		android.hardware.radio.V1_5.BarringInfo.ServiceType.SMS;
		android.hardware.radio.network.BarringInfo.SERVICE_TYPE_SMS;

		//TODO: add barring constants for Operator-Specific barring codes

		@@ -112,13 +112,13 @@ public final class BarringInfo implements Parcelable {

		/** Barring is inactive */
		public static final int BARRING_TYPE_NONE =
		android.hardware.radio.V1_5.BarringInfo.BarringType.NONE;
		android.hardware.radio.network.BarringInfo.BARRING_TYPE_NONE;
		/** The service is barred */
		public static final int BARRING_TYPE_UNCONDITIONAL =
		android.hardware.radio.V1_5.BarringInfo.BarringType.UNCONDITIONAL;
		android.hardware.radio.network.BarringInfo.BARRING_TYPE_UNCONDITIONAL;
		/** The service may be barred based on additional factors */
		public static final int BARRING_TYPE_CONDITIONAL =
		android.hardware.radio.V1_5.BarringInfo.BarringType.CONDITIONAL;
		android.hardware.radio.network.BarringInfo.BARRING_TYPE_CONDITIONAL;

		/** If a modem does not report barring info, then the barring type will be UNKNOWN */
		public static final int BARRING_TYPE_UNKNOWN = -1;