diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2015-03-09 23:29:09 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-03-09 23:29:10 +0000 |
| commit | 7e443fbe85b39842dbf0d5949184e51bae19d59c (patch) | |
| tree | 0d54c86f6f4538811552b24ce12afde2724d8d16 /core | |
| parent | f44b94c2adefae7b54bb60cce72a73e9a95a55cf (diff) | |
| parent | 864005b02625fb9a82336b736bf1ca81b1fa77f2 (diff) | |
| download | frameworks_base-7e443fbe85b39842dbf0d5949184e51bae19d59c.zip frameworks_base-7e443fbe85b39842dbf0d5949184e51bae19d59c.tar.gz frameworks_base-7e443fbe85b39842dbf0d5949184e51bae19d59c.tar.bz2 | |
Merge "Camera2: Remove unused parameters in ICameraDeviceUser#createStream"
Diffstat (limited to 'core')
3 files changed, 3 insertions, 5 deletions
diff --git a/core/java/android/hardware/camera2/ICameraDeviceUser.aidl b/core/java/android/hardware/camera2/ICameraDeviceUser.aidl index 50a58ed..d286d38 100644 --- a/core/java/android/hardware/camera2/ICameraDeviceUser.aidl +++ b/core/java/android/hardware/camera2/ICameraDeviceUser.aidl @@ -66,7 +66,7 @@ interface ICameraDeviceUser int deleteStream(int streamId); // non-negative value is the stream ID. negative value is status_t - int createStream(int width, int height, int format, in Surface surface); + int createStream(in Surface surface); int createDefaultRequest(int templateId, out CameraMetadataNative request); diff --git a/core/java/android/hardware/camera2/impl/CameraDeviceImpl.java b/core/java/android/hardware/camera2/impl/CameraDeviceImpl.java index ec450bd..78aefa5 100644 --- a/core/java/android/hardware/camera2/impl/CameraDeviceImpl.java +++ b/core/java/android/hardware/camera2/impl/CameraDeviceImpl.java @@ -373,9 +373,7 @@ public class CameraDeviceImpl extends CameraDevice { // Add all new streams for (Surface s : addSet) { - // TODO: remove width,height,format since we are ignoring - // it. - int streamId = mRemoteDevice.createStream(0, 0, 0, s); + int streamId = mRemoteDevice.createStream(s); mConfiguredOutputs.put(streamId, s); } diff --git a/core/java/android/hardware/camera2/legacy/CameraDeviceUserShim.java b/core/java/android/hardware/camera2/legacy/CameraDeviceUserShim.java index fcf172c..26cd498 100644 --- a/core/java/android/hardware/camera2/legacy/CameraDeviceUserShim.java +++ b/core/java/android/hardware/camera2/legacy/CameraDeviceUserShim.java @@ -504,7 +504,7 @@ public class CameraDeviceUserShim implements ICameraDeviceUser { } @Override - public int createStream(int width, int height, int format, Surface surface) { + public int createStream(Surface surface) { if (DEBUG) { Log.d(TAG, "createStream called."); } |