Snap for 5764972 from 2cc5346954967135815dc6aaca3e1544220450e9 to qt-c2f2-release (2bac7b2a) · Commits · e / os / android_frameworks_base

core/java/android/os/ParcelFileDescriptor.java

+9 −5

Original line number	Diff line number	Diff line
		@@ -581,12 +581,16 @@ public class ParcelFileDescriptor implements Parcelable, Closeable {
		public static ParcelFileDescriptor fromData(byte[] data, String name) throws IOException {
		if (data == null) return null;
		MemoryFile file = new MemoryFile(name, data.length);
		try {
		if (data.length > 0) {
		file.writeBytes(data, 0, 0, data.length);
		}
		file.deactivate();
		FileDescriptor fd = file.getFileDescriptor();
		return fd != null ? ParcelFileDescriptor.dup(fd) : null;
		} finally {
		file.close();
		}
		}

		/**

core/java/com/android/internal/config/sysui/SystemUiDeviceConfigFlags.java

+34 −1

Original line number	Diff line number	Diff line
		@@ -186,6 +186,38 @@ public final class SystemUiDeviceConfigFlags {
		*/
		public static final String ASSIST_HANDLES_SHOW_WHEN_TAUGHT = "assist_handles_show_when_taught";

		/**
		* (long) Duration per pixel, in milliseconds, of scrolling text at fast speed.
		*/
		public static final String ASSIST_TRANSCRIPTION_DURATION_PER_PX_FAST =
		"assist_transcription_duration_per_px_fast";

		/**
		* (long) Duration per pixel, in milliseconds, of scrolling text at regular speed.
		*/
		public static final String ASSIST_TRANSCRIPTION_DURATION_PER_PX_REGULAR =
		"assist_transcription_duration_per_px_regular";

		/**
		* (long) Duration, in milliseconds, over which text fades in.
		*/
		public static final String ASSIST_TRANSCRIPTION_FADE_IN_DURATION =
		"assist_transcription_fade_in_duration";

		/**
		* (long) Maximum total duration, in milliseconds, for a given transcription.
		*/
		public static final String ASSIST_TRANSCRIPTION_MAX_DURATION =
		"assist_transcription_max_duration";

		/**
		* (long) Minimum total duration, in milliseconds, for a given transcription.
		*/
		public static final String ASSIST_TRANSCRIPTION_MIN_DURATION =
		"assist_transcription_min_duration";

		// Flags related to brightline falsing

		/**
		* (bool) Whether to use the new BrightLineFalsingManager.
		*/
		@@ -275,5 +307,6 @@ public final class SystemUiDeviceConfigFlags {
		"brightline_falsing_zigzag_y_secondary_deviance";


		private SystemUiDeviceConfigFlags() { }
		private SystemUiDeviceConfigFlags() {
		}
		}

core/java/com/android/internal/widget/MediaNotificationView.java

+47 −0

Original line number	Diff line number	Diff line
		@@ -26,6 +26,8 @@ import android.widget.FrameLayout;
		import android.widget.ImageView;
		import android.widget.RemoteViews;

		import java.util.ArrayList;

		/**
		* A TextView that can float around an image on the end.
		*
		@@ -42,6 +44,7 @@ public class MediaNotificationView extends FrameLayout {
		private View mMainColumn;
		private View mMediaContent;
		private int mImagePushIn;
		private ArrayList<VisibilityChangeListener> mListeners;

		public MediaNotificationView(Context context) {
		this(context, null);
		@@ -168,4 +171,48 @@ public class MediaNotificationView extends FrameLayout {
		mMainColumn = findViewById(com.android.internal.R.id.notification_main_column);
		mMediaContent = findViewById(com.android.internal.R.id.notification_media_content);
		}

		@Override
		public void onVisibilityAggregated(boolean isVisible) {
		super.onVisibilityAggregated(isVisible);
		for (int i = 0; i < mListeners.size(); i++) {
		mListeners.get(i).onAggregatedVisibilityChanged(isVisible);
		}
		}

		/**
		* Add a listener to receive updates on the visibility of this view
		*
		* @param listener The listener to add.
		*/
		public void addVisibilityListener(VisibilityChangeListener listener) {
		if (mListeners == null) {
		mListeners = new ArrayList<>();
		}
		if (!mListeners.contains(listener)) {
		mListeners.add(listener);
		}
		}

		/**
		* Remove the specified listener
		*
		* @param listener The listener to remove.
		*/
		public void removeVisibilityListener(VisibilityChangeListener listener) {
		if (mListeners != null) {
		mListeners.remove(listener);
		}
		}

		/**
		* Interface for receiving updates when the view's visibility changes
		*/
		public interface VisibilityChangeListener {
		/**
		* Method called when the visibility of this view has changed
		* @param isVisible true if the view is now visible
		*/
		void onAggregatedVisibilityChanged(boolean isVisible);
		}
		}

core/res/res/values/strings.xml

+3 −0

Original line number	Diff line number	Diff line
		@@ -187,6 +187,9 @@
		<string name="notification_channel_wfc">Wi-Fi calling</string>
		<!-- Telephony notification channel name for a channel containing SIM notifications -->
		<string name="notification_channel_sim">SIM status</string>
		<!-- Telephony notification channel name for a channel containing high priority SIM notifications -->
		<string name="notification_channel_sim_high_prio">High priority SIM status</string>


		<!-- Displayed to tell the user that peer changed TTY mode -->
		<string name="peerTtyModeFull">Peer requested TTY Mode FULL</string>

core/res/res/values/symbols.xml

+1 −0

Original line number	Diff line number	Diff line
		@@ -648,6 +648,7 @@
		<java-symbol type="string" name="notification_channel_voice_mail" />
		<java-symbol type="string" name="notification_channel_wfc" />
		<java-symbol type="string" name="notification_channel_sim" />
		<java-symbol type="string" name="notification_channel_sim_high_prio" />
		<java-symbol type="string" name="SetupCallDefault" />
		<java-symbol type="string" name="accept" />
		<java-symbol type="string" name="activity_chooser_view_see_all" />