summaryrefslogtreecommitdiffstats
path: root/src_pd
diff options
context:
space:
mode:
authorSascha Haeberling <haeberling@google.com>2015-03-06 23:46:27 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-03-06 23:46:27 +0000
commit2cd148f3cb0d37b2e8220c6226c201bf4d117ea2 (patch)
tree12c6d32b0c3e3bc08ff043e36b86d410f0ae6a58 /src_pd
parentac8e7dfcf441ffa38415f2e555ad2061673ef2cd (diff)
parent86d753fcbb0c7474fa9b2797e76e31ef575e76cd (diff)
downloadandroid_packages_apps_Camera2-2cd148f3cb0d37b2e8220c6226c201bf4d117ea2.tar.gz
android_packages_apps_Camera2-2cd148f3cb0d37b2e8220c6226c201bf4d117ea2.tar.bz2
android_packages_apps_Camera2-2cd148f3cb0d37b2e8220c6226c201bf4d117ea2.zip
Merge "Add black-list for resolutions." into ub-camera-haleakala
Diffstat (limited to 'src_pd')
-rw-r--r--src_pd/com/android/camera/util/GservicesHelper.java8
1 files changed, 8 insertions, 0 deletions
diff --git a/src_pd/com/android/camera/util/GservicesHelper.java b/src_pd/com/android/camera/util/GservicesHelper.java
index 9cddbff04..c08f842dc 100644
--- a/src_pd/com/android/camera/util/GservicesHelper.java
+++ b/src_pd/com/android/camera/util/GservicesHelper.java
@@ -21,6 +21,14 @@ import android.content.Context;
public class GservicesHelper {
+ public static String getBlacklistedResolutionsBack(ContentResolver contentResolver) {
+ return "";
+ }
+
+ public static String getBlacklistedResolutionsFront(ContentResolver contentResolver) {
+ return "";
+ }
+
public static boolean isCaptureModuleDisabled(ContentResolver contentResolver) {
return false;
}