summaryrefslogtreecommitdiffstats
path: root/src_pd
diff options
context:
space:
mode:
authorPaul Rohde <codelogic@google.com>2015-03-30 22:08:00 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-03-30 22:08:02 +0000
commit45314d55fb25d19dc452be076ad3cbd3faaebe29 (patch)
treea62879796271edbac625cb1c0d106c2521438a04 /src_pd
parent4a0c6900b1aaa75cbd2546fdc26b08fcb9544e22 (diff)
parenta1a76c8ae8a0c6f0ffca427758c771ee77af2c59 (diff)
downloadandroid_packages_apps_Camera2-45314d55fb25d19dc452be076ad3cbd3faaebe29.tar.gz
android_packages_apps_Camera2-45314d55fb25d19dc452be076ad3cbd3faaebe29.tar.bz2
android_packages_apps_Camera2-45314d55fb25d19dc452be076ad3cbd3faaebe29.zip
Merge "Collect and log jank statistics in the Camera." into ub-camera-haleakala
Diffstat (limited to 'src_pd')
-rw-r--r--src_pd/com/android/camera/stats/UsageStatistics.java3
-rw-r--r--src_pd/com/android/camera/util/GservicesHelper.java4
2 files changed, 7 insertions, 0 deletions
diff --git a/src_pd/com/android/camera/stats/UsageStatistics.java b/src_pd/com/android/camera/stats/UsageStatistics.java
index 5fd9a5dd3..924b6d1a1 100644
--- a/src_pd/com/android/camera/stats/UsageStatistics.java
+++ b/src_pd/com/android/camera/stats/UsageStatistics.java
@@ -56,6 +56,9 @@ public class UsageStatistics {
public void backgrounded() {
}
+ public void cameraFrameDrop(double deltaMs, double previousDeltaMs) {
+ }
+
public void storageWarning(long storageSpace) {
}
diff --git a/src_pd/com/android/camera/util/GservicesHelper.java b/src_pd/com/android/camera/util/GservicesHelper.java
index c08f842dc..12ae56a5e 100644
--- a/src_pd/com/android/camera/util/GservicesHelper.java
+++ b/src_pd/com/android/camera/util/GservicesHelper.java
@@ -33,6 +33,10 @@ public class GservicesHelper {
return false;
}
+ public static boolean isJankStatisticsEnabled(ContentResolver contentResolver) {
+ return false;
+ }
+
public static int getCaptureSupportLevelOverrideBack(ContentResolver contentResolver) {
return -1;
}