Merge "camera2: Fix exception swallowing in params classes createFromParcel" into oc-mr1-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
b8ce7ca6a1
@@ -501,13 +501,7 @@ public final class OutputConfiguration implements Parcelable {
|
||||
new Parcelable.Creator<OutputConfiguration>() {
|
||||
@Override
|
||||
public OutputConfiguration createFromParcel(Parcel source) {
|
||||
try {
|
||||
OutputConfiguration outputConfiguration = new OutputConfiguration(source);
|
||||
return outputConfiguration;
|
||||
} catch (Exception e) {
|
||||
Log.e(TAG, "Exception creating OutputConfiguration from parcel", e);
|
||||
return null;
|
||||
}
|
||||
return new OutputConfiguration(source);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -36,13 +36,7 @@ public final class VendorTagDescriptor implements Parcelable {
|
||||
new Parcelable.Creator<VendorTagDescriptor>() {
|
||||
@Override
|
||||
public VendorTagDescriptor createFromParcel(Parcel source) {
|
||||
try {
|
||||
VendorTagDescriptor vendorDescriptor = new VendorTagDescriptor(source);
|
||||
return vendorDescriptor;
|
||||
} catch (Exception e) {
|
||||
Log.e(TAG, "Exception creating VendorTagDescriptor from parcel", e);
|
||||
return null;
|
||||
}
|
||||
return new VendorTagDescriptor(source);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -36,13 +36,7 @@ public final class VendorTagDescriptorCache implements Parcelable {
|
||||
new Parcelable.Creator<VendorTagDescriptorCache>() {
|
||||
@Override
|
||||
public VendorTagDescriptorCache createFromParcel(Parcel source) {
|
||||
try {
|
||||
VendorTagDescriptorCache vendorDescriptorCache = new VendorTagDescriptorCache(source);
|
||||
return vendorDescriptorCache;
|
||||
} catch (Exception e) {
|
||||
Log.e(TAG, "Exception creating VendorTagDescriptorCache from parcel", e);
|
||||
return null;
|
||||
}
|
||||
return new VendorTagDescriptorCache(source);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
Reference in New Issue
Block a user