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

Commit 2b65ceda authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker Committed by Anis Assi
Browse files

Merge cherrypicks of [15800897, 15800899, 15800901, 15800903, 15800905,... 

Merge cherrypicks of [15800897, 15800899, 15800901, 15800903, 15800905, 15801007, 15800676, 15800678, 15800969, 15800800] into security-aosp-qt-release

Change-Id: I53bc552cdf99f2c28954c37db6b4c8bb70b8c51f
parents 5f889a0c f40bca9a

core/java/android/bluetooth/BluetoothDevice.java

+8 −1
Original line number Diff line number Diff line
@@ -1059,7 +1059,14 @@ public final class BluetoothDevice implements Parcelable { 
            return null;

        }

        try {

            return service.getRemoteAlias(this);

            String alias = service.getRemoteAlias(this);

            if (alias == null) {

                return getName();

            }

            return alias

                    .replace('\t', ' ')

                    .replace('\n', ' ')

                    .replace('\r', ' ');

        } catch (RemoteException e) {

            Log.e(TAG, "", e);

        }

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

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

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

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

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