Merge cherrypicks of [8549820, 8549668, 8549613, 8549614, 8549935, 8549808,... (5f06dfc1) · Commits · e / os / android_frameworks_base

core/java/android/os/RedactingFileDescriptor.java

+21 −5

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

		/**
		* 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
		*/
		@@ -44,13 +44,16 @@ public class RedactingFileDescriptor {
		private static final boolean DEBUG = true;

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

		private FileDescriptor mInner = 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 {
		mRedactRanges = checkRangesArgument(redactRanges);
		mFreeOffsets = freeOffsets;

		try {
		try {
		@@ -88,13 +91,17 @@ public class RedactingFileDescriptor {
		*
		* @param file The underlying file to open.
		* @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
		* 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,
		long[] redactRanges) throws IOException {
		return new RedactingFileDescriptor(context, file, mode, redactRanges).mOuter;
		long[] redactRanges, long[] freePositions) throws IOException {
		return new RedactingFileDescriptor(context, file, mode, redactRanges, freePositions).mOuter;
		}

		/**
		@@ -169,6 +176,15 @@ public class RedactingFileDescriptor {
		for (long j = start; j < end; j++) {
		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;
		}

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

+295 −210

File changed.

Preview size limit exceeded, changes collapsed.

core/res/AndroidManifest.xml

+2 −1

Original line number	Diff line number	Diff line
		@@ -4662,8 +4662,9 @@
		android:process=":ui">
		</activity>
		<activity android:name="com.android.internal.app.PlatLogoActivity"
		android:theme="@style/Theme.Wallpaper.NoTitleBar.Fullscreen"
		android:theme="@style/Theme.DeviceDefault.DayNight"
		android:configChanges="orientation\|keyboardHidden"
		android:icon="@drawable/platlogo"
		android:process=":ui">
		</activity>
		<activity android:name="com.android.internal.app.DisableCarModeActivity"

core/res/res/drawable-nodpi/android_logotype.xml

0 → 100644

+42 −0

File added.

Preview size limit exceeded, changes collapsed.

core/res/res/drawable-nodpi/platlogo.xml

+10 −16

File changed.

Preview size limit exceeded, changes collapsed.