Loading src/java/com/android/internal/telephony/imsphone/ImsPhoneCallTracker.java +9 −18 Original line number Diff line number Diff line Loading @@ -1405,11 +1405,6 @@ public final class ImsPhoneCallTracker extends CallTracker { } foregroundImsPhoneCall.merge(peerImsPhoneCall, ImsPhoneCall.State.ACTIVE); // TODO Temporary code. Remove the try-catch block from the runnable once thread // synchronization is fixed. Runnable r = new Runnable() { @Override public void run() { try { final ImsPhoneConnection conn = findConnection(call); log("onCallMerged: ImsPhoneConnection=" + conn); Loading @@ -1419,10 +1414,6 @@ public final class ImsPhoneCallTracker extends CallTracker { } catch (Exception e) { loge("onCallMerged: exception " + e); } } }; ImsPhoneCallTracker.this.post(r); // After merge complete, update foreground as Active // and background call as Held, if background call exists Loading Loading
src/java/com/android/internal/telephony/imsphone/ImsPhoneCallTracker.java +9 −18 Original line number Diff line number Diff line Loading @@ -1405,11 +1405,6 @@ public final class ImsPhoneCallTracker extends CallTracker { } foregroundImsPhoneCall.merge(peerImsPhoneCall, ImsPhoneCall.State.ACTIVE); // TODO Temporary code. Remove the try-catch block from the runnable once thread // synchronization is fixed. Runnable r = new Runnable() { @Override public void run() { try { final ImsPhoneConnection conn = findConnection(call); log("onCallMerged: ImsPhoneConnection=" + conn); Loading @@ -1419,10 +1414,6 @@ public final class ImsPhoneCallTracker extends CallTracker { } catch (Exception e) { loge("onCallMerged: exception " + e); } } }; ImsPhoneCallTracker.this.post(r); // After merge complete, update foreground as Active // and background call as Held, if background call exists Loading