Merge "CaptioningManager: handle a case where caption calls enabled resource is not defined"

2022-01-24 13:45:11 +00:00
parent 24784d33e1 6785133405
commit 7d3df7b69f
1 changed files with 7 additions and 1 deletions
--- a/core/java/android/view/accessibility/CaptioningManager.java
+++ b/core/java/android/view/accessibility/CaptioningManager.java
@@ -254,7 +254,13 @@ public class CaptioningManager {
     * Returns true if system wide call captioning is enabled for this device.
     */
    public boolean isCallCaptioningEnabled() {
-        return mResources.getBoolean(R.bool.config_systemCaptionsServiceCallsEnabled);
+        try {
+            return mResources.getBoolean(
+                R.bool.config_systemCaptionsServiceCallsEnabled);
+        } catch (Resources.NotFoundException e) {
+            // The resource may not be defined, return false in that case
+            return false;
+        }
    }

    private void notifyEnabledChanged() {