Snap for 5726885 from 7c33cbcbcc9e12a130ca62c52607cc88fec2ec9c to qt-qpr1-release (014f5978) · Commits · e / os / android_frameworks_base

config/hiddenapi-greylist-max-p.txt

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -70,6 +70,8 @@ Lcom/android/internal/R$styleable;->MenuView:[I
	Lcom/android/internal/R$styleable;->Searchable:[I		Lcom/android/internal/R$styleable;->Searchable:[I
	Lcom/android/internal/R$styleable;->SearchableActionKey:[I		Lcom/android/internal/R$styleable;->SearchableActionKey:[I
	Lcom/android/internal/telephony/IPhoneSubInfo$Stub;-><init>()V		Lcom/android/internal/telephony/IPhoneSubInfo$Stub;-><init>()V
			Lcom/android/internal/telephony/ITelephony;->getDataActivity()I
			Lcom/android/internal/telephony/ITelephony;->getDataState()I
	Lcom/android/internal/telephony/ITelephonyRegistry;->notifyCallForwardingChanged(Z)V		Lcom/android/internal/telephony/ITelephonyRegistry;->notifyCallForwardingChanged(Z)V
	Lcom/android/internal/telephony/ITelephonyRegistry;->notifyCellLocation(Landroid/os/Bundle;)V		Lcom/android/internal/telephony/ITelephonyRegistry;->notifyCellLocation(Landroid/os/Bundle;)V
	Lcom/android/internal/telephony/ITelephonyRegistry;->notifyDataActivity(I)V		Lcom/android/internal/telephony/ITelephonyRegistry;->notifyDataActivity(I)V

core/java/android/net/NetworkTemplate.java

+30 −7

Original line number	Original line	Diff line number	Diff line
	@@ -48,6 +48,7 @@ import java.io.DataInputStream;
	import java.io.DataOutputStream;		import java.io.DataOutputStream;
	import java.io.IOException;		import java.io.IOException;
	import java.util.Arrays;		import java.util.Arrays;
			import java.util.List;
	import java.util.Objects;		import java.util.Objects;

	/**		/**
	@@ -481,19 +482,41 @@ public class NetworkTemplate implements Parcelable {
	* For example, given an incoming template matching B, and the currently		* For example, given an incoming template matching B, and the currently
	* active merge set [A,B], we'd return a new template that primarily matches		* active merge set [A,B], we'd return a new template that primarily matches
	* A, but also matches B.		* A, but also matches B.
			* TODO: remove and use {@link #normalize(NetworkTemplate, List)}.
	*/		*/
	@UnsupportedAppUsage		@UnsupportedAppUsage
	public static NetworkTemplate normalize(NetworkTemplate template, String[] merged) {		public static NetworkTemplate normalize(NetworkTemplate template, String[] merged) {
	if (template.isMatchRuleMobile() && ArrayUtils.contains(merged, template.mSubscriberId)) {		return normalize(template, Arrays.<String[]>asList(merged));
			}

			/**
			* Examine the given template and normalize if it refers to a "merged"
			* mobile subscriber. We pick the "lowest" merged subscriber as the primary
			* for key purposes, and expand the template to match all other merged
			* subscribers.
			*
			* There can be multiple merged subscriberIds for multi-SIM devices.
			*
			* <p>
			* For example, given an incoming template matching B, and the currently
			* active merge set [A,B], we'd return a new template that primarily matches
			* A, but also matches B.
			*/
			public static NetworkTemplate normalize(NetworkTemplate template, List<String[]> mergedList) {
			if (!template.isMatchRuleMobile()) return template;

			for (String[] merged : mergedList) {
			if (ArrayUtils.contains(merged, template.mSubscriberId)) {
	// Requested template subscriber is part of the merge group; return		// Requested template subscriber is part of the merge group; return
	// a template that matches all merged subscribers.		// a template that matches all merged subscribers.
	return new NetworkTemplate(template.mMatchRule, merged[0], merged,		return new NetworkTemplate(template.mMatchRule, merged[0], merged,
	template.mNetworkId);		template.mNetworkId);
	} else {
	return template;
	}		}
	}		}

			return template;
			}

	@UnsupportedAppUsage		@UnsupportedAppUsage
	public static final @android.annotation.NonNull Creator<NetworkTemplate> CREATOR = new Creator<NetworkTemplate>() {		public static final @android.annotation.NonNull Creator<NetworkTemplate> CREATOR = new Creator<NetworkTemplate>() {
	@Override		@Override

core/java/android/os/RedactingFileDescriptor.java

+21 −5

Original line number	Original line	Diff line number	Diff line
	@@ -35,7 +35,7 @@ import java.util.Arrays;

	/**		/**
	* Variant of {@link FileDescriptor} that allows its creator to specify regions		* Variant of {@link FileDescriptor} that allows its creator to specify regions
	* that should be redacted (appearing as zeros to the reader).		* that should be redacted.
	*		*
	* @hide		* @hide
	*/		*/
	@@ -44,13 +44,16 @@ public class RedactingFileDescriptor {
	private static final boolean DEBUG = true;		private static final boolean DEBUG = true;

	private volatile long[] mRedactRanges;		private volatile long[] mRedactRanges;
			private volatile long[] mFreeOffsets;

	private FileDescriptor mInner = null;		private FileDescriptor mInner = null;
	private ParcelFileDescriptor mOuter = null;		private ParcelFileDescriptor mOuter = null;

	private RedactingFileDescriptor(Context context, File file, int mode, long[] redactRanges)		private RedactingFileDescriptor(
			Context context, File file, int mode, long[] redactRanges, long[] freeOffsets)
	throws IOException {		throws IOException {
	mRedactRanges = checkRangesArgument(redactRanges);		mRedactRanges = checkRangesArgument(redactRanges);
			mFreeOffsets = freeOffsets;

	try {		try {
	try {		try {
	@@ -88,13 +91,17 @@ public class RedactingFileDescriptor {
	*		*
	* @param file The underlying file to open.		* @param file The underlying file to open.
	* @param mode The {@link ParcelFileDescriptor} mode to open with.		* @param mode The {@link ParcelFileDescriptor} mode to open with.
	* @param redactRanges List of file offsets that should be redacted, stored		* @param redactRanges List of file ranges that should be redacted, stored
	* as {@code [start1, end1, start2, end2, ...]}. Start values are		* as {@code [start1, end1, start2, end2, ...]}. Start values are
	* inclusive and end values are exclusive.		* inclusive and end values are exclusive.
			* @param freePositions List of file offsets at which the four byte value 'free' should be
			* written instead of zeros within parts of the file covered by {@code redactRanges}.
			* Non-redacted bytes will not be modified even if covered by a 'free'. This is
			* useful for overwriting boxes in ISOBMFF files with padding data.
	*/		*/
	public static ParcelFileDescriptor open(Context context, File file, int mode,		public static ParcelFileDescriptor open(Context context, File file, int mode,
	long[] redactRanges) throws IOException {		long[] redactRanges, long[] freePositions) throws IOException {
	return new RedactingFileDescriptor(context, file, mode, redactRanges).mOuter;		return new RedactingFileDescriptor(context, file, mode, redactRanges, freePositions).mOuter;
	}		}

	/**		/**
	@@ -169,6 +176,15 @@ public class RedactingFileDescriptor {
	for (long j = start; j < end; j++) {		for (long j = start; j < end; j++) {
	data[(int) (j - offset)] = 0;		data[(int) (j - offset)] = 0;
	}		}
			// Overwrite data at 'free' offsets within the redaction ranges.
			for (long freeOffset : mFreeOffsets) {
			final long freeEnd = freeOffset + 4;
			final long redactFreeStart = Math.max(freeOffset, start);
			final long redactFreeEnd = Math.min(freeEnd, end);
			for (long j = redactFreeStart; j < redactFreeEnd; j++) {
			data[(int) (j - offset)] = (byte) "free".charAt((int) (j - freeOffset));
			}
			}
	}		}
	return n;		return n;
	}		}

core/java/android/provider/DeviceConfig.java

+9 −0

Original line number	Original line	Diff line number	Diff line
	@@ -336,6 +336,15 @@ public final class DeviceConfig {
	@TestApi		@TestApi
	String KEY_SYSTEM_GESTURES_EXCLUDED_BY_PRE_Q_STICKY_IMMERSIVE =		String KEY_SYSTEM_GESTURES_EXCLUDED_BY_PRE_Q_STICKY_IMMERSIVE =
	"system_gestures_excluded_by_pre_q_sticky_immersive";		"system_gestures_excluded_by_pre_q_sticky_immersive";

			/**
			* Key for controlling which packages are explicitly blocked from running at refresh rates
			* higher than 60hz.
			*
			* @see android.provider.DeviceConfig#NAMESPACE_WINDOW_MANAGER
			* @hide
			*/
			String KEY_HIGH_REFRESH_RATE_BLACKLIST = "high_refresh_rate_blacklist";
	}		}

	private static final Object sLock = new Object();		private static final Object sLock = new Object();

core/java/com/android/internal/app/PlatLogoActivity.java

+295 −210

File changed.

Preview size limit exceeded, changes collapsed.