Merge branch 'lollipop-mr1-release' of https://android.googlesource.com/platform/packages/apps/Camera2 into cm-12.1staging/cm-12.1

Change-Id: I24fa423d91d8d441cbf5d9e75b98037584dd2fbc

3 files changed, 9 insertions, 2 deletions

diff --git a/src_pd/com/android/camera/util/ReleaseDialogHelper.java b/src_pd/com/android/camera/util/ReleaseHelper.java
index 9db1245c1..dd41125b8 100644
--- a/src_pd/com/android/camera/util/ReleaseDialogHelper.java
+++ b/src_pd/com/android/camera/util/ReleaseHelper.java
@@ -21,7 +21,7 @@ import android.app.Activity;
 import com.android.camera.data.LocalData;
 import com.android.camera.settings.SettingsManager;
 
-public class ReleaseDialogHelper {
+public class ReleaseHelper {
     public static void showReleaseInfoDialogOnStart(Activity activity,
             SettingsManager settingsManager) {
         // Do nothing.
@@ -34,4 +34,8 @@ public class ReleaseDialogHelper {
     public static boolean shouldShowReleaseInfoDialogOnShare(LocalData data) {
         return false;
     }
+
+    public static boolean shouldLogVerbose() {
+        return false;
+    }
 }
diff --git a/src_pd/com/android/camera/util/UsageStatistics.java b/src_pd/com/android/camera/util/UsageStatistics.java
index d68dec904..6c208dec7 100644
--- a/src_pd/com/android/camera/util/UsageStatistics.java
+++ b/src_pd/com/android/camera/util/UsageStatistics.java
@@ -26,6 +26,7 @@ import java.util.HashMap;
 
 public class UsageStatistics {
     public static final long VIEW_TIMEOUT_MILLIS = 0;
+    public static final int NONE = -1;
 
     private static UsageStatistics sInstance;
 
@@ -66,7 +67,7 @@ public class UsageStatistics {
                                       Boolean volumeButtonShutter) {
     }
 
-    public void cameraFailure(int cause, String info) {
+    public void cameraFailure(int cause, String info, int agentAction, int agentState) {
     }
 
     public void changeScreen(int newScreen, Integer interactionCause) {
diff --git a/src_pd/com/google/common/logging/eventprotos.java b/src_pd/com/google/common/logging/eventprotos.java
index afb7eb3b4..292d2a6e4 100644
--- a/src_pd/com/google/common/logging/eventprotos.java
+++ b/src_pd/com/google/common/logging/eventprotos.java
@@ -54,6 +54,8 @@ public class eventprotos {
             public static final int SECURITY = 10000;
             public static final int OPEN_FAILURE = 10000;
             public static final int RECONNECT_FAILURE = 10000;
+            public static final int API_RUNTIME_EXCEPTION = 10000;
+            public static final int API_TIMEOUT = 10000;
         }
     }