Merge remote-tracking branch 'origin/lineage-18.1' into v1-r (c9357ffe) · Commits · e / os / android_frameworks_base

core/java/android/bluetooth/BluetoothDevice.java

+4 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1230,7 +1230,10 @@ public final class BluetoothDevice implements Parcelable {
	if (alias == null) {		if (alias == null) {
	return getName();		return getName();
	}		}
	return alias;		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/content/pm/parsing/ParsingPackageImpl.java

+3 −3

core/java/android/content/pm/parsing/ParsingPackageUtils.java

+63 −0

Original line number	Original line	Diff line number	Diff line
	@@ -84,6 +84,7 @@ import android.net.Uri;
	import android.os.Build;		import android.os.Build;
	import android.os.Bundle;		import android.os.Bundle;
	import android.os.FileUtils;		import android.os.FileUtils;
			import android.os.Parcel;
	import android.os.RemoteException;		import android.os.RemoteException;
	import android.os.Trace;		import android.os.Trace;
	import android.os.ext.SdkExtensions;		import android.os.ext.SdkExtensions;
	@@ -2834,6 +2835,68 @@ public class ParsingPackageUtils {
	return sa.getNonResourceString(index);		return sa.getNonResourceString(index);
	}		}

			/**
			* Writes the keyset mapping to the provided package. {@code null} mappings are permitted.
			*/
			public static void writeKeySetMapping(@NonNull Parcel dest,
			@NonNull Map<String, ArraySet<PublicKey>> keySetMapping) {
			if (keySetMapping == null) {
			dest.writeInt(-1);
			return;
			}

			final int N = keySetMapping.size();
			dest.writeInt(N);

			for (String key : keySetMapping.keySet()) {
			dest.writeString(key);
			ArraySet<PublicKey> keys = keySetMapping.get(key);
			if (keys == null) {
			dest.writeInt(-1);
			continue;
			}

			final int M = keys.size();
			dest.writeInt(M);
			for (int j = 0; j < M; j++) {
			dest.writeSerializable(keys.valueAt(j));
			}
			}
			}

			/**
			* Reads a keyset mapping from the given parcel at the given data position. May return
			* {@code null} if the serialized mapping was {@code null}.
			*/
			@NonNull
			public static ArrayMap<String, ArraySet<PublicKey>> readKeySetMapping(@NonNull Parcel in) {
			final int N = in.readInt();
			if (N == -1) {
			return null;
			}

			ArrayMap<String, ArraySet<PublicKey>> keySetMapping = new ArrayMap<>();
			for (int i = 0; i < N; ++i) {
			String key = in.readString();
			final int M = in.readInt();
			if (M == -1) {
			keySetMapping.put(key, null);
			continue;
			}

			ArraySet<PublicKey> keys = new ArraySet<>(M);
			for (int j = 0; j < M; ++j) {
			PublicKey pk = (PublicKey) in.readSerializable();
			keys.add(pk);
			}

			keySetMapping.put(key, keys);
			}

			return keySetMapping;
			}


	/**		/**
	* Callback interface for retrieving information that may be needed while parsing		* Callback interface for retrieving information that may be needed while parsing
	* a package.		* a package.

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
	@@ -143,13 +143,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

Original line number	Original line	Diff line number	Diff line
	@@ -1007,7 +1007,7 @@ public class ParsingPackageImpl implements ParsingPackage, Parcelable {
	sForInternedStringList.parcel(this.requestedPermissions, dest, flags);		sForInternedStringList.parcel(this.requestedPermissions, dest, flags);
	sForInternedStringList.parcel(this.implicitPermissions, dest, flags);		sForInternedStringList.parcel(this.implicitPermissions, dest, flags);
	sForStringSet.parcel(this.upgradeKeySets, dest, flags);		sForStringSet.parcel(this.upgradeKeySets, dest, flags);
	dest.writeMap(this.keySetMapping);		ParsingPackageUtils.writeKeySetMapping(dest, this.keySetMapping);
	sForInternedStringList.parcel(this.protectedBroadcasts, dest, flags);		sForInternedStringList.parcel(this.protectedBroadcasts, dest, flags);
	dest.writeTypedList(this.activities);		dest.writeTypedList(this.activities);
	dest.writeTypedList(this.receivers);		dest.writeTypedList(this.receivers);
	@@ -1026,7 +1026,7 @@ public class ParsingPackageImpl implements ParsingPackage, Parcelable {
	dest.writeBoolean(this.use32BitAbi);		dest.writeBoolean(this.use32BitAbi);
	dest.writeBoolean(this.visibleToInstantApps);		dest.writeBoolean(this.visibleToInstantApps);
	dest.writeBoolean(this.forceQueryable);		dest.writeBoolean(this.forceQueryable);
	dest.writeParcelableList(this.queriesIntents, flags);		dest.writeTypedList(this.queriesIntents, flags);
	sForInternedStringList.parcel(this.queriesPackages, dest, flags);		sForInternedStringList.parcel(this.queriesPackages, dest, flags);
	sForInternedStringSet.parcel(this.queriesProviders, dest, flags);		sForInternedStringSet.parcel(this.queriesProviders, dest, flags);
	dest.writeString(this.appComponentFactory);		dest.writeString(this.appComponentFactory);
	@@ -1169,7 +1169,7 @@ public class ParsingPackageImpl implements ParsingPackage, Parcelable {
	this.requestedPermissions = sForInternedStringList.unparcel(in);		this.requestedPermissions = sForInternedStringList.unparcel(in);
	this.implicitPermissions = sForInternedStringList.unparcel(in);		this.implicitPermissions = sForInternedStringList.unparcel(in);
	this.upgradeKeySets = sForStringSet.unparcel(in);		this.upgradeKeySets = sForStringSet.unparcel(in);
	this.keySetMapping = in.readHashMap(boot);		this.keySetMapping = ParsingPackageUtils.readKeySetMapping(in);
	this.protectedBroadcasts = sForInternedStringList.unparcel(in);		this.protectedBroadcasts = sForInternedStringList.unparcel(in);

	this.activities = in.createTypedArrayList(ParsedActivity.CREATOR);		this.activities = in.createTypedArrayList(ParsedActivity.CREATOR);