Skip to content
This repository was archived by the owner on Nov 8, 2023. It is now read-only.

Commit 93e1579

Browse files
Jayant ChowdharyAndroid (Google) Code Review
authored andcommitted
Merge "camera2: Fix exception swallowing in params classes createFromParcel" into qt-dev
2 parents 2159ba8 + 7bf30cb commit 93e1579

File tree

4 files changed

+4
-28
lines changed

4 files changed

+4
-28
lines changed

core/java/android/hardware/camera2/params/OutputConfiguration.java

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -631,13 +631,7 @@ public int getSurfaceGroupId() {
631631
new Parcelable.Creator<OutputConfiguration>() {
632632
@Override
633633
public OutputConfiguration createFromParcel(Parcel source) {
634-
try {
635-
OutputConfiguration outputConfiguration = new OutputConfiguration(source);
636-
return outputConfiguration;
637-
} catch (Exception e) {
638-
Log.e(TAG, "Exception creating OutputConfiguration from parcel", e);
639-
return null;
640-
}
634+
return new OutputConfiguration(source);
641635
}
642636

643637
@Override

core/java/android/hardware/camera2/params/SessionConfiguration.java

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -138,13 +138,7 @@ private SessionConfiguration(@NonNull Parcel source) {
138138
new Parcelable.Creator<SessionConfiguration> () {
139139
@Override
140140
public SessionConfiguration createFromParcel(Parcel source) {
141-
try {
142-
SessionConfiguration sessionConfiguration = new SessionConfiguration(source);
143-
return sessionConfiguration;
144-
} catch (Exception e) {
145-
Log.e(TAG, "Exception creating SessionConfiguration from parcel", e);
146-
return null;
147-
}
141+
return new SessionConfiguration(source);
148142
}
149143

150144
@Override

core/java/android/hardware/camera2/params/VendorTagDescriptor.java

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,7 @@ private VendorTagDescriptor(Parcel source) {
3636
new Parcelable.Creator<VendorTagDescriptor>() {
3737
@Override
3838
public VendorTagDescriptor createFromParcel(Parcel source) {
39-
try {
40-
VendorTagDescriptor vendorDescriptor = new VendorTagDescriptor(source);
41-
return vendorDescriptor;
42-
} catch (Exception e) {
43-
Log.e(TAG, "Exception creating VendorTagDescriptor from parcel", e);
44-
return null;
45-
}
39+
return new VendorTagDescriptor(source);
4640
}
4741

4842
@Override

core/java/android/hardware/camera2/params/VendorTagDescriptorCache.java

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,7 @@ private VendorTagDescriptorCache(Parcel source) {
3636
new Parcelable.Creator<VendorTagDescriptorCache>() {
3737
@Override
3838
public VendorTagDescriptorCache createFromParcel(Parcel source) {
39-
try {
40-
VendorTagDescriptorCache vendorDescriptorCache = new VendorTagDescriptorCache(source);
41-
return vendorDescriptorCache;
42-
} catch (Exception e) {
43-
Log.e(TAG, "Exception creating VendorTagDescriptorCache from parcel", e);
44-
return null;
45-
}
39+
return new VendorTagDescriptorCache(source);
4640
}
4741

4842
@Override

0 commit comments

Comments
 (0)