commit 1fc9f46eae9be05b0469d1402fe99cc63976c251
author BK Choi <bkchoi@google.com> Tue Jan 02 17:19:05 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jan 02 17:19:05 2024 +0000
tree ff31e31135b3a6540c5e35596662a43378b657be
parent 286efffdf07a0df16d8e4f8fb59698e113ec8cf2
parent d68c74c6bae3913b2b9c3fe29138cdabf5a5d6e9

Merge "Set the correct platform type in AudioSystem#getPlatformType()." into main

media/java/android/media/AudioSystem.java

diff --git a/media/java/android/media/AudioSystem.java b/media/java/android/media/AudioSystem.java
index 46a0b99..0f6cbff 100644
--- a/media/java/android/media/AudioSystem.java
+++ b/media/java/android/media/AudioSystem.java
@@ -2499,14 +2499,12 @@
      * </ul>
      */
     public static int getPlatformType(Context context) {
-        if (((TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE))
-                .isVoiceCapable()) {
+        if (context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_AUTOMOTIVE)) {
+            return PLATFORM_AUTOMOTIVE;
+        } else if ((context.getSystemService(TelephonyManager.class)).isVoiceCapable()) {
             return PLATFORM_VOICE;
         } else if (context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_LEANBACK)) {
             return PLATFORM_TELEVISION;
-        } else if (context.getPackageManager().hasSystemFeature(
-                PackageManager.FEATURE_AUTOMOTIVE)) {
-            return PLATFORM_AUTOMOTIVE;
         } else {
             return PLATFORM_DEFAULT;
         }