diff --git a/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java b/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
index 1d5a7d3eb7baf..2b53895b7dc43 100644
--- a/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
+++ b/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
@@ -284,11 +284,6 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice {
 
         addAndStartAction(
                 new SystemAudioActionFromTv(this, avr.getLogicalAddress(), enabled, callback));
-   }
-
-    boolean canChangeSystemAudioMode() {
-        // TODO: once have immutable device info, test whether avr info exists or not.
-        return false;
     }
 
     void setSystemAudioMode(boolean on) {
@@ -504,6 +499,12 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice {
         return false;
     }
 
+    @ServiceThreadOnly
+    HdmiCecDeviceInfo getAvrDeviceInfo() {
+        assertRunOnServiceThread();
+        return getDeviceInfo(HdmiCec.ADDR_AUDIO_SYSTEM);
+    }
+
     /**
      * Return a {@link HdmiCecDeviceInfo} corresponding to the given {@code logicalAddress}.
      *
@@ -520,10 +521,12 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice {
         return mDeviceInfos.get(logicalAddress);
     }
 
-    @ServiceThreadOnly
-    HdmiCecDeviceInfo getAvrDeviceInfo() {
-        assertRunOnServiceThread();
-        return getDeviceInfo(HdmiCec.ADDR_AUDIO_SYSTEM);
+    boolean hasSystemAudioDevice() {
+        return getSafeAvrDeviceInfo() != null;
+    }
+
+    HdmiCecDeviceInfo getSafeAvrDeviceInfo() {
+        return getSafeDeviceInfo(HdmiCec.ADDR_AUDIO_SYSTEM);
     }
 
     /**
@@ -539,10 +542,6 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice {
         }
     }
 
-    HdmiCecDeviceInfo getSafeAvrDeviceInfo() {
-        return getSafeDeviceInfo(HdmiCec.ADDR_AUDIO_SYSTEM);
-    }
-
     /**
      * Called when a device is newly added or a new device is detected.
      *
diff --git a/services/core/java/com/android/server/hdmi/HdmiControlService.java b/services/core/java/com/android/server/hdmi/HdmiControlService.java
index 055751b51f17d..1a18c10ad541e 100644
--- a/services/core/java/com/android/server/hdmi/HdmiControlService.java
+++ b/services/core/java/com/android/server/hdmi/HdmiControlService.java
@@ -672,7 +672,7 @@ public final class HdmiControlService extends SystemService {
             if (tv == null) {
                 return false;
             }
-            return tv.canChangeSystemAudioMode();
+            return tv.hasSystemAudioDevice();
         }
 
         @Override