Centralize logic for Camera API feature determination.

  Bug: 19179276

This captures camera capabilities in a centralized class and allows
them to be overridden by GServices in the field or using adb.

Since this is not it's own class it would be trivial to create another
instance for testing and pass that into CameraActivity or even to change
these values using a UI before the actual Activity is started.

Change-Id: I74262c8467f631c7b5e42b02d269d5f401d4e9e7

1 files changed, 10 insertions, 8 deletions

diff --git a/src_pd_gcam/com/android/camera/util/GcamHelper.java b/src_pd_gcam/com/android/camera/util/GcamHelper.java
index 97d4b2ca0..c375c5762 100644
--- a/src_pd_gcam/com/android/camera/util/GcamHelper.java
+++ b/src_pd_gcam/com/android/camera/util/GcamHelper.java
@@ -13,31 +13,33 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package com.android.camera.util;
 
 import android.content.ContentResolver;
 
 import com.android.camera.CameraModule;
 import com.android.camera.app.AppController;
+import com.android.camera.one.config.OneCameraFeatureConfig;
+import com.android.camera.one.config.OneCameraFeatureConfig.HdrPlusSupportLevel;
 
 public class GcamHelper {
 
-    public static CameraModule createGcamModule(AppController app) {
+    public static CameraModule createGcamModule(AppController app,
+            HdrPlusSupportLevel hdrPlusSupportLevel) {
         return null;
     }
 
-    public static boolean hasGcamAsSeparateModule() {
-        return false;
-    }
-
-    public static boolean hasGcamCapture() {
+    public static boolean hasGcamAsSeparateModule(OneCameraFeatureConfig config) {
         return false;
     }
 
-    public static boolean hasGcamAsHDRMode() {
+    public static boolean hasGcamCapture(OneCameraFeatureConfig config) {
         return false;
     }
 
-    public static void init(ContentResolver contentResolver) {
+    public static HdrPlusSupportLevel determineHdrPlusSupportLevel(
+            ContentResolver contentResolver, boolean useCaptureModule) {
+        return HdrPlusSupportLevel.NONE;
     }
 }