Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b8ce7ca6 authored by Jayant Chowdhary's avatar Jayant Chowdhary Committed by Android (Google) Code Review
Browse files

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

parents 7380c153 8a115381

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

+1 −7
Original line number Diff line number Diff line
@@ -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

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

+1 −7
Original line number Diff line number Diff line
@@ -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

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

+1 −7
Original line number Diff line number Diff line
@@ -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