Merge "Add new IRadio HAL version 2.2" (d5adca90) · Commits · e / os / android_frameworks_opt_telephony

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

+5 −2

Original line number	Diff line number	Diff line
		@@ -164,8 +164,11 @@ public class RIL extends BaseCommands implements CommandsInterface {
		/** @hide */
		public static final HalVersion RADIO_HAL_VERSION_2_1 = new HalVersion(2, 1);

		/** @hide */
		public static final HalVersion RADIO_HAL_VERSION_2_2 = new HalVersion(2, 2);

		// Hal version
		private Map<Integer, HalVersion> mHalVersion = new HashMap<>();
		private final Map<Integer, HalVersion> mHalVersion = new HashMap<>();

		//***** Instance Variables

		@@ -6415,7 +6418,7 @@ public class RIL extends BaseCommands implements CommandsInterface {
		switch (interfaceVersion) {
		case 1: return RADIO_HAL_VERSION_2_0;
		case 2: return RADIO_HAL_VERSION_2_1;
		case 3: return RADIO_HAL_VERSION_2_1; // for now
		case 3: return RADIO_HAL_VERSION_2_2;
		default: return RADIO_HAL_VERSION_UNKNOWN;
		}
		}