Fix concurrent access violation. (c573e860) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/TelephonyRegistry.java

+6 −6

Original line number	Diff line number	Diff line
		@@ -1586,7 +1586,7 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub {
		r.callback.onServiceStateChanged(
		new ServiceState(mServiceState[phoneId]));
		} catch (RemoteException ex) {
		remove(r.binder);
		mRemoveList.add(r.binder);
		}
		}

		@@ -1613,7 +1613,7 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub {
		r.callback.onSignalStrengthChanged((gsmSignalStrength == 99 ? -1
		: gsmSignalStrength));
		} catch (RemoteException ex) {
		remove(r.binder);
		mRemoveList.add(r.binder);
		}
		}

		@@ -1625,7 +1625,7 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub {
		}
		r.callback.onCellInfoChanged(mCellInfo.get(phoneId));
		} catch (RemoteException ex) {
		remove(r.binder);
		mRemoveList.add(r.binder);
		}
		}

		@@ -1638,7 +1638,7 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub {
		r.callback.onMessageWaitingIndicatorChanged(
		mMessageWaiting[phoneId]);
		} catch (RemoteException ex) {
		remove(r.binder);
		mRemoveList.add(r.binder);
		}
		}

		@@ -1651,7 +1651,7 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub {
		r.callback.onCallForwardingIndicatorChanged(
		mCallForwarding[phoneId]);
		} catch (RemoteException ex) {
		remove(r.binder);
		mRemoveList.add(r.binder);
		}
		}

		@@ -1676,7 +1676,7 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub {
		r.callback.onDataConnectionStateChanged(mDataConnectionState[phoneId],
		mDataConnectionNetworkType[phoneId]);
		} catch (RemoteException ex) {
		remove(r.binder);
		mRemoveList.add(r.binder);
		}
		}
		}