Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add a lock for call read/write operations to avoid ConcurrentModificationException." into sc-qpr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-08-31 22:12:30 +00:00
committed by Android (Google) Code Review
parent 66c8b26209 c71732375d
commit 6ba0239947
1 changed files with 31 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
telecomm/java/android/telecom/Phone.java
View File

@@ -23,6 +23,8 @@ import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.util.ArrayMap; import android.util.ArrayMap;
import com.android.internal.annotations.GuardedBy;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@@ -115,6 +117,7 @@ public final class Phone {
public static final int SDK_VERSION_R = 30; public static final int SDK_VERSION_R = 30;
// A Map allows us to track each Call by its Telecom-specified call ID // A Map allows us to track each Call by its Telecom-specified call ID
@GuardedBy("mLock")
private final Map<String, Call> mCallByTelecomCallId = new ArrayMap<>(); private final Map<String, Call> mCallByTelecomCallId = new ArrayMap<>();
// A List allows us to keep the Calls in a stable iteration order so that casually developed // A List allows us to keep the Calls in a stable iteration order so that casually developed
@@ -139,6 +142,8 @@ public final class Phone {
*/ */
private final int mTargetSdkVersion; private final int mTargetSdkVersion;
private final Object mLock = new Object();
Phone(InCallAdapter adapter, String callingPackage, int targetSdkVersion) { Phone(InCallAdapter adapter, String callingPackage, int targetSdkVersion) {
mInCallAdapter = adapter; mInCallAdapter = adapter;
mCallingPackage = callingPackage; mCallingPackage = callingPackage;
@@ -152,12 +157,16 @@ public final class Phone {
return; return;
} }
Call call = mCallByTelecomCallId.get(parcelableCall.getId()); Call call = getCallById(parcelableCall.getId());
if (call == null) { if (call == null) {
call = new Call(this, parcelableCall.getId(), mInCallAdapter, call = new Call(this, parcelableCall.getId(), mInCallAdapter,
parcelableCall.getState(), mCallingPackage, mTargetSdkVersion); parcelableCall.getState(), mCallingPackage, mTargetSdkVersion);
mCallByTelecomCallId.put(parcelableCall.getId(), call);
mCalls.add(call); synchronized (mLock) {
mCallByTelecomCallId.put(parcelableCall.getId(), call);
mCalls.add(call);
}
checkCallTree(parcelableCall); checkCallTree(parcelableCall);
call.internalUpdate(parcelableCall, mCallByTelecomCallId); call.internalUpdate(parcelableCall, mCallByTelecomCallId);
fireCallAdded(call); fireCallAdded(call);
@@ -169,8 +178,10 @@ public final class Phone {
} }
final void internalRemoveCall(Call call) { final void internalRemoveCall(Call call) {
mCallByTelecomCallId.remove(call.internalGetCallId()); synchronized (mLock) {
mCalls.remove(call); mCallByTelecomCallId.remove(call.internalGetCallId());
mCalls.remove(call);
}
InCallService.VideoCall videoCall = call.getVideoCall(); InCallService.VideoCall videoCall = call.getVideoCall();
if (videoCall != null) { if (videoCall != null) {
@@ -183,14 +194,14 @@ public final class Phone {
if (mTargetSdkVersion < SDK_VERSION_R if (mTargetSdkVersion < SDK_VERSION_R
&& parcelableCall.getState() == Call.STATE_AUDIO_PROCESSING) { && parcelableCall.getState() == Call.STATE_AUDIO_PROCESSING) {
Log.i(this, "removing audio processing call during update for sdk compatibility"); Log.i(this, "removing audio processing call during update for sdk compatibility");
Call call = mCallByTelecomCallId.get(parcelableCall.getId()); Call call = getCallById(parcelableCall.getId());
if (call != null) { if (call != null) {
internalRemoveCall(call); internalRemoveCall(call);
} }
return; return;
} }
Call call = mCallByTelecomCallId.get(parcelableCall.getId()); Call call = getCallById(parcelableCall.getId());
if (call != null) { if (call != null) {
checkCallTree(parcelableCall); checkCallTree(parcelableCall);
call.internalUpdate(parcelableCall, mCallByTelecomCallId); call.internalUpdate(parcelableCall, mCallByTelecomCallId);
@@ -207,8 +218,14 @@ public final class Phone {
} }
} }
Call getCallById(String callId) {
synchronized (mLock) {
return mCallByTelecomCallId.get(callId);
}
}
final void internalSetPostDialWait(String telecomId, String remaining) { final void internalSetPostDialWait(String telecomId, String remaining) {
Call call = mCallByTelecomCallId.get(telecomId); Call call = getCallById(telecomId);
if (call != null) { if (call != null) {
call.internalSetPostDialWait(remaining); call.internalSetPostDialWait(remaining);
} }
@@ -222,7 +239,7 @@ public final class Phone {
} }
final Call internalGetCallByTelecomId(String telecomId) { final Call internalGetCallByTelecomId(String telecomId) {
return mCallByTelecomCallId.get(telecomId); return getCallById(telecomId);
} }
final void internalBringToForeground(boolean showDialpad) { final void internalBringToForeground(boolean showDialpad) {
@@ -241,35 +258,35 @@ public final class Phone {
} }
final void internalOnConnectionEvent(String telecomId, String event, Bundle extras) { final void internalOnConnectionEvent(String telecomId, String event, Bundle extras) {
Call call = mCallByTelecomCallId.get(telecomId); Call call = getCallById(telecomId);
if (call != null) { if (call != null) {
call.internalOnConnectionEvent(event, extras); call.internalOnConnectionEvent(event, extras);
} }
} }
final void internalOnRttUpgradeRequest(String callId, int requestId) { final void internalOnRttUpgradeRequest(String callId, int requestId) {
Call call = mCallByTelecomCallId.get(callId); Call call = getCallById(callId);
if (call != null) { if (call != null) {
call.internalOnRttUpgradeRequest(requestId); call.internalOnRttUpgradeRequest(requestId);
} }
} }
final void internalOnRttInitiationFailure(String callId, int reason) { final void internalOnRttInitiationFailure(String callId, int reason) {
Call call = mCallByTelecomCallId.get(callId); Call call = getCallById(callId);
if (call != null) { if (call != null) {
call.internalOnRttInitiationFailure(reason); call.internalOnRttInitiationFailure(reason);
} }
} }
final void internalOnHandoverFailed(String callId, int error) { final void internalOnHandoverFailed(String callId, int error) {
Call call = mCallByTelecomCallId.get(callId); Call call = getCallById(callId);
if (call != null) { if (call != null) {
call.internalOnHandoverFailed(error); call.internalOnHandoverFailed(error);
} }
} }
final void internalOnHandoverComplete(String callId) { final void internalOnHandoverComplete(String callId) {
Call call = mCallByTelecomCallId.get(callId); Call call = getCallById(callId);
if (call != null) { if (call != null) {
call.internalOnHandoverComplete(); call.internalOnHandoverComplete();
} }