diff options
| author | qimengp <qimengp@codeaurora.org> | 2017-05-03 10:43:44 +0800 |
|---|---|---|
| committer | qimengp <qimengp@codeaurora.org> | 2017-05-04 10:56:15 +0800 |
| commit | 9cce1f7eb64e767266641fc18b831219861aa16d (patch) | |
| tree | c1aacd36fb603fe2f189e3988bc65a108d70142c /src/com/android/camera/CameraManager.java | |
| parent | 5f56b6aa6f2e6874c1dffa6f86a01f8df524f257 (diff) | |
| download | android_packages_apps_Snap-9cce1f7eb64e767266641fc18b831219861aa16d.tar.gz android_packages_apps_Snap-9cce1f7eb64e767266641fc18b831219861aa16d.tar.bz2 android_packages_apps_Snap-9cce1f7eb64e767266641fc18b831219861aa16d.zip | |
Revert "Revert "SnapdragonCamera: Enable snapcam for Android O""
This reverts commit 04740b4f5391e04d1117d547519af44b0a67e9d8.
Change-Id: I1d8f18b2e7dabfb17e3bdb0e3c1c0c76e12f4f61
Diffstat (limited to 'src/com/android/camera/CameraManager.java')
| -rwxr-xr-x[-rw-r--r--] | src/com/android/camera/CameraManager.java | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/src/com/android/camera/CameraManager.java b/src/com/android/camera/CameraManager.java index 284f7d899..0239fb7b1 100644..100755 --- a/src/com/android/camera/CameraManager.java +++ b/src/com/android/camera/CameraManager.java @@ -25,8 +25,10 @@ import android.hardware.Camera.Parameters; import android.os.Build; import android.os.Handler; import android.view.SurfaceHolder; -import android.hardware.Camera$CameraDataCallback; -import android.hardware.Camera$CameraMetaDataCallback; +/* Disable_temporary +import android.hardware.Camera.CameraDataCallback; +import android.hardware.Camera.CameraMetaDataCallback; +*/ /** * An interface which provides possible camera device operations. * @@ -178,8 +180,9 @@ public interface CameraManager { * Sets the metadata cb * @cb Metadata callback object */ - public void setMetadataCb (Camera$CameraMetaDataCallback cb); - + /* + public void setMetadataCb (Camera.CameraMetaDataCallback cb); + */ /** * Reconnects to the camera device. * @see android.hardware.Camera#reconnect() @@ -371,7 +374,9 @@ public interface CameraManager { * * @param cb cameraDataCallback to use */ - public void setHistogramMode(Camera$CameraDataCallback cb); + /* Disable_temporary + public void setHistogramMode(Camera.CameraDataCallback cb); + */ /** * Send the Histogram Data. * |