diff options
| -rw-r--r-- | telecomm/java/android/telecom/RemoteConnection.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/telecomm/java/android/telecom/RemoteConnection.java b/telecomm/java/android/telecom/RemoteConnection.java index 57fc9ced91ae..f30d7bdef810 100644 --- a/telecomm/java/android/telecom/RemoteConnection.java +++ b/telecomm/java/android/telecom/RemoteConnection.java @@ -25,6 +25,7 @@ import android.annotation.Nullable; import android.annotation.SystemApi; import android.hardware.camera2.CameraManager; import android.net.Uri; +import android.os.BadParcelableException; import android.os.Bundle; import android.os.Handler; import android.os.IBinder; @@ -1464,7 +1465,11 @@ public final class RemoteConnection { if (mExtras == null) { mExtras = new Bundle(); } - mExtras.putAll(extras); + try { + mExtras.putAll(extras); + } catch (BadParcelableException bpe) { + Log.w(this, "putExtras: could not unmarshal extras; exception = " + bpe); + } notifyExtrasChanged(); } |