Merge "Avoid throwing an Exception when setFrameRate is not implemented" into main

1 files changed, 1 insertions, 2 deletions

diff --git a/core/java/android/view/Surface.java b/core/java/android/view/Surface.java
index a1f44e4c9622..6c6e8b247886 100644
--- a/core/java/android/view/Surface.java
+++ b/core/java/android/view/Surface.java
@@ -1073,8 +1073,7 @@ public class Surface implements Parcelable {
             if (error == -EINVAL) {
                 throw new IllegalArgumentException("Invalid argument to Surface.setFrameRate()");
             } else if (error != 0) {
-                throw new RuntimeException("Failed to set frame rate on Surface. Native error: "
-                        + error);
+                Log.e(TAG, "Failed to set frame rate on Surface. Native error: " + error);
             }
         }
     }