summaryrefslogtreecommitdiffstats
path: root/src_pd
diff options
context:
space:
mode:
authorSol Boucher <solb@google.com>2014-08-16 00:23:35 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-08-15 21:23:40 +0000
commitf67f64f3b5272d1da317b8eda8e1ea1e46539416 (patch)
tree8ac58f9f8b1abaa0ded08bb590400c4326eb0585 /src_pd
parenta69d497fd44faab8afe65b748dfede715ea7239f (diff)
parent44ce4b26614f85518d548a6750c7a08908ae3596 (diff)
downloadandroid_packages_apps_Camera2-f67f64f3b5272d1da317b8eda8e1ea1e46539416.tar.gz
android_packages_apps_Camera2-f67f64f3b5272d1da317b8eda8e1ea1e46539416.tar.bz2
android_packages_apps_Camera2-f67f64f3b5272d1da317b8eda8e1ea1e46539416.zip
Merge "Enable seamless switching to/from camera2-backed Photo module" into ub-camera-glacier
Diffstat (limited to 'src_pd')
-rw-r--r--src_pd/com/android/camera/util/GservicesHelper.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/src_pd/com/android/camera/util/GservicesHelper.java b/src_pd/com/android/camera/util/GservicesHelper.java
index f5fe9f9c2..6c388596c 100644
--- a/src_pd/com/android/camera/util/GservicesHelper.java
+++ b/src_pd/com/android/camera/util/GservicesHelper.java
@@ -22,4 +22,9 @@ public class GservicesHelper {
public static int getMaxAllowedNativeMemoryMb(Context context) {
return -1;
}
+
+ public static boolean useCamera2ApiThroughPortabilityLayer(Context context) {
+ // Use the camera2 API by default. This only affects PhotoModule on L.
+ return true;
+ }
}