Snap for 6855963 from 79a1219925b2c8d7a12cc63a95bbffb914484cbe to rvc-qpr1-release (5c4e69c5) · Commits · e / os / android_frameworks_base

core/java/android/bluetooth/BluetoothCodecConfig.java

+31 −1

Original line number	Diff line number	Diff line
		@@ -51,19 +51,25 @@ public final class BluetoothCodecConfig implements Parcelable {
		@Retention(RetentionPolicy.SOURCE)
		public @interface SourceCodecType {}

		@UnsupportedAppUsage
		public static final int SOURCE_CODEC_TYPE_SBC = 0;

		@UnsupportedAppUsage
		public static final int SOURCE_CODEC_TYPE_AAC = 1;

		@UnsupportedAppUsage
		public static final int SOURCE_CODEC_TYPE_APTX = 2;

		@UnsupportedAppUsage
		public static final int SOURCE_CODEC_TYPE_APTX_HD = 3;

		@UnsupportedAppUsage
		public static final int SOURCE_CODEC_TYPE_LDAC = 4;

		@UnsupportedAppUsage
		public static final int SOURCE_CODEC_TYPE_MAX = 5;


		@UnsupportedAppUsage
		public static final int SOURCE_CODEC_TYPE_INVALID = 1000 * 1000;

		/** @hide */
		@@ -75,10 +81,13 @@ public final class BluetoothCodecConfig implements Parcelable {
		@Retention(RetentionPolicy.SOURCE)
		public @interface CodecPriority {}

		@UnsupportedAppUsage
		public static final int CODEC_PRIORITY_DISABLED = -1;

		@UnsupportedAppUsage
		public static final int CODEC_PRIORITY_DEFAULT = 0;

		@UnsupportedAppUsage
		public static final int CODEC_PRIORITY_HIGHEST = 1000 * 1000;


		@@ -95,18 +104,25 @@ public final class BluetoothCodecConfig implements Parcelable {
		@Retention(RetentionPolicy.SOURCE)
		public @interface SampleRate {}

		@UnsupportedAppUsage
		public static final int SAMPLE_RATE_NONE = 0;

		@UnsupportedAppUsage
		public static final int SAMPLE_RATE_44100 = 0x1 << 0;

		@UnsupportedAppUsage
		public static final int SAMPLE_RATE_48000 = 0x1 << 1;

		@UnsupportedAppUsage
		public static final int SAMPLE_RATE_88200 = 0x1 << 2;

		@UnsupportedAppUsage
		public static final int SAMPLE_RATE_96000 = 0x1 << 3;

		@UnsupportedAppUsage
		public static final int SAMPLE_RATE_176400 = 0x1 << 4;

		@UnsupportedAppUsage
		public static final int SAMPLE_RATE_192000 = 0x1 << 5;


		@@ -120,12 +136,16 @@ public final class BluetoothCodecConfig implements Parcelable {
		@Retention(RetentionPolicy.SOURCE)
		public @interface BitsPerSample {}

		@UnsupportedAppUsage
		public static final int BITS_PER_SAMPLE_NONE = 0;

		@UnsupportedAppUsage
		public static final int BITS_PER_SAMPLE_16 = 0x1 << 0;

		@UnsupportedAppUsage
		public static final int BITS_PER_SAMPLE_24 = 0x1 << 1;

		@UnsupportedAppUsage
		public static final int BITS_PER_SAMPLE_32 = 0x1 << 2;


		@@ -138,10 +158,13 @@ public final class BluetoothCodecConfig implements Parcelable {
		@Retention(RetentionPolicy.SOURCE)
		public @interface ChannelMode {}

		@UnsupportedAppUsage
		public static final int CHANNEL_MODE_NONE = 0;

		@UnsupportedAppUsage
		public static final int CHANNEL_MODE_MONO = 0x1 << 0;

		@UnsupportedAppUsage
		public static final int CHANNEL_MODE_STEREO = 0x1 << 1;

		private final @SourceCodecType int mCodecType;
		@@ -154,6 +177,7 @@ public final class BluetoothCodecConfig implements Parcelable {
		private final long mCodecSpecific3;
		private final long mCodecSpecific4;

		@UnsupportedAppUsage
		public BluetoothCodecConfig(@SourceCodecType int codecType, @CodecPriority int codecPriority,
		@SampleRate int sampleRate, @BitsPerSample int bitsPerSample,
		@ChannelMode int channelMode, long codecSpecific1,
		@@ -170,6 +194,7 @@ public final class BluetoothCodecConfig implements Parcelable {
		mCodecSpecific4 = codecSpecific4;
		}

		@UnsupportedAppUsage
		public BluetoothCodecConfig(@SourceCodecType int codecType) {
		mCodecType = codecType;
		mCodecPriority = BluetoothCodecConfig.CODEC_PRIORITY_DEFAULT;
		@@ -391,6 +416,7 @@ public final class BluetoothCodecConfig implements Parcelable {
		*
		* @return the codec type
		*/
		@UnsupportedAppUsage
		public @SourceCodecType int getCodecType() {
		return mCodecType;
		}
		@@ -411,6 +437,7 @@ public final class BluetoothCodecConfig implements Parcelable {
		*
		* @return the codec priority
		*/
		@UnsupportedAppUsage
		public @CodecPriority int getCodecPriority() {
		return mCodecPriority;
		}
		@@ -441,6 +468,7 @@ public final class BluetoothCodecConfig implements Parcelable {
		*
		* @return the codec sample rate
		*/
		@UnsupportedAppUsage
		public @SampleRate int getSampleRate() {
		return mSampleRate;
		}
		@@ -455,6 +483,7 @@ public final class BluetoothCodecConfig implements Parcelable {
		*
		* @return the codec bits per sample
		*/
		@UnsupportedAppUsage
		public @BitsPerSample int getBitsPerSample() {
		return mBitsPerSample;
		}
		@@ -479,6 +508,7 @@ public final class BluetoothCodecConfig implements Parcelable {
		*
		* @return a codec specific value1.
		*/
		@UnsupportedAppUsage
		public long getCodecSpecific1() {
		return mCodecSpecific1;
		}

core/java/android/bluetooth/BluetoothCodecStatus.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@
		package android.bluetooth;

		import android.annotation.Nullable;
		import android.compat.annotation.UnsupportedAppUsage;
		import android.os.Parcel;
		import android.os.Parcelable;

		@@ -38,6 +39,7 @@ public final class BluetoothCodecStatus implements Parcelable {
		* This extra represents the current codec status of the A2DP
		* profile.
		*/
		@UnsupportedAppUsage
		public static final String EXTRA_CODEC_STATUS =
		"android.bluetooth.extra.CODEC_STATUS";

		@@ -196,6 +198,7 @@ public final class BluetoothCodecStatus implements Parcelable {
		*
		* @return the current codec configuration
		*/
		@UnsupportedAppUsage
		public @Nullable BluetoothCodecConfig getCodecConfig() {
		return mCodecConfig;
		}
		@@ -205,6 +208,7 @@ public final class BluetoothCodecStatus implements Parcelable {
		*
		* @return an array with the codecs local capabilities
		*/
		@UnsupportedAppUsage
		public @Nullable BluetoothCodecConfig[] getCodecsLocalCapabilities() {
		return mCodecsLocalCapabilities;
		}
		@@ -214,6 +218,7 @@ public final class BluetoothCodecStatus implements Parcelable {
		*
		* @return an array with the codecs selectable capabilities
		*/
		@UnsupportedAppUsage
		public @Nullable BluetoothCodecConfig[] getCodecsSelectableCapabilities() {
		return mCodecsSelectableCapabilities;
		}

libs/hwui/renderthread/CanvasContext.cpp

+6 −3

Original line number	Diff line number	Diff line
		@@ -139,7 +139,7 @@ void CanvasContext::destroy() {
		mAnimationContext->destroy();
		}

		static void setBufferCount(ANativeWindow* window, uint32_t extraBuffers) {
		static void setBufferCount(ANativeWindow* window) {
		int query_value;
		int err = window->query(window, NATIVE_WINDOW_MIN_UNDEQUEUED_BUFFERS, &query_value);
		if (err != 0 \|\| query_value < 0) {
		@@ -148,7 +148,9 @@ static void setBufferCount(ANativeWindow* window, uint32_t extraBuffers) {
		}
		auto min_undequeued_buffers = static_cast<uint32_t>(query_value);

		int bufferCount = min_undequeued_buffers + 2 + extraBuffers;
		// We only need to set min_undequeued + 2 because the renderahead amount was already factored into the
		// query for min_undequeued
		int bufferCount = min_undequeued_buffers + 2;
		native_window_set_buffer_count(window, bufferCount);
		}

		@@ -179,7 +181,8 @@ void CanvasContext::setSurface(ANativeWindow* window, bool enableTimeout) {
		mNativeSurface ? mNativeSurface->getNativeWindow() : nullptr, mSwapBehavior);

		if (mNativeSurface && !mNativeSurface->didSetExtraBuffers()) {
		setBufferCount(mNativeSurface->getNativeWindow(), mRenderAheadCapacity);
		setBufferCount(mNativeSurface->getNativeWindow());

		}

		mFrameNumber = -1;

packages/SystemUI/res-keyguard/values-km/strings.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -100,7 +100,7 @@
		<string name="kg_pin_accepted" msgid="1625501841604389716">"កូដត្រូវបានទទួលយក!"</string>
		<string name="keyguard_carrier_default" msgid="6359808469637388586">"គ្មានសេវាទេ។"</string>
		<string name="accessibility_ime_switch_button" msgid="9082358310194861329">"ប្ដូរវិធីបញ្ចូល"</string>
		<string name="airplane_mode" msgid="2528005343938497866">"មុខងារពេលជិះយន្តហោះ"</string>
		<string name="airplane_mode" msgid="2528005343938497866">"ពេលជិះយន្តហោះ"</string>
		<string name="kg_prompt_reason_restart_pattern" msgid="4720554342633852066">"តម្រូវឲ្យប្រើលំនាំ បន្ទាប់ពីឧបករណ៍ចាប់ផ្តើមឡើងវិញ"</string>
		<string name="kg_prompt_reason_restart_pin" msgid="1587671566498057656">"តម្រូវឲ្យបញ្ចូលកូដ PIN បន្ទាប់ពីឧបករណ៍ចាប់ផ្តើមឡើងវិញ"</string>
		<string name="kg_prompt_reason_restart_password" msgid="8061279087240952002">"តម្រូវឲ្យបញ្ចូលពាក្យសម្ងាត់ បន្ទាប់ពីឧបករណ៍ចាប់ផ្តើមឡើងវិញ"</string>

packages/SystemUI/res/values-ca/strings.xml

+3 −3

Original line number	Diff line number	Diff line
		@@ -92,10 +92,10 @@
		<string name="screenrecord_background_processing_label" msgid="7244617554884238898">"Processant gravació de pantalla"</string>
		<string name="screenrecord_channel_description" msgid="4147077128486138351">"Notificació en curs d\'una sessió de gravació de la pantalla"</string>
		<string name="screenrecord_start_label" msgid="1750350278888217473">"Vols iniciar la gravació?"</string>
		<string name="screenrecord_description" msgid="1123231719680353736">"Quan graves contingut, el sistema Android pot capturar qualsevol informació sensible que es mostri a la pantalla o que es reprodueixi al dispositiu. Això inclou les contrasenyes, la informació de pagament, les fotos, els missatges i l\'àudio."</string>
		<string name="screenrecord_description" msgid="1123231719680353736">"Durant la gravació, el sistema Android pot capturar qualsevol informació sensible que es mostri a la pantalla o que es reprodueixi al dispositiu. Això inclou contrasenyes, informació de pagament, fotos, missatges i àudio."</string>
		<string name="screenrecord_audio_label" msgid="6183558856175159629">"Grava l\'àudio"</string>
		<string name="screenrecord_device_audio_label" msgid="9016927171280567791">"Àudio del dispositiu"</string>
		<string name="screenrecord_device_audio_description" msgid="4922694220572186193">"Sons del dispositiu, com ara la música, les trucades i els sons de trucada"</string>
		<string name="screenrecord_device_audio_description" msgid="4922694220572186193">"So del dispositiu, com ara música, trucades i sons de trucada"</string>
		<string name="screenrecord_mic_label" msgid="2111264835791332350">"Micròfon"</string>
		<string name="screenrecord_device_audio_and_mic_label" msgid="1831323771978646841">"Àudio del dispositiu i micròfon"</string>
		<string name="screenrecord_start" msgid="330991441575775004">"Inicia"</string>
		@@ -387,7 +387,7 @@
		<string name="quick_settings_cast_no_wifi" msgid="6980194769795014875">"La Wi‑Fi no està connectada"</string>
		<string name="quick_settings_brightness_dialog_title" msgid="4980669966716685588">"Brillantor"</string>
		<string name="quick_settings_brightness_dialog_auto_brightness_label" msgid="2325362583903258677">"AUTOMÀTICA"</string>
		<string name="quick_settings_inversion_label" msgid="5078769633069667698">"Inverteix els colors"</string>
		<string name="quick_settings_inversion_label" msgid="5078769633069667698">"Inverteix colors"</string>
		<string name="quick_settings_color_space_label" msgid="537528291083575559">"Mode de correcció de color"</string>
		<string name="quick_settings_more_settings" msgid="2878235926753776694">"Més opcions"</string>
		<string name="quick_settings_done" msgid="2163641301648855793">"Fet"</string>