Merge "Fix concurrent access violation." into lmp-mr1-dev (fdadab4b) · Commits · e / os / android_frameworks_base

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

+12 −11

Original line number	Diff line number	Diff line
		@@ -217,6 +217,7 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub {
		checkPossibleMissNotify(r, newDefaultPhoneId);
		}
		}
		handleRemoveListLocked();
		}
		mDefaultSubId = newDefaultSubId;
		mDefaultPhoneId = newDefaultPhoneId;
		@@ -1445,7 +1446,7 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub {
		r.callback.onServiceStateChanged(
		new ServiceState(mServiceState[phoneId]));
		} catch (RemoteException ex) {
		remove(r.binder);
		mRemoveList.add(r.binder);
		}
		}

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

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

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

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

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