diff options
| author | Angus Kong <shkong@google.com> | 2013-07-19 14:55:07 -0700 |
|---|---|---|
| committer | Angus Kong <shkong@google.com> | 2013-07-24 12:05:32 -0700 |
| commit | 6a8e8a1a0f3e8e62cd350733e275047475380d6b (patch) | |
| tree | 89e31aadbee612f72a6ecb97585cb2d9418c2bbe /src/com/android/camera/PhotoModule.java | |
| parent | 2641302a93350698b2eeee2bc90b6a9836e23007 (diff) | |
| download | android_packages_apps_Snap-6a8e8a1a0f3e8e62cd350733e275047475380d6b.tar.gz android_packages_apps_Snap-6a8e8a1a0f3e8e62cd350733e275047475380d6b.tar.bz2 android_packages_apps_Snap-6a8e8a1a0f3e8e62cd350733e275047475380d6b.zip | |
Remove legacy code ActivityBase.java.
Change-Id: I7b372e5d69c3d01b4012ab61bbf725a7fec8a445
Diffstat (limited to 'src/com/android/camera/PhotoModule.java')
| -rw-r--r-- | src/com/android/camera/PhotoModule.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index 6ca26aa3e..361f111ea 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -1301,8 +1301,8 @@ public class PhotoModule // To reduce the latency, keep the camera for a short time so it does // not need to be opened again. if (mCameraDevice != null && mActivity.isSecureCamera() - && ActivityBase.isFirstStartAfterScreenOn()) { - ActivityBase.resetFirstStartAfterScreenOn(); + && CameraActivity.isFirstStartAfterScreenOn()) { + CameraActivity.resetFirstStartAfterScreenOn(); CameraHolder.instance().keep(KEEP_CAMERA_TIMEOUT); } // Reset the focus first. Camera CTS does not guarantee that @@ -1826,7 +1826,7 @@ public class PhotoModule public boolean isImageCaptureIntent() { String action = mActivity.getIntent().getAction(); return (MediaStore.ACTION_IMAGE_CAPTURE.equals(action) - || ActivityBase.ACTION_IMAGE_CAPTURE_SECURE.equals(action)); + || CameraActivity.ACTION_IMAGE_CAPTURE_SECURE.equals(action)); } private void setupCaptureParams() { |