drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix potential exceptions in CallDiagnosticService and missing locks.

Browse Source 
There is a possibility of a call receiving a details update when it has
already been removed from the CallDiagnosticService.  Handling this case
by just ignoring the details update (since it isn't relevant as the call
is now removed).
Also noted there were a number of places where access to the shared
maps was not synchronized as it should be.

Test: Run manual tests and note no more CDS crashes from SCONE app.
Fixes: 188939131
Change-Id: Ic1f96fd60a70432bef0daaa2e9729c66401ba4ac
This commit is contained in:
Tyler Gunn 2021-05-21 16:20:16 -07:00
parent 9b14a50805
commit 07d3736f5d
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
telecomm/java/android/telecom/CallDiagnosticService.java
View File

@ -294,6 +294,10 @@ public abstract class CallDiagnosticService extends Service {
CallDiagnostics callDiagnostics;
synchronized (mLock) {
callDiagnostics = mDiagnosticCallByTelecomCallId.get(telecomCallId);
if (callDiagnostics == null) {
// Possible to get a call update after a call is removed.
return;
}
mCallByTelecomCallId.put(telecomCallId, newCallDetails);
}
getExecutor().execute(() -> callDiagnostics.handleCallUpdated(newCallDetails));
@ -306,12 +310,12 @@ public abstract class CallDiagnosticService extends Service {
private void handleCallRemoved(@NonNull String telecomCallId) {
Log.i(this, "handleCallRemoved: callId=%s - removed", telecomCallId);
if (mCallByTelecomCallId.containsKey(telecomCallId)) {
mCallByTelecomCallId.remove(telecomCallId);
}
CallDiagnostics callDiagnostics;
synchronized (mLock) {
if (mCallByTelecomCallId.containsKey(telecomCallId)) {
mCallByTelecomCallId.remove(telecomCallId);
}
if (mDiagnosticCallByTelecomCallId.containsKey(telecomCallId)) {
callDiagnostics = mDiagnosticCallByTelecomCallId.remove(telecomCallId);
} else {
@ -353,7 +357,10 @@ public abstract class CallDiagnosticService extends Service {
private void handleCallDisconnected(@NonNull String callId,
@NonNull DisconnectCause disconnectCause) {
Log.i(this, "handleCallDisconnected: call=%s; cause=%s", callId, disconnectCause);
CallDiagnostics callDiagnostics = mDiagnosticCallByTelecomCallId.get(callId);
CallDiagnostics callDiagnostics;
synchronized (mLock) {
callDiagnostics = mDiagnosticCallByTelecomCallId.get(callId);
}
CharSequence message;
if (disconnectCause.getImsReasonInfo() != null) {
message = callDiagnostics.onCallDisconnected(disconnectCause.getImsReasonInfo());
@ -391,7 +398,9 @@ public abstract class CallDiagnosticService extends Service {
@NonNull CallQuality callQuality) {
Log.i(this, "handleCallQualityChanged; call=%s, cq=%s", callId, callQuality);
CallDiagnostics callDiagnostics;
callDiagnostics = mDiagnosticCallByTelecomCallId.get(callId);
synchronized(mLock) {
callDiagnostics = mDiagnosticCallByTelecomCallId.get(callId);
}
if (callDiagnostics != null) {
callDiagnostics.onCallQualityReceived(callQuality);
}