2 files changed, 15 insertions, 1 deletions
diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java
index 8564d4cb9..3480c762a 100755
--- a/src/com/android/camera/CaptureModule.java
+++ b/src/com/android/camera/CaptureModule.java
@@ -6145,7 +6145,6 @@ public class CaptureModule implements CameraModule, PhotoController,
             if(DEBUG) Log.d(TAG, "isDepthFocus is " + isDepthFocus);
             if (isDepthFocus != null && isDepthFocus == 1) {
                 mIsDepthFocus = true;
-                return;
             } else {
                 mIsDepthFocus = false;
             }
@@ -6154,6 +6153,10 @@ public class CaptureModule implements CameraModule, PhotoController,
             if (DEBUG) e.printStackTrace();
         }
 
+        // If focus started then don't return
+        if (mIsDepthFocus && mLastResultAFState == CaptureResult.CONTROL_AF_STATE_INACTIVE) {
+            return;
+        }
         // Report state change when AF state has changed.
         if (resultAFState != mLastResultAFState && mFocusStateListener != null) {
             mActivity.runOnUiThread(new Runnable() {
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(' ');