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

Prevent BadParcelableException in InCallService

Browse Source 
When call detail extra contains non-framework class object, the system classloader will not be able to unmarshall the object hence the process which holds IncallService will crash.

Test: manual test by inserting a test parcel into CompanionClientConnectionService.
Bug: 253967348
Change-Id: I3abd2868c532a65ad53d559ce6eca6cc9cf6c25e
(cherry picked from commit 7f6e5de7bc05dff6a5b673dfa17d99160772cbb4)
This commit is contained in:
qing
2022-10-28 03:40:43 +00:00
committed by Eric Rahm
parent 692ad9d0f2
commit 723dac69d7
1 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
telecomm/java/android/telecom/Call.java
View File

@@ -24,6 +24,7 @@ import android.annotation.TestApi;
import android.compat.annotation.UnsupportedAppUsage;
import android.content.pm.ServiceInfo;
import android.net.Uri;
import android.os.BadParcelableException;
import android.os.Build;
import android.os.Bundle;
import android.os.Handler;
@@ -2951,21 +2952,27 @@ public final class Call {
for(String key : bundle.keySet()) {
if (key != null) {
final Object value = bundle.get(key);
final Object newValue = newBundle.get(key);
if (!newBundle.containsKey(key)) {
return false;
}
if (value instanceof Bundle && newValue instanceof Bundle) {
if (!areBundlesEqual((Bundle) value, (Bundle) newValue)) {
// In case new call extra contains non-framework class objects, return false to
// force update the call extra
try {
final Object value = bundle.get(key);
final Object newValue = newBundle.get(key);
if (value instanceof Bundle && newValue instanceof Bundle) {
if (!areBundlesEqual((Bundle) value, (Bundle) newValue)) {
return false;
}
}
if (value instanceof byte[] && newValue instanceof byte[]) {
if (!Arrays.equals((byte[]) value, (byte[]) newValue)) {
return false;
}
} else if (!Objects.equals(value, newValue)) {
return false;
}
}
if (value instanceof byte[] && newValue instanceof byte[]) {
if (!Arrays.equals((byte[]) value, (byte[]) newValue)) {
return false;
}
} else if (!Objects.equals(value, newValue)) {
} catch (BadParcelableException e) {
return false;
}
}