Merge "CameraUtil: add float clamp function" into gb-ub-photos-carlsbad

1 files changed, 7 insertions, 1 deletions

diff --git a/src/com/android/camera/util/CameraUtil.java b/src/com/android/camera/util/CameraUtil.java
index 9f4ea91f5..458ae04f2 100644
--- a/src/com/android/camera/util/CameraUtil.java
+++ b/src/com/android/camera/util/CameraUtil.java
@@ -393,6 +393,12 @@ public class CameraUtil {
         return x;
     }
 
+    public static float clamp(float x, float min, float max) {
+        if (x > max) return max;
+        if (x < min) return min;
+        return x;
+    }
+
     public static int getDisplayRotation(Activity activity) {
         int rotation = activity.getWindowManager().getDefaultDisplay()
                 .getRotation();
@@ -826,7 +832,7 @@ public class CameraUtil {
     }
 
     private static class ImageFileNamer {
-        private SimpleDateFormat mFormat;
+        private final SimpleDateFormat mFormat;
 
         // The date (in milliseconds) used to generate the last name.
         private long mLastDate;