diff options
author | Sascha Haeberling <haeberling@google.com> | 2014-08-23 02:05:47 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-23 02:05:47 +0000 |
commit | ceff90aa9bcb2cfce2f48b187948af8bbbdc9172 (patch) | |
tree | 189e5d0d8a51a5b321b869751913cc69f4760231 /src_pd_gcam/com/android/camera | |
parent | 0a395068f1360aafdea215d4c182b0f3df57abd2 (diff) | |
parent | 392f249b8295509cf6c31984f2420b876ca5a7ac (diff) | |
download | android_packages_apps_Camera2-ceff90aa9bcb2cfce2f48b187948af8bbbdc9172.tar.gz android_packages_apps_Camera2-ceff90aa9bcb2cfce2f48b187948af8bbbdc9172.tar.bz2 android_packages_apps_Camera2-ceff90aa9bcb2cfce2f48b187948af8bbbdc9172.zip |
am 392f249b: Merge "Enable switching within CaptureModule to HDR+ and back." into ub-camera-glacier
* commit '392f249b8295509cf6c31984f2420b876ca5a7ac':
Enable switching within CaptureModule to HDR+ and back.
Diffstat (limited to 'src_pd_gcam/com/android/camera')
-rw-r--r-- | src_pd_gcam/com/android/camera/util/GcamHelper.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src_pd_gcam/com/android/camera/util/GcamHelper.java b/src_pd_gcam/com/android/camera/util/GcamHelper.java index 2b9a00036..97d4b2ca0 100644 --- a/src_pd_gcam/com/android/camera/util/GcamHelper.java +++ b/src_pd_gcam/com/android/camera/util/GcamHelper.java @@ -19,7 +19,6 @@ import android.content.ContentResolver; import com.android.camera.CameraModule; import com.android.camera.app.AppController; -import com.android.camera.app.CameraServices; public class GcamHelper { @@ -27,6 +26,10 @@ public class GcamHelper { return null; } + public static boolean hasGcamAsSeparateModule() { + return false; + } + public static boolean hasGcamCapture() { return false; } |