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

Unverified Commit 10e300d4 authored Nov 03, 2021 by Kevin F. Haggerty

Merge tag 'android-security-10.0.0_r60' into staging/lineage-17.1_merge-android-security-10.0.0_r60

Android security 10.0.0 release 60

* tag 'android-security-10.0.0_r60':
  TIF: fix issue of using caller-aware methods after clearCallingIdentity()
  [DO NOT MERGE] Fixing unsafe pending intent in notification
  Backporting the change of ag/15629060 to qt-dev
  DO NOT MERGE Bluetooth: Fix formatting in getAlias()
  camera2: Fix exception swallowing in params classes createFromParcel

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationModeController.java

Change-Id: I58696f93b3d03ba8037113f7d040784e4b5394a8

parents ba6f7056 2b65ceda

core/java/android/bluetooth/BluetoothDevice.java

+8 −1

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