merge in nyc-release history after reset to nyc-dev
diff --git a/src/com/android/server/telecom/InCallController.java b/src/com/android/server/telecom/InCallController.java
index e5a9bac..0a14ffb 100644
--- a/src/com/android/server/telecom/InCallController.java
+++ b/src/com/android/server/telecom/InCallController.java
@@ -84,27 +84,31 @@
@Override
public void onServiceConnected(ComponentName name, IBinder service) {
Log.startSession("ICSBC.oSC");
- try {
- Log.d(this, "onServiceConnected: %s %b %b", name, mIsBound, mIsConnected);
- mIsBound = true;
- if (mIsConnected) {
- // Only proceed if we are supposed to be connected.
- onConnected(service);
+ synchronized (mLock) {
+ try {
+ Log.d(this, "onServiceConnected: %s %b %b", name, mIsBound, mIsConnected);
+ mIsBound = true;
+ if (mIsConnected) {
+ // Only proceed if we are supposed to be connected.
+ onConnected(service);
+ }
+ } finally {
+ Log.endSession();
}
- } finally {
- Log.endSession();
}
}
@Override
public void onServiceDisconnected(ComponentName name) {
Log.startSession("ICSBC.oSD");
- try {
- Log.d(this, "onDisconnected: %s", name);
- mIsBound = false;
- onDisconnected();
- } finally {
- Log.endSession();
+ synchronized (mLock) {
+ try {
+ Log.d(this, "onDisconnected: %s", name);
+ mIsBound = false;
+ onDisconnected();
+ } finally {
+ Log.endSession();
+ }
}
}
};
