Merge "napdragonCamera: Disable KEY_SAVERAW when get RAW10 size is null" into camera-SnapdragonCamera.lnx.2.0

1 files changed, 11 insertions, 0 deletions

diff --git a/src/com/android/camera/SettingsActivity.java b/src/com/android/camera/SettingsActivity.java
index 4a8e28d8f..330733d29 100755
--- a/src/com/android/camera/SettingsActivity.java
+++ b/src/com/android/camera/SettingsActivity.java
@@ -35,6 +35,7 @@ import android.content.Context;
 import android.content.DialogInterface;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
+import android.graphics.ImageFormat;
 import android.os.Bundle;
 import android.preference.ListPreference;
 import android.preference.Preference;
@@ -47,6 +48,7 @@ import android.preference.SwitchPreference;
 import android.view.Window;
 import android.view.WindowManager;
 import android.util.Log;
+import android.util.Size;
 import android.widget.Toast;
 import android.widget.LinearLayout;
 import android.widget.TextView;
@@ -683,6 +685,15 @@ public class SettingsActivity extends PreferenceActivity {
             }
         }
 
+        // when get RAW10 size is null, disable the KEY_SAVERAW
+        int cameraId = mSettingsManager.getCurrentCameraId();
+        Size[] rawSize = mSettingsManager.getSupportedOutputSize(cameraId,
+                ImageFormat.RAW10);
+        if (rawSize == null) {
+            Preference p = findPreference(SettingsManager.KEY_SAVERAW);
+            p.setEnabled(false);
+        }
+
         try {
             String versionName = getPackageManager().getPackageInfo(getPackageName(), 0).versionName;
             int index = versionName.indexOf(' ');