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

Commit c7a76259 authored Nov 09, 2021 by /e/ robot

Merge remote-tracking branch 'origin/lineage-17.1' into v1-q

parents d7fded04 10e300d4

core/java/android/bluetooth/BluetoothDevice.java

+8 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1208,7 +1208,14 @@ public final class BluetoothDevice implements Parcelable {
	return null;		return null;
	}		}
	try {		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) {		} catch (RemoteException e) {
	Log.e(TAG, "", e);		Log.e(TAG, "", e);
	}		}

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

+1 −7

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

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

+1 −7

Original line number	Original line	Diff line number	Diff line
	@@ -138,13 +138,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

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

+1 −7

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

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

+1 −7

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