Merge "Fix HIDL re-connect fail after switching from Mock Modem" (ab907ab0) · Commits · e / os / android_frameworks_opt_telephony

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

+13 −2

Original line number	Diff line number	Diff line
		@@ -565,9 +565,20 @@ public class RIL extends BaseCommands implements CommandsInterface {
		if (mMockModem != null) {
		mMockModem = null;
		for (int service = MIN_SERVICE_IDX; service <= MAX_SERVICE_IDX; service++) {
		if (service == HAL_SERVICE_RADIO) {
		if (isRadioVersion2_0()) {
		mHalVersion.put(service, RADIO_HAL_VERSION_2_0);
		} else {
		mHalVersion.put(service, RADIO_HAL_VERSION_UNKNOWN);
		}
		} else {
		if (isRadioServiceSupported(service)) {
		resetProxyAndRequestList(service);
		mHalVersion.put(service, RADIO_HAL_VERSION_UNKNOWN);
		} else {
		mHalVersion.put(service, RADIO_HAL_VERSION_UNSUPPORTED);
		}
		}
		resetProxyAndRequestList(service);
		}
		}
		}