diff options
107 files changed, 403 insertions, 237 deletions
diff --git a/apct-tests/perftests/core/AndroidManifest.xml b/apct-tests/perftests/core/AndroidManifest.xml index 56fa70cfc220..039548035f35 100644 --- a/apct-tests/perftests/core/AndroidManifest.xml +++ b/apct-tests/perftests/core/AndroidManifest.xml @@ -15,6 +15,7 @@ <application> <uses-library android:name="android.test.runner" /> + <profileable android:shell="true" /> <activity android:name="android.perftests.utils.PerfTestActivity" android:exported="true"> <intent-filter> diff --git a/api/Android.bp b/api/Android.bp index 9fb7b35605b8..505d7bf99135 100644 --- a/api/Android.bp +++ b/api/Android.bp @@ -38,23 +38,9 @@ bootstrap_go_package { pluginFor: ["soong_build"], } -python_defaults { - name: "python3_version_defaults", - version: { - py2: { - enabled: false, - }, - py3: { - enabled: true, - embedded_launcher: false, - }, - }, -} - python_binary_host { name: "api_versions_trimmer", srcs: ["api_versions_trimmer.py"], - defaults: ["python3_version_defaults"], } python_test_host { @@ -64,7 +50,6 @@ python_test_host { "api_versions_trimmer_unittests.py", "api_versions_trimmer.py", ], - defaults: ["python3_version_defaults"], test_options: { unit_test: true, }, @@ -73,7 +58,6 @@ python_test_host { python_binary_host { name: "merge_annotation_zips", srcs: ["merge_annotation_zips.py"], - defaults: ["python3_version_defaults"], } python_test_host { @@ -83,7 +67,6 @@ python_test_host { "merge_annotation_zips.py", "merge_annotation_zips_test.py", ], - defaults: ["python3_version_defaults"], test_options: { unit_test: true, }, diff --git a/api/Android.mk b/api/Android.mk new file mode 100644 index 000000000000..ce5f995033c5 --- /dev/null +++ b/api/Android.mk @@ -0,0 +1,2 @@ +.PHONY: checkapi +checkapi: frameworks-base-api-current-compat frameworks-base-api-system-current-compat frameworks-base-api-module-lib-current-compat diff --git a/core/api/system-current.txt b/core/api/system-current.txt index 0126199add0c..bb14dc008a57 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -10327,6 +10327,7 @@ package android.provider { field public static final String NAMESPACE_LOCATION = "location"; field public static final String NAMESPACE_MEDIA = "media"; field public static final String NAMESPACE_MEDIA_NATIVE = "media_native"; + field public static final String NAMESPACE_NEARBY = "nearby"; field public static final String NAMESPACE_NETD_NATIVE = "netd_native"; field public static final String NAMESPACE_NNAPI_NATIVE = "nnapi_native"; field public static final String NAMESPACE_ON_DEVICE_PERSONALIZATION = "on_device_personalization"; diff --git a/core/java/android/app/ContextImpl.java b/core/java/android/app/ContextImpl.java index 6d982ced385c..9673e8ce6b56 100644 --- a/core/java/android/app/ContextImpl.java +++ b/core/java/android/app/ContextImpl.java @@ -1094,7 +1094,7 @@ class ContextImpl extends Context { && (options == null || ActivityOptions.fromBundle(options).getLaunchTaskId() == -1)) { throw new AndroidRuntimeException( - "Calling startActivity() from outside of an Activity " + "Calling startActivity() from outside of an Activity" + " context requires the FLAG_ACTIVITY_NEW_TASK flag." + " Is this really what you want?"); } @@ -1128,7 +1128,7 @@ class ContextImpl extends Context { public int startActivitiesAsUser(Intent[] intents, Bundle options, UserHandle userHandle) { if ((intents[0].getFlags()&Intent.FLAG_ACTIVITY_NEW_TASK) == 0) { throw new AndroidRuntimeException( - "Calling startActivities() from outside of an Activity " + "Calling startActivities() from outside of an Activity" + " context requires the FLAG_ACTIVITY_NEW_TASK flag on first Intent." + " Is this really what you want?"); } @@ -1142,7 +1142,7 @@ class ContextImpl extends Context { warnIfCallingFromSystemProcess(); if ((intents[0].getFlags()&Intent.FLAG_ACTIVITY_NEW_TASK) == 0) { throw new AndroidRuntimeException( - "Calling startActivities() from outside of an Activity " + "Calling startActivities() from outside of an Activity" + " context requires the FLAG_ACTIVITY_NEW_TASK flag on first Intent." + " Is this really what you want?"); } diff --git a/core/java/android/content/pm/OWNERS b/core/java/android/content/pm/OWNERS index 087e61d70576..25efdc68a3bd 100644 --- a/core/java/android/content/pm/OWNERS +++ b/core/java/android/content/pm/OWNERS @@ -1,11 +1,10 @@ # Bug component: 36137 -toddke@android.com -toddke@google.com patb@google.com +per-file Package* = file:/PACKAGE_MANAGER_OWNERS per-file PackageParser.java = set noparent -per-file PackageParser.java = chiuwinson@google.com,patb@google.com,toddke@google.com +per-file PackageParser.java = chiuwinson@google.com,patb@google.com per-file *Capability* = file:/core/java/android/content/pm/SHORTCUT_OWNERS per-file *Shortcut* = file:/core/java/android/content/pm/SHORTCUT_OWNERS per-file AppSearchPerson.java = file:/core/java/android/content/pm/SHORTCUT_OWNERS diff --git a/core/java/android/net/Ikev2VpnProfile.java b/core/java/android/net/Ikev2VpnProfile.java index 3979c6c78dcb..10ce3bf78b2a 100644 --- a/core/java/android/net/Ikev2VpnProfile.java +++ b/core/java/android/net/Ikev2VpnProfile.java @@ -483,9 +483,6 @@ public final class Ikev2VpnProfile extends PlatformVpnProfile { final VpnProfile profile = new VpnProfile("" /* Key; value unused by IKEv2VpnProfile(s) */, mIsRestrictedToTestNetworks, mExcludeLocalRoutes, mRequiresInternetValidation, mIkeTunConnParams); - - profile.server = getServerAddr(); - profile.ipsecIdentifier = getUserIdentity(); profile.proxy = mProxyInfo; profile.isBypassable = mIsBypassable; profile.isMetered = mIsMetered; @@ -499,6 +496,8 @@ public final class Ikev2VpnProfile extends PlatformVpnProfile { } profile.type = mType; + profile.server = getServerAddr(); + profile.ipsecIdentifier = getUserIdentity(); profile.setAllowedAlgorithms(mAllowedAlgorithms); switch (mType) { case TYPE_IKEV2_IPSEC_USER_PASS: diff --git a/core/java/android/preference/GenericInflater.java b/core/java/android/preference/GenericInflater.java index 7edc987ee0c1..fe53d4eeff64 100644 --- a/core/java/android/preference/GenericInflater.java +++ b/core/java/android/preference/GenericInflater.java @@ -406,7 +406,7 @@ abstract class GenericInflater<T, P extends GenericInflater.Parent> { InflateException ie = new InflateException(attrs .getPositionDescription() + ": Error inflating class " - + constructor.getClass().getName()); + + constructor.getDeclaringClass().getName()); ie.initCause(e); throw ie; } diff --git a/core/java/android/provider/DeviceConfig.java b/core/java/android/provider/DeviceConfig.java index d40303035c89..7b9ef726b1a3 100644 --- a/core/java/android/provider/DeviceConfig.java +++ b/core/java/android/provider/DeviceConfig.java @@ -203,6 +203,15 @@ public final class DeviceConfig { @SystemApi public static final String NAMESPACE_TETHERING = "tethering"; + + /** + * Namespace for Nearby module. + * + * @hide + */ + @SystemApi + public static final String NAMESPACE_NEARBY = "nearby"; + /** * Namespace for content capture feature used by on-device machine intelligence * to provide suggestions in a privacy-safe manner. diff --git a/core/java/com/android/internal/os/Zygote.java b/core/java/com/android/internal/os/Zygote.java index b1e7d15cbf4a..deafd19e866f 100644 --- a/core/java/com/android/internal/os/Zygote.java +++ b/core/java/com/android/internal/os/Zygote.java @@ -1001,16 +1001,24 @@ public final class Zygote { } /** + * This will enable jdwp by default for all apps. It is OK to cache this property + * because we expect to reboot the system whenever this property changes + */ + private static final boolean ENABLE_JDWP = SystemProperties.get( + "persist.debug.dalvik.vm.jdwp.enabled").equals("1"); + + /** * Applies debugger system properties to the zygote arguments. * - * If "ro.debuggable" is "1", all apps are debuggable. Otherwise, - * the debugger state is specified via the "--enable-jdwp" flag - * in the spawn request. + * For eng builds all apps are debuggable. On userdebug and user builds + * if persist.debuggable.dalvik.vm.jdwp.enabled is 1 all apps are + * debuggable. Otherwise, the debugger state is specified via the + * "--enable-jdwp" flag in the spawn request. * * @param args non-null; zygote spawner args */ static void applyDebuggerSystemProperty(ZygoteArguments args) { - if (RoSystemProperties.DEBUGGABLE) { + if (Build.IS_ENG || ENABLE_JDWP) { args.mRuntimeFlags |= Zygote.DEBUG_ENABLE_JDWP; } } diff --git a/core/java/com/android/internal/util/TypedProperties.java b/core/java/com/android/internal/util/TypedProperties.java index 5613999ea773..c10dbe7fdf3b 100644 --- a/core/java/com/android/internal/util/TypedProperties.java +++ b/core/java/com/android/internal/util/TypedProperties.java @@ -264,29 +264,29 @@ public class TypedProperties extends HashMap<String, Object> { // Ensure that the type can hold this value, and return. int width = (type >> 8) & 0xff; switch (width) { - case 1: - if (value < Byte.MIN_VALUE || value > Byte.MAX_VALUE) { - throw new ParseException(st, "8-bit integer constant"); - } - return new Byte((byte)value); - case 2: - if (value < Short.MIN_VALUE || value > Short.MAX_VALUE) { - throw new ParseException(st, "16-bit integer constant"); - } - return new Short((short)value); - case 4: - if (value < Integer.MIN_VALUE || value > Integer.MAX_VALUE) { - throw new ParseException(st, "32-bit integer constant"); - } - return new Integer((int)value); - case 8: - if (value < Long.MIN_VALUE || value > Long.MAX_VALUE) { - throw new ParseException(st, "64-bit integer constant"); - } - return new Long(value); - default: - throw new IllegalStateException( - "Internal error; unexpected integer type width " + width); + case 1: + if (value < Byte.MIN_VALUE || value > Byte.MAX_VALUE) { + throw new ParseException(st, "8-bit integer constant"); + } + return Byte.valueOf((byte) value); + case 2: + if (value < Short.MIN_VALUE || value > Short.MAX_VALUE) { + throw new ParseException(st, "16-bit integer constant"); + } + return Short.valueOf((short) value); + case 4: + if (value < Integer.MIN_VALUE || value > Integer.MAX_VALUE) { + throw new ParseException(st, "32-bit integer constant"); + } + return Integer.valueOf((int) value); + case 8: + if (value < Long.MIN_VALUE || value > Long.MAX_VALUE) { + throw new ParseException(st, "64-bit integer constant"); + } + return Long.valueOf(value); + default: + throw new IllegalStateException( + "Internal error; unexpected integer type width " + width); } } else if ((type & 0xff) == 'F') { if (token != StreamTokenizer.TT_WORD) { @@ -317,10 +317,10 @@ public class TypedProperties extends HashMap<String, Object> { throw new ParseException(st, "32-bit float constant"); } } - return new Float((float)value); + return Float.valueOf((float) value); } else { // This property is a double; no need to truncate. - return new Double(value); + return Double.valueOf(value); } } else if (type == TYPE_STRING) { // Expect a quoted string or the word "null". diff --git a/core/jni/android_os_MessageQueue.cpp b/core/jni/android_os_MessageQueue.cpp index f7a98d16f2e3..30d9ea19be39 100644 --- a/core/jni/android_os_MessageQueue.cpp +++ b/core/jni/android_os_MessageQueue.cpp @@ -51,6 +51,21 @@ public: virtual int handleEvent(int fd, int events, void* data); + /** + * A simple proxy that holds a weak reference to a looper callback. + */ + class WeakLooperCallback : public LooperCallback { + protected: + virtual ~WeakLooperCallback(); + + public: + WeakLooperCallback(const wp<LooperCallback>& callback); + virtual int handleEvent(int fd, int events, void* data); + + private: + wp<LooperCallback> mCallback; + }; + private: JNIEnv* mPollEnv; jobject mPollObj; @@ -131,7 +146,8 @@ void NativeMessageQueue::setFileDescriptorEvents(int fd, int events) { if (events & CALLBACK_EVENT_OUTPUT) { looperEvents |= Looper::EVENT_OUTPUT; } - mLooper->addFd(fd, Looper::POLL_CALLBACK, looperEvents, this, + mLooper->addFd(fd, Looper::POLL_CALLBACK, looperEvents, + sp<WeakLooperCallback>::make(this), reinterpret_cast<void*>(events)); } else { mLooper->removeFd(fd); @@ -162,6 +178,24 @@ int NativeMessageQueue::handleEvent(int fd, int looperEvents, void* data) { } +// --- NativeMessageQueue::WeakLooperCallback --- + +NativeMessageQueue::WeakLooperCallback::WeakLooperCallback(const wp<LooperCallback>& callback) : + mCallback(callback) { +} + +NativeMessageQueue::WeakLooperCallback::~WeakLooperCallback() { +} + +int NativeMessageQueue::WeakLooperCallback::handleEvent(int fd, int events, void* data) { + sp<LooperCallback> callback = mCallback.promote(); + if (callback != nullptr) { + return callback->handleEvent(fd, events, data); + } + return 0; +} + + // ---------------------------------------------------------------------------- sp<MessageQueue> android_os_MessageQueue_getMessageQueue(JNIEnv* env, jobject messageQueueObj) { diff --git a/core/res/res/values-af/strings.xml b/core/res/res/values-af/strings.xml index f56fd6e753f0..be90a3586c0d 100644 --- a/core/res/res/values-af/strings.xml +++ b/core/res/res/values-af/strings.xml @@ -1600,7 +1600,7 @@ <string name="default_audio_route_name" product="tv" msgid="4908971385068087367">"TV"</string> <string name="default_audio_route_name" product="default" msgid="9213546147739983977">"Foon"</string> <string name="default_audio_route_name_dock_speakers" msgid="1551166029093995289">"Dokluidsprekers"</string> - <string name="default_audio_route_name_hdmi" msgid="5474470558160717850">"HDMI"</string> + <string name="default_audio_route_name_external_device" msgid="5474470558160717850">"HDMI"</string> <string name="default_audio_route_name_headphones" msgid="6954070994792640762">"Oorfone"</string> <string name="default_audio_route_name_usb" msgid="895668743163316932">"USB"</string> <string name="default_audio_route_category_name" msgid="5241740395748134483">"Stelsel"</string> diff --git a/core/res/res/values-am/strings.xml b/core/res/res/values-am/strings.xml index 66a37eba07d9..b69eee4c3601 100644 --- a/core/res/res/values-am/strings.xml +++ b/core/res/res/values-am/strings.xml @@ -1600,7 +1600,7 @@ <string name="default_audio_route_name" product="tv" msgid="4908971385068087367">"ቴሌቪዥን"</string> <string name="default_audio_route_name" product="default" msgid="9213546147739983977">"ስልክ"</string> <string name="default_audio_route_name_dock_speakers" msgid="1551166029093995289">"የትከል ድምፅ ማጉያዎች"</string> - <string name="default_audio_route_name_hdmi" msgid="5474470558160717850">"ኤችዲኤምአይ"</string> + <string name="default_audio_route_name_external_device" msgid="5474470558160717850">"ኤችዲኤምአይ"</string> <string name="default_audio_route_name_headphones" msgid="6954070994792640762">"የጆሮ ማዳመጫዎች"</string> <string name="default_audio_route_name_usb" msgid="895668743163316932">"ዩ ኤስ ቢ"</string> <string name="default_audio_route_category_name" msgid="5241740395748134483">"ስርዓት"</string> diff --git a/core/res/res/values-ar/strings.xml b/core/res/res/values-ar/strings.xml index 83e104f763e8..1ad9333b5fea 100644 --- a/core/res/res/values-ar/strings.xml +++ b/core/res/res/values-ar/strings.xml @@ -1604,7 +1604,7 @@ <string name="default_audio_route_name" product="tv" msgid="4908971385068087367">"التلفزيون"</string> <string name="default_audio_route_name" product="default" msgid="9213546147739983977">"الهاتف"</string> <string name="default_audio_route_name_dock_speakers" msgid="1551166029093995289">"مكبرات صوت للإرساء"</string> - <string name="default_audio_route_name_hdmi" msgid="5474470558160717850">"HDMI"</string> + <string name="default_audio_route_name_external_device" msgid="5474470558160717850">"HDMI"</string> <string name="default_audio_route_name_headphones" msgid="6954070994792640762">"سماعات رأس"</string> <string name="default_audio_route_name_usb" msgid="895668743163316932">"USB"</string> <string name="default_audio_route_category_name" msgid="5241740395748134483">"النظام"</string> diff --git a/core/res/res/values-as/strings.xml b/core/res/res/values-as/strings.xml index 4d803c815c14..ad17d374e48e 100644 --- a/core/res/res/values-as/strings.xml +++ b/core/res/res/values-as/strings.xml @@ -1600,7 +1600,7 @@ <string name="default_audio_route_name" product="tv" msgid="4908971385068087367">"টিভি"</string> <string name="default_audio_route_name" product="default" msgid="9213546147739983977">"ফ\'ন"</string> <string name="default_audio_route_name_dock_speakers" msgid="1551166029093995289">"ড\'ক স্পীকাৰসমূহ"</string> - <string name="default_audio_route_name_hdmi" msgid="5474470558160717850">"HDMI"</string> + <string name="default_audio_route_name_external_device" msgid="5474470558160717850">"HDMI"</string> <string name="default_audio_route_name_headphones" msgid="6954070994792640762">"হেডফ\'নবোৰ"</string> <string name="default_audio_route_name_usb" msgid="895668743163316932">"ইউএছবি"</string> <string name="default_audio_route_category_name" msgid="5241740395748134483">"ছিষ্টেম"</string> diff --git a/core/res/res/values-az/strings.xml b/core/res/res/values-az/strings.xml index cc5ecf7dd4ce..f34586ea6f95 100644 --- a/core/res/res/values-az/strings.xml +++ b/core/res/res/values-az/strings.xml @@ -1600,7 +1600,7 @@ <string name="default_audio_route_name" product="tv" msgid="4908971385068087367">"TV"</string> <string name="default_audio_route_name" product="default" msgid="9213546147739983977">"Telefon"</string> <string name="default_audio_route_name_dock_speakers" msgid="1551166029093995289">"Dok spikerlər"</string> - <string name="default_audio_route_name_hdmi" msgid="5474470558160717850">"HDMI"</string> + <string name="default_audio_route_name_external_device" msgid="5474470558160717850">"HDMI"</string> <string name="default_audio_route_name_headphones" msgid="6954070994792640762">"Qulaqlıq"</string> <string name="default_audio_route_name_usb" msgid="895668743163316932">"USB"</string> <string name="default_audio_route_category_name" msgid="5241740395748134483">"Sistem"</string> diff --git a/core/res/res/values-b+sr+Latn/strings.xml b/core/res/res/values-b+sr+Latn/strings.xml index ac937ba421ed..1107f7de1c97 100644 --- a/core/res/res/values-b+sr+Latn/strings.xml +++ b/core/res/res/values-b+sr+Latn/strings.xml @@ -1601,7 +1601,7 @@ <string name="default_audio_route_name" product="tv" msgid="4908971385068087367">"TV"</string> <string name="default_audio_route_name" product="default" msgid="9213546147739983977">"Telefon"</string> <string name="default_audio_route_name_dock_speakers" msgid="1551166029093995289">"Zvučnici bazne stanice"</string> - <string name="default_audio_route_name_hdmi" msgid="5474470558160717850">"HDMI"</string> + <string name="default_audio_route_name_external_device" msgid="5474470558160717850">"HDMI"</string> <string name="default_audio_route_name_headphones" msgid="6954070994792640762">"Slušalice"</string> <string name="default_audio_route_name_usb" msgid="895668743163316932">"USB"</string> <string name="default_audio_route_category_name" msgid="5241740395748134483">"Sistem"</string> diff --git a/core/res/res/values-be/strings.xml b/core/res/res/values-be/strings.xml index d99241ed1e9e..fd80ccc2b095 100644 --- a/core/res/res/values-be/strings.xml +++ b/core/res/res/values-be/strings.xml @@ -1602,7 +1602,7 @@ <string name="default_audio_route_name" product="tv" msgid="4908971385068087367">"ТБ"</string> <string name="default_audio_route_name" product="default" msgid="9213546147739983977">"Тэлефон"</string> <string name="default_audio_route_name_dock_speakers" msgid="1551166029093995289">"Дынамікі станцыi"</string> - <string name="default_audio_route_name_hdmi" msgid="5474470558160717850">"HDMI"</string> + <string name="default_audio_route_name_external_device" msgid="5474470558160717850">"HDMI"</string> <string name="default_audio_route_name_headphones" msgid="6954070994792640762">"Навушнікі"</string> <string name="default_audio_route_name_usb" msgid="895668743163316932">"USB"</string> <string name="default_audio_route_category_name" msgid="5241740395748134483">"Сістэма"</string> diff --git a/core/res/res/values-bg/strings.xml b/core/res/res/values-bg/strings.xml index d15abc76852b..686a2ca70ac4 100644 --- a/core/res/res/values-bg/strings.xml +++ b/core/res/res/values-bg/strings.xml @@ -1600,7 +1600,7 @@ <string name="default_audio_route_name" product="tv" msgid="4908971385068087367">"Телевизор"</string> <string name="default_audio_route_name" product="default" msgid="9213546147739983977">"Телефон"</string> <string name="default_audio_route_name_dock_speakers" msgid="1551166029093995289">"Докинг станц.: Високогов."</string> - <string name="default_audio_route_name_hdmi" msgid="5474470558160717850">"HDMI"</string> + <string name="default_audio_route_name_external_device" msgid="5474470558160717850">"HDMI"</string> <string name="default_audio_route_name_headphones" msgid="6954070994792640762">"Слушалки"</string> <string name="default_audio_route_name_usb" msgid="895668743163316932">"USB"</string> <string name="default_audio_route_category_name" msgid="5241740395748134483">"Система"</string> diff --git a/core/res/res/values-bn/strings.xml b/core/res/res/values-bn/strings.xml index 5cab048b5202..fb6a6ac9cf49 100644 --- a/core/res/res/values-bn/strings.xml +++ b/core/res/res/values-bn/strings.xml @@ -1600,7 +1600,7 @@ <string name="default_audio_route_name" product="tv" msgid="4908971385068087367">"টিভি"</string> <string name="default_audio_route_name" product="default" msgid="9213546147739983977">"ফোন"</string> <string name="default_audio_route_name_dock_speakers" msgid="1551166029093995289">"ডক স্পিকার"</string> - <string name="default_audio_route_name_hdmi" msgid="5474470558160717850">"HDMI"</string> + <string name="default_audio_route_name_external_device" msgid="5474470558160717850">"HDMI"</string> <string name="default_audio_route_name_headphones" msgid="6954070994792640762">"হেডফোন"</string> <string name="default_audio_route_name_usb" msgid="895668743163316932">"USB"</string> <string name="default_audio_route_category_name" msgid="5241740395748134483">"সিস্টেম"</string> diff --git a/core/res/res/values-bs/strings.xml b/core/res/res/values-bs/strings.xml index a442f093b15f..2c644a87daa7 100644 --- a/core/res/res/values-bs/strings.xml +++ b/core/res/res/values-bs/strings.xml @@ -1601,7 +1601,7 @@ <string name="default_audio_route_name" product="tv" msgid="4908971385068087367">"TV"</string> <string name="default_audio_route_name" product="default" msgid="9213546147739983977">"Telefon"</string> <string name="default_audio_route_name_dock_speakers" msgid="1551166029093995289">"Zvučnici priključne stanice"</string> - <string name="default_audio_route_name_hdmi" msgid="5474470558160717850">"HDMI"</string> + <string name="default_audio_route_name_external_device" msgid="5474470558160717850">"HDMI"</string> <string name="default_audio_route_name_headphones" msgid="6954070994792640762">"Slušalice"</string> <string name="default_audio_route_name_usb" msgid="895668743163316932">"USB"</string> <string name="default_audio_route_category_name" msgid="5241740395748134483">"Sistem"</string> diff --git a/core/res/res/values-ca/strings.xml b/core/res/res/values-ca/strings.xml index d48d83aa193f..4a780e168fea 100644 --- a/core/res/res/values-ca/strings.xml +++ b/core/res/res/values-ca/strings.xml @@ -1600,7 +1600,7 @@ <string name="default_audio_route_name" product="tv" msgid="4908971385068087367">"Televisor"</string> <string name="default_audio_route_name" product="default" msgid="9213546147739983977">"Telèfon"</string> <string name="default_audio_route_name_dock_speakers" msgid="1551166029093995289">"Altaveus de la base"</string> - <string name="default_audio_route_name_hdmi" msgid="5474470558160717850">"HDMI"</string> + <string name="default_audio_route_name_external_device" msgid="5474470558160717850">"HDMI"</string> <string name="default_audio_route_name_headphones" msgid="6954070994792640762">"Auriculars"</string> <string name="default_audio_route_name_usb" msgid="895668743163316932">"USB"</string> <string name="default_audio_route_category_name" msgid="5241740395748134483">"Sistema"</string> diff --git a/core/res/res/values-cs/strings.xml b/core/res/res/values-cs/strings.xml index 94e91392a60e..7923cece9e42 100644 --- a/core/res/res/values-cs/strings.xml +++ b/core/res/res/values-cs/strings.xml @@ -1602,7 +1602,7 @@ <string name="default_audio_route_name" product="tv" msgid="4908971385068087367">"Televize"</string> <string name="default_audio_route_name" product="default" msgid="9213546147739983977">"Telefon"</string> <string name="default_audio_route_name_dock_speakers" msgid="1551166029093995289">"Reproduktory doku"</string> - <string name="default_audio_route_name_hdmi" msgid="5474470558160717850">"HDMI"</string> + <string name="default_audio_route_name_external_device" msgid="5474470558160717850">"HDMI"</string> <string name="default_audio_route_name_headphones" msgid="6954070994792640762">"Sluchátka"</string> <string name="default_audio_route_name_usb" msgid="895668743163316932">"USB"</string> <string name="default_audio_route_category_name" msgid="5241740395748134483">"Systém"</string> diff --git a/core/res/res/values-da/strings.xml b/core/res/res/values-da/strings.xml index d85a39a57c95..0e2a8dc5b533 100644 --- a/core/res/res/values-da/strings.xml +++ b/core/res/res/values-da/strings.xml @@ -1600,7 +1600,7 @@ <string name="default_audio_route_name" product="tv" msgid="4908971385068087367">"Tv"</string> <string name="default_audio_route_name" product="default" msgid="9213546147739983977">"Telefon"</string> <string name="default_audio_route_name_dock_speakers" msgid="1551166029093995289">"Dockstationens højttalere"</string> - <string name="default_audio_route_name_hdmi" msgid="5474470558160717850">"HDMI"</string> + <string name="default_audio_route_name_external_device" msgid="5474470558160717850">"HDMI"</string> <string name="default_audio_route_name_headphones" msgid="6954070994792640762">"Hovedtelefoner"</string> <string name="default_audio_route_name_usb" msgid="895668743163316932">"USB"</string> <string name="default_audio_route_category_name" msgid="5241740395748134483">"System"</string> diff --git a/core/res/res/values-de/strings.xml b/core/res/res/values-de/strings.xml index d3a220841f99..f6647b53ba09 100644 --- a/core/res/res/values-de/strings.xml +++ b/core/res/res/values-de/strings.xml @@ -1600,7 +1600,7 @@ <string name="default_audio_route_name" product="tv" msgid="4908971385068087367">"TV"</string> <string name="default_audio_route_name" product="default" msgid="9213546147739983977">"Telefon"</string> <string name="default_audio_route_name_dock_speakers" msgid="1551166029093995289">"Dock-Lautsprecher"</string> - <string name="default_audio_route_name_hdmi" msgid="5474470558160717850">"HDMI"</string> + <string name="default_audio_route_name_external_device" msgid="5474470558160717850">"HDMI"</string> <string name="default_audio_route_name_headphones" msgid="6954070994792640762">"Kopfhörer"</string> <string name="default_audio_route_name_usb" msgid="895668743163316932">"USB"</string> <string name="default_audio_route_category_name" msgid="5241740395748134483">"System"</string> diff --git a/core/res/res/values-el/strings.xml b/core/res/res/values-el/strings.xml index a6a8cabfb6d6..147416a8f5da 100644 --- a/core/res/res/values-el/strings.xml +++ b/core/res/res/values-el/strings.xml @@ -1600,7 +1600,7 @@ <string name="default_audio_route_name" product="tv" msgid="4908971385068087367">"Τηλεόραση"</string> <string name="default_audio_route_name" product="default" msgid="9213546147739983977">"Τηλέφωνο"</string> <string name="default_audio_route_name_dock_speakers" msgid="1551166029093995289">"Ηχεία βάσης σύνδεσης"</string> - <string name="default_audio_route_name_hdmi" msgid="5474470558160717850">"HDMI"</string> + <string name="default_audio_route_name_external_device" msgid="5474470558160717850">"HDMI"</string> <string name="default_audio_route_name_headphones" msgid="6954070994792640762">"Ακουστικά"</string> <string name="default_audio_route_name_usb" msgid="895668743163316932">"USB"</string> <string name="default_audio_route_category_name" msgid="5241740395748134483">"Σύστημα"</string> diff --git a/core/res/res/values-en-rAU/strings.xml b/core/res/res/values-en-rAU/strings.xml index ff62378a9f92..faf659b4189f 100644 --- a/core/res/res/values-en-rAU/strings.xml +++ b/core/res/res/values-en-rAU/strings.xml @@ -1600,7 +1600,7 @@ <string name="default_audio_route_name" product="tv" msgid="4908971385068087367">"TV"</string> <string name="default_audio_route_name" product="default" msgid="9213546147739983977">"Phone"</string> <string name="default_audio_route_name_dock_speakers" msgid="1551166029093995289">"Dock speakers"</string> - <string name="default_audio_route_name_hdmi" msgid="5474470558160717850">"HDMI"</string> + <string name="default_audio_route_name_external_device" msgid="5474470558160717850">"HDMI"</string> <string name="default_audio_route_name_headphones" msgid="6954070994792640762">"Headphones"</string> <string name="default_audio_route_name_usb" msgid="895668743163316932">"USB"</string> <string name="default_audio_route_category_name" msgid="5241740395748134483">"System"</string> diff --git a/core/res/res/values-en-rCA/strings.xml b/core/res/res/values-en-rCA/strings.xml index 515ccde3134d..9a286c53526c 100644 --- a/core/res/res/values-en-rCA/strings.xml +++ b/core/res/res/values-en-rCA/strings.xml @@ -1600,7 +1600,7 @@ <string name="default_audio_route_name" product="tv" msgid="4908971385068087367">"TV"</string> <string name="default_audio_route_name" product="default" msgid="9213546147739983977">"Phone"</string> <string name="default_audio_route_name_dock_speakers" msgid="1551166029093995289">"Dock speakers"</string> - <string name="default_audio_route_name_hdmi" msgid="5474470558160717850">"HDMI"</string> + <string name="default_audio_route_name_external_device" msgid="5474470558160717850">"HDMI"</string> <string name="default_audio_route_name_headphones" msgid="6954070994792640762">"Headphones"</string> <string name="default_audio_route_name_usb" msgid="895668743163316932">"USB"</string> <string name="default_audio_route_category_name" msgid="5241740395748134483">"System"</string> diff --git a/core/res/res/values-en-rGB/strings.xml b/core/res/res/values-en-rGB/strings.xml index a37b767c0e94..fce4a193cc82 100644 --- a/core/res/res/values-en-rGB/strings.xml +++ b/core/res/res/values-en-rGB/strings.xml @@ -1600,7 +1600,7 @@ <string name="default_audio_route_name" product="tv" msgid="4908971385068087367">"TV"</string> <string name="default_audio_route_name" product="default" msgid="9213546147739983977">"Phone"</string> <string name="default_audio_route_name_dock_speakers" msgid="1551166029093995289">"Dock speakers"</string> - <string name="default_audio_route_name_hdmi" msgid="5474470558160717850">"HDMI"</string> + <string name="default_audio_route_name_external_device" msgid="5474470558160717850">"HDMI"</string> <string name="default_audio_route_name_headphones" msgid="6954070994792640762">"Headphones"</string> <string name="default_audio_route_name_usb" msgid="895668743163316932">"USB"</string> <string name="default_audio_route_category_name" msgid="5241740395748134483">"System"</string> diff --git a/core/res/res/values-en-rIN/strings.xml b/core/res/res/values-en-rIN/strings.xml index 0dad5773d542..1ec8db3deb99 100644 --- a/core/res/res/values-en-rIN/strings.xml +++ b/core/res/res/values-en-rIN/strings.xml @@ -1600,7 +1600,7 @@ <string name="default_audio_route_name" product="tv" msgid="4908971385068087367">"TV"</string> <string name="default_audio_route_name" product="default" msgid="9213546147739983977">"Phone"</string> <string name="default_audio_route_name_dock_speakers" msgid="1551166029093995289">"Dock speakers"</string> - <string name="default_audio_route_name_hdmi" msgid="5474470558160717850">"HDMI"</string> + <string name="default_audio_route_name_external_device" msgid="5474470558160717850">"HDMI"</string> <string name="default_audio_route_name_headphones" msgid="6954070994792640762">"Headphones"</string> <string name="default_audio_route_name_usb" msgid="895668743163316932">"USB"</string> <string name="default_audio_route_category_name" msgid="5241740395748134483">"System"</string> diff --git a/core/res/res/values-en-rXC/strings.xml b/core/res/res/values-en-rXC/strings.xml index ed747b26fa63..d6bab59e6c20 100644 --- a/core/res/res/values-en-rXC/strings.xml +++ b/core/res/res/values-en-rXC/strings.xml @@ -1600,7 +1600,7 @@ <string name="default_audio_route_name" product="tv" msgid="4908971385068087367">"TV"</string> <string name="default_audio_route_name" product="default" msgid="9213546147739983977">"Phone"</string> <string name="default_audio_route_name_dock_speakers" msgid="1551166029093995289">"Dock speakers"</string> - <string name="default_audio_route_name_hdmi" msgid="5474470558160717850">"HDMI"</string> + <string name="default_audio_route_name_external_device" msgid="5474470558160717850">"HDMI"</string> <string name="default_audio_route_name_headphones" msgid="6954070994792640762">"Headphones"</string> <string name="default_audio_route_name_usb" msgid="895668743163316932">"USB"</string> <string name="default_audio_route_category_name" msgid="5241740395748134483">"System"</string> diff --git a/core/res/res/values-es-rUS/strings.xml b/core/res/res/values-es-rUS/strings.xml index 3d5584b4a146..3f6a5b338e06 100644 --- a/core/res/res/values-es-rUS/strings.xml +++ b/core/res/res/values-es-rUS/strings.xml @@ -1600,7 +1600,7 @@ <string name="default_audio_route_name" product="tv" msgid="4908971385068087367">"TV"</string> <string name="default_audio_route_name" product="default" msgid="9213546147739983977">"Dispositivo"</string> <string name="default_audio_route_name_dock_speakers" msgid="1551166029093995289">"Altavoces del conector"</string> - <string name="default_audio_route_name_hdmi" msgid="5474470558160717850">"HDMI"</string> + <string name="default_audio_route_name_external_device" msgid="5474470558160717850">"HDMI"</string> <string name="default_audio_route_name_headphones" msgid="6954070994792640762">"Auriculares"</string> <string name="default_audio_route_name_usb" msgid="895668743163316932">"USB"</string> <string name="default_audio_route_category_name" msgid="5241740395748134483">"Sistema"</string> diff --git a/core/res/res/values-es/strings.xml b/core/res/res/values-es/strings.xml index e197fb593ad1..e5169ef70817 100644 --- a/core/res/res/values-es/strings.xml +++ b/core/res/res/values-es/strings.xml @@ -1600,7 +1600,7 @@ <string name="default_audio_route_name" product="tv" msgid="4908971385068087367">"TV"</string> <string name="default_audio_route_name" product="default" msgid="9213546147739983977">"Teléfono"</string> <string name="default_audio_route_name_dock_speakers" msgid="1551166029093995289">"Altavoces de la base"</string> - <string name="default_audio_route_name_hdmi" msgid="5474470558160717850">"HDMI"</string> + <string name="default_audio_route_name_external_device" msgid="5474470558160717850">"HDMI"</string> <string name="default_audio_route_name_headphones" msgid="6954070994792640762">"Auriculares"</string> <string name="default_audio_route_name_usb" msgid="895668743163316932">"USB"</string> <string name="default_audio_route_category_name" msgid="5241740395748134483">"Sistema"</string> diff --git a/core/res/res/values-et/strings.xml b/core/res/res/values-et/strings.xml index 7ff9f18b7d03..dccdeef4dc3d 100644 --- a/core/res/res/values-et/strings.xml +++ b/core/res/res/values-et/strings.xml @@ -1600,7 +1600,7 @@ <string name="default_audio_route_name" product="tv" msgid="4908971385068087367">"Teler"</string> <string name="default_audio_route_name" product="default" msgid="9213546147739983977">"Telefon"</string> <string name="default_audio_route_name_dock_speakers" msgid="1551166029093995289">"Doki kõlarid"</string> - <string name="default_audio_route_name_hdmi" msgid="5474470558160717850">"HDMI"</string> + <string name="default_audio_route_name_external_device" msgid="5474470558160717850">"HDMI"</string> <string name="default_audio_route_name_headphones" msgid="6954070994792640762">"Kõrvaklapid"</string> <string name="default_audio_route_name_usb" msgid="895668743163316932">"USB"</string> <string name="default_audio_route_category_name" msgid="5241740395748134483">"Süsteem"</string> diff --git a/core/res/res/values-eu/strings.xml b/core/res/res/values-eu/strings.xml index 16597da79805..d2fc6272e945 100644 --- a/core/res/res/values-eu/strings.xml +++ b/core/res/res/values-eu/strings.xml @@ -1600,7 +1600,7 @@ <string name="default_audio_route_name" product="tv" msgid="4908971385068087367">"Telebista"</string> <string name="default_audio_route_name" product="default" msgid="9213546147739983977">"Telefonoa"</string> <string name="default_audio_route_name_dock_speakers" msgid="1551166029093995289">"Konektatu bozgorailuak oinarrira"</string> - <string name="default_audio_route_name_hdmi" msgid="5474470558160717850">"HDMI"</string> + <string name="default_audio_route_name_external_device" msgid="5474470558160717850">"HDMI"</string> <string name="default_audio_route_name_headphones" msgid="6954070994792640762">"Entzungailuak"</string> <string name="default_audio_route_name_usb" msgid="895668743163316932">"USB"</string> <string name="default_audio_route_category_name" msgid="5241740395748134483">"Sistema"</string> diff --git a/core/res/res/values-fa/strings.xml b/core/res/res/values-fa/strings.xml index f4b1504bfab6..b24876884df7 100644 --- a/core/res/res/values-fa/strings.xml +++ b/core/res/res/values-fa/strings.xml @@ -1600,7 +1600,7 @@ <string name="default_audio_route_name" product="tv" msgid="4908971385068087367">"تلویزیون"</string> <string name="default_audio_route_name" product="default" msgid="9213546147739983977">"تلفن"</string> <string name="default_audio_route_name_dock_speakers" msgid="1551166029093995289">"بلندگوهای جایگاه"</string> - <string name="default_audio_route_name_hdmi" msgid="5474470558160717850">"HDMI"</string> + <string name="default_audio_route_name_external_device" msgid="5474470558160717850">"HDMI"</string> <string name="default_audio_route_name_headphones" msgid="6954070994792640762">"هدفونها"</string> <string name="default_audio_route_name_usb" msgid="895668743163316932">"USB"</string> <string name="default_audio_route_category_name" msgid="5241740395748134483">"سیستم"</string> diff --git a/core/res/res/values-fi/strings.xml b/core/res/res/values-fi/strings.xml index 374ac8ed903d..ef57e79aa7fd 100644 --- a/core/res/res/values-fi/strings.xml +++ b/core/res/res/values-fi/strings.xml @@ -1600,7 +1600,7 @@ <string name="default_audio_route_name" product="tv" msgid="4908971385068087367">"TV"</string> <string name="default_audio_route_name" product="default" msgid="9213546147739983977">"Puhelin"</string> <string name="default_audio_route_name_dock_speakers" msgid="1551166029093995289">"Telineen kaiuttimet"</string> - <string name="default_audio_route_name_hdmi" msgid="5474470558160717850">"HDMI"</string> + <string name="default_audio_route_name_external_device" msgid="5474470558160717850">"HDMI"</string> <string name="default_audio_route_name_headphones" msgid="6954070994792640762">"Kuulokkeet"</string> <string name="default_audio_route_name_usb" msgid="895668743163316932">"USB"</string> <string name="default_audio_route_category_name" msgid="5241740395748134483">"Järjestelmä"</string> diff --git a/core/res/res/values-fr-rCA/strings.xml b/core/res/res/values-fr-rCA/strings.xml index 8bdfd9e39b92..7e7eb8ccc111 100644 --- a/core/res/res/values-fr-rCA/strings.xml +++ b/core/res/res/values-fr-rCA/strings.xml @@ -1600,7 +1600,7 @@ <string name="default_audio_route_name" product="tv" msgid="4908971385068087367">"Télévision"</string> <string name="default_audio_route_name" product="default" msgid="9213546147739983977">"Téléphone"</string> <string name="default_audio_route_name_dock_speakers" msgid="1551166029093995289">"Haut-parleurs de la station d\'accueil"</string> - <string name="default_audio_route_name_hdmi" msgid="5474470558160717850">"HDMI"</string> + <string name="default_audio_route_name_external_device" msgid="5474470558160717850">"HDMI"</string> <string name="default_audio_route_name_headphones" msgid="6954070994792640762">"Oreillettes"</string> <string name="default_audio_route_name_usb" msgid="895668743163316932">"USB"</string> <string name="default_audio_route_category_name" msgid="5241740395748134483">"Système"</string> diff --git a/core/res/res/values-fr/strings.xml b/core/res/res/values-fr/strings.xml index b85ede6299f1..1f4ed9f80827 100644 --- a/core/res/res/values-fr/strings.xml +++ b/core/res/res/values-fr/strings.xml @@ -1600,7 +1600,7 @@ <string name="default_audio_route_name" product="tv" msgid="4908971385068087367">"Téléviseur"</string> <string name="default_audio_route_name" product="default" msgid="9213546147739983977">"Téléphone"</string> <string name="default_audio_route_name_dock_speakers" msgid="1551166029093995289">"Haut-parleurs de la station d\'accueil"</string> - <string name="default_audio_route_name_hdmi" msgid="5474470558160717850">"HDMI"</string> + <string name="default_audio_route_name_external_device" msgid="5474470558160717850">"HDMI"</string> <string name="default_audio_route_name_headphones" msgid="6954070994792640762">"Écouteurs"</string> <string name="default_audio_route_name_usb" msgid="895668743163316932">"USB"</string> <string name="default_audio_route_category_name" msgid="5241740395748134483">"Système"</string> diff --git a/core/res/res/values-gl/strings.xml b/core/res/res/values-gl/strings.xml index cd63e634bac5..d824b2ab862c 100644 --- a/core/res/res/values-gl/strings.xml +++ b/core/res/res/values-gl/strings.xml @@ -1600,7 +1600,7 @@ <string name="default_audio_route_name" product="tv" msgid="4908971385068087367">"Televisión"</string> <string name="default_audio_route_name" product="default" msgid="9213546147739983977">"Teléfono"</string> <string name="default_audio_route_name_dock_speakers" msgid="1551166029093995289">"Conectar altofalantes á base"</string> - <string name="default_audio_route_name_hdmi" msgid="5474470558160717850">"HDMI"</string> + <string name="default_audio_route_name_external_device" msgid="5474470558160717850">"HDMI"</string> <string name="default_audio_route_name_headphones" msgid="6954070994792640762">"Auriculares"</string> <string name="default_audio_route_name_usb" msgid="895668743163316932">"USB"</string> <string name="default_audio_route_category_name" msgid="5241740395748134483">"Sistema"</string> diff --git a/core/res/res/values-gu/strings.xml b/core/res/res/values-gu/strings.xml index fe60591ca3b7..17bc90a05c4b 100644 --- a/core/res/res/values-gu/strings.xml +++ b/core/res/res/values-gu/strings.xml @@ -1600,7 +1600,7 @@ <string name="default_audio_route_name" product="tv" msgid="4908971385068087367">"TV"</string> <string name="default_audio_route_name" product="default" msgid="9213546147739983977">"ફોન"</string> <string name="default_audio_route_name_dock_speakers" msgid="1551166029093995289">"સ્પીકર્સ ડૉક કરો"</string> - <string name="default_audio_route_name_hdmi" msgid="5474470558160717850">"HDMI"</string> + <string name="default_audio_route_name_external_device" msgid="5474470558160717850">"HDMI"</string> <string name="default_audio_route_name_headphones" msgid="6954070994792640762">"હેડફોન"</string> <string name="default_audio_route_name_usb" msgid="895668743163316932">"USB"</string> <string name="default_audio_route_category_name" msgid="5241740395748134483">"સિસ્ટમ"</string> diff --git a/core/res/res/values-hi/strings.xml b/core/res/res/values-hi/strings.xml index 307f84625ab9..11448ea34c8f 100644 --- a/core/res/res/values-hi/strings.xml +++ b/core/res/res/values-hi/strings.xml @@ -1600,7 +1600,7 @@ <string name="default_audio_route_name" product="tv" msgid="4908971385068087367">"टीवी"</string> <string name="default_audio_route_name" product="default" msgid="9213546147739983977">"फ़ोन"</string> <string name="default_audio_route_name_dock_speakers" msgid="1551166029093995289">"डॉक स्पीकर"</string> - <string name="default_audio_route_name_hdmi" msgid="5474470558160717850">"HDMI"</string> + <string name="default_audio_route_name_external_device" msgid="5474470558160717850">"HDMI"</string> <string name="default_audio_route_name_headphones" msgid="6954070994792640762">"हेडफ़ोन"</string> <string name="default_audio_route_name_usb" msgid="895668743163316932">"यूएसबी"</string> <string name="default_audio_route_category_name" msgid="5241740395748134483">"सिस्टम"</string> diff --git a/core/res/res/values-hr/strings.xml b/core/res/res/values-hr/strings.xml index a40a5737483c..0777add731d3 100644 --- a/core/res/res/values-hr/strings.xml +++ b/core/res/res/values-hr/strings.xml @@ -1601,7 +1601,7 @@ <string name="default_audio_route_name" product="tv" msgid="4908971385068087367">"Televizor"</string> <string name="default_audio_route_name" product="default" msgid="9213546147739983977">"Telefon"</string> <string name="default_audio_route_name_dock_speakers" msgid="1551166029093995289">"Zvučnici postolja"</string> - <string name="default_audio_route_name_hdmi" msgid="5474470558160717850">"HDMI"</string> + <string name="default_audio_route_name_external_device" msgid="5474470558160717850">"HDMI"</string> <string name="default_audio_route_name_headphones" msgid="6954070994792640762">"Slušalice"</string> <string name="default_audio_route_name_usb" msgid="895668743163316932">"USB"</string> <string name="default_audio_route_category_name" msgid="5241740395748134483">"Sustav"</string> diff --git a/core/res/res/values-hu/strings.xml b/core/res/res/values-hu/strings.xml index dd17aa592c89..929fd3d96575 100644 --- a/core/res/res/values-hu/strings.xml +++ b/core/res/res/values-hu/strings.xml @@ -1600,7 +1600,7 @@ <string name="default_audio_route_name" product="tv" msgid="4908971385068087367">"TV"</string> <string name="default_audio_route_name" product="default" msgid="9213546147739983977">"Telefon"</string> <string name="default_audio_route_name_dock_speakers" msgid="1551166029093995289">"Dokkolóegység hangszórója"</string> - <string name="default_audio_route_name_hdmi" msgid="5474470558160717850">"HDMI"</string> + <string name="default_audio_route_name_external_device" msgid="5474470558160717850">"HDMI"</string> <string name="default_audio_route_name_headphones" msgid="6954070994792640762">"Fejhallgató"</string> <string name="default_audio_route_name_usb" msgid="895668743163316932">"USB"</string> <string name="default_audio_route_category_name" msgid="5241740395748134483">"Rendszer"</string> diff --git a/core/res/res/values-hy/strings.xml b/core/res/res/values-hy/strings.xml index 27f95aed3115..438a65c2946f 100644 --- a/core/res/res/values-hy/strings.xml +++ b/core/res/res/values-hy/strings.xml @@ -1600,7 +1600,7 @@ <string name="default_audio_route_name" product="tv" msgid="4908971385068087367">"Հեռուստացույց"</string> <string name="default_audio_route_name" product="default" msgid="9213546147739983977">"Հեռախոս"</string> <string name="default_audio_route_name_dock_speakers" msgid="1551166029093995289">"Դոկ-կայանի բարձրախոսներ"</string> - <string name="default_audio_route_name_hdmi" msgid="5474470558160717850">"HDMI"</string> + <string name="default_audio_route_name_external_device" msgid="5474470558160717850">"HDMI"</string> <string name="default_audio_route_name_headphones" msgid="6954070994792640762">"Ականջակալներ"</string> <string name="default_audio_route_name_usb" msgid="895668743163316932">"USB"</string> <string name="default_audio_route_category_name" msgid="5241740395748134483">"Համակարգ"</string> diff --git a/core/res/res/values-in/strings.xml b/core/res/res/values-in/strings.xml index 5c430b24cdc5..a9669039074b 100644 --- a/core/res/res/values-in/strings.xml +++ b/core/res/res/values-in/strings.xml @@ -1600,7 +1600,7 @@ <string name="default_audio_route_name" product="tv" msgid="4908971385068087367">"TV"</string> <string name="default_audio_route_name" product="default" msgid="9213546147739983977">"Ponsel"</string> <string name="default_audio_route_name_dock_speakers" msgid="1551166029093995289">"Pengeras suara dok"</string> - <string name="default_audio_route_name_hdmi" msgid="5474470558160717850">"HDMI"</string> + <string name="default_audio_route_name_external_device" msgid="5474470558160717850">"HDMI"</string> <string name="default_audio_route_name_headphones" msgid="6954070994792640762">"Headphone"</string> <string name="default_audio_route_name_usb" msgid="895668743163316932">"USB"</string> <string name="default_audio_route_category_name" msgid="5241740395748134483">"Sistem"</string> diff --git a/core/res/res/values-is/strings.xml b/core/res/res/values-is/strings.xml index 84ea0d3bfa1c..b9767087f619 100644 --- a/core/res/res/values-is/strings.xml +++ b/core/res/res/values-is/strings.xml @@ -1600,7 +1600,7 @@ <string name="default_audio_route_name" product="tv" msgid="4908971385068087367">"Sjónvarp"</string> <string name="default_audio_route_name" product="default" msgid="9213546147739983977">"Sími"</string> <string name="default_audio_route_name_dock_speakers" msgid="1551166029093995289">"Dokkuhátalarar"</string> - <string name="default_audio_route_name_hdmi" msgid="5474470558160717850">"HDMI"</string> + <string name="default_audio_route_name_external_device" msgid="5474470558160717850">"HDMI"</string> <string name="default_audio_route_name_headphones" msgid="6954070994792640762">"Heyrnartól"</string> <string name="default_audio_route_name_usb" msgid="895668743163316932">"USB"</string> <string name="default_audio_route_category_name" msgid="5241740395748134483">"Kerfi"</string> diff --git a/core/res/res/values-it/strings.xml b/core/res/res/values-it/strings.xml index 5739e78f675d..88efdc39a159 100644 --- a/core/res/res/values-it/strings.xml +++ b/core/res/res/values-it/strings.xml @@ -1600,7 +1600,7 @@ <string name="default_audio_route_name" product="tv" msgid="4908971385068087367">"TV"</string> <string name="default_audio_route_name" product="default" msgid="9213546147739983977">"Telefono"</string> <string name="default_audio_route_name_dock_speakers" msgid="1551166029093995289">"Altoparlanti dock"</string> - <string name="default_audio_route_name_hdmi" msgid="5474470558160717850">"HDMI"</string> + <string name="default_audio_route_name_external_device" msgid="5474470558160717850">"HDMI"</string> <string name="default_audio_route_name_headphones" msgid="6954070994792640762">"Cuffie audio"</string> <string name="default_audio_route_name_usb" msgid="895668743163316932">"USB"</string> <string name="default_audio_route_category_name" msgid="5241740395748134483">"Sistema"</string> diff --git a/core/res/res/values-iw/strings.xml b/core/res/res/values-iw/strings.xml index 190c68b17847..fb6853a0261e 100644 --- a/core/res/res/values-iw/strings.xml +++ b/core/res/res/values-iw/strings.xml @@ -1602,7 +1602,7 @@ <string name="default_audio_route_name" product="tv" msgid="4908971385068087367">"טלוויזיה"</string> <string name="default_audio_route_name" product="default" msgid="9213546147739983977">"טלפון"</string> <string name="default_audio_route_name_dock_speakers" msgid="1551166029093995289">"רמקולים של מעגן"</string> - <string name="default_audio_route_name_hdmi" msgid="5474470558160717850">"HDMI"</string> + <string name="default_audio_route_name_external_device" msgid="5474470558160717850">"HDMI"</string> <string name="default_audio_route_name_headphones" msgid="6954070994792640762">"אוזניות"</string> <string name="default_audio_route_name_usb" msgid="895668743163316932">"USB"</string> <string name="default_audio_route_category_name" msgid="5241740395748134483">"מערכת"</string> diff --git a/core/res/res/values-ja/strings.xml b/core/res/res/values-ja/strings.xml index 5dca722faba4..5db1bfaff899 100644 --- a/core/res/res/values-ja/strings.xml +++ b/core/res/res/values-ja/strings.xml @@ -1600,7 +1600,7 @@ <string name="default_audio_route_name" product="tv" msgid="4908971385068087367">"テレビ"</string> <string name="default_audio_route_name" product="default" msgid="9213546147739983977">"モバイル デバイス"</string> <string name="default_audio_route_name_dock_speakers" msgid="1551166029093995289">"ホルダーのスピーカー"</string> - <string name="default_audio_route_name_hdmi" msgid="5474470558160717850">"HDMI"</string> + <string name="default_audio_route_name_external_device" msgid="5474470558160717850">"HDMI"</string> <string name="default_audio_route_name_headphones" msgid="6954070994792640762">"ヘッドホン"</string> <string name="default_audio_route_name_usb" msgid="895668743163316932">"USB"</string> <string name="default_audio_route_category_name" msgid="5241740395748134483">"システム"</string> diff --git a/core/res/res/values-ka/strings.xml b/core/res/res/values-ka/strings.xml index 6d0ab2c9efe6..44f560014e1f 100644 --- a/core/res/res/values-ka/strings.xml +++ b/core/res/res/values-ka/strings.xml @@ -1600,7 +1600,7 @@ <string name="default_audio_route_name" product="tv" msgid="4908971385068087367">"ტელევიზია"</string> <string name="default_audio_route_name" product="default" msgid="9213546147739983977">"ტელეფონი"</string> <string name="default_audio_route_name_dock_speakers" msgid="1551166029093995289">"სპიკერების მიმაგრება"</string> - <string name="default_audio_route_name_hdmi" msgid="5474470558160717850">"HDMI"</string> + <string name="default_audio_route_name_external_device" msgid="5474470558160717850">"HDMI"</string> <string name="default_audio_route_name_headphones" msgid="6954070994792640762">"ყურსასმენები"</string> <string name="default_audio_route_name_usb" msgid="895668743163316932">"USB"</string> <string name="default_audio_route_category_name" msgid="5241740395748134483">"სისტემა"</string> diff --git a/core/res/res/values-kk/strings.xml b/core/res/res/values-kk/strings.xml index 399ddbcb6d0b..9d09ce1b82a2 100644 --- a/core/res/res/values-kk/strings.xml +++ b/core/res/res/values-kk/strings.xml @@ -1600,7 +1600,7 @@ <string name="default_audio_route_name" product="tv" msgid="4908971385068087367">"ТД"</string> <string name="default_audio_route_name" product="default" msgid="9213546147739983977">"Телефон"</string> <string name="default_audio_route_name_dock_speakers" msgid="1551166029093995289">"Үндеткіштерді қондыру"</string> - <string name="default_audio_route_name_hdmi" msgid="5474470558160717850">"HDMI"</string> + <string name="default_audio_route_name_external_device" msgid="5474470558160717850">"HDMI"</string> <string name="default_audio_route_name_headphones" msgid="6954070994792640762">"Құлақаспаптар"</string> <string name="default_audio_route_name_usb" msgid="895668743163316932">"USB"</string> <string name="default_audio_route_category_name" msgid="5241740395748134483">"Жүйе"</string> diff --git a/core/res/res/values-km/strings.xml b/core/res/res/values-km/strings.xml index 65c2305548b5..c05e2342890e 100644 --- a/core/res/res/values-km/strings.xml +++ b/core/res/res/values-km/strings.xml @@ -1600,7 +1600,7 @@ <string name="default_audio_route_name" product="tv" msgid="4908971385068087367">"ទូរទស្សន៍"</string> <string name="default_audio_route_name" product="default" msgid="9213546147739983977">"ទូរសព្ទ"</string> <string name="default_audio_route_name_dock_speakers" msgid="1551166029093995289">"ភ្ជាប់អូប៉ាល័រ"</string> - <string name="default_audio_route_name_hdmi" msgid="5474470558160717850">"HDMI"</string> + <string name="default_audio_route_name_external_device" msgid="5474470558160717850">"HDMI"</string> <string name="default_audio_route_name_headphones" msgid="6954070994792640762">"កាស"</string> <string name="default_audio_route_name_usb" msgid="895668743163316932">"USB"</string> <string name="default_audio_route_category_name" msgid="5241740395748134483">"ប្រព័ន្ធ"</string> diff --git a/core/res/res/values-kn/strings.xml b/core/res/res/values-kn/strings.xml index 439e9ab89dfd..c3501d46134c 100644 --- a/core/res/res/values-kn/strings.xml +++ b/core/res/res/values-kn/strings.xml @@ -1600,7 +1600,7 @@ <string name="default_audio_route_name" product="tv" msgid="4908971385068087367">"ಟಿವಿ"</string> <string name="default_audio_route_name" product="default" msgid="9213546147739983977">"ಫೋನ್"</string> <string name="default_audio_route_name_dock_speakers" msgid="1551166029093995289">"ಡಾಕ್ ಸ್ಪೀಕರ್ಗಳು"</string> - <string name="default_audio_route_name_hdmi" msgid="5474470558160717850">"HDMI"</string> + <string name="default_audio_route_name_external_device" msgid="5474470558160717850">"HDMI"</string> <string name="default_audio_route_name_headphones" msgid="6954070994792640762">"ಹೆಡ್ಫೋನ್ಗಳು"</string> <string name="default_audio_route_name_usb" msgid="895668743163316932">"USB"</string> <string name="default_audio_route_category_name" msgid="5241740395748134483">"ಸಿಸ್ಟಂ"</string> diff --git a/core/res/res/values-ko/strings.xml b/core/res/res/values-ko/strings.xml index 05f1ed6e8d5d..a01a02bc5b28 100644 --- a/core/res/res/values-ko/strings.xml +++ b/core/res/res/values-ko/strings.xml @@ -1600,7 +1600,7 @@ <string name="default_audio_route_name" product="tv" msgid="4908971385068087367">"TV"</string> <string name="default_audio_route_name" product="default" msgid="9213546147739983977">"휴대전화"</string> <string name="default_audio_route_name_dock_speakers" msgid="1551166029093995289">"도크 스피커"</string> - <string name="default_audio_route_name_hdmi" msgid="5474470558160717850">"HDMI"</string> + <string name="default_audio_route_name_external_device" msgid="5474470558160717850">"HDMI"</string> <string name="default_audio_route_name_headphones" msgid="6954070994792640762">"헤드폰"</string> <string name="default_audio_route_name_usb" msgid="895668743163316932">"USB"</string> <string name="default_audio_route_category_name" msgid="5241740395748134483">"시스템"</string> diff --git a/core/res/res/values-ky/strings.xml b/core/res/res/values-ky/strings.xml index dcb8b32138cd..5e87c452e44a 100644 --- a/core/res/res/values-ky/strings.xml +++ b/core/res/res/values-ky/strings.xml @@ -1600,7 +1600,7 @@ <string name="default_audio_route_name" product="tv" msgid="4908971385068087367">"Сыналгы"</string> <string name="default_audio_route_name" product="default" msgid="9213546147739983977">"Телефон"</string> <string name="default_audio_route_name_dock_speakers" msgid="1551166029093995289">"Аудио док бекет"</string> - <string name="default_audio_route_name_hdmi" msgid="5474470558160717850">"HDMI"</string> + <string name="default_audio_route_name_external_device" msgid="5474470558160717850">"HDMI"</string> <string name="default_audio_route_name_headphones" msgid="6954070994792640762">"Кулакчын"</string> <string name="default_audio_route_name_usb" msgid="895668743163316932">"USB"</string> <string name="default_audio_route_category_name" msgid="5241740395748134483">"Тутум"</string> diff --git a/core/res/res/values-lo/strings.xml b/core/res/res/values-lo/strings.xml index 91204bf12ede..1ee961ed05b0 100644 --- a/core/res/res/values-lo/strings.xml +++ b/core/res/res/values-lo/strings.xml @@ -1600,7 +1600,7 @@ <string name="default_audio_route_name" product="tv" msgid="4908971385068087367">"ໂທລະພາບ"</string> <string name="default_audio_route_name" product="default" msgid="9213546147739983977">"ໂທລະສັບ"</string> <string name="default_audio_route_name_dock_speakers" msgid="1551166029093995289">"ບ່ອນຕັ້ງລຳໂພງ"</string> - <string name="default_audio_route_name_hdmi" msgid="5474470558160717850">"HDMI"</string> + <string name="default_audio_route_name_external_device" msgid="5474470558160717850">"HDMI"</string> <string name="default_audio_route_name_headphones" msgid="6954070994792640762">"ຫູຟັງ"</string> <string name="default_audio_route_name_usb" msgid="895668743163316932">"USB"</string> <string name="default_audio_route_category_name" msgid="5241740395748134483">"ລະບົບ"</string> diff --git a/core/res/res/values-lt/strings.xml b/core/res/res/values-lt/strings.xml index 43610ba1976b..aeef81d7c873 100644 --- a/core/res/res/values-lt/strings.xml +++ b/core/res/res/values-lt/strings.xml @@ -1602,7 +1602,7 @@ <string name="default_audio_route_name" product="tv" msgid="4908971385068087367">"TV"</string> <string name="default_audio_route_name" product="default" msgid="9213546147739983977">"Telefonas"</string> <string name="default_audio_route_name_dock_speakers" msgid="1551166029093995289">"Doko garsiakalbiai"</string> - <string name="default_audio_route_name_hdmi" msgid="5474470558160717850">"HDMI"</string> + <string name="default_audio_route_name_external_device" msgid="5474470558160717850">"HDMI"</string> <string name="default_audio_route_name_headphones" msgid="6954070994792640762">"Ausinės"</string> <string name="default_audio_route_name_usb" msgid="895668743163316932">"USB"</string> <string name="default_audio_route_category_name" msgid="5241740395748134483">"Sistema"</string> diff --git a/core/res/res/values-lv/strings.xml b/core/res/res/values-lv/strings.xml index adf956aa3f38..d71b5b9fa076 100644 --- a/core/res/res/values-lv/strings.xml +++ b/core/res/res/values-lv/strings.xml @@ -1601,7 +1601,7 @@ <string name="default_audio_route_name" product="tv" msgid="4908971385068087367">"TV"</string> <string name="default_audio_route_name" product="default" msgid="9213546147739983977">"Tālrunis"</string> <string name="default_audio_route_name_dock_speakers" msgid="1551166029093995289">"Doka skaļruņi"</string> - <string name="default_audio_route_name_hdmi" msgid="5474470558160717850">"HDMI"</string> + <string name="default_audio_route_name_external_device" msgid="5474470558160717850">"HDMI"</string> <string name="default_audio_route_name_headphones" msgid="6954070994792640762">"Austiņas"</string> <string name="default_audio_route_name_usb" msgid="895668743163316932">"USB"</string> <string name="default_audio_route_category_name" msgid="5241740395748134483">"Sistēma"</string> diff --git a/core/res/res/values-mk/strings.xml b/core/res/res/values-mk/strings.xml index 9d754d4b5571..8f804fa4097f 100644 --- a/core/res/res/values-mk/strings.xml +++ b/core/res/res/values-mk/strings.xml @@ -1600,7 +1600,7 @@ <string name="default_audio_route_name" product="tv" msgid="4908971385068087367">"Телевизор"</string> <string name="default_audio_route_name" product="default" msgid="9213546147739983977">"Телефон"</string> <string name="default_audio_route_name_dock_speakers" msgid="1551166029093995289">"Приклучи звучници"</string> - <string name="default_audio_route_name_hdmi" msgid="5474470558160717850">"HDMI"</string> + <string name="default_audio_route_name_external_device" msgid="5474470558160717850">"HDMI"</string> <string name="default_audio_route_name_headphones" msgid="6954070994792640762">"Слушалки"</string> <string name="default_audio_route_name_usb" msgid="895668743163316932">"USB"</string> <string name="default_audio_route_category_name" msgid="5241740395748134483">"Систем"</string> diff --git a/core/res/res/values-ml/strings.xml b/core/res/res/values-ml/strings.xml index 4922d0a8654e..64c92066bcb1 100644 --- a/core/res/res/values-ml/strings.xml +++ b/core/res/res/values-ml/strings.xml @@ -1600,7 +1600,7 @@ <string name="default_audio_route_name" product="tv" msgid="4908971385068087367">"ടിവി"</string> <string name="default_audio_route_name" product="default" msgid="9213546147739983977">"ഫോണ്"</string> <string name="default_audio_route_name_dock_speakers" msgid="1551166029093995289">"ഡോക്ക് സ്പീക്കറുകൾ"</string> - <string name="default_audio_route_name_hdmi" msgid="5474470558160717850">"HDMI"</string> + <string name="default_audio_route_name_external_device" msgid="5474470558160717850">"HDMI"</string> <string name="default_audio_route_name_headphones" msgid="6954070994792640762">"ഹെഡ്ഫോണുകൾ"</string> <string name="default_audio_route_name_usb" msgid="895668743163316932">"USB"</string> <string name="default_audio_route_category_name" msgid="5241740395748134483">"സിസ്റ്റം"</string> diff --git a/core/res/res/values-mn/strings.xml b/core/res/res/values-mn/strings.xml index 63e165d1dbdd..46c898b91ebc 100644 --- a/core/res/res/values-mn/strings.xml +++ b/core/res/res/values-mn/strings.xml @@ -1600,7 +1600,7 @@ <string name="default_audio_route_name" product="tv" msgid="4908971385068087367">"Tелевиз"</string> <string name="default_audio_route_name" product="default" msgid="9213546147739983977">"Утас"</string> <string name="default_audio_route_name_dock_speakers" msgid="1551166029093995289">"Чанга яригчийг суулгах"</string> - <string name="default_audio_route_name_hdmi" msgid="5474470558160717850">"HDMI"</string> + <string name="default_audio_route_name_external_device" msgid="5474470558160717850">"HDMI"</string> <string name="default_audio_route_name_headphones" msgid="6954070994792640762">"Чихэвч"</string> <string name="default_audio_route_name_usb" msgid="895668743163316932">"USB"</string> <string name="default_audio_route_category_name" msgid="5241740395748134483">"Систем"</string> diff --git a/core/res/res/values-mr/strings.xml b/core/res/res/values-mr/strings.xml index 511d58d972ca..2d5a14bfb663 100644 --- a/core/res/res/values-mr/strings.xml +++ b/core/res/res/values-mr/strings.xml @@ -1600,7 +1600,7 @@ <string name="default_audio_route_name" product="tv" msgid="4908971385068087367">"टीव्ही"</string> <string name="default_audio_route_name" product="default" msgid="9213546147739983977">"फोन"</string> <string name="default_audio_route_name_dock_speakers" msgid="1551166029093995289">"स्पीकर डॉक करा"</string> - <string name="default_audio_route_name_hdmi" msgid="5474470558160717850">"HDMI"</string> + <string name="default_audio_route_name_external_device" msgid="5474470558160717850">"HDMI"</string> <string name="default_audio_route_name_headphones" msgid="6954070994792640762">"हेडफोन"</string> <string name="default_audio_route_name_usb" msgid="895668743163316932">"USB"</string> <string name="default_audio_route_category_name" msgid="5241740395748134483">"सिस्टम"</string> diff --git a/core/res/res/values-ms/strings.xml b/core/res/res/values-ms/strings.xml index ad2eb1b45102..150a1446528f 100644 --- a/core/res/res/values-ms/strings.xml +++ b/core/res/res/values-ms/strings.xml @@ -1600,7 +1600,7 @@ <string name="default_audio_route_name" product="tv" msgid="4908971385068087367">"TV"</string> <string name="default_audio_route_name" product="default" msgid="9213546147739983977">"Telefon"</string> <string name="default_audio_route_name_dock_speakers" msgid="1551166029093995289">"Pembesar suara dok"</string> - <string name="default_audio_route_name_hdmi" msgid="5474470558160717850">"HDMI"</string> + <string name="default_audio_route_name_external_device" msgid="5474470558160717850">"HDMI"</string> <string name="default_audio_route_name_headphones" msgid="6954070994792640762">"Fon kepala"</string> <string name="default_audio_route_name_usb" msgid="895668743163316932">"USB"</string> <string name="default_audio_route_category_name" msgid="5241740395748134483">"Sistem"</string> diff --git a/core/res/res/values-my/strings.xml b/core/res/res/values-my/strings.xml index 15722899110c..601cb2271e1f 100644 --- a/core/res/res/values-my/strings.xml +++ b/core/res/res/values-my/strings.xml @@ -1600,7 +1600,7 @@ <string name="default_audio_route_name" product="tv" msgid="4908971385068087367">"TV"</string> <string name="default_audio_route_name" product="default" msgid="9213546147739983977">"ဖုန်း"</string> <string name="default_audio_route_name_dock_speakers" msgid="1551166029093995289">"အထိုင်ရှိသော စပီကာများ"</string> - <string name="default_audio_route_name_hdmi" msgid="5474470558160717850">"HDMI"</string> + <string name="default_audio_route_name_external_device" msgid="5474470558160717850">"HDMI"</string> <string name="default_audio_route_name_headphones" msgid="6954070994792640762">"နားကြပ်"</string> <string name="default_audio_route_name_usb" msgid="895668743163316932">"USB"</string> <string name="default_audio_route_category_name" msgid="5241740395748134483">"စနစ်"</string> diff --git a/core/res/res/values-nb/strings.xml b/core/res/res/values-nb/strings.xml index 144af97fa9a8..f5ccb47dda67 100644 --- a/core/res/res/values-nb/strings.xml +++ b/core/res/res/values-nb/strings.xml @@ -1600,7 +1600,7 @@ <string name="default_audio_route_name" product="tv" msgid="4908971385068087367">"Google TV"</string> <string name="default_audio_route_name" product="default" msgid="9213546147739983977">"Telefon"</string> <string name="default_audio_route_name_dock_speakers" msgid="1551166029093995289">"Dokkhøyttalere"</string> - <string name="default_audio_route_name_hdmi" msgid="5474470558160717850">"HDMI"</string> + <string name="default_audio_route_name_external_device" msgid="5474470558160717850">"HDMI"</string> <string name="default_audio_route_name_headphones" msgid="6954070994792640762">"Hodetelefoner"</string> <string name="default_audio_route_name_usb" msgid="895668743163316932">"USB"</string> <string name="default_audio_route_category_name" msgid="5241740395748134483">"System"</string> diff --git a/core/res/res/values-ne/strings.xml b/core/res/res/values-ne/strings.xml index 9f98e96afc75..76f21bc231ce 100644 --- a/core/res/res/values-ne/strings.xml +++ b/core/res/res/values-ne/strings.xml @@ -1600,7 +1600,7 @@ <string name="default_audio_route_name" product="tv" msgid="4908971385068087367">"टिभी"</string> <string name="default_audio_route_name" product="default" msgid="9213546147739983977">"फोन"</string> <string name="default_audio_route_name_dock_speakers" msgid="1551166029093995289">"डक स्पिकरहरू"</string> - <string name="default_audio_route_name_hdmi" msgid="5474470558160717850">"HDMI"</string> + <string name="default_audio_route_name_external_device" msgid="5474470558160717850">"HDMI"</string> <string name="default_audio_route_name_headphones" msgid="6954070994792640762">"हेडफोनहरू"</string> <string name="default_audio_route_name_usb" msgid="895668743163316932">"USB"</string> <string name="default_audio_route_category_name" msgid="5241740395748134483">"प्रणाली"</string> diff --git a/core/res/res/values-nl/strings.xml b/core/res/res/values-nl/strings.xml index 1eef2f4224cf..3af2652e240a 100644 --- a/core/res/res/values-nl/strings.xml +++ b/core/res/res/values-nl/strings.xml @@ -1600,7 +1600,7 @@ <string name="default_audio_route_name" product="tv" msgid="4908971385068087367">"Tv"</string> <string name="default_audio_route_name" product="default" msgid="9213546147739983977">"Telefoon"</string> <string name="default_audio_route_name_dock_speakers" msgid="1551166029093995289">"Dockluidsprekers"</string> - <string name="default_audio_route_name_hdmi" msgid="5474470558160717850">"HDMI"</string> + <string name="default_audio_route_name_external_device" msgid="5474470558160717850">"HDMI"</string> <string name="default_audio_route_name_headphones" msgid="6954070994792640762">"Hoofdtelefoon"</string> <string name="default_audio_route_name_usb" msgid="895668743163316932">"USB"</string> <string name="default_audio_route_category_name" msgid="5241740395748134483">"Systeem"</string> diff --git a/core/res/res/values-or/strings.xml b/core/res/res/values-or/strings.xml index b16c4b0143f0..e2f774a18900 100644 --- a/core/res/res/values-or/strings.xml +++ b/core/res/res/values-or/strings.xml @@ -1600,7 +1600,7 @@ <string name="default_audio_route_name" product="tv" msgid="4908971385068087367">"TV"</string> <string name="default_audio_route_name" product="default" msgid="9213546147739983977">"ଫୋନ"</string> <string name="default_audio_route_name_dock_speakers" msgid="1551166029093995289">"ଡକ୍ ସ୍ପିକର୍"</string> - <string name="default_audio_route_name_hdmi" msgid="5474470558160717850">"HDMI"</string> + <string name="default_audio_route_name_external_device" msgid="5474470558160717850">"HDMI"</string> <string name="default_audio_route_name_headphones" msgid="6954070994792640762">"ହେଡଫୋନ୍"</string> <string name="default_audio_route_name_usb" msgid="895668743163316932">"USB"</string> <string name="default_audio_route_category_name" msgid="5241740395748134483">"ସିଷ୍ଟମ"</string> diff --git a/core/res/res/values-pa/strings.xml b/core/res/res/values-pa/strings.xml index b900c8e111fa..4fa67e77d870 100644 --- a/core/res/res/values-pa/strings.xml +++ b/core/res/res/values-pa/strings.xml @@ -1600,7 +1600,7 @@ <string name="default_audio_route_name" product="tv" msgid="4908971385068087367">"TV"</string> <string name="default_audio_route_name" product="default" msgid="9213546147739983977">"ਫ਼ੋਨ ਕਰੋ"</string> <string name="default_audio_route_name_dock_speakers" msgid="1551166029093995289">"ਡੌਕ ਸਪੀਕਰਸ"</string> - <string name="default_audio_route_name_hdmi" msgid="5474470558160717850">"HDMI"</string> + <string name="default_audio_route_name_external_device" msgid="5474470558160717850">"HDMI"</string> <string name="default_audio_route_name_headphones" msgid="6954070994792640762">"ਹੈੱਡਫ਼ੋਨ"</string> <string name="default_audio_route_name_usb" msgid="895668743163316932">"USB"</string> <string name="default_audio_route_category_name" msgid="5241740395748134483">"ਸਿਸਟਮ"</string> diff --git a/core/res/res/values-pl/strings.xml b/core/res/res/values-pl/strings.xml index dd2847d18bbc..6199a4c5d53e 100644 --- a/core/res/res/values-pl/strings.xml +++ b/core/res/res/values-pl/strings.xml @@ -1602,7 +1602,7 @@ <string name="default_audio_route_name" product="tv" msgid="4908971385068087367">"Telewizor"</string> <string name="default_audio_route_name" product="default" msgid="9213546147739983977">"Telefon"</string> <string name="default_audio_route_name_dock_speakers" msgid="1551166029093995289">"Głośniki stacji dokującej"</string> - <string name="default_audio_route_name_hdmi" msgid="5474470558160717850">"HDMI"</string> + <string name="default_audio_route_name_external_device" msgid="5474470558160717850">"HDMI"</string> <string name="default_audio_route_name_headphones" msgid="6954070994792640762">"Słuchawki"</string> <string name="default_audio_route_name_usb" msgid="895668743163316932">"USB"</string> <string name="default_audio_route_category_name" msgid="5241740395748134483">"System"</string> diff --git a/core/res/res/values-pt-rBR/strings.xml b/core/res/res/values-pt-rBR/strings.xml index 48d856af2bee..9e8d6db27203 100644 --- a/core/res/res/values-pt-rBR/strings.xml +++ b/core/res/res/values-pt-rBR/strings.xml @@ -1600,7 +1600,7 @@ <string name="default_audio_route_name" product="tv" msgid="4908971385068087367">"TV"</string> <string name="default_audio_route_name" product="default" msgid="9213546147739983977">"Telefone"</string> <string name="default_audio_route_name_dock_speakers" msgid="1551166029093995289">"Alto-falantes na base"</string> - <string name="default_audio_route_name_hdmi" msgid="5474470558160717850">"HDMI"</string> + <string name="default_audio_route_name_external_device" msgid="5474470558160717850">"HDMI"</string> <string name="default_audio_route_name_headphones" msgid="6954070994792640762">"Fones de ouvido"</string> <string name="default_audio_route_name_usb" msgid="895668743163316932">"USB"</string> <string name="default_audio_route_category_name" msgid="5241740395748134483">"Sistema"</string> diff --git a/core/res/res/values-pt-rPT/strings.xml b/core/res/res/values-pt-rPT/strings.xml index f50a1b7440cc..90e646fc1342 100644 --- a/core/res/res/values-pt-rPT/strings.xml +++ b/core/res/res/values-pt-rPT/strings.xml @@ -1600,7 +1600,7 @@ <string name="default_audio_route_name" product="tv" msgid="4908971385068087367">"TV"</string> <string name="default_audio_route_name" product="default" msgid="9213546147739983977">"Telemóvel"</string> <string name="default_audio_route_name_dock_speakers" msgid="1551166029093995289">"Altif. estação ancoragem"</string> - <string name="default_audio_route_name_hdmi" msgid="5474470558160717850">"HDMI"</string> + <string name="default_audio_route_name_external_device" msgid="5474470558160717850">"HDMI"</string> <string name="default_audio_route_name_headphones" msgid="6954070994792640762">"Auscultadores"</string> <string name="default_audio_route_name_usb" msgid="895668743163316932">"USB"</string> <string name="default_audio_route_category_name" msgid="5241740395748134483">"Sistema"</string> diff --git a/core/res/res/values-pt/strings.xml b/core/res/res/values-pt/strings.xml index 48d856af2bee..9e8d6db27203 100644 --- a/core/res/res/values-pt/strings.xml +++ b/core/res/res/values-pt/strings.xml @@ -1600,7 +1600,7 @@ <string name="default_audio_route_name" product="tv" msgid="4908971385068087367">"TV"</string> <string name="default_audio_route_name" product="default" msgid="9213546147739983977">"Telefone"</string> <string name="default_audio_route_name_dock_speakers" msgid="1551166029093995289">"Alto-falantes na base"</string> - <string name="default_audio_route_name_hdmi" msgid="5474470558160717850">"HDMI"</string> + <string name="default_audio_route_name_external_device" msgid="5474470558160717850">"HDMI"</string> <string name="default_audio_route_name_headphones" msgid="6954070994792640762">"Fones de ouvido"</string> <string name="default_audio_route_name_usb" msgid="895668743163316932">"USB"</string> <string name="default_audio_route_category_name" msgid="5241740395748134483">"Sistema"</string> diff --git a/core/res/res/values-ro/strings.xml b/core/res/res/values-ro/strings.xml index 2a55d2e79853..557efbdd610a 100644 --- a/core/res/res/values-ro/strings.xml +++ b/core/res/res/values-ro/strings.xml @@ -1601,7 +1601,7 @@ <string name="default_audio_route_name" product="tv" msgid="4908971385068087367">"TV"</string> <string name="default_audio_route_name" product="default" msgid="9213546147739983977">"Telefon"</string> <string name="default_audio_route_name_dock_speakers" msgid="1551166029093995289">"Difuz. dispozit. andocare"</string> - <string name="default_audio_route_name_hdmi" msgid="5474470558160717850">"HDMI"</string> + <string name="default_audio_route_name_external_device" msgid="5474470558160717850">"HDMI"</string> <string name="default_audio_route_name_headphones" msgid="6954070994792640762">"Căști"</string> <string name="default_audio_route_name_usb" msgid="895668743163316932">"USB"</string> <string name="default_audio_route_category_name" msgid="5241740395748134483">"Sistem"</string> diff --git a/core/res/res/values-ru/strings.xml b/core/res/res/values-ru/strings.xml index 5fa268100a32..03b2a71505c4 100644 --- a/core/res/res/values-ru/strings.xml +++ b/core/res/res/values-ru/strings.xml @@ -1602,7 +1602,7 @@ <string name="default_audio_route_name" product="tv" msgid="4908971385068087367">"Телевизор"</string> <string name="default_audio_route_name" product="default" msgid="9213546147739983977">"Телефон"</string> <string name="default_audio_route_name_dock_speakers" msgid="1551166029093995289">"Динамики док-станции"</string> - <string name="default_audio_route_name_hdmi" msgid="5474470558160717850">"HDMI"</string> + <string name="default_audio_route_name_external_device" msgid="5474470558160717850">"HDMI"</string> <string name="default_audio_route_name_headphones" msgid="6954070994792640762">"Наушники"</string> <string name="default_audio_route_name_usb" msgid="895668743163316932">"USB"</string> <string name="default_audio_route_category_name" msgid="5241740395748134483">"Система"</string> diff --git a/core/res/res/values-si/strings.xml b/core/res/res/values-si/strings.xml index 7c5029334051..ff0b58fdcbae 100644 --- a/core/res/res/values-si/strings.xml +++ b/core/res/res/values-si/strings.xml @@ -1600,7 +1600,7 @@ <string name="default_audio_route_name" product="tv" msgid="4908971385068087367">"රූපවාහිනී"</string> <string name="default_audio_route_name" product="default" msgid="9213546147739983977">"දුරකථනය"</string> <string name="default_audio_route_name_dock_speakers" msgid="1551166029093995289">"නාදක ඩොක් කරන්න"</string> - <string name="default_audio_route_name_hdmi" msgid="5474470558160717850">"HDMI"</string> + <string name="default_audio_route_name_external_device" msgid="5474470558160717850">"HDMI"</string> <string name="default_audio_route_name_headphones" msgid="6954070994792640762">"ඉස් බණු"</string> <string name="default_audio_route_name_usb" msgid="895668743163316932">"USB"</string> <string name="default_audio_route_category_name" msgid="5241740395748134483">"පද්ධතිය"</string> diff --git a/core/res/res/values-sk/strings.xml b/core/res/res/values-sk/strings.xml index b41739460d36..924513c0f785 100644 --- a/core/res/res/values-sk/strings.xml +++ b/core/res/res/values-sk/strings.xml @@ -1602,7 +1602,7 @@ <string name="default_audio_route_name" product="tv" msgid="4908971385068087367">"Televízor"</string> <string name="default_audio_route_name" product="default" msgid="9213546147739983977">"Telefón"</string> <string name="default_audio_route_name_dock_speakers" msgid="1551166029093995289">"Reproduktory doku"</string> - <string name="default_audio_route_name_hdmi" msgid="5474470558160717850">"HDMI"</string> + <string name="default_audio_route_name_external_device" msgid="5474470558160717850">"HDMI"</string> <string name="default_audio_route_name_headphones" msgid="6954070994792640762">"Slúchadlá"</string> <string name="default_audio_route_name_usb" msgid="895668743163316932">"USB"</string> <string name="default_audio_route_category_name" msgid="5241740395748134483">"Systém"</string> diff --git a/core/res/res/values-sl/strings.xml b/core/res/res/values-sl/strings.xml index 682af015f636..8a6e2e57f888 100644 --- a/core/res/res/values-sl/strings.xml +++ b/core/res/res/values-sl/strings.xml @@ -1602,7 +1602,7 @@ <string name="default_audio_route_name" product="tv" msgid="4908971385068087367">"Televizor"</string> <string name="default_audio_route_name" product="default" msgid="9213546147739983977">"Telefon"</string> <string name="default_audio_route_name_dock_speakers" msgid="1551166029093995289">"Zvočniki stojala"</string> - <string name="default_audio_route_name_hdmi" msgid="5474470558160717850">"HDMI"</string> + <string name="default_audio_route_name_external_device" msgid="5474470558160717850">"HDMI"</string> <string name="default_audio_route_name_headphones" msgid="6954070994792640762">"Slušalke"</string> <string name="default_audio_route_name_usb" msgid="895668743163316932">"USB"</string> <string name="default_audio_route_category_name" msgid="5241740395748134483">"Sistem"</string> diff --git a/core/res/res/values-sq/strings.xml b/core/res/res/values-sq/strings.xml index 2f3fc8ee5aca..478808365d42 100644 --- a/core/res/res/values-sq/strings.xml +++ b/core/res/res/values-sq/strings.xml @@ -1600,7 +1600,7 @@ <string name="default_audio_route_name" product="tv" msgid="4908971385068087367">"Televizori"</string> <string name="default_audio_route_name" product="default" msgid="9213546147739983977">"Telefon"</string> <string name="default_audio_route_name_dock_speakers" msgid="1551166029093995289">"Altoparlantët e stacionit"</string> - <string name="default_audio_route_name_hdmi" msgid="5474470558160717850">"HDMI"</string> + <string name="default_audio_route_name_external_device" msgid="5474470558160717850">"HDMI"</string> <string name="default_audio_route_name_headphones" msgid="6954070994792640762">"Kufjet"</string> <string name="default_audio_route_name_usb" msgid="895668743163316932">"USB"</string> <string name="default_audio_route_category_name" msgid="5241740395748134483">"Sistemi"</string> diff --git a/core/res/res/values-sr/strings.xml b/core/res/res/values-sr/strings.xml index 3cf2505e4782..ac631c6f5041 100644 --- a/core/res/res/values-sr/strings.xml +++ b/core/res/res/values-sr/strings.xml @@ -1601,7 +1601,7 @@ <string name="default_audio_route_name" product="tv" msgid="4908971385068087367">"ТВ"</string> <string name="default_audio_route_name" product="default" msgid="9213546147739983977">"Телефон"</string> <string name="default_audio_route_name_dock_speakers" msgid="1551166029093995289">"Звучници базне станице"</string> - <string name="default_audio_route_name_hdmi" msgid="5474470558160717850">"HDMI"</string> + <string name="default_audio_route_name_external_device" msgid="5474470558160717850">"HDMI"</string> <string name="default_audio_route_name_headphones" msgid="6954070994792640762">"Слушалице"</string> <string name="default_audio_route_name_usb" msgid="895668743163316932">"USB"</string> <string name="default_audio_route_category_name" msgid="5241740395748134483">"Систем"</string> diff --git a/core/res/res/values-sv/strings.xml b/core/res/res/values-sv/strings.xml index b118773d793f..6b70ff558332 100644 --- a/core/res/res/values-sv/strings.xml +++ b/core/res/res/values-sv/strings.xml @@ -1600,7 +1600,7 @@ <string name="default_audio_route_name" product="tv" msgid="4908971385068087367">"TV"</string> <string name="default_audio_route_name" product="default" msgid="9213546147739983977">"Mobil"</string> <string name="default_audio_route_name_dock_speakers" msgid="1551166029093995289">"Dockningsstationens högtalare"</string> - <string name="default_audio_route_name_hdmi" msgid="5474470558160717850">"HDMI"</string> + <string name="default_audio_route_name_external_device" msgid="5474470558160717850">"HDMI"</string> <string name="default_audio_route_name_headphones" msgid="6954070994792640762">"Hörlurar"</string> <string name="default_audio_route_name_usb" msgid="895668743163316932">"USB"</string> <string name="default_audio_route_category_name" msgid="5241740395748134483">"System"</string> diff --git a/core/res/res/values-sw/strings.xml b/core/res/res/values-sw/strings.xml index 09b32a642261..df38ca64a5fa 100644 --- a/core/res/res/values-sw/strings.xml +++ b/core/res/res/values-sw/strings.xml @@ -1600,7 +1600,7 @@ <string name="default_audio_route_name" product="tv" msgid="4908971385068087367">"Runinga"</string> <string name="default_audio_route_name" product="default" msgid="9213546147739983977">"Simu"</string> <string name="default_audio_route_name_dock_speakers" msgid="1551166029093995289">"Vipasa sauti vya kituo"</string> - <string name="default_audio_route_name_hdmi" msgid="5474470558160717850">"HDMI"</string> + <string name="default_audio_route_name_external_device" msgid="5474470558160717850">"HDMI"</string> <string name="default_audio_route_name_headphones" msgid="6954070994792640762">"Vipokeasauti"</string> <string name="default_audio_route_name_usb" msgid="895668743163316932">"USB"</string> <string name="default_audio_route_category_name" msgid="5241740395748134483">"Mfumo"</string> diff --git a/core/res/res/values-ta/strings.xml b/core/res/res/values-ta/strings.xml index 6c20e21ceffb..464d7960c32c 100644 --- a/core/res/res/values-ta/strings.xml +++ b/core/res/res/values-ta/strings.xml @@ -1600,7 +1600,7 @@ <string name="default_audio_route_name" product="tv" msgid="4908971385068087367">"டிவி"</string> <string name="default_audio_route_name" product="default" msgid="9213546147739983977">"ஃபோன்"</string> <string name="default_audio_route_name_dock_speakers" msgid="1551166029093995289">"மொபைல் வைக்கும் கருவியின் ஸ்பீக்கர்கள்"</string> - <string name="default_audio_route_name_hdmi" msgid="5474470558160717850">"HDMI"</string> + <string name="default_audio_route_name_external_device" msgid="5474470558160717850">"HDMI"</string> <string name="default_audio_route_name_headphones" msgid="6954070994792640762">"ஹெட்ஃபோன்கள்"</string> <string name="default_audio_route_name_usb" msgid="895668743163316932">"USB"</string> <string name="default_audio_route_category_name" msgid="5241740395748134483">"சிஸ்டம்"</string> diff --git a/core/res/res/values-te/strings.xml b/core/res/res/values-te/strings.xml index 9bcce326bc42..ffc216efced8 100644 --- a/core/res/res/values-te/strings.xml +++ b/core/res/res/values-te/strings.xml @@ -1600,7 +1600,7 @@ <string name="default_audio_route_name" product="tv" msgid="4908971385068087367">"టీవీ"</string> <string name="default_audio_route_name" product="default" msgid="9213546147739983977">"ఫోన్"</string> <string name="default_audio_route_name_dock_speakers" msgid="1551166029093995289">"డాక్ స్పీకర్లు"</string> - <string name="default_audio_route_name_hdmi" msgid="5474470558160717850">"HDMI"</string> + <string name="default_audio_route_name_external_device" msgid="5474470558160717850">"HDMI"</string> <string name="default_audio_route_name_headphones" msgid="6954070994792640762">"హెడ్ఫోన్లు"</string> <string name="default_audio_route_name_usb" msgid="895668743163316932">"USB"</string> <string name="default_audio_route_category_name" msgid="5241740395748134483">"సిస్టమ్"</string> diff --git a/core/res/res/values-th/strings.xml b/core/res/res/values-th/strings.xml index 83d3e8a195e5..323237da8f1f 100644 --- a/core/res/res/values-th/strings.xml +++ b/core/res/res/values-th/strings.xml @@ -1600,7 +1600,7 @@ <string name="default_audio_route_name" product="tv" msgid="4908971385068087367">"ทีวี"</string> <string name="default_audio_route_name" product="default" msgid="9213546147739983977">"โทรศัพท์"</string> <string name="default_audio_route_name_dock_speakers" msgid="1551166029093995289">"ลำโพงแท่นชาร์จ"</string> - <string name="default_audio_route_name_hdmi" msgid="5474470558160717850">"HDMI"</string> + <string name="default_audio_route_name_external_device" msgid="5474470558160717850">"HDMI"</string> <string name="default_audio_route_name_headphones" msgid="6954070994792640762">"หูฟัง"</string> <string name="default_audio_route_name_usb" msgid="895668743163316932">"USB"</string> <string name="default_audio_route_category_name" msgid="5241740395748134483">"ระบบ"</string> diff --git a/core/res/res/values-tl/strings.xml b/core/res/res/values-tl/strings.xml index 6956fc3e2465..4b3bbf689043 100644 --- a/core/res/res/values-tl/strings.xml +++ b/core/res/res/values-tl/strings.xml @@ -1600,7 +1600,7 @@ <string name="default_audio_route_name" product="tv" msgid="4908971385068087367">"TV"</string> <string name="default_audio_route_name" product="default" msgid="9213546147739983977">"Telepono"</string> <string name="default_audio_route_name_dock_speakers" msgid="1551166029093995289">"Mga speaker ng dock"</string> - <string name="default_audio_route_name_hdmi" msgid="5474470558160717850">"HDMI"</string> + <string name="default_audio_route_name_external_device" msgid="5474470558160717850">"HDMI"</string> <string name="default_audio_route_name_headphones" msgid="6954070994792640762">"Mga Headphone"</string> <string name="default_audio_route_name_usb" msgid="895668743163316932">"USB"</string> <string name="default_audio_route_category_name" msgid="5241740395748134483">"System"</string> diff --git a/core/res/res/values-tr/strings.xml b/core/res/res/values-tr/strings.xml index a8517a8b4e2f..548778a2cd4f 100644 --- a/core/res/res/values-tr/strings.xml +++ b/core/res/res/values-tr/strings.xml @@ -1600,7 +1600,7 @@ <string name="default_audio_route_name" product="tv" msgid="4908971385068087367">"TV"</string> <string name="default_audio_route_name" product="default" msgid="9213546147739983977">"Telefon"</string> <string name="default_audio_route_name_dock_speakers" msgid="1551166029093995289">"Yuva hoparlörleri"</string> - <string name="default_audio_route_name_hdmi" msgid="5474470558160717850">"HDMI"</string> + <string name="default_audio_route_name_external_device" msgid="5474470558160717850">"HDMI"</string> <string name="default_audio_route_name_headphones" msgid="6954070994792640762">"Kulaklıklar"</string> <string name="default_audio_route_name_usb" msgid="895668743163316932">"USB"</string> <string name="default_audio_route_category_name" msgid="5241740395748134483">"Sistem"</string> diff --git a/core/res/res/values-uk/strings.xml b/core/res/res/values-uk/strings.xml index 1160a2eedc56..b70839feb89a 100644 --- a/core/res/res/values-uk/strings.xml +++ b/core/res/res/values-uk/strings.xml @@ -1602,7 +1602,7 @@ <string name="default_audio_route_name" product="tv" msgid="4908971385068087367">"Телевізор"</string> <string name="default_audio_route_name" product="default" msgid="9213546147739983977">"Телефон"</string> <string name="default_audio_route_name_dock_speakers" msgid="1551166029093995289">"Динаміки док-станції"</string> - <string name="default_audio_route_name_hdmi" msgid="5474470558160717850">"HDMI"</string> + <string name="default_audio_route_name_external_device" msgid="5474470558160717850">"HDMI"</string> <string name="default_audio_route_name_headphones" msgid="6954070994792640762">"Навушники"</string> <string name="default_audio_route_name_usb" msgid="895668743163316932">"USB"</string> <string name="default_audio_route_category_name" msgid="5241740395748134483">"Система"</string> diff --git a/core/res/res/values-ur/strings.xml b/core/res/res/values-ur/strings.xml index 08872aa2268c..e731362ff027 100644 --- a/core/res/res/values-ur/strings.xml +++ b/core/res/res/values-ur/strings.xml @@ -1600,7 +1600,7 @@ <string name="default_audio_route_name" product="tv" msgid="4908971385068087367">"TV"</string> <string name="default_audio_route_name" product="default" msgid="9213546147739983977">"فون"</string> <string name="default_audio_route_name_dock_speakers" msgid="1551166029093995289">"ڈاک اسپیکرز"</string> - <string name="default_audio_route_name_hdmi" msgid="5474470558160717850">"HDMI"</string> + <string name="default_audio_route_name_external_device" msgid="5474470558160717850">"HDMI"</string> <string name="default_audio_route_name_headphones" msgid="6954070994792640762">"ہیڈ فونز"</string> <string name="default_audio_route_name_usb" msgid="895668743163316932">"USB"</string> <string name="default_audio_route_category_name" msgid="5241740395748134483">"سسٹم"</string> diff --git a/core/res/res/values-uz/strings.xml b/core/res/res/values-uz/strings.xml index 10fd1337603d..dc28aa4b7d41 100644 --- a/core/res/res/values-uz/strings.xml +++ b/core/res/res/values-uz/strings.xml @@ -1600,7 +1600,7 @@ <string name="default_audio_route_name" product="tv" msgid="4908971385068087367">"TV"</string> <string name="default_audio_route_name" product="default" msgid="9213546147739983977">"Telefon"</string> <string name="default_audio_route_name_dock_speakers" msgid="1551166029093995289">"Taglik karnaylar"</string> - <string name="default_audio_route_name_hdmi" msgid="5474470558160717850">"HDMI"</string> + <string name="default_audio_route_name_external_device" msgid="5474470558160717850">"HDMI"</string> <string name="default_audio_route_name_headphones" msgid="6954070994792640762">"Quloq karnaychalari"</string> <string name="default_audio_route_name_usb" msgid="895668743163316932">"USB"</string> <string name="default_audio_route_category_name" msgid="5241740395748134483">"Tizim"</string> diff --git a/core/res/res/values-vi/strings.xml b/core/res/res/values-vi/strings.xml index d606c38a8cf7..ccbf1364ba87 100644 --- a/core/res/res/values-vi/strings.xml +++ b/core/res/res/values-vi/strings.xml @@ -1600,7 +1600,7 @@ <string name="default_audio_route_name" product="tv" msgid="4908971385068087367">"TV"</string> <string name="default_audio_route_name" product="default" msgid="9213546147739983977">"Điện thoại"</string> <string name="default_audio_route_name_dock_speakers" msgid="1551166029093995289">"Loa đế"</string> - <string name="default_audio_route_name_hdmi" msgid="5474470558160717850">"HDMI"</string> + <string name="default_audio_route_name_external_device" msgid="5474470558160717850">"HDMI"</string> <string name="default_audio_route_name_headphones" msgid="6954070994792640762">"Tai nghe"</string> <string name="default_audio_route_name_usb" msgid="895668743163316932">"USB"</string> <string name="default_audio_route_category_name" msgid="5241740395748134483">"Hệ thống"</string> diff --git a/core/res/res/values-zh-rCN/strings.xml b/core/res/res/values-zh-rCN/strings.xml index d86c174163ed..762f878f5190 100644 --- a/core/res/res/values-zh-rCN/strings.xml +++ b/core/res/res/values-zh-rCN/strings.xml @@ -1600,7 +1600,7 @@ <string name="default_audio_route_name" product="tv" msgid="4908971385068087367">"电视"</string> <string name="default_audio_route_name" product="default" msgid="9213546147739983977">"手机"</string> <string name="default_audio_route_name_dock_speakers" msgid="1551166029093995289">"基座扬声器"</string> - <string name="default_audio_route_name_hdmi" msgid="5474470558160717850">"HDMI"</string> + <string name="default_audio_route_name_external_device" msgid="5474470558160717850">"HDMI"</string> <string name="default_audio_route_name_headphones" msgid="6954070994792640762">"耳机"</string> <string name="default_audio_route_name_usb" msgid="895668743163316932">"USB"</string> <string name="default_audio_route_category_name" msgid="5241740395748134483">"系统"</string> diff --git a/core/res/res/values-zh-rHK/strings.xml b/core/res/res/values-zh-rHK/strings.xml index 369705c0970f..78b648fa19f8 100644 --- a/core/res/res/values-zh-rHK/strings.xml +++ b/core/res/res/values-zh-rHK/strings.xml @@ -1600,7 +1600,7 @@ <string name="default_audio_route_name" product="tv" msgid="4908971385068087367">"電視"</string> <string name="default_audio_route_name" product="default" msgid="9213546147739983977">"手機"</string> <string name="default_audio_route_name_dock_speakers" msgid="1551166029093995289">"插座喇叭"</string> - <string name="default_audio_route_name_hdmi" msgid="5474470558160717850">"HDMI"</string> + <string name="default_audio_route_name_external_device" msgid="5474470558160717850">"HDMI"</string> <string name="default_audio_route_name_headphones" msgid="6954070994792640762">"耳機"</string> <string name="default_audio_route_name_usb" msgid="895668743163316932">"USB"</string> <string name="default_audio_route_category_name" msgid="5241740395748134483">"系統"</string> diff --git a/core/res/res/values-zh-rTW/strings.xml b/core/res/res/values-zh-rTW/strings.xml index a72421346cdf..76a10a4d8a1c 100644 --- a/core/res/res/values-zh-rTW/strings.xml +++ b/core/res/res/values-zh-rTW/strings.xml @@ -1600,7 +1600,7 @@ <string name="default_audio_route_name" product="tv" msgid="4908971385068087367">"電視"</string> <string name="default_audio_route_name" product="default" msgid="9213546147739983977">"手機"</string> <string name="default_audio_route_name_dock_speakers" msgid="1551166029093995289">"座架喇叭"</string> - <string name="default_audio_route_name_hdmi" msgid="5474470558160717850">"HDMI"</string> + <string name="default_audio_route_name_external_device" msgid="5474470558160717850">"HDMI"</string> <string name="default_audio_route_name_headphones" msgid="6954070994792640762">"耳機"</string> <string name="default_audio_route_name_usb" msgid="895668743163316932">"USB"</string> <string name="default_audio_route_category_name" msgid="5241740395748134483">"系統"</string> diff --git a/core/res/res/values-zu/strings.xml b/core/res/res/values-zu/strings.xml index 7eb85962c293..4cf770de3c0d 100644 --- a/core/res/res/values-zu/strings.xml +++ b/core/res/res/values-zu/strings.xml @@ -1600,7 +1600,7 @@ <string name="default_audio_route_name" product="tv" msgid="4908971385068087367">"I-TV"</string> <string name="default_audio_route_name" product="default" msgid="9213546147739983977">"Ifoni"</string> <string name="default_audio_route_name_dock_speakers" msgid="1551166029093995289">"Izipikha ze-Dock"</string> - <string name="default_audio_route_name_hdmi" msgid="5474470558160717850">"HDMI"</string> + <string name="default_audio_route_name_external_device" msgid="5474470558160717850">"HDMI"</string> <string name="default_audio_route_name_headphones" msgid="6954070994792640762">"Ama-headphone"</string> <string name="default_audio_route_name_usb" msgid="895668743163316932">"I-USB"</string> <string name="default_audio_route_category_name" msgid="5241740395748134483">"Isistimu"</string> diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index bf155cc756c4..48db970f9659 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -4503,8 +4503,8 @@ <!-- Name of the default audio route when an audio dock is connected. [CHAR LIMIT=50] --> <string name="default_audio_route_name_dock_speakers">Dock speakers</string> - <!-- Name of the default audio route when HDMI is connected. [CHAR LIMIT=50] --> - <string name="default_audio_route_name_hdmi">HDMI</string> + <!-- Name of the default audio route when an external device is connected. [CHAR LIMIT=50] --> + <string name="default_audio_route_name_external_device">External Device</string> <!-- Name of the default audio route when wired headphones are connected. [CHAR LIMIT=50] --> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index dc09c4cc2144..234c43525a01 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -1064,7 +1064,7 @@ <java-symbol type="string" name="default_audio_route_id" /> <java-symbol type="string" name="default_audio_route_name" /> <java-symbol type="string" name="default_audio_route_name_dock_speakers" /> - <java-symbol type="string" name="default_audio_route_name_hdmi" /> + <java-symbol type="string" name="default_audio_route_name_external_device" /> <java-symbol type="string" name="default_audio_route_name_headphones" /> <java-symbol type="string" name="default_audio_route_name_usb" /> <java-symbol type="string" name="default_audio_route_category_name" /> diff --git a/media/java/android/media/MediaRouter.java b/media/java/android/media/MediaRouter.java index 7d57734defc5..375981a9d7e8 100644 --- a/media/java/android/media/MediaRouter.java +++ b/media/java/android/media/MediaRouter.java @@ -221,7 +221,7 @@ public class MediaRouter { } else if ((newRoutes.mainType & AudioRoutesInfo.MAIN_DOCK_SPEAKERS) != 0) { name = R.string.default_audio_route_name_dock_speakers; } else if ((newRoutes.mainType&AudioRoutesInfo.MAIN_HDMI) != 0) { - name = R.string.default_audio_route_name_hdmi; + name = R.string.default_audio_route_name_external_device; } else if ((newRoutes.mainType&AudioRoutesInfo.MAIN_USB) != 0) { name = R.string.default_audio_route_name_usb; } else { diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index 91d813803ac4..da914716bf19 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -8786,6 +8786,7 @@ public class ActivityManagerService extends IActivityManager.Stub * @param incrementalMetrics metrics for apps installed on Incremental. * @param errorId a unique id to append to the dropbox headers. */ + @SuppressWarnings("DoNotCall") // Ignore warning for synchronous to call to worker.run() public void addErrorToDropBox(String eventType, ProcessRecord process, String processName, String activityShortComponentName, String parentShortComponentName, ProcessRecord parentProcess, diff --git a/services/core/java/com/android/server/connectivity/Vpn.java b/services/core/java/com/android/server/connectivity/Vpn.java index 676dc196f20c..6a53978175af 100644 --- a/services/core/java/com/android/server/connectivity/Vpn.java +++ b/services/core/java/com/android/server/connectivity/Vpn.java @@ -3210,41 +3210,44 @@ public class Vpn { return; } - if (mSession != null && mMobikeEnabled) { - Log.d( - TAG, - "IKE Session has mobility. Delay handleSessionLost for losing network " - + network - + " on session with token " - + mCurrentToken); - - final int token = mCurrentToken; - // Delay the teardown in case a new network will be available soon. For example, - // during handover between two WiFi networks, Android will disconnect from the - // first WiFi and then connects to the second WiFi. - mScheduledHandleNetworkLostFuture = - mExecutor.schedule( - () -> { - if (isActiveToken(token)) { - handleSessionLost(null /* exception */, network); - } else { - Log.d( - TAG, - "Scheduled handleSessionLost fired for " - + "obsolete token " - + token); + Log.d(TAG, "Schedule a delay handleSessionLost for losing network " + + network + + " on session with token " + + mCurrentToken); + + final int token = mCurrentToken; + // Delay the teardown in case a new network will be available soon. For example, + // during handover between two WiFi networks, Android will disconnect from the + // first WiFi and then connects to the second WiFi. + mScheduledHandleNetworkLostFuture = + mExecutor.schedule( + () -> { + if (isActiveToken(token)) { + handleSessionLost(new IkeNetworkLostException(network), + network); + + synchronized (Vpn.this) { + // Ignore stale runner. + if (mVpnRunner != this) return; + + updateState(DetailedState.DISCONNECTED, + "Network lost"); } + } else { + Log.d( + TAG, + "Scheduled handleSessionLost fired for " + + "obsolete token " + + token); + } + + // Reset mScheduledHandleNetworkLostFuture since it's + // already run on executor thread. + mScheduledHandleNetworkLostFuture = null; + }, + NETWORK_LOST_TIMEOUT_MS, + TimeUnit.MILLISECONDS); - // Reset mScheduledHandleNetworkLostFuture since it's - // already run on executor thread. - mScheduledHandleNetworkLostFuture = null; - }, - NETWORK_LOST_TIMEOUT_MS, - TimeUnit.MILLISECONDS); - } else { - Log.d(TAG, "Call handleSessionLost for losing network " + network); - handleSessionLost(null /* exception */, network); - } } private void cancelHandleNetworkLostTimeout() { @@ -4185,8 +4188,6 @@ public class Vpn { */ @NonNull public synchronized List<String> getAppExclusionList(@NonNull String packageName) { - enforceNotRestrictedUser(); - final long oldId = Binder.clearCallingIdentity(); try { final byte[] bytes = getVpnProfileStore().get(getVpnAppExcludedForPackage(packageName)); diff --git a/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceAudioSystem.java b/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceAudioSystem.java index 99bbc3f2d86b..32ff5e220825 100644 --- a/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceAudioSystem.java +++ b/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceAudioSystem.java @@ -71,6 +71,9 @@ public class HdmiCecLocalDeviceAudioSystem extends HdmiCecLocalDeviceSource { private static final String TAG = "HdmiCecLocalDeviceAudioSystem"; private static final boolean WAKE_ON_HOTPLUG = false; + private static final int MAX_CHANNELS = 8; + private static final HashMap<Integer, List<Integer>> AUDIO_CODECS_MAP = + mapAudioCodecWithAudioFormat(); // Whether the System Audio Control feature is enabled or not. True by default. @GuardedBy("mLock") @@ -485,17 +488,17 @@ public class HdmiCecLocalDeviceAudioSystem extends HdmiCecLocalDeviceSource { } } - @AudioCodec int[] audioFormatCodes = parseAudioFormatCodes(message.getParams()); + @AudioCodec int[] audioCodecs = parseAudioCodecs(message.getParams()); byte[] sadBytes; if (config != null && config.size() > 0) { - sadBytes = getSupportedShortAudioDescriptorsFromConfig(config, audioFormatCodes); + sadBytes = getSupportedShortAudioDescriptorsFromConfig(config, audioCodecs); } else { AudioDeviceInfo deviceInfo = getSystemAudioDeviceInfo(); if (deviceInfo == null) { return Constants.ABORT_UNABLE_TO_DETERMINE; } - sadBytes = getSupportedShortAudioDescriptors(deviceInfo, audioFormatCodes); + sadBytes = getSupportedShortAudioDescriptors(deviceInfo, audioCodecs); } if (sadBytes.length == 0) { @@ -508,11 +511,12 @@ public class HdmiCecLocalDeviceAudioSystem extends HdmiCecLocalDeviceSource { } } - private byte[] getSupportedShortAudioDescriptors( - AudioDeviceInfo deviceInfo, @AudioCodec int[] audioFormatCodes) { - ArrayList<byte[]> sads = new ArrayList<>(audioFormatCodes.length); - for (@AudioCodec int audioFormatCode : audioFormatCodes) { - byte[] sad = getSupportedShortAudioDescriptor(deviceInfo, audioFormatCode); + @VisibleForTesting + byte[] getSupportedShortAudioDescriptors( + AudioDeviceInfo deviceInfo, @AudioCodec int[] audioCodecs) { + ArrayList<byte[]> sads = new ArrayList<>(audioCodecs.length); + for (@AudioCodec int audioCodec : audioCodecs) { + byte[] sad = getSupportedShortAudioDescriptor(deviceInfo, audioCodec); if (sad != null) { if (sad.length == 3) { @@ -520,7 +524,7 @@ public class HdmiCecLocalDeviceAudioSystem extends HdmiCecLocalDeviceSource { } else { HdmiLogger.warning( "Dropping Short Audio Descriptor with length %d for requested codec %x", - sad.length, audioFormatCode); + sad.length, audioCodec); } } } @@ -528,7 +532,7 @@ public class HdmiCecLocalDeviceAudioSystem extends HdmiCecLocalDeviceSource { } private byte[] getSupportedShortAudioDescriptorsFromConfig( - List<DeviceConfig> deviceConfig, @AudioCodec int[] audioFormatCodes) { + List<DeviceConfig> deviceConfig, @AudioCodec int[] audioCodecs) { DeviceConfig deviceConfigToUse = null; String audioDeviceName = SystemProperties.get( Constants.PROPERTY_SYSTEM_AUDIO_MODE_AUDIO_PORT, @@ -544,13 +548,13 @@ public class HdmiCecLocalDeviceAudioSystem extends HdmiCecLocalDeviceSource { return new byte[0]; } HashMap<Integer, byte[]> map = new HashMap<>(); - ArrayList<byte[]> sads = new ArrayList<>(audioFormatCodes.length); + ArrayList<byte[]> sads = new ArrayList<>(audioCodecs.length); for (CodecSad codecSad : deviceConfigToUse.supportedCodecs) { map.put(codecSad.audioCodec, codecSad.sad); } - for (int i = 0; i < audioFormatCodes.length; i++) { - if (map.containsKey(audioFormatCodes[i])) { - byte[] sad = map.get(audioFormatCodes[i]); + for (int i = 0; i < audioCodecs.length; i++) { + if (map.containsKey(audioCodecs[i])) { + byte[] sad = map.get(audioCodecs[i]); if (sad != null && sad.length == 3) { sads.add(sad); } @@ -572,42 +576,171 @@ public class HdmiCecLocalDeviceAudioSystem extends HdmiCecLocalDeviceSource { /** * Returns a 3 byte short audio descriptor as described in CEC 1.4 table 29 or null if the - * audioFormatCode is not supported. + * audioCodec is not supported. */ @Nullable - private byte[] getSupportedShortAudioDescriptor( - AudioDeviceInfo deviceInfo, @AudioCodec int audioFormatCode) { - switch (audioFormatCode) { - case Constants.AUDIO_CODEC_NONE: { - return null; - } - case Constants.AUDIO_CODEC_LPCM: { - return getLpcmShortAudioDescriptor(deviceInfo); + @VisibleForTesting + byte[] getSupportedShortAudioDescriptor( + AudioDeviceInfo deviceInfo, @AudioCodec int audioCodec) { + byte[] shortAudioDescriptor = new byte[3]; + + int[] deviceSupportedAudioFormats = deviceInfo.getEncodings(); + // Return null when audioCodec or device does not support any audio formats. + if (!AUDIO_CODECS_MAP.containsKey(audioCodec) || deviceSupportedAudioFormats.length == 0) { + return null; + } + List<Integer> audioCodecSupportedAudioFormats = AUDIO_CODECS_MAP.get(audioCodec); + + for (int supportedAudioFormat : deviceSupportedAudioFormats) { + if (audioCodecSupportedAudioFormats.contains(supportedAudioFormat)) { + // Initialise the first two bytes of short audio descriptor. + shortAudioDescriptor[0] = getFirstByteOfSAD(deviceInfo, audioCodec); + shortAudioDescriptor[1] = getSecondByteOfSAD(deviceInfo); + switch (audioCodec) { + case Constants.AUDIO_CODEC_NONE: { + return null; + } + case Constants.AUDIO_CODEC_LPCM: { + if (supportedAudioFormat == AudioFormat.ENCODING_PCM_16BIT) { + shortAudioDescriptor[2] = (byte) 0x01; + } else if (supportedAudioFormat + == AudioFormat.ENCODING_PCM_24BIT_PACKED) { + shortAudioDescriptor[2] = (byte) 0x04; + } else { + // Since no bit is reserved for these audio formats in LPCM codec. + shortAudioDescriptor[2] = (byte) 0x00; + } + return shortAudioDescriptor; + } + case Constants.AUDIO_CODEC_DD: + case Constants.AUDIO_CODEC_MPEG1: + case Constants.AUDIO_CODEC_MP3: + case Constants.AUDIO_CODEC_MPEG2: + case Constants.AUDIO_CODEC_AAC: + case Constants.AUDIO_CODEC_DTS: { + shortAudioDescriptor[2] = getThirdSadByteForCodecs2Through8(deviceInfo); + return shortAudioDescriptor; + } + case Constants.AUDIO_CODEC_DDP: + case Constants.AUDIO_CODEC_DTSHD: + case Constants.AUDIO_CODEC_TRUEHD: { + // Default value is 0x0 unless defined by Audio Codec Vendor. + shortAudioDescriptor[2] = (byte) 0x00; + return shortAudioDescriptor; + } + case Constants.AUDIO_CODEC_ATRAC: + case Constants.AUDIO_CODEC_ONEBITAUDIO: + case Constants.AUDIO_CODEC_DST: + case Constants.AUDIO_CODEC_WMAPRO: + // Not supported. + default: { + return null; + } + } } - // TODO(b/80297701): implement the rest of the codecs - case Constants.AUDIO_CODEC_DD: - case Constants.AUDIO_CODEC_MPEG1: - case Constants.AUDIO_CODEC_MP3: - case Constants.AUDIO_CODEC_MPEG2: - case Constants.AUDIO_CODEC_AAC: - case Constants.AUDIO_CODEC_DTS: - case Constants.AUDIO_CODEC_ATRAC: - case Constants.AUDIO_CODEC_ONEBITAUDIO: - case Constants.AUDIO_CODEC_DDP: - case Constants.AUDIO_CODEC_DTSHD: - case Constants.AUDIO_CODEC_TRUEHD: - case Constants.AUDIO_CODEC_DST: - case Constants.AUDIO_CODEC_WMAPRO: - default: { - return null; + } + return null; + } + + private static HashMap<Integer, List<Integer>> mapAudioCodecWithAudioFormat() { + // Mapping the values of @AudioCodec audio codecs with @AudioFormat audio formats. + HashMap<Integer, List<Integer>> audioCodecsMap = new HashMap<Integer, List<Integer>>(); + + audioCodecsMap.put(Constants.AUDIO_CODEC_NONE, List.of(AudioFormat.ENCODING_DEFAULT)); + audioCodecsMap.put( + Constants.AUDIO_CODEC_LPCM, + List.of( + AudioFormat.ENCODING_PCM_8BIT, + AudioFormat.ENCODING_PCM_16BIT, + AudioFormat.ENCODING_PCM_FLOAT, + AudioFormat.ENCODING_PCM_24BIT_PACKED, + AudioFormat.ENCODING_PCM_32BIT)); + audioCodecsMap.put(Constants.AUDIO_CODEC_DD, List.of(AudioFormat.ENCODING_AC3)); + audioCodecsMap.put(Constants.AUDIO_CODEC_MPEG1, List.of(AudioFormat.ENCODING_AAC_HE_V1)); + audioCodecsMap.put(Constants.AUDIO_CODEC_MPEG2, List.of(AudioFormat.ENCODING_AAC_HE_V2)); + audioCodecsMap.put(Constants.AUDIO_CODEC_MP3, List.of(AudioFormat.ENCODING_MP3)); + audioCodecsMap.put(Constants.AUDIO_CODEC_AAC, List.of(AudioFormat.ENCODING_AAC_LC)); + audioCodecsMap.put(Constants.AUDIO_CODEC_DTS, List.of(AudioFormat.ENCODING_DTS)); + audioCodecsMap.put( + Constants.AUDIO_CODEC_DDP, + List.of(AudioFormat.ENCODING_E_AC3, AudioFormat.ENCODING_E_AC3_JOC)); + audioCodecsMap.put(Constants.AUDIO_CODEC_DTSHD, List.of(AudioFormat.ENCODING_DTS_HD)); + audioCodecsMap.put( + Constants.AUDIO_CODEC_TRUEHD, + List.of(AudioFormat.ENCODING_DOLBY_TRUEHD, AudioFormat.ENCODING_DOLBY_MAT)); + + return audioCodecsMap; + } + + private byte getFirstByteOfSAD(AudioDeviceInfo deviceInfo, @AudioCodec int audioCodec) { + byte firstByte = 0; + int maxNumberOfChannels = getMaxNumberOfChannels(deviceInfo); + + // Fill bits 0-2 of the first byte. + firstByte |= (maxNumberOfChannels - 1); + + // Fill bits 3-6 of the first byte. + firstByte |= (audioCodec << 3); + + return firstByte; + } + + private byte getSecondByteOfSAD(AudioDeviceInfo deviceInfo) { + ArrayList<Integer> samplingRates = + new ArrayList<Integer>(Arrays.asList(32, 44, 48, 88, 96, 176, 192)); + + // samplingRatesdevicesupports is guaranteed to be not null + int[] samplingRatesDeviceSupports = deviceInfo.getSampleRates(); + if (samplingRatesDeviceSupports.length == 0) { + Slog.e(TAG, "Device supports arbitrary rates"); + // Since device supports arbitrary rates, we will return 0x7f since bit 7 is reserved. + return (byte) 0x7f; + } + byte secondByte = 0; + for (int supportedSampleRate : samplingRatesDeviceSupports) { + if (samplingRates.contains(supportedSampleRate)) { + int index = samplingRates.indexOf(supportedSampleRate); + // Setting the bit of a sample rate which is being supported. + secondByte |= (1 << index); } } + + return secondByte; } - @Nullable - private byte[] getLpcmShortAudioDescriptor(AudioDeviceInfo deviceInfo) { - // TODO(b/80297701): implement - return null; + /** + * Empty array from deviceInfo.getChannelCounts() implies device supports arbitrary channel + * counts and hence we assume max channels are supported by the device. + */ + private int getMaxNumberOfChannels(AudioDeviceInfo deviceInfo) { + int maxNumberOfChannels = MAX_CHANNELS; + int[] channelCounts = deviceInfo.getChannelCounts(); + if (channelCounts.length != 0) { + maxNumberOfChannels = channelCounts[channelCounts.length - 1]; + maxNumberOfChannels = + (maxNumberOfChannels > MAX_CHANNELS ? MAX_CHANNELS : maxNumberOfChannels); + } + return maxNumberOfChannels; + } + + private byte getThirdSadByteForCodecs2Through8(AudioDeviceInfo deviceInfo) { + /* + * Here, we are assuming that max bit rate is closely equals to the max sampling rate the + * device supports. + */ + int maxSamplingRate = 0; + int[] samplingRatesDeviceSupports = deviceInfo.getSampleRates(); + if (samplingRatesDeviceSupports.length == 0) { + maxSamplingRate = 192; + } else { + for (int sampleRate : samplingRatesDeviceSupports) { + if (maxSamplingRate < sampleRate) { + maxSamplingRate = sampleRate; + } + } + } + + return (byte) (maxSamplingRate / 8); } @Nullable @@ -634,14 +767,14 @@ public class HdmiCecLocalDeviceAudioSystem extends HdmiCecLocalDeviceSource { } @AudioCodec - private int[] parseAudioFormatCodes(byte[] params) { - @AudioCodec int[] audioFormatCodes = new int[params.length]; + private int[] parseAudioCodecs(byte[] params) { + @AudioCodec int[] audioCodecs = new int[params.length]; for (int i = 0; i < params.length; i++) { byte val = params[i]; - audioFormatCodes[i] = - val >= 1 && val <= Constants.AUDIO_CODEC_MAX ? val : Constants.AUDIO_CODEC_NONE; + audioCodecs[i] = + val >= 1 && val <= Constants.AUDIO_CODEC_MAX ? val : Constants.AUDIO_CODEC_NONE; } - return audioFormatCodes; + return audioCodecs; } @Override diff --git a/services/core/java/com/android/server/media/SystemMediaRoute2Provider.java b/services/core/java/com/android/server/media/SystemMediaRoute2Provider.java index d91bf8c00044..9466a6f5615f 100644 --- a/services/core/java/com/android/server/media/SystemMediaRoute2Provider.java +++ b/services/core/java/com/android/server/media/SystemMediaRoute2Provider.java @@ -287,7 +287,7 @@ class SystemMediaRoute2Provider extends MediaRoute2Provider { name = com.android.internal.R.string.default_audio_route_name_dock_speakers; } else if ((newRoutes.mainType & AudioRoutesInfo.MAIN_HDMI) != 0) { type = TYPE_HDMI; - name = com.android.internal.R.string.default_audio_route_name_hdmi; + name = com.android.internal.R.string.default_audio_route_name_external_device; } else if ((newRoutes.mainType & AudioRoutesInfo.MAIN_USB) != 0) { type = TYPE_USB_DEVICE; name = com.android.internal.R.string.default_audio_route_name_usb; diff --git a/telephony/java/android/telephony/NetworkService.java b/telephony/java/android/telephony/NetworkService.java index c75de42707a6..ac892da765e7 100644 --- a/telephony/java/android/telephony/NetworkService.java +++ b/telephony/java/android/telephony/NetworkService.java @@ -265,7 +265,7 @@ public abstract class NetworkService extends Service { /** @hide */ @Override public void onDestroy() { - mHandlerThread.quit(); + mHandlerThread.quitSafely(); super.onDestroy(); } diff --git a/telephony/java/android/telephony/data/DataService.java b/telephony/java/android/telephony/data/DataService.java index 700d61597d00..d8b2cbebdf28 100644 --- a/telephony/java/android/telephony/data/DataService.java +++ b/telephony/java/android/telephony/data/DataService.java @@ -725,7 +725,7 @@ public abstract class DataService extends Service { @Override public void onDestroy() { - mHandlerThread.quit(); + mHandlerThread.quitSafely(); super.onDestroy(); } diff --git a/tools/fonts/Android.bp b/tools/fonts/Android.bp index eeb9e3ceda1e..f8629f9bd0b8 100644 --- a/tools/fonts/Android.bp +++ b/tools/fonts/Android.bp @@ -24,12 +24,7 @@ package { python_defaults { name: "fonts_python_defaults", version: { - py2: { - enabled: false, - embedded_launcher: false, - }, py3: { - enabled: true, embedded_launcher: true, }, }, |