summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorEino-Ville Talvala <etalvala@google.com>2015-02-23 15:20:51 -0800
committerEino-Ville Talvala <etalvala@google.com>2015-03-09 11:15:30 -0700
commit864005b02625fb9a82336b736bf1ca81b1fa77f2 (patch)
treeec56003a83a5981c969917f126cc00d71208e00e /core
parent3c36b8e9569292b7da9a916b148a21dd6c273dc9 (diff)
downloadframeworks_base-864005b02625fb9a82336b736bf1ca81b1fa77f2.zip
frameworks_base-864005b02625fb9a82336b736bf1ca81b1fa77f2.tar.gz
frameworks_base-864005b02625fb9a82336b736bf1ca81b1fa77f2.tar.bz2
Camera2: Remove unused parameters in ICameraDeviceUser#createStream
- width, height, format are unused Change-Id: I26540aab1118108b0325df69cfa2dd23da41849b
Diffstat (limited to 'core')
-rw-r--r--core/java/android/hardware/camera2/ICameraDeviceUser.aidl2
-rw-r--r--core/java/android/hardware/camera2/impl/CameraDeviceImpl.java4
-rw-r--r--core/java/android/hardware/camera2/legacy/CameraDeviceUserShim.java2
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.");
}