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

Merge "camera2: Fix exception swallowing in params classes createFromParcel" into qt-dev

Browse Source
This commit is contained in:
Jayant Chowdhary
2021-08-09 15:12:22 +00:00
committed by Android (Google) Code Review
parent 2159ba8c04 7bf30cb92a
commit 93e157955a
4 changed files with 4 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/hardware/camera2/params/OutputConfiguration.java
View File

@@ -631,13 +631,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

8
core/java/android/hardware/camera2/params/SessionConfiguration.java
View File

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

8
core/java/android/hardware/camera2/params/VendorTagDescriptor.java
View File

@@ -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

8
core/java/android/hardware/camera2/params/VendorTagDescriptorCache.java
View File

@@ -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