commit cabb01cbd9fe7ddf4a2a11160db936f23201afaa
author Tyler Gunn <tgunn@google.com> Mon Dec 07 23:12:03 2015 +0000
committer android-build-merger <android-build-merger@google.com> Mon Dec 07 23:12:03 2015 +0000
tree ce3d5cd8eed2dcc2039373b090af81c6d2cb0492
parent 9491c839f3c3d06b453563acbcc5fe87f152c5d2
parent 59cacee0ac1e6116800a3a62c607a45404367f36

Post updateExtras to handler to avoid potential concurrency issue.
am: 59cacee0ac

* commit '59cacee0ac1e6116800a3a62c607a45404367f36':
  Post updateExtras to handler to avoid potential concurrency issue.

src/com/android/services/telephony/TelephonyConnection.java

diff --git a/src/com/android/services/telephony/TelephonyConnection.java b/src/com/android/services/telephony/TelephonyConnection.java
index 5995e53..d0da59d 100644
--- a/src/com/android/services/telephony/TelephonyConnection.java
+++ b/src/com/android/services/telephony/TelephonyConnection.java
@@ -623,7 +623,11 @@
         setWifi(mOriginalConnection.isWifi());
         setVideoProvider(mOriginalConnection.getVideoProvider());
         setAudioQuality(mOriginalConnection.getAudioQuality());
-        updateExtras(mOriginalConnection.getConnectionExtras());
+
+        // Post update of extras to the handler; extras are updated via the handler to ensure thread
+        // safety.
+        mHandler.obtainMessage(MSG_CONNECTION_EXTRAS_CHANGED,
+                mOriginalConnection.getConnectionExtras()).sendToTarget();
 
         if (isImsConnection()) {
             mWasImsConnection = true;