2 files changed, 19 insertions, 10 deletions
diff --git a/src_pd/com/android/camera/one/v2/OneCameraCreator.java b/src_pd/com/android/camera/one/v2/OneCameraCreator.java
index 248caa96e..ea9a94e1e 100644
--- a/src_pd/com/android/camera/one/v2/OneCameraCreator.java
+++ b/src_pd/com/android/camera/one/v2/OneCameraCreator.java
@@ -16,28 +16,35 @@
 
 package com.android.camera.one.v2;
 
+import android.content.Context;
 import android.hardware.camera2.CameraCharacteristics;
 import android.hardware.camera2.CameraDevice;
 import android.util.DisplayMetrics;
 
+import com.android.camera.FatalErrorHandler;
 import com.android.camera.SoundPlayer;
-import com.android.camera.app.AppController;
 import com.android.camera.async.MainThread;
 import com.android.camera.burst.BurstFacade;
 import com.android.camera.one.OneCamera;
+import com.android.camera.one.OneCameraCaptureSetting;
 import com.android.camera.one.config.OneCameraFeatureConfig;
 import com.android.camera.one.v2.photo.ImageRotationCalculator;
 import com.android.camera.util.Size;
 
 public class OneCameraCreator {
-    public static OneCamera create(AppController context, boolean useHdr,
-            OneCameraFeatureConfig featureConfig, CameraDevice device,
-            CameraCharacteristics characteristics, Size pictureSize,
-            int maxMemoryMB, int maxImages,
-            DisplayMetrics displayMetrics, SoundPlayer soundPlayer,
-            MainThread mainThread, ImageRotationCalculator imageRotationCalculator,
-            BurstFacade burstController) {
+    public static OneCamera create(
+            CameraDevice device,
+            CameraCharacteristics characteristics,
+            OneCameraFeatureConfig featureConfig,
+            OneCameraCaptureSetting captureSetting,
+            DisplayMetrics displayMetrics,
+            Context context,
+            MainThread mainThread,
+            ImageRotationCalculator imageRotationCalculator,
+            BurstFacade burstController,
+            SoundPlayer soundPlayer,
+            FatalErrorHandler fatalErrorHandler) {
         // TODO: Might want to switch current camera to vendor HDR.
-        return new OneCameraImpl(device, characteristics, pictureSize);
+        return new OneCameraImpl(device, characteristics, captureSetting.getCaptureSize());
     }
 }
diff --git a/src_pd/com/android/camera/stats/UsageStatistics.java b/src_pd/com/android/camera/stats/UsageStatistics.java
index b563d81a5..558f13080 100644
--- a/src_pd/com/android/camera/stats/UsageStatistics.java
+++ b/src_pd/com/android/camera/stats/UsageStatistics.java
@@ -46,7 +46,9 @@ public class UsageStatistics {
     public void mediaView(String ref, long modifiedMillis, float zoom) {
     }
 
-    public void foregrounded(int source, int mode) {
+    public void foregrounded(int source, int mode, boolean isKeyguardLocked,
+                             boolean isKeyguardSecure, boolean startupOnCreate,
+                             long controlTime) {
     }
 
     public void backgrounded() {