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

Merge "Merge "Catch BadParcelableException in RemoteConnection when setting extras." into oc-dr1-dev am: bcfa22584b" into oc-mr1-dev

Browse Source
This commit is contained in:
Android Build Merger (Role)
2017-08-11 21:13:27 +00:00
committed by Android (Google) Code Review
parent 5500732584 38c61bf7bd
commit 149cfd37db
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
telecomm/java/android/telecom/RemoteConnection.java
View File

@@ -25,6 +25,7 @@ import android.annotation.Nullable;
import android.annotation.SystemApi; import android.annotation.SystemApi;
import android.hardware.camera2.CameraManager; import android.hardware.camera2.CameraManager;
import android.net.Uri; import android.net.Uri;
import android.os.BadParcelableException;
import android.os.Bundle; import android.os.Bundle;
import android.os.Handler; import android.os.Handler;
import android.os.IBinder; import android.os.IBinder;
@@ -1464,7 +1465,11 @@ public final class RemoteConnection {
if (mExtras == null) { if (mExtras == null) {
mExtras = new Bundle(); mExtras = new Bundle();
} }
mExtras.putAll(extras); try {
mExtras.putAll(extras);
} catch (BadParcelableException bpe) {
Log.w(this, "putExtras: could not unmarshal extras; exception = " + bpe);
}
notifyExtrasChanged(); notifyExtrasChanged();
} }