Merge "camera2: Fix exception swallowing in params classes createFromParcel" into qt-dev am: 93e157955a am: 0cf6fdb791

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15121727

Change-Id: I1adb4fa9ae369c1eabbd3fcbdac7abf4425743bb
This commit is contained in:
Jayant Chowdhary
2021-08-09 15:30:32 +00:00
committed by Automerger Merge Worker
4 changed files with 4 additions and 28 deletions

View File

@@ -631,13 +631,7 @@ public final class OutputConfiguration implements Parcelable {
new Parcelable.Creator<OutputConfiguration>() { new Parcelable.Creator<OutputConfiguration>() {
@Override @Override
public OutputConfiguration createFromParcel(Parcel source) { public OutputConfiguration createFromParcel(Parcel source) {
try { return new OutputConfiguration(source);
OutputConfiguration outputConfiguration = new OutputConfiguration(source);
return outputConfiguration;
} catch (Exception e) {
Log.e(TAG, "Exception creating OutputConfiguration from parcel", e);
return null;
}
} }
@Override @Override

View File

@@ -143,13 +143,7 @@ public final class SessionConfiguration implements Parcelable {
new Parcelable.Creator<SessionConfiguration> () { new Parcelable.Creator<SessionConfiguration> () {
@Override @Override
public SessionConfiguration createFromParcel(Parcel source) { public SessionConfiguration createFromParcel(Parcel source) {
try { return new SessionConfiguration(source);
SessionConfiguration sessionConfiguration = new SessionConfiguration(source);
return sessionConfiguration;
} catch (Exception e) {
Log.e(TAG, "Exception creating SessionConfiguration from parcel", e);
return null;
}
} }
@Override @Override

View File

@@ -36,13 +36,7 @@ public final class VendorTagDescriptor implements Parcelable {
new Parcelable.Creator<VendorTagDescriptor>() { new Parcelable.Creator<VendorTagDescriptor>() {
@Override @Override
public VendorTagDescriptor createFromParcel(Parcel source) { public VendorTagDescriptor createFromParcel(Parcel source) {
try { return new VendorTagDescriptor(source);
VendorTagDescriptor vendorDescriptor = new VendorTagDescriptor(source);
return vendorDescriptor;
} catch (Exception e) {
Log.e(TAG, "Exception creating VendorTagDescriptor from parcel", e);
return null;
}
} }
@Override @Override

View File

@@ -36,13 +36,7 @@ public final class VendorTagDescriptorCache implements Parcelable {
new Parcelable.Creator<VendorTagDescriptorCache>() { new Parcelable.Creator<VendorTagDescriptorCache>() {
@Override @Override
public VendorTagDescriptorCache createFromParcel(Parcel source) { public VendorTagDescriptorCache createFromParcel(Parcel source) {
try { return new VendorTagDescriptorCache(source);
VendorTagDescriptorCache vendorDescriptorCache = new VendorTagDescriptorCache(source);
return vendorDescriptorCache;
} catch (Exception e) {
Log.e(TAG, "Exception creating VendorTagDescriptorCache from parcel", e);
return null;
}
} }
@Override @Override