Merge "Correct the value of cookie" into udc-dev (a0d196d6) · Commits · e / os / android_frameworks_opt_telephony

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

+5 −5

Original line number	Diff line number	Diff line
		@@ -387,11 +387,11 @@ public class RIL extends BaseCommands implements CommandsInterface {

		case EVENT_AIDL_PROXY_DEAD:
		int aidlService = msg.arg1;
		AtomicLong obj = (AtomicLong) msg.obj;
		riljLog("handleMessage: EVENT_AIDL_PROXY_DEAD cookie = " + msg.obj
		long msgCookie = (long) msg.obj;
		riljLog("handleMessage: EVENT_AIDL_PROXY_DEAD cookie = " + msgCookie
		+ ", service = " + serviceToString(aidlService) + ", cookie = "
		+ mServiceCookies.get(aidlService));
		if (obj.get() == mServiceCookies.get(aidlService).get()) {
		if (msgCookie == mServiceCookies.get(aidlService).get()) {
		mIsRadioProxyInitialized = false;
		resetProxyAndRequestList(aidlService);
		}
		@@ -473,7 +473,7 @@ public class RIL extends BaseCommands implements CommandsInterface {
		public void binderDied() {
		riljLog("Service " + serviceToString(mService) + " has died.");
		mRilHandler.sendMessage(mRilHandler.obtainMessage(EVENT_AIDL_PROXY_DEAD, mService,
		0 /* ignored arg2 */, mServiceCookies.get(mService)));
		0 /* ignored arg2 */, mServiceCookies.get(mService).get()));
		unlinkToDeath();
		}
		}
		@@ -1072,7 +1072,7 @@ public class RIL extends BaseCommands implements CommandsInterface {
		if (!mIsRadioProxyInitialized) {
		mIsRadioProxyInitialized = true;
		serviceProxy.getHidl().linkToDeath(mRadioProxyDeathRecipient,
		mServiceCookies.get(service).incrementAndGet());
		mServiceCookies.get(HAL_SERVICE_RADIO).incrementAndGet());
		serviceProxy.getHidl().setResponseFunctions(
		mRadioResponse, mRadioIndication);
		}